Sfoglia il codice sorgente

5.5首页风量监测,工作面智能管控修改-提交

lxh 1 settimana fa
parent
commit
273c8f743c

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

@@ -151,14 +151,14 @@ export function getDate(workData) {
         deviceID: workTypeList[j]['deviceID'],
         deviceType: 'sys_surface_caimei',
       };
-      itemData['jin'] = (1042 + (Math.random() * 2 - 1 * 50)).toFixed(2);
-      itemData['hui'] = (1082 + (Math.random() * 2 - 1 * 50)).toFixed(2);
+      itemData['jin'] = (3403 + (Math.random() * 2 - 1 * 50)).toFixed(2);
+      itemData['hui'] = (3424 + (Math.random() * 2 - 1 * 50)).toFixed(2);
 
       // 第一次模拟
       for (let i = 0; i < 5; i++) {
         const item = {
-          jin: (1042 + (Math.random() * 2 - 1 * 50)).toFixed(2),
-          hui: (1082 + (Math.random() * 2 - 1 * 50)).toFixed(2),
+          jin: (3403 + (Math.random() * 2 - 1 * 50)).toFixed(2),
+          hui: (3424 + (Math.random() * 2 - 1 * 50)).toFixed(2),
           time: getTime((i + 1) * 5),
           deviceName: workTypeList[j]['deviceName'],
           deviceID: workTypeList[j]['deviceID'],
@@ -178,11 +178,11 @@ export function getDate(workData) {
         const minutes = now.minute() > 9 ? now.minute() : `0${now.minute()}`;
         const seconds = now.second() > 9 ? now.second() : `0${now.second()}`;
         workData[j]['history'].shift();
-        workData[j]['jin'] = (1042 + (Math.random() * 2 - 1 * 50)).toFixed(2);
-        workData[j]['hui'] = (1082 + (Math.random() * 2 - 1 * 50)).toFixed(2);
+        workData[j]['jin'] = (3403 + (Math.random() * 2 - 1 * 50)).toFixed(2);
+        workData[j]['hui'] = (3424 + (Math.random() * 2 - 1 * 50)).toFixed(2);
         workData[j]['history'].push({
-          jin: (1042 + (Math.random() * 2 - 1 * 50)).toFixed(2),
-          hui: (1082 + (Math.random() * 2 - 1 * 50)).toFixed(2),
+          jin: (3403 + (Math.random() * 2 - 1 * 50)).toFixed(2),
+          hui: (3424 + (Math.random() * 2 - 1 * 50)).toFixed(2),
           time: `${hours}:${minutes}:${seconds}`,
         });
       }

+ 15 - 15
src/views/vent/home/colliery/components/wind-monitor.vue

@@ -223,21 +223,21 @@ function getOption() {
           zlevel: -1,
         },
       ],
-      // dataZoom: [
-      //   {
-      //     // 这部分是关键
-      //     show: echartData.xdata.length > 8 ? true : false,
-      //     type: 'slider', // 这里可以选择你需要的类型,例如 'inside'
-      //     start: 0, // 数据窗口范围的起始百分比
-      //     end: echartData.xdata.length > 8 && echartData.xdata.length <= 16 ? 50 : echartData.xdata.length > 16 ? 25 : 100, // 数据窗口范围的结束百分比
-      //     height: 10, // 设置缩放条高度
-      //     left: 'center',
-      //     bottom: 25,
-      //     labelPrecision: 0, // 标签精度,默认为auto
-      //     showDetail: false, // 是否显示详情
-      //     showDataShadow: false, // 是否显示数据阴影
-      //   },
-      // ],
+      dataZoom: [
+        {
+          // 这部分是关键
+          show: echartData.xdata.length > 8 ? true : false,
+          type: 'slider', // 这里可以选择你需要的类型,例如 'inside'
+          start: 0, // 数据窗口范围的起始百分比
+          end: echartData.xdata.length > 8 && echartData.xdata.length <= 16 ? 50 : echartData.xdata.length > 16 ? 25 : 100, // 数据窗口范围的结束百分比
+          height: 10, // 设置缩放条高度
+          left: 'center',
+          bottom: 25,
+          labelPrecision: 0, // 标签精度,默认为auto
+          showDetail: false, // 是否显示详情
+          showDataShadow: false, // 是否显示数据阴影
+        },
+      ],
       tooltip: {
         trigger: 'axis',
         show: false,

+ 12 - 5
src/views/vent/home/colliery/index.vue

@@ -217,12 +217,19 @@
         lineList.value = paramArr;
       }
 
-      if (res.sys_surface_caimei.length != 0) {
-        workList.value = res.sys_surface_caimei;
-      } else {
-        let paramArr: any = [];
+      // if (res.sys_surface_caimei.length != 0) {
+      //   workList.value = res.sys_surface_caimei;
+      // } else {
+      //   let paramArr: any = [];
+      //   workList.value = getDate(paramArr);
+      // }
+         let paramArr: any = [
+          {
+            deviceName:'25216采煤工作面',
+            deviceID:'1',
+          }
+         ];
         workList.value = getDate(paramArr);
-      }
       warnData.value = res.warn || [];
       deviceData.value = res.device || {};