130分站，158分站bug修改

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

@@ -153,7 +153,8 @@
         <div class="detail-content" v-if="activeKey == 'manageAuto'">
 
           <a-table size="small" :scroll="{ y: 710 }" :row-key="(record) => record.stationId"
-            :expandedRowKeys="expandedRowKeys" :columns="columnsDetail" :data-source="tableData1" @expand="tableExpand">
+            :expandedRowKeys="expandedRowKeys" :columns="columnsDetail130" :data-source="tableData1"
+            @expand="tableExpand">
 
             <template #bodyCell="{ column, text }"></template>
             <template #expandedRowRender="{ record }">
@@ -217,6 +218,10 @@
                 </a-select>
                 <a-button type="success" @click="getDeviceList">读取</a-button>
               </a-form-item> -->
+              <a-form-item label="地址:">
+                <a-input v-model:value="formEdit.dz" placeholder="请输入" style="width: 260px; margin-right: 10px" />
+                <a-button class="down-btn" type="primary" @click="handleClick('地址')">下发</a-button>
+              </a-form-item>
               <a-form-item label="探头距离:">
                 <a-input v-model:value="formEdit.ttjl" placeholder="请输入" style="width: 260px; margin-right: 10px" />
                 <a-button class="down-btn" type="primary" @click="handleClick('探头距离')">下发</a-button>
@@ -302,10 +307,6 @@
                   style="width: 260px; margin-right: 10px" />
                 <a-button class="down-btn" type="primary" @click="handleClick('第一路485波特率')">下发</a-button>
               </a-form-item>
-              <a-form-item label="保存密码:">
-                <a-input v-model:value="formEdit.bcmm" placeholder="请输入" style="width: 260px; margin-right: 10px" />
-                <a-button class="down-btn" type="primary" @click="handleClick('保存密码')">下发</a-button>
-              </a-form-item>
               <a-form-item label="复位:">
                 <a-input v-model:value="formEdit.fw" placeholder="请输入" style="width: 260px; margin-right: 10px" />
                 <a-button class="down-btn" type="primary" @click="handleClick('复位')">下发</a-button>
@@ -314,12 +315,24 @@
                 <a-input v-model:value="formEdit.range" placeholder="请输入" style="width: 260px; margin-right: 10px" />
                 <a-button class="down-btn" type="primary" @click="handleClick('浮动范围')">下发</a-button>
               </a-form-item>
+              <a-form-item label="测试模式:">
+                <a-select ref="select" v-model:value="formEdit.csms" placeholder="请选择..."
+                  style="width: 260px; margin-right: 10px">
+                  <a-select-option v-for="(item, index) in optionList" :key="index" :value="item.value">{{ item.label
+                  }}</a-select-option>
+                </a-select>
+                <a-button class="down-btn" type="primary" @click="handleClick('测试模式')">下发</a-button>
+              </a-form-item>
               <a-form-item label="测试风速:">
                 <a-input v-model:value="formEdit.csfs" placeholder="请输入" style="width: 260px; margin-right: 10px" />
                 <a-button class="down-btn" type="primary" @click="handleClick('测试风速')">下发</a-button>
               </a-form-item>
               <a-form-item label="测试风向:">
-                <a-input v-model:value="formEdit.csfx" placeholder="请输入" style="width: 260px; margin-right: 10px" />
+                <a-select ref="select" v-model:value="formEdit.csfx" placeholder="请选择..."
+                  style="width: 260px; margin-right: 10px">
+                  <a-select-option v-for="(item, index) in optionList1" :key="index" :value="item.value">{{ item.label
+                  }}</a-select-option>
+                </a-select>
                 <a-button class="down-btn" type="primary" @click="handleClick('测试风向')">下发</a-button>
               </a-form-item>
             </a-form>
@@ -365,7 +378,7 @@ import {
   //   remove158Device
 } from '../safetyList.api';
 
-import { columnsDetail, columns, deviceColumns130 } from '../safetyList.data';
+import { columnsDetail130, columns, deviceColumns130, optionList, optionList1, derictList, pagination } from '../safetyList.data';
 
 import customHeader from '/@/components/vent/customHeader.vue';
 import operateRecord from './operateRecord.vue'
@@ -373,7 +386,6 @@ import { AesEncryption } from '/@/utils/cipher';
 import { loginCipher } from '/@/settings/encryptionSetting';
 import { message } from 'ant-design-vue';
 
-
 let expandedRowKeys = reactive<any[]>([])
 const { hasPermission } = usePermission();
 let activeKey = ref('device');
@@ -391,19 +403,13 @@ let openNum = ref(0);
 let clsoeNum = ref(0);
 let tableData = ref<any[]>([]);
 let tableData1 = ref<any[]>([]);
-//分页参数配置
-let pagination = reactive({
-  current: 1, // 当前页码
-  pageSize: 20, // 每页显示条数
-  total: 0, // 总条目数，后端返回
-  // showTotal: (total, range) => `${range[0]}-${range[1]} 条，总共 ${total} 条`, // 分页右下角显示信息
-  showSizeChanger: true, // 是否可改变每页显示条数
-  pageSizeOptions: ['10', '20', '30', '40', '50', '100'], // 可选的每页显示条数
-});
+
 let visibleModalEdit = ref(false);
 let visibleModalEdit1 = ref(false);
 let formEdit = reactive({
   id: '',
+  dz: '',
+  csms: '',
   ttjl: '',
   jxjl: '',
   jd: '',
@@ -425,7 +431,6 @@ let formEdit = reactive({
   dbjyz: '',
   bjsn: '',
   dyl485btl: '',
-  bcmm: '',
   fw: '',
   range: '',
   csfs: '',
@@ -464,10 +469,7 @@ let visibleModalDebug = ref(false);
 let debugFlag = ref('');
 let debugStationId = ref('');
 let debugDeviceId = ref('');
-let derictList = reactive<any[]>([
-  { label: '正向', value: '0' },
-  { label: '反向', value: '1' },
-]);
+
 let devStationId = ref('');
 let stationId = ref('');
 
@@ -476,8 +478,9 @@ let visibleModalDebugEnd = ref(false);
 let startupDataDebugEnd = reactive({
   pwd: '',
 });
-
 let operationData = ref<any[]>([])//操作记录列表
+
+
 //定时刷新左侧分站数据
 let timer: null | NodeJS.Timeout = null;
 function getMonitor(flag = false) {
@@ -574,6 +577,8 @@ async function onChangeTab(tab) {
 function cancenModal() {
   clearTimeout(timer2)
   formEdit.id = ''
+  formEdit.dz = ''
+  formEdit.csms = ''
   formEdit.ttjl = ''
   formEdit.jxjl = ''
   formEdit.jd = ''
@@ -595,7 +600,6 @@ function cancenModal() {
   formEdit.dbjyz = ''
   formEdit.bjsn = ''
   formEdit.dyl485btl = ''
-  formEdit.bcmm = ''
   formEdit.fw = ''
   formEdit.range = ''
   formEdit.csfs = ''
@@ -615,14 +619,14 @@ function cancenModal() {
 //获取详细信息列表
 async function getStationList() {
   let res = await get130List();
-  res.forEach((el) => {
-    el.linkstatusC = el.linkstatus ? '连接' : '断开';
-    el.key = el.stationId
+  tableData1.value = res.map((el: any) => {
     el.devInfoList = el.devInfoList.map(v => {
       return { ...v, ...v.param }
     })
+    el.key = el.stationId
+    el = { ...el, ...el.station130Param }
+    return el
   });
-  tableData1.value = res;
 }
 // //传感器选项切换
 // function changeCgq(val) {
@@ -644,6 +648,16 @@ async function handleEdit(record) {
 //下发
 async function handleClick(data) {
   switch (data) {
+    case '地址':
+      await set130StationData({ stationId: devStationId.value, deviceId: '', plcCode: 'dz', value: formEdit.dz });
+      visibleModalEdit1.value = false;
+      getStationList();
+      break;
+    case '测试模式':
+      await set130StationData({ stationId: devStationId.value, deviceId: '', plcCode: 'csms', value: formEdit.csms });
+      visibleModalEdit1.value = false;
+      getStationList();
+      break;
     case '探头距离':
       await set130StationData({ stationId: devStationId.value, deviceId: '', plcCode: 'ttjl', value: formEdit.ttjl });
       visibleModalEdit1.value = false;
@@ -749,11 +763,6 @@ async function handleClick(data) {
       visibleModalEdit1.value = false;
       getStationList();
       break;
-    case '保存密码':
-      await set130StationData({ stationId: devStationId.value, deviceId: '', plcCode: 'bcmm', value: formEdit.bcmm });
-      visibleModalEdit1.value = false;
-      getStationList();
-      break;
     case '复位':
       await set130StationData({ stationId: devStationId.value, deviceId: '', plcCode: 'fw', value: formEdit.fw });
       visibleModalEdit1.value = false;

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

@@ -825,6 +825,7 @@ async function getSubStationList() {
 //分站站点选项点击
 function cardClick(item, index) {
   clearTimeout(timer3)
+  clearTimeout(timer)
   selectedIndex.value = index; // 更新选中索引
   activeIndex.value = item.isNewAccess || !item.linkstatus ? index : null;
   stationName.value = item.strname;
@@ -902,6 +903,7 @@ async function getStationListAll() {
 //显示全部
 function getAllShow() {
   clearTimeout(timer)
+  clearTimeout(timer3)
   getStationListAll()
   getMonitor3()
 }
@@ -963,7 +965,7 @@ function debugClick(record) {
 async function handleOkDebugEnd() {
   const encryption = new AesEncryption({ key: loginCipher.key, iv: loginCipher.iv });
   let res = await updateDebugStatus({ pwd: encryption.encryptByAES(startupDataDebugEnd.pwd), stationId: debugStationId.value, deviceId: debugDeviceId.value, debugFlag: '0' });
-  if (res.code = 500) {
+  if (res.code == 500) {
     message.error(res.message);
   } else {
     visibleModalDebugEnd.value = false;

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

@@ -1,5 +1,27 @@
 import { BasicColumn } from '/@/components/Table';
-
+//130分站测试模式
+export  const optionList:any[] = [
+  { label: '调试模式', value: '1' },
+  { label: '正常模式', value: '0' }
+]
+//130分站测试风向
+export  const  optionList1:any[] = [
+  { label: '反风', value: '1' },
+  { label: '正风', value: '0' }
+]
+export  const derictList:any[] = [
+  { label: '正向', value: '0' },
+  { label: '反向', value: '1' },
+];
+//分页参数配置
+export const pagination = {
+  current: 1, // 当前页码
+  pageSize: 20, // 每页显示条数
+  total: 0, // 总条目数，后端返回
+  // showTotal: (total, range) => `${range[0]}-${range[1]} 条，总共 ${total} 条`, // 分页右下角显示信息
+  showSizeChanger: true, // 是否可改变每页显示条数
+  pageSizeOptions: ['10', '20', '30', '40', '50', '100'], // 可选的每页显示条数
+};
 export const columns: BasicColumn[] = [
   // {
   //     title: '序号',
@@ -177,6 +199,124 @@ export const columnsDetail: BasicColumn[] = [
     slots: { customRender: 'action' },
   },
 ];
+export const columnsDetail130: BasicColumn[] = [
+  {
+    title: '煤矿名称',
+    dataIndex: 'mkmc',
+    key: 'mkmc',
+    width: 180,
+    align: 'center',
+  },
+  {
+    title: '电流1',
+    dataIndex: 'dl1',
+    key: 'dl1',
+    align: 'center',
+  },
+  {
+    title: '电流2',
+    dataIndex: 'dl2',
+    key: 'dl2',
+    align: 'center',
+  },
+  {
+    title: '电流3',
+    dataIndex: 'dl3',
+    key: 'dl3',
+    align: 'center',
+  },
+  {
+    title: '电流4',
+    dataIndex: 'dl4',
+    key: 'dl4',
+    align: 'center',
+  },
+  {
+    title: '电流5',
+    dataIndex: 'dl5',
+    key: 'dl5',
+    align: 'center',
+  },
+  {
+    title: '电流6',
+    dataIndex: 'dl6',
+    key: 'dl6',
+    align: 'center',
+  },
+  {
+    title: '电池电量',
+    dataIndex: 'dcdl',
+    key: 'dcdl',
+    align: 'center',
+  },
+  {
+    title: '电池电压',
+    dataIndex: 'dcdy',
+    key: 'dcdy',
+    align: 'center',
+  },
+  {
+    title: '输出电压1',
+    dataIndex: 'scdy1',
+    key: 'scdy1',
+    align: 'center',
+  },
+  {
+    title: '输出电压2',
+    dataIndex: 'scdy2',
+    key: 'scdy2',
+    align: 'center',
+  },
+  {
+    title: '输出电压3',
+    dataIndex: 'scdy3',
+    key: 'scdy3',
+    align: 'center',
+  },
+  {
+    title: '输出电压4',
+    dataIndex: 'scdy4',
+    key: 'scdy4',
+    align: 'center',
+  },
+  {
+    title: '输出电压5',
+    dataIndex: 'scdy5',
+    key: 'scdy5',
+    align: 'center',
+  },
+  {
+    title: '输出电压6',
+    dataIndex: 'scdy6',
+    key: 'scdy6',
+    align: 'center',
+  },
+  {
+    title: '交直流',
+    dataIndex: 'jzl',
+    key: 'jzl',
+    align: 'center',
+  },
+   {
+    title: '版本寄存器',
+    dataIndex: 'bbjcq',
+    key: 'bbjcq',
+    align: 'center',
+  },
+   {
+    title: '传感器版本',
+    dataIndex: 'csfx',
+    key: 'csfx',
+    align: 'center',
+  },
+  // {
+  //   title: '操作',
+  //   dataIndex: 'action',
+  //   width: 150,
+  //   align: 'center',
+  //   slots: { customRender: 'action' },
+  // },
+];
 export const deviceColumns: BasicColumn[] = [
   {
     title: '安装位置',