Browse Source

公司端首页详情页功能修改-提交

lxh 9 months ago
parent
commit
d082cdc999

+ 1 - 1
public/js/config.js

@@ -4,7 +4,7 @@ const VUE_APP_URL = {
 }
 const History_Type = {
   // type: 'remote', // remote、vent  (remote 代表的是历史查询走的装备院的接口,vent是走的咱们的,目前神东的项目都用remote, 其他矿用vent)
-  type: 'vent', // remote、vent
+  type: 'remote', // remote、vent
   deviceType: []
 }
 

+ 2 - 2
src/views/vent/home/clique/components/dialog-modal.vue

@@ -180,9 +180,9 @@
         zlList[1]['percent'] = ((zlList[1]['value'] / valueM.value) * 100).toFixed(2);
         zlList[2]['percent'] = ((zlList[2]['value'] / valueM.value) * 100).toFixed(2);
 
-        windLfList[0].value = ((newC.sys_data.xufengliang / parseFloat(newC.sys_data.zongfengliang)) * 100).toFixed(2);
+        windLfList[0].value = newC.sys_data.useM3Perent || 0;
         windLfList[1].value = (
-          ((parseFloat(newC.sys_data.zongfengliang) - parseFloat(newC.sys_data.zonghuifeng)) / parseFloat(newC.sys_data.zonghuifeng)) *
+          ((parseFloat(newC.sys_data.zongfengliang) - parseFloat(newC.sys_data.zongjinfeng)) / parseFloat(newC.sys_data.zongfengliang)) *
           100
         ).toFixed(2);
 

+ 27 - 27
src/views/vent/home/clique/components/icon-light.vue

@@ -25,16 +25,16 @@
   let pointList = ref<any[]>(
     globalConfig.History_Type == 'vent'
       ? [
-          { code: 'liuTa', imgSrc: warningLevel1, label: 'lt', leftV: '327px', topV: '40px', textColor: '#fff', align: 'left' },
-          { code: 'cunCaoErTa', imgSrc: warningLevel1, label: 'cce', leftV: '291px', topV: '69px', textColor: '#fff', align: 'left' },
-          { code: 'buErTaiTa', imgSrc: warningLevel1, label: 'bet', leftV: '286px', topV: '97px', textColor: 'rgba(255, 231, 83,.9)', align: 'left' },
-          { code: 'wuLunTa', imgSrc: warningLevel1, label: 'wlml', leftV: '327px', topV: '115px', textColor: '#fff', align: 'left' },
-          { code: 'cunCaoTa', imgSrc: warningLevel1, label: 'cc', leftV: '346px', topV: '132px', textColor: 'rgba(255, 231, 83,.9)', align: 'left' },
-          { code: 'shiKanTa', imgSrc: warningLevel1, label: 'skt', leftV: '373px', topV: '149px', textColor: '#fff', align: 'left' },
-          { code: 'buLieTa', imgSrc: warningLevel1, label: 'blt', leftV: '408px', topV: '184px', textColor: 'rgba(255, 231, 83,.9)', align: 'left' },
-          { code: 'haLaGouTa', imgSrc: warningLevel1, label: 'hlg', leftV: '445px', topV: '214px', textColor: '#fff', align: 'left' },
+          { code: 'sdmtjtltmk', imgSrc: warningLevel1, label: 'lt', leftV: '327px', topV: '40px', textColor: '#fff', align: 'left' },
+          { code: 'sdmtjtcctrk', imgSrc: warningLevel1, label: 'cce', leftV: '291px', topV: '69px', textColor: '#fff', align: 'left' },
+          { code: 'sdmtjtbetmk', imgSrc: warningLevel1, label: 'bet', leftV: '286px', topV: '97px', textColor: 'rgba(255, 231, 83,.9)', align: 'left' },
+          { code: 'sdmtjtwlmlmk', imgSrc: warningLevel1, label: 'wlml', leftV: '327px', topV: '115px', textColor: '#fff', align: 'left' },
+          { code: 'sdmtjtcctmk', imgSrc: warningLevel1, label: 'cc', leftV: '346px', topV: '132px', textColor: 'rgba(255, 231, 83,.9)', align: 'left' },
+          { code: 'sdmtjtsgtmk', imgSrc: warningLevel1, label: 'skt', leftV: '373px', topV: '149px', textColor: '#fff', align: 'left' },
+          { code: 'sdmtjtbltmk', imgSrc: warningLevel1, label: 'blt', leftV: '408px', topV: '184px', textColor: 'rgba(255, 231, 83,.9)', align: 'left' },
+          { code: 'sdmtjthlgmk', imgSrc: warningLevel1, label: 'hlg', leftV: '445px', topV: '214px', textColor: '#fff', align: 'left' },
           {
-            code: 'shangWanTa',
+            code: 'sdmtjtswmk',
             imgSrc: warningLevel1,
             label: 'sw',
             leftV: '439px',
@@ -42,17 +42,17 @@
             textColor: 'rgba(255, 231, 83,.9)',
             align: 'left',
           },
-          { code: 'huoJiTuTa', imgSrc: warningLevel1, label: 'hjt', leftV: '398px', topV: '265px', textColor: '#fff', align: 'left' },
-          { code: 'daLiuTa', imgSrc: warningLevel1, label: 'dlt', leftV: '492px', topV: '260px', textColor: '#fff', align: 'left' },
-          { code: 'jinJieTa', imgSrc: warningLevel1, label: 'jj', leftV: '565px', topV: '413px', textColor: 'rgba(255, 231, 83,.9)', align: 'left' },
-          { code: 'yuJiaTa', imgSrc: warningLevel1, label: 'yjl', leftV: '669px', topV: '308px', textColor: '#fff', align: 'left' },
-          { code: 'baoDeTa', imgSrc: warningLevel1, label: 'bd', leftV: '862px', topV: '340px', textColor: 'rgba(255, 231, 83,.9)', align: 'left' },
+          { code: 'sdmtjtdltmkhjtj', imgSrc: warningLevel1, label: 'hjt', leftV: '398px', topV: '265px', textColor: '#fff', align: 'left' },
+          { code: 'sdmtjtdltmk', imgSrc: warningLevel1, label: 'dlt', leftV: '492px', topV: '260px', textColor: '#fff', align: 'left' },
+          { code: 'sdmtjtjjmk', imgSrc: warningLevel1, label: 'jj', leftV: '565px', topV: '413px', textColor: 'rgba(255, 231, 83,.9)', align: 'left' },
+          { code: 'sdmtjtyjlmk', imgSrc: warningLevel1, label: 'yjl', leftV: '669px', topV: '308px', textColor: '#fff', align: 'left' },
+          { code: 'sdmtjtbdmk', imgSrc: warningLevel1, label: 'bd', leftV: '862px', topV: '340px', textColor: 'rgba(255, 231, 83,.9)', align: 'left' },
         ]
       : [
-          { code: 'liuTa', imgSrc: warningLevel4, label: '柳塔矿', leftV: '375px', topV: '135px', textColor: '#fff', align: 'right' },
-          { code: 'cunCaoErTa', imgSrc: warningLevel1, label: '寸草塔二矿', leftV: '269px', topV: '116px', textColor: '#fff', align: 'left' },
+          { code: 'sdmtjtltmk', imgSrc: warningLevel4, label: '柳塔矿', leftV: '375px', topV: '135px', textColor: '#fff', align: 'right' },
+          { code: 'sdmtjtcctrk', imgSrc: warningLevel1, label: '寸草塔二矿', leftV: '269px', topV: '116px', textColor: '#fff', align: 'left' },
           {
-            code: 'buErTaiTa',
+            code: 'sdmtjtbetmk',
             imgSrc: warningLevel1,
             label: '布尔台矿',
             leftV: '329px',
@@ -60,9 +60,9 @@
             textColor: 'rgba(255, 231, 83,.9)',
             align: 'left',
           },
-          { code: 'wuLunTa', imgSrc: warningLevel3, label: '乌兰木伦矿', leftV: '432px', topV: '178px', textColor: '#fff', align: 'right' },
+          { code: 'sdmtjtwlmlmk', imgSrc: warningLevel3, label: '乌兰木伦矿', leftV: '432px', topV: '178px', textColor: '#fff', align: 'right' },
           {
-            code: 'cunCaoTa',
+            code: 'sdmtjtcctmk',
             imgSrc: warningLevel1,
             label: '寸草塔矿',
             leftV: '396px',
@@ -70,9 +70,9 @@
             textColor: 'rgba(255, 231, 83,.9)',
             align: 'left',
           },
-          { code: 'shiKanTa', imgSrc: warningLevel1, label: '石圪台矿', leftV: '470px', topV: '236px', textColor: '#fff', align: 'right' },
+          { code: 'sdmtjtsgtmk', imgSrc: warningLevel1, label: '石圪台矿', leftV: '470px', topV: '236px', textColor: '#fff', align: 'right' },
           {
-            code: 'buLieTa',
+            code: 'sdmtjtbltmk',
             imgSrc: warningLevel1,
             label: '补连塔矿',
             leftV: '432px',
@@ -80,9 +80,9 @@
             textColor: 'rgba(255, 231, 83,.9)',
             align: 'left',
           },
-          { code: 'haLaGouTa', imgSrc: warningLevel2, label: '哈拉沟矿', leftV: '511px', topV: '302px', textColor: '#fff', align: 'right' },
+          { code: 'sdmtjthlgmk', imgSrc: warningLevel2, label: '哈拉沟矿', leftV: '511px', topV: '302px', textColor: '#fff', align: 'right' },
           {
-            code: 'shangWanTa',
+            code: 'sdmtjtswmk',
             imgSrc: warningLevel1,
             label: '上湾矿',
             leftV: '381px',
@@ -91,9 +91,9 @@
             align: 'left',
           },
           // { code: 'huoJiTuTa', imgSrc: warningLevel1, label: '活鸡兔井', leftV: '398px', topV: '265px', textColor: '#fff', align: 'left' },
-          { code: 'daLiuTa', imgSrc: warningLevel1, label: '大柳塔矿', leftV: '588px', topV: '338px', textColor: '#fff', align: 'right' },
+          { code: 'sdmtjtdltmk', imgSrc: warningLevel1, label: '大柳塔矿', leftV: '588px', topV: '338px', textColor: '#fff', align: 'right' },
           {
-            code: 'jinJieTa',
+            code: 'sdmtjtjjmk',
             imgSrc: warningLevel1,
             label: '锦界矿',
             leftV: '575px',
@@ -101,9 +101,9 @@
             textColor: 'rgba(255, 231, 83,.9)',
             align: 'center',
           },
-          { code: 'yuJiaTa', imgSrc: warningLevel1, label: '榆家梁矿', leftV: '699px', topV: '307px', textColor: '#fff', align: 'center' },
+          { code: 'sdmtjtyjlmk', imgSrc: warningLevel1, label: '榆家梁矿', leftV: '699px', topV: '307px', textColor: '#fff', align: 'center' },
           {
-            code: 'baoDeTa',
+            code: 'sdmtjtbdmk',
             imgSrc: warningLevel4,
             label: '保德矿',
             leftV: '892px',

+ 4 - 1
src/views/vent/home/clique/index.vue

@@ -86,6 +86,8 @@
     data1: [],
   });
 
+  let orgcode=ref('')
+
   // https获取监测数据
   let timer: null | NodeJS.Timeout = null;
   function getMonitor() {
@@ -120,7 +122,7 @@
         roadData.data1.push(el.sys_data.deviceName);
       });
       compositeData.value = res[0].majorpath_data;
-      centerDetail.value = res[0];
+      centerDetail.value = res.filter(v=>v.orgcode==orgcode.value)[0];
     }
   }
   //获取文件共享中心数据
@@ -136,6 +138,7 @@
 
   function showDetail(code, label, leftV, topV) {
     if (code) {
+      orgcode.value=code
       dialogTitle.value = label;
       isShowDialog.value = true;
     }