Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/views/vent/gas/gasInspectNonfc/index2.vue

@@ -35,8 +35,8 @@
           <a-popconfirm title="删除内容无法恢复，是否删除" ok-text="确定" cancel-text="取消" @confirm="handleDelCardInfo(record)">
             <a class="table-action-link">删除</a>
           </a-popconfirm>
-          <a class="table-action-link" @click="moveUp(record)">上移</a>
-          <a class="table-action-link" @click="moveDown(record)">下移</a>
+          <!-- <a class="table-action-link" @click="moveUp(record)">上移</a> -->
+          <!-- <a class="table-action-link" @click="moveDown(record)">下移</a> -->
         </template>
         <template #bodyCell="{ column, text }">
           <template v-if="column.dataIndex == 'isSensor'">
@@ -91,7 +91,7 @@
     list,
     importByExcel,
     exportGasByExcel,
-    moveOrderNum,
+    // moveOrderNum,
     editNew,
     taskSubmit,
     clearCardInfoNew,
@@ -242,34 +242,34 @@
       //   navigator.msSaveBlob(blob, fileName);
     }
   }
-  //列表上移
-  async function moveUp(param) {
-    let res = await moveOrderNum({ id: param.id, moveType: 'upp' });
-    if (res) {
-      queryByIdList();
-    }
-  }
-  //列表下移
-  async function moveDown(param) {
-    let res = await moveOrderNum({ id: param.id, moveType: 'bel' });
-    if (res) {
-      queryByIdList();
-    }
-  }
-  //巡检次数筛选
-  let handlerFilter = (param) => {
-    let data = param.key;
-    switch (data) {
-      case '1':
-        pagination.current = 1;
-        tableData.value = tableData.value.filter((v) => v.insType == '1');
-        break;
-      case '2':
-        pagination.current = 2;
-        tableData.value = tableData.value.filter((v) => v.insType == '2');
-        break;
-    }
-  };
+  // //列表上移
+  // async function moveUp(param) {
+  //   let res = await moveOrderNum({ id: param.id, moveType: 'upp' });
+  //   if (res) {
+  //     queryByIdList();
+  //   }
+  // }
+  // //列表下移
+  // async function moveDown(param) {
+  //   let res = await moveOrderNum({ id: param.id, moveType: 'bel' });
+  //   if (res) {
+  //     queryByIdList();
+  //   }
+  // }
+  // //巡检次数筛选
+  // let handlerFilter = (param) => {
+  //   let data = param.key;
+  //   switch (data) {
+  //     case '1':
+  //       pagination.current = 1;
+  //       tableData.value = tableData.value.filter((v) => v.insType == '1');
+  //       break;
+  //     case '2':
+  //       pagination.current = 2;
+  //       tableData.value = tableData.value.filter((v) => v.insType == '2');
+  //       break;
+  //   }
+  // };
   //新增瓦斯巡检地点
   let getTjAddress = () => {
     visibleAddress.value = true;

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

@@ -103,8 +103,8 @@ export const columns: BasicColumn[] = [
               },
               {
                 title: '光瓦测量数据(%)',
-                dataIndex: 'gwSdzNight1',
-                key: 'gwSdzNight1',
+                dataIndex: 'ch4Night1',
+                key: 'ch4Night1',
                 width: 100,
                 align: 'center',
               },
@@ -177,8 +177,8 @@ export const columns: BasicColumn[] = [
               },
               {
                 title: '光瓦测量数据(%)',
-                dataIndex: 'gwSdzNight2',
-                key: 'gwSdzNight2',
+                dataIndex: 'ch4Night2',
+                key: 'ch4Night2',
                 width: 100,
                 align: 'center',
               },
@@ -293,8 +293,8 @@ export const columns: BasicColumn[] = [
               },
               {
                 title: '光瓦测量数据(%)',
-                dataIndex: 'gwSdzEarly1',
-                key: 'gwSdzEarly1',
+                dataIndex: 'ch4Early1',
+                key: 'ch4Early1',
                 width: 100,
                 align: 'center',
               },
@@ -367,8 +367,8 @@ export const columns: BasicColumn[] = [
               },
               {
                 title: '光瓦测量数据(%) ',
-                dataIndex: 'gwSdzEarly2',
-                key: 'gwSdzEarly2',
+                dataIndex: 'ch4Early2',
+                key: 'ch4Early2',
                 width: 100,
                 align: 'center',
               },
@@ -483,8 +483,8 @@ export const columns: BasicColumn[] = [
               },
               {
                 title: '光瓦测量数据(%)',
-                dataIndex: 'gwSdzNoon1',
-                key: 'gwSdzNoon1',
+                dataIndex: 'ch4Noon1',
+                key: 'ch4Noon1',
                 width: 100,
                 align: 'center',
               },
@@ -557,8 +557,8 @@ export const columns: BasicColumn[] = [
               },
               {
                 title: '光瓦测量数据(%)',
-                dataIndex: 'gwSdzNoon2',
-                key: 'gwSdzNoon2',
+                dataIndex: 'ch4Noon2',
+                key: 'ch4Noon2',
                 width: 100,
                 align: 'center',
               },