光钎测温更新，注浆更新，瓦斯日报表监测更新，158分站监测详情更新

src/components/chart/BarAndLine.vue

@@ -218,7 +218,7 @@
             propType.ymin = yMin;
             return true;
           });
-          debugger;
+          // debugger;
           // 根据sort分组
           const groupedBy = {};
           for (const item of chartsColumns) {

src/views/vent/gas/gasReport/gas-report.data.ts

@@ -5,6 +5,14 @@ export const columns: BasicColumn[] = [
     title: '瓦斯日报',
     children: [
       {
+        title: '排序',
+        dataIndex: 'order_num',
+        key: 'order_num',
+        align: 'center',
+        sorter: true,
+        width: 120,
+      },
+      {
         title: '夜班',
         children: [
           {

src/views/vent/gas/gasReport/index.vue

@@ -41,10 +41,10 @@
           <a-button type="primary" preIcon="ant-design:check-circle-outlined" style="margin-right: 10px"
             @click="getPassSh">审核通过</a-button>
           <a-button type="primary" preIcon="ant-design:download-outlined" @click="getExport">导出日报表</a-button>
-          <a-button type="primary" preIcon="ant-design:download-outlined" @click="getExport1"
-            style="margin: 0px 10px">导出瓦斯三对照报表</a-button>
+          <!-- <a-button type="primary" preIcon="ant-design:download-outlined" @click="getExport1"
+            style="margin: 0px 10px">导出瓦斯三对照报表</a-button> -->
           <a-button type="primary" preIcon="ant-design:download-outlined" @click="getExport2"
-            style="margin-right: 10px">导出瓦斯检查小票</a-button>
+          style="margin: 0px 10px">导出瓦斯检查小票</a-button>
           <a-button type="primary" preIcon="ant-design:download-outlined" @click="handleMenuClick">导出班报表</a-button>
           <!-- <a-dropdown>
             <template #overlay>
@@ -85,7 +85,7 @@
             <div :style="{ color: Number(text) >= 0 && Number(text) <= 23 ? '#0ae715' : '#ff2313' }">{{ text }}</div>
           </template>
           <template
-            v-if="column.dataIndex == 'tNight1' || column.dataIndex == 'tNight2' || column.dataIndex == 'tEarly1' || column.dataIndex == 'tEarly2' || column.dataIndex == 'tNoon1' || column.dataIndex == 'tNoon2'">
+            v-if="column.dataIndex == 'tnight1' || column.dataIndex == 'tnight2' || column.dataIndex == 'tearly1' || column.dataIndex == 'tearly2' || column.dataIndex == 'tnoon1' || column.dataIndex == 'tnoon2'">
             <div :style="{ color: Number(text) >= 3 && Number(text) <= 25 ? '#0ae715' : '#ff2313' }">{{ text }}</div>
           </template>
           <template
@@ -247,7 +247,7 @@ function getTs() {
       param = false
     } else if ((Number(el.co2Night1) >= 0.04 && Number(el.co2Night1) <= 0.1) && (Number(el.co2Night2) >= 0.04 && Number(el.co2Night2) <= 0.1) && (Number(el.co2Early1) >= 0.04 && Number(el.co2Early1) <= 0.1) && (Number(el.co2Early2) >= 0.04 && Number(el.co2Early2) <= 0.1) && (Number(el.co2Noon1) >= 0.04 && Number(el.co2Noon1) <= 0.1) && (Number(el.co2Noon2) >= 0.04 && Number(el.co2Noon2) <= 0.1)) {
       param = false
-    } else if ((Number(el.tNight1) >= 3 && Number(el.tNight1) <= 25) && (Number(el.tNight2) >= 3 && Number(el.tNight2) <= 25) && (Number(el.tEarly1) >= 3 && Number(el.tEarly1) <= 25) && (Number(el.tEarly2) >= 3 && Number(el.tEarly2) <= 25) && (Number(el.tNoon1) >= 3 && Number(el.tNoon1) <= 25) && (Number(el.tNoon2) >= 3 && Number(el.tNoon2) <= 25)) {
+    } else if ((Number(el.tnight1) >= 3 && Number(el.tnight1) <= 25) && (Number(el.tnight2) >= 3 && Number(el.tnight2) <= 25) && (Number(el.tearly1) >= 3 && Number(el.tearly1) <= 25) && (Number(el.tearly2) >= 3 && Number(el.tearly2) <= 25) && (Number(el.tnoon1) >= 3 && Number(el.tnoon1) <= 25) && (Number(el.tnoon2) >= 3 && Number(el.tnoon2) <= 25)) {
       param = false
     } else if ((Number(el.ch4Night1) >= 0 && Number(el.ch4Night1) <= 0.1) && (Number(el.ch4Night2) >= 0 && Number(el.ch4Night2) <= 0.1) && (Number(el.ch4Early1) >= 0 && Number(el.ch4Early1) <= 0.1) && (Number(el.ch4Early2) >= 0 && Number(el.ch4Early2) <= 0.1) && (Number(el.ch4Noon1) >= 0 && Number(el.ch4Noon1) <= 0.1) && (Number(el.ch4Noon2) >= 0 && Number(el.ch4Noon2) <= 0.1)) {
       param = false

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

@@ -1120,7 +1120,8 @@
         const newPage = router.resolve({ path: '/monitorChannel/monitor-fanlocal1', query: { id: activeID.value, deviceType: record.deviceType } });
         window.open(newPage.href, '_blank');
       } else if (deviceType.value.indexOf('pulping') != -1) {
-        const newPage = router.resolve({ path: '/grout-home', query: { id: activeID.value } });
+        // const newPage = router.resolve({ path: '/grout-home', query: { id: activeID.value } });
+        const newPage = router.resolve({ path: '/grout-home',});
         window.open(newPage.href, '_blank');
       } else if (deviceType.value.indexOf('pressurefan') != -1) {
         const newPage = router.resolve({ path: '/nitrogen/home', query: { id: activeID.value } });
@@ -1141,7 +1142,8 @@
         const newPage = router.resolve({ path: '/forcFan/home', query: { id: activeID.value } });
         window.open(newPage.href, '_blank');
       } else if (deviceType.value.indexOf('pulping') != -1) {
-        const newPage = router.resolve({ path: '/grout-home', query: { id: activeID.value } });
+        // const newPage = router.resolve({ path: '/grout-home', query: { id: activeID.value } });
+        const newPage = router.resolve({ path: '/grout-home', });
         window.open(newPage.href, '_blank');
       } else if (deviceType.value.indexOf('gasmonitor') != -1) {
         const newPage = router.resolve({ path: '/gas/warn/home' });
@@ -1175,7 +1177,8 @@
         const newPage = router.resolve({ path: '/forcFan/home', query: { id: activeID.value } });
         window.open(newPage.href, '_blank');
       } else if (deviceType.value.indexOf('pulping') != -1) {
-        const newPage = router.resolve({ path: '/grout-home', query: { id: systemID.value } });
+        // const newPage = router.resolve({ path: '/grout-home', query: { id: systemID.value } });
+        const newPage = router.resolve({ path: '/grout-home', });
         window.open(newPage.href, '_blank');
       } else if (deviceType.value.indexOf('gasDay_normal') != -1) {
         const newPage = router.resolve({ path: '/gas/gas-report-inspect/home' });

src/views/vent/monitorManager/groutMonitor/grout.data.ts

@@ -657,7 +657,7 @@ export function getMonitorComponent() {
       groutHome = defineAsyncComponent(() => import('./components/groutHomelt.vue'));
       return groutHome;
     default:
-      groutHome = defineAsyncComponent(() => import('./components/groutHomeJj.vue'));
+      groutHome = defineAsyncComponent(() => import('./components/groutHomeHjt.vue'));
       // groutHome = defineAsyncComponent(() => import('./components/groutHomelt.vue'));
       return groutHome;
   }

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

@@ -186,11 +186,11 @@
                 @click="handleEdit(record)">编辑</a-button>
             </template>
             <template #bodyCell="{ column, text }"></template>
-            <template #expandedRowRender>
-              <a-table :columns="deviceColumns" :data-source="tableData2" :pagination="false"   maxWidth="340"
+            <template #expandedRowRender="{ record }">
+              <a-table :columns="deviceColumns" :data-source="record.deviceList" :pagination="false"   maxWidth="340"
               :scroll="{ x: 'max-content', y: 200 }">
-                <template #action="{ record }"></template>
-                <template #bodyCell="{ column }"></template>
+                <!-- <template #action="{ record }"></template>
+                <template #bodyCell="{ column }"></template> -->
               </a-table>
             </template>
           </a-table>
@@ -403,7 +403,6 @@ let openNum = ref(0);
 let clsoeNum = ref(0);
 let tableData = ref<any[]>([]);
 let tableData1 = ref<any[]>([]);
-let tableData2 = ref<any[]>([])
 //分页参数配置
 let pagination = reactive({
   current: 1, // 当前页码
@@ -555,7 +554,7 @@ async function tableExpand(expaned, record) {
   if(res && expaned){
     // expandedRowKeys.length=0
     let data = await get158StationData();
-    tableData2.value = data.filter(v => v.stationId == record.stationId)[0].deviceList || []
+    tableData1.value=data
     expandedRowKeys.push(record.stationId)
   }else {
     expandedRowKeys.length=0