1. 网络实时解算给关联设备添加定位功能

src/views/vent/home/colliery/components/fan-monitor.vue

@@ -13,7 +13,7 @@
         @change="changeSelect"
       />
       <div class="status-yx">
-        <template v-if="fjStatus !== '断开'">
+        <template v-if="fjStatus !== '断开' && fjStatus !== '-'">
           <div class="now-name">
             <i style="margin: 0px 5px 0px 5px">
               <SvgIcon class="icon" size="14" name="yxfj" />
@@ -23,7 +23,7 @@
           <div class="now-status">{{ fjStatus }}</div>
         </template>
         <template v-else>
-          <div class="now-status" style="margin-left: 25px">断开</div>
+          <div v-if="fjStatus == '断开'" class="now-status" style="margin-left: 25px">断开</div>
         </template>
       </div>
     </div>
@@ -70,7 +70,7 @@
           ? '主机'
           : selectData.readData.Fan2StartStatus && selectData.readData.Fan2StartStatus == '1'
           ? '备机'
-          : '断开';
+          ? selectData.readData.Fan1StartStatus && selectData.readData.Fan1StartStatus == '0' &&  selectData.readData.Fan2StartStatus && selectData.readData.Fan2StartStatus == '0' ? '断开' : '-';
       echartData.xdata = selectData.readData.windQuantity1 || selectData.readData.windQuantity1_merge;
       echartData.ydata = selectData.readData.windQuantity2 || selectData.readData.windQuantity2_merge;
       if (echartData.xdata && echartData.ydata) {

src/views/vent/monitorManager/deviceMonitor/components/network/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="zl-box">
     <div class="zl-container-box">
-      <!-- <customHeader >网络实时解算</customHeader> -->
       <div class="top-box">
         <transition
           enter-active-class="animate__animated  animate__slideInLeft"
@@ -97,7 +96,13 @@
             <div class="item-top-title">传感器实时数据</div>
             <BorderBox1 class="table-box border-bg" backgroundColor="#00bfff15">
               <div class="table-container">
-                <a-table :columns="sensorColumns" :data-source="pageData.sensorDataList" :pagination="false" size="small" />
+                <a-table :columns="sensorColumns" :data-source="pageData.sensorDataList" :pagination="false" size="small" >
+                  <template #bodyCell="{ column, record }">
+                    <div v-if="column.dataIndex == 'action'">
+                       <a @click="goLocation(record.deviceID, record)">定位</a>
+                    </div>
+                  </template>
+                </a-table>
               </div>
             </BorderBox1>
           </div>
@@ -111,6 +116,9 @@
                       <span class="signal-round"
                         :class="{ 'signal-round-red': record['level'] == 1, 'signal-round-orange': record['level'] == 2, 'signal-round-yellow': record['level'] == 3 }"></span>
                     </div>
+                    <div v-if="column.dataIndex == 'action'">
+                      <a @click="goLocation(record.deviceID, record)">定位</a>
+                    </div>
                   </template>
                 </a-table>
               </div>
@@ -149,7 +157,13 @@
                 </div>
               </div>
               <div class="table-container">
-                <a-table :columns="columns" :data-source="tableDate" :pagination="false" size="small" />
+                <a-table :columns="columns" :data-source="tableDate" :pagination="false" size="small" >
+                  <template #bodyCell="{ column, record }">
+                    <div v-if="column.dataIndex == 'action'">
+                      <a @click="goLocation(record.deviceID, record)">定位</a>
+                    </div>
+                  </template>
+                </a-table>
               </div>
             </BorderBox11>
           </div>
@@ -222,7 +236,7 @@ import { BorderBox11, BorderBox1, ScrollBoard as DvScrollBoard } from '@kjgl77/d
 import { sensorColumns, networkColumns, warningColumns, deviceTab, SensorType, NetworkType, windowColumns, gateColumns, WindowType, GateType, solveTimesData } from './network.data'
 import dayjs from 'dayjs'
 import { formatNum } from '/@/utils/ventutil'
-import customHeader from '/@/components/vent/customHeader.vue';
+import { getActions } from '/@/qiankun/state';
 
 
 const emit = defineEmits(['changePageType'])
@@ -234,7 +248,7 @@ const props = defineProps({
 })
 
 let count = 0;
-
+const actions = getActions();
 const pageData = reactive({
   currentTime: dayjs(new Date().getTime() + count).format('YYYY-MM-DD HH:mm:ss'),
   totalEnterNum: '-',
@@ -324,8 +338,9 @@ function analyzePageResult(resultData){
       for (const key in solutionresult['tuns']) {
         const item = solutionresult['tuns'][key]
         const obj = {
-          nTunID: key,
+          nTunID: item['nTunID'],
           strName: item['strName'],
+          deviceID: item['nTunID'],
           dHFric: item['dHFric'] != null ? item['dHFric'].toFixed(2) : '-', //摩擦阻力
           dHLocal: item['dHNature'] != null ? item['dHNature'].toFixed(2) : '-', //局部阻力
           dHNature: item['dHNature'] != null ? item['dHNature'].toFixed(2) : '-', //自然风压
@@ -340,7 +355,8 @@ function analyzePageResult(resultData){
       for (const key in solutionresult['gates']) {
         const item = solutionresult['gates'][key]
         const obj = {
-          nGateID: key,
+          nGateID: item['nGateID'],
+          deviceID: item['nGateID'],
           strName: item['strName'],
           data_dHDiff: item['data_dHDiff'] != null ? item['data_dHDiff'].toFixed(2) : '-', //风门压差
           data_dQ_min: item['data_dQ_min'] != null ? item['data_dQ_min'].toFixed(2) : '-', //风门漏风量
@@ -353,8 +369,9 @@ function analyzePageResult(resultData){
       for (const key in solutionresult['windows']) {
         const item = solutionresult['windows'][key]
         const obj = {
-          nWindowID: key,
+          nWindowID: item['nWindowID'],
           strName: item['strName'],
+          deviceID: item['nWindowID'],
           data_dHDiff: item['data_dHDiff'] != null ? item['data_dHDiff'].toFixed(2) : '-', //风门压差
           data_dQ_min: item['data_dQ_min'] != null ? item['data_dQ_min'].toFixed(2) : '-', //风门漏风量
           data_dQ_s: item['data_dQ_s'] != null ? item['data_dQ_s'].toFixed(2) : '-', //风门漏风量
@@ -371,6 +388,7 @@ function analyzePageResult(resultData){
     resultData['monitors'].forEach((item => {
       item = {
         strinstallpos: item.strinstallpos,
+        deviceID: item['deviceID'],
         va: item['readData']['va'] != null ? Number(item['readData']['va']).toFixed(2) : '-',
         m3: item['readData']['m3'] != null ? formatNum(Number(item['readData']['m3'])) : '-',
       }
@@ -414,6 +432,11 @@ function setTable(code) {
   }
 }
 
+function goLocation(id: string, record:any) {
+  console.log(id, record)
+  actions.setGlobalState({ locationId: id, locationObj: null, pageObj: null });
+}
+
 watch(() => props.pageResult, (newData) => {
   analyzePageResult(newData)
 })

src/views/vent/monitorManager/deviceMonitor/components/network/network.data.ts

@@ -57,6 +57,12 @@ export const sensorColumns: BasicColumn[] = [
     width: 100,
     align: 'center',
   },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 80,
+    align: 'center',
+  },
 ];
 
 export const sensorData = () => {
@@ -135,18 +141,24 @@ export const networkColumns: BasicColumn[] = [
     align: 'center',
   },
   {
-    title: '局部阻力(Pa)',
-    dataIndex: 'dHLocal',
-    width: 120,
-    align: 'center',
-  },
-  {
-    title: '自然风压(Pa)',
-    dataIndex: 'dHNature',
+    title: '操作',
+    dataIndex: 'action',
     width: 120,
     align: 'center',
   },
   // {
+  //   title: '局部阻力(Pa)',
+  //   dataIndex: 'dHLocal',
+  //   width: 120,
+  //   align: 'center',
+  // },
+  // {
+  //   title: '自然风压(Pa)',
+  //   dataIndex: 'dHNature',
+  //   width: 120,
+  //   align: 'center',
+  // },
+  // {
   //   title: '面积（㎡）',
   //   dataIndex: 'fArea',
   //   width: 120,
@@ -192,11 +204,17 @@ export const gateColumns: BasicColumn[] = [
     align: 'center',
   },
   {
-    title: '风门漏风量(m³/s)',
-    dataIndex: 'data_dQ_s',
-    width: 180,
+    title: '操作',
+    dataIndex: 'action',
+    width: 120,
     align: 'center',
   },
+  // {
+  //   title: '风门漏风量(m³/s)',
+  //   dataIndex: 'data_dQ_s',
+  //   width: 180,
+  //   align: 'center',
+  // },
 ];
 
 export const windowColumns: BasicColumn[] = [
@@ -225,11 +243,17 @@ export const windowColumns: BasicColumn[] = [
     align: 'center',
   },
   {
-    title: '风窗漏风量(m³/s)',
-    dataIndex: 'data_dQ_s',
-    width: 180,
+    title: '操作',
+    dataIndex: 'action',
+    width: 120,
     align: 'center',
   },
+  // {
+  //   title: '风窗漏风量(m³/s)',
+  //   dataIndex: 'data_dQ_s',
+  //   width: 180,
+  //   align: 'center',
+  // },
 ];
 
 export const networkData = () => {
@@ -307,6 +331,12 @@ export const warningColumns: BasicColumn[] = [
     width: 120,
     align: 'center',
   },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 80,
+    align: 'center',
+  },
 ];
 
 export const warningData = () => {