设备分站，预警管控外因火灾修改-提交

src/views/vent/monitorManager/alarmMonitor/common/mainWell.vue

@@ -486,6 +486,7 @@
 
       if (val.smoke.length != 0) {
         val.smoke.forEach((el) => {
+          el.smokeVal=el.readData.smokeval=='0' || el.readData.smokeval=='0.0' ? '无烟' : el.readData.smokeval=='1' ? '有烟' :el.readData.smokeval 
           monitorlistYw.push({
             strinstallpos: el.strinstallpos,
             val: el.readData.smokeval,

src/views/vent/monitorManager/comment/comment.data.ts

@@ -172,6 +172,58 @@ export const gaspatrolColumnsOne: BasicColumn[] = [
     slots: { customRender: 'action' },
   },
 ];
+//设备分站
+export const stationColumns:BasicColumn[]=[
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    customRender: ({ index }: { index: number }) => `${index + 1}`,
+  },
+  {
+    title: '安装位置',
+    dataIndex: 'strinstallpos',
+    key: 'strinstallpos',
+    align: 'center',
+  },
+  {
+    title: 'Ip地址',
+    dataIndex: 'strip',
+    key: 'strip',
+    align: 'center',
+  },
+  {
+    title: '供电模式',
+    dataIndex: 'gdmsC',
+    key: 'gdmsC',
+    align: 'center',
+  },
+  {
+    title: '电池容量(%)',
+    dataIndex: 'dcrl',
+    key: 'dcrl',
+    align: 'center',
+  },
+  {
+    title: '启用状态',
+    dataIndex: 'linkId',
+    key: 'linkId',
+    align: 'center',
+  },
+  {
+    title: '通讯状态',
+    dataIndex: 'linkstatusC',
+    key: 'linkstatusC',
+    align: 'center',
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 200,
+    align: 'center',
+    slots: { customRender: 'action' },
+  },
+]
 export const dsutColumns: BasicColumn[] = [
   {
     title: '序号',

src/views/vent/monitorManager/comment/stationTable.vue

@@ -0,0 +1,88 @@
+<template>
+    <div class="stationTable">
+        <div class="content-area">
+            <a-table :columns="stationColumns" size="small" :data-source="stationTableData" class="tableW"
+                :pagination="false" :scroll="{ y: 620 }">
+                <template #action="{ record }">
+                    <a class="table-action-link" @click="handlerDetail(record)">详情</a>
+                    <a class="table-action-link" @click="handlerLocation(record)">定位</a>
+                </template>
+            </a-table>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted, watch } from 'vue';
+import { stationColumns } from './comment.data';
+let props = defineProps({
+    isShowAction: {
+        type: Boolean,
+        default: false,
+    },
+    tableData: {
+        type: Array,
+        default: () => {
+            return [];
+        },
+    },
+});
+let stationTableData = ref<any[]>([]);
+let $emit = defineEmits(['locate','stationDetail']);
+//定位
+function handlerLocation(record) {
+    $emit('locate', record);
+}
+//查看详情
+function handlerDetail(record){
+    $emit('stationDetail', record);
+}
+watch(
+    () => props.tableData,
+    (newV, oldV) => {
+        stationTableData.value = newV || []
+    },
+    { immediate: true }
+);
+onMounted(() => { });
+</script>
+
+<style lang="less" scoped>
+@ventSpace: zxm;
+
+.stationTable {
+
+    .zxm-picker,
+    .zxm-input {
+        border: 1px solid #3ad8ff77;
+        background-color: #ffffff00;
+        color: #fff;
+    }
+}
+
+:deep(.@{ventSpace}-table-body) {
+    height: auto !important;
+
+    tr>td {
+        background: #ffffff00 !important;
+    }
+
+    tr.@{ventSpace}-table-row-selected {
+        td {
+            background: #007cc415 !important;
+        }
+    }
+}
+
+:deep(.jeecg-basic-table .@{ventSpace}-table-wrapper .@{ventSpace}-table-title) {
+    min-height: 0;
+}
+
+:deep(.@{ventSpace}-pagination) {
+    margin-right: 20px !important;
+}
+
+:deep(.zxm-table-thead > tr > th:last-child) {
+    border-right: 1px solid #91e9fe55 !important;
+}
+</style>

src/views/vent/monitorManager/deviceMonitor/components/device/device.api.ts

@@ -15,8 +15,11 @@ enum Api {
   exportXlsUrl = '/monitor/exportXls',
   queryNowGasInsInfo = '/safety/gasDayReport/queryNowGasInsInfo', //查询当前各班瓦斯巡检信息
   queryNowGasSta = '/safety/gasDayReport/queryNowGasSta',
-   queryReportData='/safety/reportLocalData/queryReportData'//查询瓦斯日报列表
+   queryReportData='/safety/reportLocalData/queryReportData',//查询瓦斯日报列表
+   getDeviceListBySubId = '/safety/ventanalyDeviceInfo/getDeviceListBySubId',//查询分站
 }
+//分站全部列表
+export const getListAll = () => defHttp.post({ url: Api.getDeviceListBySubId });
 /**
  * 列表接口
  * @param params

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

@@ -533,10 +533,11 @@ export const noWarningArr = [
   'bundleDayReport',
   'bundleSpyDayReport',
   'gate_linkdlfm',
+  'substation_normal'
 ]; // 无预警详情的
 export const haveSysDetailArr = ['forcFan', 'pulping']; //有场景详情的
 // export const haveSysDetailArr = ['']; //有场景详情的
 export const noHistoryArr = () =>
   History_Type['type'] == 'remote'
     ? ['surface_history', 'majorpath', 'gasDayReport', 'dustDayReport', 'bundleDayReport', 'bundleSpyDayReport', 'gasDay', 'gate_linkdlfm']
-    : ['majorpath', 'gasDayReport', 'dustDayReport', 'bundleDayReport', 'bundleSpyDayReport', 'gate_linkdlfm', 'gasDay'];
+    : ['majorpath', 'gasDayReport', 'dustDayReport', 'bundleDayReport', 'bundleSpyDayReport', 'gate_linkdlfm', 'gasDay','substation_normal'];

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

@@ -282,7 +282,11 @@
               <bundleSpyMonitorTable @locate="goLocation" :isShowAction="true"></bundleSpyMonitorTable>
             </template>
             <template v-else-if="deviceType.startsWith('dusting') && activeKey == '1'">
-              <DustingTable :dataSource="dataSource" :deviceType="deviceType" :scroll="scroll" @locate="goLocation"/>
+              <DustingTable :dataSource="dataSource" :deviceType="deviceType" :scroll="scroll" @locate="goLocation" />
+            </template>
+            <!-- 设备分站 -->
+            <template v-else-if="deviceType.startsWith('substation_normal') && activeKey == '1'">
+              <stationTable :tableData="stationData" @locate="goLocation" @stationDetail="stationDetail"></stationTable>
             </template>
             <template v-else>
               <!-- 工作面echarts图标 -->
@@ -462,13 +466,15 @@ import {
   getExportUrl,
   queryNowGasInsInfo,
   queryNowGasSta,
-  queryReportData
+  queryReportData,
+  getListAll
 } from './device.api';
 import AlarmHistoryTable from '../../../comment/AlarmHistoryTable.vue';
 import HistoryTable from '../../../comment/HistoryTable.vue';
 import HandlerHistoryTable from '../../../comment/HandlerHistoryTable.vue';
 import MonitorTable from '../../../comment/MonitorTable.vue';
 import GroupMonitorTable from '../../../comment/GroupMonitorTable.vue';
+import stationTable from '../../../comment/stationTable.vue'
 import gaspatrolTable from '../../../comment/gaspatrolTable.vue';
 import gasReport from '../../../comment/gasReport.vue'
 import gasReportCount from '../../../comment/gasReportCount.vue'
@@ -519,7 +525,7 @@ const inspectList = reactive<any[]>([
   { label: '第二次巡检已检数', val: 0 },
   { label: '第二次巡检未检数', val: 0 },
 ]);
-
+const stationData = ref<any[]>([])
 const glob = useGlobSetting();
 // import { BorderBox8 as DvBorderBox8 } from '@kjgl77/datav-vue3';
 
@@ -699,8 +705,10 @@ function getMonitor(flag?) {
           if (deviceType.value.startsWith('gasDay_normal')) {
             await queryNowGasInsInfoList();//人工瓦斯巡检
           } else if (deviceType.value.startsWith('gasDayReport')) {
-            let searchParams=glob.sysOrgCode=='sdmtjtbetmk' ? searchReportParam1.value : searchReportParam.value
+            let searchParams = glob.sysOrgCode == 'sdmtjtbetmk' ? searchReportParam1.value : searchReportParam.value
             await getSearchReport(searchParams)//瓦斯日报
+          } else if (deviceType.value.startsWith('substation_normal')) {//分站
+            await getStationList()
           } else {
             await getDataSource();
           }
@@ -881,6 +889,12 @@ async function getDataSource() {
   }
 }
 
+//设备分站详情跳转
+function stationDetail(){
+  const newPage = router.resolve({ path: '/safety/list/detail/home' });
+  window.open(newPage.href, '_blank');
+}
+
 function goLocation(record) {
   // debugger;
   if (record['deviceType'] == 'person_bd' || record['deviceType'] == 'car_bd') {
@@ -891,6 +905,8 @@ function goLocation(record) {
     actions.setGlobalState({ locationName: record.strInstallPos, locationObj: null, pageObj: null, type: record['deviceType'] });
   } else if (deviceType.value == 'gasDayReport') {
     actions.setGlobalState({ locationName: record.jcdd, locationObj: null, pageObj: null, type: record['deviceType'] });
+  } else if (deviceType.value == 'substation_normal') {
+    actions.setGlobalState({ locationName: record.strinstallpos, locationObj: null, pageObj: null, type: record['deviceType'] });
   } else {
     if (deviceType.value.startsWith('location')) {
       actions.setGlobalState({ locationId: record.deviceID, locationObj: null, pageObj: null, type: 'person' });
@@ -902,6 +918,16 @@ function goLocation(record) {
   }
 }
 
+//查询分站列表
+async function getStationList() {
+  let res = await getListAll();
+  res.forEach((el) => {
+    el.key = el.id;
+    el.linkstatusC = el.linkstatus ? '连接' : '断开';
+    el.gdmsC = el.gdms == '1' ? '直流供电' : el.gdms == '0' ? '交流供电' : '';
+  });
+  stationData.value = res;
+}
 //查询当前各班瓦斯巡检信息
 async function queryNowGasInsInfoList() {
   let res = await queryNowGasInsInfo({
@@ -942,10 +968,10 @@ async function getSearch(param) {
 }
 //查询瓦斯日报列表数据
 async function getSearchReport(param) {
-  if(glob.sysOrgCode=='sdmtjtbetmk'){
-    searchReportParam1.value=param
-  }else {
-    searchReportParam.value=param
+  if (glob.sysOrgCode == 'sdmtjtbetmk') {
+    searchReportParam1.value = param
+  } else {
+    searchReportParam.value = param
   }
   let res = await queryReportData({ type: param })
   console.log(res, '瓦斯日报列表')