分站管理IP地址添加，灾害预警按钮权限添加-提交

src/views/vent/monitorManager/alarmMonitor/common.data.ts

@@ -108,8 +108,8 @@ export const ventilateTopList = [
     value: null,
     text: '',
     list: [
-      { id: 0, label: 'O₂', value: 0 },
-      { id: 1, label: 'CO', value: 0 },
+      { id: 0, label: 'O₂', value: '--' },
+      { id: 1, label: 'CO', value: '--' },
     ],
   },
 ];

src/views/vent/monitorManager/alarmMonitor/warn/deviceWarn.vue

@@ -2,6 +2,7 @@
   <customHeader :options="options" @change="getSelectRow" :optionValue="optionValue"> 设备监测预警 </customHeader>
   <div class="alarm-modal">
     <a-button
+      v-if="hasPermission('fan:remote')"
       preIcon="ant-design:rollback-outlined"
       type="text"
       size="small"
@@ -55,11 +56,11 @@
   import { useSystemSelect } from '/@/hooks/vent/useSystemSelect';
   import { useRouter } from 'vue-router';
   import { getAssetURL } from '/@/utils/ui';
-
+  import { usePermission } from '/@/hooks/web/usePermission';
   // const props = defineProps({
   //   deviceId: { type: String },
   // });
-
+  const { hasPermission } = usePermission();
   let iconsMonitor = reactive({
     // fanmain: {
     //   url: getAssetURL('home-container/device/zhushan.png'),

src/views/vent/monitorManager/alarmMonitor/warn/dustWarn.vue

@@ -3,6 +3,7 @@
   <div class="dustWarn">
     <div class="top-dust">
       <a-button
+       v-if="hasPermission('fan:remote')"
         preIcon="ant-design:rollback-outlined"
         type="text"
         size="small"
@@ -80,7 +81,9 @@
   import { useSystemSelect } from '/@/hooks/vent/useSystemSelect';
   import { useRouter } from 'vue-router';
   import CustomHeader from '/@/components/vent/customHeader.vue';
-
+  import { usePermission } from '/@/hooks/web/usePermission';
+  
+  const { hasPermission } = usePermission();
   const { options, optionValue, getSelectRow, getSysDataSource } = useSystemSelect('sys_surface_caimei'); // 参数为场景类型（设备类型管理中可以查询到）
   //左侧数据列表
   let menuList = reactive<any[]>([]);

src/views/vent/monitorManager/alarmMonitor/warn/fireWarn.vue

@@ -2,6 +2,7 @@
   <customHeader :options="options" @change="getSelectRow" :optionValue="optionValue"> 火灾监测预警 </customHeader>
   <div class="fireWarn">
     <a-button
+     v-if="hasPermission('fan:remote')"
       preIcon="ant-design:rollback-outlined"
       type="text"
       size="small"
@@ -36,7 +37,9 @@
   import { useGlobSetting } from '/@/hooks/setting';
   import { useRouter } from 'vue-router';
   import CustomHeader from '/@/components/vent/customHeader.vue';
-
+  import { usePermission } from '/@/hooks/web/usePermission';
+  
+  const { hasPermission } = usePermission();
   const { options, optionValue, getSelectRow, getSysDataSource } = useSystemSelect('sys_surface_caimei'); // 参数为场景类型（设备类型管理中可以查询到）
   //当前加载组件
   let currentLoad = ref('');

src/views/vent/monitorManager/alarmMonitor/warn/gasWarn.vue

@@ -2,6 +2,7 @@
   <customHeader :options="options" @change="getSelectRow" :optionValue="optionValue"> 瓦斯监测预警 </customHeader>
   <div class="gasWarn">
     <a-button
+     v-if="hasPermission('fan:remote')"
       preIcon="ant-design:rollback-outlined"
       type="text"
       size="small"
@@ -112,7 +113,9 @@
   import warnTargetGas from '../common/warnTargetGas.vue';
   import gasParamter from '../common/gasParamter.vue';
   import { typeMenuListGas } from '../common.data';
-
+  import { usePermission } from '/@/hooks/web/usePermission';
+  
+  const { hasPermission } = usePermission();
   const { options, optionValue, getSelectRow, getSysDataSource } = useSystemSelect('sys_surface_caimei'); // 参数为场景类型（设备类型管理中可以查询到）
   //当前左侧激活菜单的索引
   let activeIndex1 = ref(0);

src/views/vent/monitorManager/alarmMonitor/warn/ventilateWarn.vue

@@ -3,6 +3,7 @@
   <div class="ventilateWarn">
     <div class="ventilate-top">
       <a-button
+      v-if="hasPermission('fan:remote')"
         preIcon="ant-design:rollback-outlined"
         type="text"
         size="small"
@@ -37,7 +38,7 @@
               <div class="value">
                 <div class="content-box" v-for="(items, ind) in item.list" :key="ind">
                   <span style="color: #b3b8cc">{{ `${items.label} :` }}</span>
-                  <span style="color: #3df6ff; margin-left: 10px">{{ `${items.value}%` }}</span>
+                  <span style="color: #3df6ff; margin-left: 10px">{{ items.value }}</span>
                 </div>
               </div>
             </div>
@@ -91,7 +92,9 @@
   import { ventilateTopList } from '../common.data';
   import CustomHeader from '/@/components/vent/customHeader.vue';
   import echartLine from '../common/echartLine.vue';
+  import { usePermission } from '/@/hooks/web/usePermission';
 
+  const { hasPermission } = usePermission();
   const { options, optionValue, getSelectRow, getSysDataSource } = useSystemSelect('sys_surface_caimei'); // 参数为场景类型（设备类型管理中可以查询到）
   let router = useRouter();
   //左侧数据列表

src/views/vent/safetyList/common/detail.vue

@@ -678,6 +678,7 @@ async function getStationList1() {
     res.forEach(el => {
         el.key = el.id
         el.linkIdC = el.linkId || ''
+        el.stripC=el.strip  || ''
         el.linkstatusC = el.linkstatus ? '连接' : '断开'
         el.gdmsC = el.gdms == '1' ? '直流供电' : el.gdms == '0' ? '交流供电' : ''
         // el.debugTitle = '调试'
@@ -685,6 +686,7 @@ async function getStationList1() {
         el.children.forEach(v => {
             v.key = v.id
             v.debugTitle = '调试'
+            v.stripC=v.strserno || ''
             v.linkstatusC = v.netStatus ? '连接' : '断开'
             v.linkIdC = v.linkId == '0' ? '未启用' : v.linkId == '1' ? '启用' : v.linkId == '2' ? '设备异常' : ''
             v.updateTime = v.time

src/views/vent/safetyList/safetyList.data.ts

@@ -14,6 +14,13 @@ export const columns: BasicColumn[] = [
         align: 'center',
     },
     {
+        title: 'Ip地址',
+        dataIndex: 'stripC',
+        key: 'stripC',
+        width: 80,
+        align: 'center',
+    },
+    {
         title: '监测值',
         dataIndex: 'valueJc',
         key: 'valueJc',