Merge branch 'master' of http://h.gemho.cn:7099/18963165066/ziboyingji

public/datav/index.html

@@ -901,7 +901,7 @@
 <!-- cookie -->
 <script src="js/js.cookie.js"></script>
 <script>
-    const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '192.168.13.200') + ':8013';
+    const host = location.protocol + '//' + (location.hostname === '192.168.3.226' ? '192.168.3.37' : '192.168.13.200') + ':8013';
 
 	// 小黄
 	//const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.2.200' : '192.168.13.200') + ':8013';
@@ -1184,8 +1184,6 @@
 						if(i < 3){
 							reqiust(list[0].id, i);
 						}else{
-							console.log('list ________________ ', list);
-
 							//var item = {
 							//	name: "全部",
 							//	label: "全部",
@@ -1236,6 +1234,7 @@
 					params: {
 						enterpriseId: this.enterpriseId,
 						deptId: this.deptId,
+						mineType:this.mineType,
 					}
 				};
 				axios.get(host + '/api/yingji/keynoteadmin/deviceStatus', req).then(res => {
@@ -1262,8 +1261,6 @@
                     }
                 };
 
-				console.log('reqMines ________________ ', req.params);
-
 				axios.get(host + '/api/datav/mine', req).then(res => {
 					loading.close();
 					this.isReady = true;
@@ -1319,6 +1316,7 @@
 					params: {
 						enterpriseId: this.enterpriseId,
 						deptId: this.deptId,
+						mineType:this.mineType,
 					}
 				};
 				axios.get(host + '/api/yingji/keynoteadmin/alertList', req).then(res => {
@@ -1332,6 +1330,7 @@
 					params: {
 						enterpriseId:this.enterpriseId,
 						deptId: this.deptId,
+						mineType:this.mineType,
 						dateRange: this.daterange3.timeSpace.toString()
 					}
 				};
@@ -1349,7 +1348,6 @@
 					this.mineType = value;
 				};
 
-
 				// 矿山数据
 				this.reqMines();
 			},
@@ -1553,16 +1551,13 @@
                 window.gotoDataView = (mineType, mineId) => {
                     const mine = this.mineList.filter(x => x.mineType == mineType && x.id == mineId)[0]
 
-
+					window.localStorage.setItem('kd.selected.mine', JSON.stringify(mine))
 					window.localStorage.setItem('bigScreenDetailMenuModel', 'emergency');
 					window.open(selfHost + '/datav/detail/video-monitor.html', '_self')
 
-
 					return ;
-                    window.localStorage.setItem('kd.selected.mine', JSON.stringify(mine))
-
-                    window.open(selfHost + '/datav/detail/video-monitor.html', '_self')
-                   /* if(mineType == 1){
+                   
+                    if(mineType == 1){
                         window.open(selfHost + '/datav/underground.html', '_self')
                     }
                     if(mineType == 2){
@@ -1570,7 +1565,7 @@
                     }
                     if(mineType == 3){
                         window.open(selfHost + '/datav/tailings.html', '_self')
-                    }*/
+                    }
                 }
 
                 // 弧线
@@ -1824,6 +1819,8 @@
 				var req = {
                     params: {
 						enterpriseId:this.enterpriseId,
+						deptId: this.deptId,
+						mineType:this.mineType,
                     }
                 };
 				axios.get(host + '/api/yingji/dangerousworkaudit/dangerwork-list', req).then(res => {
@@ -1839,6 +1836,7 @@
 						params: {
 							enterpriseId:this.enterpriseId,
 							deptId: this.deptId,
+							mineType:this.mineType,
 						}
 					};
 					axios.get(host + '/api/yingji/keynoteadmin/deformationMonitoring', req).then(res => {

public/datav/watersource.html

@@ -1052,9 +1052,6 @@
 
 			function onloadDataFinish(){
 
-				console.log('onloadDataFinish ________________ ', self.enterpriseId, self.deptId);
-
-
 				// md3_1 降水选择列表事件
 				(function(){
 					self.m1tt3 = leftbar.querySelector(".m-tt3");