Merge branch 'master' of http://39.97.59.228:8013/hrx/mky-vent-base

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

@@ -775,7 +775,7 @@ async function handleClick(data) {
 
 //获取分站实时监测信息
 async function getSubStationList() {
-  let res = await subStationList({ strtype: 'modbus', reqparam: '235' });
+  let res = await subStationList({  reqparam: '235' });
   if (res.length != 0) {
     cardList.value = res;
     stationId.value = stationId.value ? stationId.value : cardList.value[0].id
@@ -850,19 +850,19 @@ async function getStationListAll() {
     el.children = el.devInfoList;
     el.children.forEach((v) => {
       v.key = v.id;
-      v.debugTitle = v.deviceType == 'windrect_ds_two_130' ? v.status === 1 ? '结束调试' : v.status === 0 ? '调试' : '' : ''
+      v.debugTitle = v.deviceType == 'windrect_ds_two_235' ? v.status === 1 ? '结束调试' : v.status === 0 ? '调试' : '' : ''
       v.stripC = v.strserno || '';
       v.linkstatusC = v.netStatus ? '连接' : '断开';
       v.linkIdC = v.linkId == '0' ? '未启用' : v.linkId == '1' ? '启用' : v.linkId == '2' ? '设备异常' : '';
       v.updateTime = v.time;
       v.gdmsC = v.gdms == '1' ? '直流供电' : v.gdms == '0' ? '交流供电' : '';
       v.valueJc = `风向:${v.forward || ''},风量:${v.m3 || ''}m³/min,风速:${v.windSpeed || ''}m/s,气压:${v.pa || ''}Pa,压差:${v.difPress || ''
-        }Pa,温度:${v.temperature || ''}℃,湿度:${v.humidity || ''}%,断面积:${v.area || ''}㎡,ch4:${v.ch4 || ''}%`;
+        }Pa,温度:${v.temperature || ''}℃,湿度:${v.humidity || ''}%,断面积:${v.area || ''}㎡,ch4:${v.ch4 || ''}%,密度:${v.density || ''}%,相对湿度:${v.humidity || ''}%`;
     });
   });
   
   tableData.value = res;
-  // pagination.total = res.total;
+  pagination.total = res.total;
 }
 //显示全部
 function getAllShow() {

types/config.d.ts

@@ -160,6 +160,7 @@ export interface GlobConfig {
   sysOrgCode: string;
   sysDataType: string;
   // isSimulate: boolean
+  is2DModel: boolean;
 }
 export interface GlobEnvConfig {
   // Site title

types/global.d.ts

@@ -10,8 +10,17 @@ declare global {
     safetyCrlPlatformUrl: string;
     gasControlMock: boolean;
     historyIsMultiple: boolean;
+    is2DModel: boolean;
   };
 
+  interface GlobalConfig {
+    simulatedPassword: string;
+    History_Type: string;
+    pageType: string;
+    showReport: boolean;
+    is2DModel: boolean;
+  }
+
   const __APP_INFO__: {
     pkg: {
       name: string;