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

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

@@ -34,7 +34,13 @@
       window.open(newPage.href, '_blank');
     }
     if (activeValue == 'gasPiping') {
-      const newPage = router.resolve({ path: '/micro-vent-3dModal/gas-pipe-net/home?type=sysMonitor&deviceType=pipingpage' });
+      const newPage = router.resolve({
+        path: '/micro-vent-3dModal/gas-pipe-net/home',
+        query: {
+          type: 'sysMonitor',
+          deviceType: 'pipingpage',
+        },
+      });
       window.open(newPage.href, '_blank');
     }
     if (activeValue == 'gasAlarm') {
@@ -42,7 +48,14 @@
       window.open(newPage.href, '_blank');
     }
     if (activeValue == 'drillDesign') {
-      const newPage = router.resolve({ path: '/micro-vent-3dModal/modelchannel/model3D/home?type=model3D&deviceType=model3D&kind=drillset' });
+      const newPage = router.resolve({
+        path: '/micro-vent-3dModal/modelchannel/model3D/home',
+        query: {
+          type: 'model3D',
+          deviceType: 'model3D',
+          kind: 'drillset',
+        },
+      });
       window.open(newPage.href, '_blank');
     }
   }

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

@@ -16,6 +16,7 @@ enum Api {
   teamAdd = '/safety/disTeamInfo/add', //区队添加
   //   teamEdit = '/safety/disTeamInfo/edit', //区队编辑
   deleteTeam = '/safety/disTeamInfo/delete', //区队删除
+  deleteTeamNew = '/safety/disTeamInfo/deleteNew', //区队删除
   addGasReportAddress = '/safety/gasDayReport/addGasReportAddress', //新增瓦斯巡检地址
   taskDetailsList = '/safety/gasDayReport/taskDetailsList', // 瓦斯巡检任务明细列表分页查询
   zipdownload = '/ventanaly-sharefile/fileServer/zipdownload',
@@ -104,6 +105,10 @@ export const teamEdit = (params) => defHttp.put({ url: Api.taskSubmit, params })
  * 区队删除
  */
 export const deleteTeam = (params) => defHttp.delete({ url: Api.deleteTeam, params }, { joinParamsToUrl: true });
+/**
+ * 区队删除
+ */
+export const deleteTeamNew = (params) => defHttp.delete({ url: Api.deleteTeamNew, params }, { joinParamsToUrl: true });
 
 /**
  * 瓦斯巡检任务明细列表分页查询

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

@@ -83,7 +83,7 @@
   import { ref, onMounted, nextTick } from 'vue';
   import customHeader from '/@/components/vent/customHeader.vue';
   import { taskColumns, pagination, taskschemas, taskDetailsColumns, taskManageColumns } from './gasInspect.data';
-  import { deleteTeam, getManageTasklist, operateGasCheckTaskDetail, taskDetailsList, teamAdd, teamEdit, teamList } from './gasInspect.api';
+  import { deleteTeamNew, getManageTasklist, operateGasCheckTaskDetail, taskDetailsList, teamAdd, teamEdit, teamList } from './gasInspect.api';
   import { BasicTable } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
   import { Modal, message } from 'ant-design-vue';
@@ -217,9 +217,10 @@
   }
 
   // 任务删除
-  function handleDelete({ id }) {
-    deleteTeam({ id }).then(() => {
+  function handleDelete({ id, taskTime }) {
+    deleteTeamNew({ id, taskTime }).then(() => {
       message.success('删除成功');
+      tableContext1.reload();
     });
   }
 

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;