heyang

pages/views/dataBoard/cagePosition.vue

@@ -184,13 +184,9 @@
 					let res = {
 						categories: ["测定仪", "色谱仪", "分析仪", "光度计", "离子色谱仪"],
 						series: [{
-			 				name: "成交量1",
+			 				name: "",
 			 				data: [90, 110, 165, 195, 187]
-			  		},
-							{
-			 				name: "成交量2",
-								data: [190, 210, 105, 35, 27]
-							}
+			  		}
 						]
 					};
 					this.chartDataTow = JSON.parse(JSON.stringify(res));

pages/views/dataBoard/daYiReservation.vue

@@ -225,40 +225,76 @@
 				],
 				dataList: [{
 						data1: '压力容器',
-						data2: '499',
+						data2: '468',
 						data3: '47',
 						data4: '220',
 						data5: '137',
 					},
 					{
 						data1: '浓缩设备',
-						data2: '199',
+						data2: '367',
 						data3: '7',
 						data4: '120',
 						data5: '37',
 					},
 					{
 						data1: '高压灭菌锅',
-						data2: '299',
+						data2: '343',
 						data3: '71',
 						data4: '10',
 						data5: '37',
 					},
 					{
 						data1: '纯水设备',
-						data2: '199',
+						data2: '256',
 						data3: '7',
 						data4: '120',
 						data5: '37',
 					},
 					{
 						data1: '二氧化碳培养箱',
-						data2: '299',
+						data2: '232',
 						data3: '71',
 						data4: '10',
 						data5: '37',
 					},
 				],
+				dataList: [{
+						data1: '压力容器',
+						data2: '468',
+						data3: '88',
+						data4: '220',
+						data5: '137',
+					},
+					{
+						data1: '浓缩设备',
+						data2: '367',
+						data3: '56',
+						data4: '120',
+						data5: '37',
+					},
+					{
+						data1: '高压灭菌锅',
+						data2: '343',
+						data3: '42',
+						data4: '10',
+						data5: '37',
+					},
+					{
+						data1: '纯水设备',
+						data2: '256',
+						data3: '34',
+						data4: '120',
+						data5: '37',
+					},
+					{
+						data1: '二氧化碳培养箱',
+						data2: '232',
+						data3: '22',
+						data4: '10',
+						data5: '37',
+					},
+				],
 				total: 0,
 			}
 		},
@@ -304,13 +340,9 @@
 					let res = {
 						categories: ["测定仪", "色谱仪", "分析仪", "光度计", "离子色谱仪"],
 						series: [{
-								name: "成交量1",
+								name: "",
 								data: [90, 110, 165, 195, 187]
 							},
-							{
-								name: "成交量2",
-								data: [190, 210, 105, 35, 27]
-							}
 						]
 					};
 					this.chartDataTow = JSON.parse(JSON.stringify(res));

pages/views/dataBoard/dataBoard.vue

@@ -10,7 +10,7 @@
 			</view>
 			<view class="header-b">
 				<view class="header-b-li">
-					<view class="header-b-li-t color-A">999</view>
+					<view class="header-b-li-t color-A">786</view>
 					<view class="header-b-li-b">今日访问人数</view>
 				</view>
 				<view class="line"></view>

pages/views/dataBoard/hazardSources.vue

@@ -25,7 +25,7 @@
 		</view>
 		<view class="small-title">
 			<view class="small-title-l">危险源总数排行TOP5 </view>
-			<img class="small-title-r" src="@/pages/images/icon_wdwg_gd.png">
+			<!-- <img class="small-title-r" src="@/pages/images/icon_wdwg_gd.png"> -->
 		</view>
 		<view class="chart">
 			<view class="chart-b">
@@ -114,55 +114,55 @@
 						align: 'center',
 					},
 					{
-						name: 'data3',
+						name: 'data2',
 						label: '总数',
 						align: 'center',
 					},
 					{
-						name: 'data4',
+						name: 'data3',
 						label: '危化品数',
 						align: 'center',
 					},
 					{
-						name: 'data5',
+						name: 'data4',
 						label: '冷热设备数',
 						align: 'center',
 					},
 				],
 				dataList: [{
 						data1: '植物保护',
-						data2: '499',
+						data2: '42',
 						data3: '47',
-						data4: '220',
-						data5: '137',
+						data4: '22',
+						data5: '13',
 					},
 					{
 						data1: '资源环境',
-						data2: '199',
-						data3: '7',
-						data4: '120',
-						data5: '37',
+						data2: '33',
+						data3: '8',
+						data4: '32',
+						data5: '28',
 					},
 					{
 						data1: '生命科学',
-						data2: '299',
-						data3: '71',
+						data2: '30',
+						data3: '28',
 						data4: '10',
-						data5: '37',
+						data5: '38',
 					},
 					{
-						data1: '资源环境',
-						data2: '199',
-						data3: '7',
-						data4: '120',
-						data5: '37',
+						data1: '园林艺术',
+						data2: '26',
+						data3: '23',
+						data4: '17',
+						data5: '54',
 					},
 					{
-						data1: '生命科学',
-						data2: '299',
-						data3: '71',
-						data4: '10',
-						data5: '37',
+						data1: '化学与药物',
+						data2: '19',
+						data3: '12',
+						data4: '11',
+						data5: '25',
 					},
 				],
 				total: 0,
@@ -191,12 +191,12 @@
 						series: [{
 								name: "危险品",
 								textColor: "#FFFFFF",
-								data: [35, 36, 31, 33, 13]
+								data: [54, 41, 36, 33, 21]
 							},
 							{
 								name: "冷热设备与特种设备",
 								textColor: "#FFFFFF",
-								data: [18, 27, 21, 24, 6]
+								data: [43, 36, 26, 31, 6]
 							}
 						]
 					};

pages/views/dataBoard/hazardousChemicals.vue

@@ -107,55 +107,55 @@
 						align: 'center',
 					},
 					{
-						name: 'data3',
+						name: 'data2',
 						label: '总数',
 						align: 'center',
 					},
 					{
-						name: 'data4',
+						name: 'data3',
 						label: '总量',
 						align: 'center',
 					},
 					{
-						name: 'data5',
+						name: 'data4',
 						label: '今日新增',
 						align: 'center',
 					},
 				],
 				dataList: [{
 						data1: '植物保护',
-						data2: '499',
+						data2: '102',
 						data3: '47',
-						data4: '220',
-						data5: '137',
+						data4: '22',
+						data5: '13',
 					},
 					{
 						data1: '资源环境',
-						data2: '199',
-						data3: '7',
-						data4: '120',
-						data5: '37',
+						data2: '74',
+						data3: '8',
+						data4: '32',
+						data5: '18',
 					},
 					{
 						data1: '生命科学',
-						data2: '299',
-						data3: '71',
+						data2: '66',
+						data3: '28',
 						data4: '10',
-						data5: '37',
+						data5: '8',
 					},
 					{
-						data1: '资源环境',
-						data2: '199',
-						data3: '7',
-						data4: '120',
-						data5: '37',
+						data1: '园林艺术',
+						data2: '56',
+						data3: '23',
+						data4: '17',
+						data5: '5',
 					},
 					{
-						data1: '生命科学',
-						data2: '299',
-						data3: '71',
-						data4: '10',
-						data5: '37',
+						data1: '化学与药物',
+						data2: '34',
+						data3: '12',
+						data4: '11',
+						data5: '21',
 					},
 				],
 				total: 0,
@@ -183,22 +183,22 @@
 							data: [{
 								"name": "植物保护",
 								"value": 50,
-								"labelText": "总量88.88kg",
+								"labelText": "总量36.65kg",
 								"textColor": "#fff",
 							}, {
 								"name": "园林艺术",
 								"value": 30,
-								"labelText": "总量88.88kg",
+								"labelText": "总量39.12kg",
 								"textColor": "#fff",
 							}, {
 								"name": "生命科学",
 								"value": 20,
-								"labelText": "总量88.88kg",
+								"labelText": "总量42.56kg",
 								"textColor": "#fff",
 							}, {
 								"name": "理学院",
 								"value": 18,
-								"labelText": "总量88.88kg",
+								"labelText": "总量56.00kg",
 								"textColor": "#fff",
 							}, {
 								"name": "农学院",

pages/views/dataBoard/labPage.vue

@@ -160,38 +160,38 @@
 				],
 				dataList: [{
 						data1: '植物保护',
-						data2: '499',
+						data2: '32',
 						data3: '47',
-						data4: '220',
-						data5: '137',
+						data4: '22',
+						data5: '13',
 					},
 					{
 						data1: '资源环境',
-						data2: '199',
-						data3: '7',
-						data4: '120',
-						data5: '37',
+						data2: '17',
+						data3: '8',
+						data4: '32',
+						data5: '28',
 					},
 					{
 						data1: '生命科学',
-						data2: '299',
-						data3: '71',
+						data2: '20',
+						data3: '28',
 						data4: '10',
-						data5: '37',
+						data5: '38',
 					},
 					{
-						data1: '资源环境',
-						data2: '199',
-						data3: '7',
-						data4: '120',
-						data5: '37',
+						data1: '园林艺术',
+						data2: '19',
+						data3: '23',
+						data4: '17',
+						data5: '54',
 					},
 					{
-						data1: '生命科学',
-						data2: '299',
-						data3: '71',
-						data4: '10',
-						data5: '37',
+						data1: '化学与药物',
+						data2: '16',
+						data3: '12',
+						data4: '11',
+						data5: '25',
 					},
 				],
 				total: 0,

pages/views/dataBoard/securityHidden.vue

@@ -19,21 +19,21 @@
 						<text>1</text>
 						<text>农学院</text>
 					</view>
-					<view class="chart-b2-li-b">132</view>
+					<view class="chart-b2-li-b">61</view>
 				</view>
 				<view class="chart-b2-li">
 					<view class="chart-b2-li-t">
-						<text>1</text>
+						<text>2</text>
 						<text>理学院</text>
 					</view>
-					<view class="chart-b2-li-b">132</view>
+					<view class="chart-b2-li-b">70</view>
 				</view>
 				<view class="chart-b2-li">
 					<view class="chart-b2-li-t">
-						<text>1</text>
+						<text>3</text>
 						<text>生命科学</text>
 					</view>
-					<view class="chart-b2-li-b">132</view>
+					<view class="chart-b2-li-b">54</view>
 				</view>
 			</view>
 			<view class="chart-b-tow" v-if="chartIndex==1 || chartIndex==2">
@@ -166,22 +166,22 @@
 						align: 'center',
 					},
 					{
-						name: 'data3',
+						name: 'data2',
 						label: '总隐患',
 						align: 'center',
 					},
 					{
-						name: 'data4',
+						name: 'data3',
 						label: '已整改',
 						align: 'center',
 					},
 					{
-						name: 'data5',
+						name: 'data4',
 						label: '未整改',
 						align: 'center',
 					},
 					{
-						name: 'data6',
+						name: 'data5',
 						label: '暂无法整改',
 						align: 'center',
 					},
@@ -202,12 +202,12 @@
 						align: 'center',
 					},
 					{
-						name: 'data3',
+						name: 'data2',
 						label: '隐患数',
 						align: 'center',
 					},
 					{
-						name: 'data4',
+						name: 'data3',
 						label: '占比',
 						align: 'center',
 					},
@@ -228,37 +228,37 @@
 						align: 'center',
 					},
 					{
-						name: 'data3',
+						name: 'data2',
 						label: '总隐患',
 						align: 'center',
 					},
 					{
-						name: 'data4',
+						name: 'data3',
 						label: '实验场所',
 						align: 'center',
 					},
 					{
-						name: 'data5',
+						name: 'data4',
 						label: '安全设施',
 						align: 'center',
 					},
 					{
-						name: 'data6',
+						name: 'data5',
 						label: '化学安全',
 						align: 'center',
 					},
 					{
-						name: 'data7',
+						name: 'data6',
 						label: '基础安全',
 						align: 'center',
 					},
 					{
-						name: 'data8',
+						name: 'data7',
 						label: '生物安全',
 						align: 'center',
 					},
 					{
-						name: 'data9',
+						name: 'data8',
 						label: '特种与冷热设备',
 						align: 'center',
 					},
@@ -266,58 +266,58 @@
 				],
 				dataList: [{
 						data1: '植物保护',
-						data2: '499',
+						data2: '102',
 						data3: '47',
-						data4: '220',
-						data5: '137',
-						data6: '137',
-						data7: '137',
-						data8: '137',
-						data9: '137',
+						data4: '22',
+						data5: '13',
+						data6: '4',
+						data7: '12',
+						data8: '23',
+						data9: '21',
 					},
 					{
 						data1: '资源环境',
-						data2: '199',
-						data3: '7',
-						data4: '120',
-						data5: '37',
-						data6: '137',
-						data7: '137',
-						data8: '137',
-						data9: '137',
+						data2: '74',
+						data3: '8',
+						data4: '32',
+						data5: '18',
+						data6: '2',
+						data7: '3',
+						data8: '23',
+						data9: '12',
 					},
 					{
 						data1: '生命科学',
-						data2: '299',
-						data3: '71',
+						data2: '66',
+						data3: '28',
 						data4: '10',
-						data5: '37',
-						data6: '137',
-						data7: '137',
-						data8: '137',
-						data9: '137',
+						data5: '8',
+						data6: '56',
+						data7: '22',
+						data8: '13',
+						data9: '12',
 					},
 					{
-						data1: '资源环境',
-						data2: '199',
-						data3: '7',
-						data4: '120',
-						data5: '37',
-						data6: '137',
-						data7: '137',
-						data8: '137',
-						data9: '137',
+						data1: '园林艺术',
+						data2: '56',
+						data3: '23',
+						data4: '17',
+						data5: '5',
+						data6: '12',
+						data7: '24',
+						data8: '53',
+						data9: '14',
 					},
 					{
-						data1: '生命科学',
-						data2: '299',
-						data3: '71',
-						data4: '10',
-						data5: '37',
-						data6: '137',
-						data7: '137',
-						data8: '137',
-						data9: '137',
+						data1: '化学与药物',
+						data2: '34',
+						data3: '12',
+						data4: '11',
+						data5: '21',
+						data6: '54',
+						data7: '11',
+						data8: '23',
+						data9: '12',
 					},
 				],
 				total: 0,
@@ -379,15 +379,11 @@
 				setTimeout(() => {
 					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
 					let res = {
-						categories: ["化学安全", "化学生物", "化学安全", "化学安全", "化学安全"],
+						categories: ["生物安全", "基础安全", "安全设施", "化学安全"],
 						series: [{
-								name: "成交量1",
-								data: [90, 110, 165, 195, 187]
+								name: "",
+								data: [55, 31, 61, 48]
 							},
-							{
-								name: "成交量2",
-								data: [190, 210, 105, 35, 27]
-							}
 						]
 					};
 					this.chartDataTow = JSON.parse(JSON.stringify(res));

pages/views/dataBoard/warningDispose.vue

@@ -164,60 +164,60 @@
 						align: 'center',
 					},
 					{
-						name: 'data3',
+						name: 'data2',
 						label: '总数',
 						align: 'center',
 					},
 					{
-						name: 'data4',
+						name: 'data3',
 						label: '昨日',
 						align: 'center',
 					},
 					{
-						name: 'data5',
+						name: 'data4',
 						label: '今日',
 						align: 'center',
 					},
 					{
-						name: 'data6',
+						name: 'data5',
 						label: '环比',
 						align: 'center',
 					},
 				],
 				dataList: [{
 						data1: '植物保护',
-						data2: '499',
+						data2: '102',
 						data3: '47',
-						data4: '220',
-						data5: '137',
+						data4: '22',
+						data5: '13',
 					},
 					{
 						data1: '资源环境',
-						data2: '199',
-						data3: '7',
-						data4: '120',
-						data5: '37',
+						data2: '74',
+						data3: '8',
+						data4: '32',
+						data5: '18',
 					},
 					{
 						data1: '生命科学',
-						data2: '299',
-						data3: '71',
+						data2: '66',
+						data3: '28',
 						data4: '10',
-						data5: '37',
+						data5: '8',
 					},
 					{
-						data1: '资源环境',
-						data2: '199',
-						data3: '7',
-						data4: '120',
-						data5: '37',
+						data1: '园林艺术',
+						data2: '56',
+						data3: '23',
+						data4: '17',
+						data5: '5',
 					},
 					{
-						data1: '生命科学',
-						data2: '299',
-						data3: '71',
-						data4: '10',
-						data5: '37',
+						data1: '化学与药物',
+						data2: '34',
+						data3: '12',
+						data4: '11',
+						data5: '21',
 					},
 				],
 				total: 0,

pages/views/teacherPage/teacherHome.vue

@@ -254,7 +254,7 @@
 						list.forEach((item) => {
 							codeData[item.split("=")[0]] = item.split("=")[1];
 						})
-						this.$nextTick(() => {
+						self.$nextTick(() => {
 							if(codeData.type == 1 || codeData.type == 2 || codeData.type == 3 || codeData.type == 5 || codeData.type == 7 ||
 							codeData.type == 8 || codeData.type == 9 || codeData.type == 10 ||
 							codeData.type == 11 || codeData.type == 12){

pages_basics/views/earlyWarningManage/earlyWarningDetail.vue

@@ -68,7 +68,7 @@
 				</view>
 				<view class="basics_li">
 					<text>存放位置：</text>
-					<text>{{form.position}}层</text>
+					<text>{{form.position}}</text>
 				</view>
 				<view class="basics_li">
 					<text>化学品余量：</text>
@@ -111,7 +111,7 @@
 					</view>
 					<view class="basics_li">
 						<text>存放位置：</text>
-						<text>{{item.position}}层</text>
+						<text>{{item.position}}</text>
 					</view>
 					<view class="basics_li">
 						<text>化学品余量：</text>

pages_manage/views/laboratory/iotControl.vue

@@ -14,7 +14,9 @@
 		</view>
 		<view class="sensor">
 			<view v-for="(item,index) in sensorData" :key="index">
-				<img class="sensor-l" :src="baseUrl+item.icon"/>
+				<!-- <img class="sensor-l" :src="baseUrl+item.icon"/> -->
+				<svg :xmlns="baseUrl+item.icon" width="50" height="50"/>
+				<view class="sensor-l" style=""></view>
 				<view class="sensor-r">{{item.deviceName}}:
 					{{item.deviceValue?item.deviceValue:''}}{{item.unit?item.unit:''}}</view>
 			</view>
@@ -91,7 +93,7 @@
 			}
 		},
 		created() {
-
+          
 		},
 		mounted() {
 			this.$set(this, 'newData', this.subjectData);
@@ -104,7 +106,11 @@
 		methods: {
 			//物联控制设备
 			deviceTypeFun(item) {
+				
 				if (item.type == 'video') {
+					uni.navigateTo({
+						url: '/pages_manage/views/laboratory/monitor'
+					});
 					if (!controlsRestrictVerify('subVideo')) {
 						uni.showToast({
 							title: '没有相关操作权限,请联系管理员',
@@ -114,6 +120,7 @@
 						});
 						return
 					}
+				
 				} else {
 					if (!controlsRestrictVerify('subHardwareControl')) {
 						uni.showToast({

pages_manage/views/laboratory/monitor.vue

@@ -7,8 +7,8 @@
       <video
           v-for="(item,index) in urlList" :key="index" :id="urlList.id" :src="item.url"
           :poster="videoCover"
-          :custom-cache='false' :autoplay="true" :controls="true"
-          :enable-danmu="false" :muted="true" :show-fullscreen-btn="true"
+          :custom-cache='false' :autoplay="true" :controls="false"
+          :enable-danmu="false" :muted="false" :show-fullscreen-btn="true"
           :show-center-play-btn="false" :show-play-btn="false"
           @error="videoErrorCallback" >
       </video>