[Mod 0000] 瓦斯巡检地点管理新的api替代

src/views/vent/gas/gasInspectNonfc/gasInspectNonfc.api.ts

@@ -13,6 +13,9 @@ enum Api {
   getAllUserInfo = '/safety/gasInsCard/getAllUserInfo', //获取早中晚班巡检员列表
   addGasReportAddress = '/safety/gasDayReport/addGasReportAddress', //新增瓦斯巡检地址
   zipdownload = '/ventanaly-sharefile/fileServer/zipdownload',
+  addGasReportAddressNew = '/safety/gasDayReport/addGasReportAddressNew', //新增瓦斯巡检地址(新自动排序)
+  clearCardInfoNew = '/safety/gasIns/deleteNew', //瓦斯巡检卡信息删除(新自动排序)
+  editNew = '/safety/gasIns/editNew', //瓦斯巡检地点编辑(新自动排序)
 }
 
 /**
@@ -76,3 +79,7 @@ export const getAllUserInfo = () => defHttp.get({ url: Api.getAllUserInfo });
  * @param params
  */
 export const taskSubmit = (params) => defHttp.post({ url: Api.taskSubmit, params });
+
+export const addGasReportAddressNew = (params) => defHttp.post({ url: Api.addGasReportAddressNew, params });
+export const clearCardInfoNew = (params) => defHttp.delete({ url: Api.clearCardInfoNew, params }, { joinParamsToUrl: true });
+export const editNew = (params) => defHttp.post({ url: Api.editNew, params });

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

@@ -87,7 +87,16 @@
   import addressAdd from './components/addressAdd2.vue';
   import { message } from 'ant-design-vue';
   import { columns2, pagination } from './gasInspectNonfc.data';
-  import { list, importByExcel, exportGasByExcel, moveOrderNum, edit, taskSubmit, clearCardInfo, addGasReportAddress } from './gasInspectNonfc.api';
+  import {
+    list,
+    importByExcel,
+    exportGasByExcel,
+    moveOrderNum,
+    editNew,
+    taskSubmit,
+    clearCardInfoNew,
+    addGasReportAddressNew,
+  } from './gasInspectNonfc.api';
 
   let keyActive = ref(0);
   let searchParams = ref('');
@@ -128,7 +137,7 @@
   };
   //编辑提交
   async function confirmEdit(param) {
-    let res = await edit({ ...param });
+    let res = await editNew({ ...param });
     if (res) {
       queryByIdList();
       visibleEdit.value = false;
@@ -141,7 +150,7 @@
 
   //删除巡检卡信息
   async function handleDelCardInfo(record) {
-    let res = await clearCardInfo({ id: record.id });
+    let res = await clearCardInfoNew({ id: record.id });
     if (res) {
       queryByIdList();
     }
@@ -268,7 +277,7 @@
   };
   //确定新增
   async function confirmAddress(param) {
-    let res = await addGasReportAddress(param);
+    let res = await addGasReportAddressNew(param);
     console.log(res, '新增瓦斯巡检地点');
     if (res) {
       visibleAddress.value = false;

src/views/vent/gas/gasPipeNet/gasPipeNet.data.ts

@@ -40,20 +40,20 @@ export const moduleConfigs: Config[] = [
       board: [
         {
           type: 'I',
-          readFrom: '',
+          readFrom: 'readData',
           layout: 'label-top',
           items: [
             {
-              label: '电压(kV)',
-              value: '${flow_merge}',
+              label: '工混流量(%)',
+              value: '${mixedTraffic}',
             },
             {
-              label: '电流(A)',
-              value: '${fy_merge}',
+              label: '标况流量(%)',
+              value: '${standardTraffic}',
             },
             {
-              label: '功率(kW)',
-              value: '${leakage}',
+              label: '温度(℃)',
+              value: '${pipeTemp}',
             },
             {
               label: '一氧化碳(%)',
@@ -65,21 +65,21 @@ export const moduleConfigs: Config[] = [
       list: [
         {
           type: 'J',
-          readFrom: '',
+          readFrom: 'readData',
           items: [
             {
               label: '阀门1开度',
-              value: '${readData.gas1}',
+              value: '${gas1}',
               color: 'blue',
             },
             {
               label: '阀门2开度',
-              value: '${readData.gas2}',
+              value: '${gas2}',
               color: 'blue',
             },
             {
               label: '阀门3开度',
-              value: '${readData.gas3}',
+              value: '${gas3}',
               color: 'blue',
             },
           ],
@@ -119,7 +119,7 @@ export const moduleConfigs: Config[] = [
       background: {
         show: true,
         type: 'video',
-        link: '/video/fanLocal.webm',
+        link: '/video/fanLocal.mp4',
       },
       layout: {
         direction: 'column',
@@ -161,7 +161,7 @@ export const moduleConfigs: Config[] = [
       background: {
         show: true,
         type: 'video',
-        link: '/video/fanLocal.webm',
+        link: '/video/fanLocal.mp4',
       },
       layout: {
         direction: 'column',