ソースを参照

工作面修改-提交

lxh 1 年間 前
コミット
a04806a5e1

+ 2 - 0
src/views/vent/home/colliery/clique.data.ts

@@ -109,6 +109,7 @@ export function getDate(workData) {
         hui: '0',
         history: [],
         deviceName: workTypeList[j]['deviceName'],
+        deviceID:workTypeList[j]['deviceID'],
         deviceType: 'sys_surface_caimei',
       };
       itemData['jin'] = (1042 + (Math.random() * 2 - 1 * 50)).toFixed(2);
@@ -121,6 +122,7 @@ export function getDate(workData) {
           hui: (1082 + (Math.random() * 2 - 1 * 50)).toFixed(2),
           time: getTime((i + 1) * 5),
           deviceName: workTypeList[j]['deviceName'],
+          deviceID:workTypeList[j]['deviceID'],
           deviceType: 'sys_surface_caimei',
         };
         itemData['history'].unshift(item);

+ 1 - 1
src/views/vent/home/colliery/index.vue

@@ -213,7 +213,7 @@ function getList() {
       paramArr.push({
         deviceName: '12204工作面',
         deviceType: 'sys_surface_caimei',
-        deviceID: Math.random() * 100,
+        deviceID: '11111',
         history: [],
         jin: 100,
         hui: 200,

+ 1 - 1
src/views/vent/monitorManager/alarmMonitor/DetailModalFire.vue

@@ -103,7 +103,7 @@ function btnClick(ind) {
       //     deviceID: el.id,
       //     strtype:el.strtype,
       //   }
-      // })
+      // })  
       menuList.length=0
       clearInterval(timer)
       current.value = ''