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

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

@@ -1,69 +1,70 @@
 import { defHttp } from '/@/utils/http/axios';
 
-
 enum Api {
-    list = '/safety/gasInsCard/list',//通过id（巡检卡id）查询
-    importByExcel='/safety/gasDayReport/importGasInsCard',//导入瓦斯巡检地址
-    exportGasByExcel='/safety/gasDayReport/exportGasByExcel',//导出瓦斯巡检地址
-    queryAllDisTeam='/safety/disTeamInfo/queryAllDisTeam',//查询所有区队
-    moveOrderNum='/safety/gasInsCard/moveOrderNum',//上下移接口
-    edit='/safety/gasInsCard/edit',//瓦斯巡检地点编辑
-    deleteCard='/safety/gasInsCard/delete',//瓦斯巡检卡删除
-    taskSubmit='/safety/disTeamInfo/edit',//任务管理下发
-    clearCardInfo='/safety/gasInsCard/clearCard',//瓦斯巡检卡信息删除
-    getAllUserInfo='/safety/gasInsCard/getAllUserInfo',//获取早中晚班巡检员列表
-    getAllGasIns='/safety/gasIns/getAllGasIns',//获取所有巡检地址
-    teamList='/safety/disTeamInfo/list',//区队分页列表查询
-    teamAdd='/safety/disTeamInfo/add',//区队添加
-    teamEdit='/safety/disTeamInfo/edit',//区队编辑
-    deleteTeam='/safety/disTeamInfo/delete',//区队删除
-    addGasReportAddress= '/safety/gasDayReport/addGasReportAddress'//新增瓦斯巡检地址
-
+  list = '/safety/gasInsCard/list', //通过id（巡检卡id）查询
+  importByExcel = '/safety/gasDayReport/importGasInsCard', //导入瓦斯巡检地址
+  exportGasByExcel = '/safety/gasDayReport/exportGasByExcel', //导出瓦斯巡检地址
+  queryAllDisTeam = '/safety/disTeamInfo/queryAllDisTeam', //查询所有区队
+  moveOrderNum = '/safety/gasInsCard/moveOrderNum', //上下移接口
+  edit = '/safety/gasInsCard/edit', //瓦斯巡检地点编辑
+  deleteCard = '/safety/gasInsCard/delete', //瓦斯巡检卡删除
+  taskSubmit = '/safety/disTeamInfo/edit', //任务管理下发
+  clearCardInfo = '/safety/gasInsCard/clearCard', //瓦斯巡检卡信息删除
+  getAllUserInfo = '/safety/gasInsCard/getAllUserInfo', //获取早中晚班巡检员列表
+  getAllGasIns = '/safety/gasIns/getAllGasIns', //获取所有巡检地址
+  teamList = '/safety/disTeamInfo/list', //区队分页列表查询
+  teamAdd = '/safety/disTeamInfo/add', //区队添加
+  //   teamEdit = '/safety/disTeamInfo/edit', //区队编辑
+  deleteTeam = '/safety/disTeamInfo/delete', //区队删除
+  addGasReportAddress = '/safety/gasDayReport/addGasReportAddress', //新增瓦斯巡检地址
+  taskDetailsList = '/safety/gasDayReport/taskDetailsList', // 瓦斯巡检任务明细列表分页查询
+  zipdownload = '/ventanaly-sharefile/fileServer/zipdownload',
+  operateGasCheckTaskDetail = '/safety/gasDayReport/operateGasCheckTaskDetail',
 }
 
 /**
  * 新增瓦斯巡检地址
- * @param params 
+ * @param params
  */
-export const addGasReportAddress = (params) => defHttp.post({ url: Api.addGasReportAddress,params });
+export const addGasReportAddress = (params) => defHttp.post({ url: Api.addGasReportAddress, params });
 /**
  * 下载文件目录
  * @param params
  */
-export const zipdownload = (params) => defHttp.post({ url: Api.zipdownload, params, responseType: 'blob' },{ joinParamsToUrl: true });
+export const zipdownload = (params) => defHttp.post({ url: Api.zipdownload, params, responseType: 'blob' }, { joinParamsToUrl: true });
 /**
  * 通过id（巡检卡id）查询
  * @param params
  */
-export const list = (params) => defHttp.get({ url: Api.list,params },);
+export const list = (params) => defHttp.get({ url: Api.list, params });
 
 /**
  * 导入瓦斯巡检地址
- * @param params 
+ * @param params
  */
 export const importByExcel = (params) => defHttp.post({ headers: { 'Content-Type': 'multipart/form-data' }, url: Api.importByExcel, params });
 
 /**
  * 导出瓦斯巡检地址
- * @param params 
+ * @param params
  */
 export const exportGasByExcel = (params) => defHttp.get({ url: Api.exportGasByExcel, params, responseType: 'blob' });
 
 /**
  * 查询所有区队
- * @param params 
+ * @param params
  */
-export const queryAllDisTeam = () => defHttp.get({ url: Api.queryAllDisTeam, });
+export const queryAllDisTeam = () => defHttp.get({ url: Api.queryAllDisTeam });
 /**
  * 上下移接口
- * @param params 
+ * @param params
  */
-export const moveOrderNum = (params) => defHttp.post({ url: Api.moveOrderNum,params });
+export const moveOrderNum = (params) => defHttp.post({ url: Api.moveOrderNum, params });
 /**
  * 瓦斯巡检地点编辑
- * @param params 
+ * @param params
  */
-export const edit = (params) => defHttp.post({ url: Api.edit,params });
+export const edit = (params) => defHttp.post({ url: Api.edit, params });
 
 /**
  * 瓦斯巡检卡-删除
@@ -76,29 +77,40 @@ export const clearCardInfo = (params) => defHttp.get({ url: Api.clearCardInfo, p
 /**
  * 获取早中晚班巡检员列表
  */
-export const getAllUserInfo = () => defHttp.get({ url: Api.getAllUserInfo, });
+export const getAllUserInfo = () => defHttp.get({ url: Api.getAllUserInfo });
 /**
  * 任务管理下发
- * @param params 
+ * @param params
  */
-export const taskSubmit = (params) => defHttp.post({ url: Api.taskSubmit,params });
+export const taskSubmit = (params) => defHttp.post({ url: Api.taskSubmit, params });
 /**
  * 获取所有巡检地址
  */
-export const getAllGasIns = () => defHttp.get({ url: Api.getAllGasIns, });
+export const getAllGasIns = () => defHttp.get({ url: Api.getAllGasIns });
 /**
  * 区队分页列表查询
  */
-export const teamList = (params) => defHttp.get({ url: Api.teamList, params}, { joinParamsToUrl: true });
+export const teamList = (params) => defHttp.get({ url: Api.teamList, params }, { joinParamsToUrl: true });
 /**
  * 区队添加
  */
-export const teamAdd = (params) => defHttp.post({ url: Api.teamAdd, params});
+export const teamAdd = (params) => defHttp.post({ url: Api.teamAdd, params });
 /**
  * 区队编辑
  */
-export const teamEdit = (params) => defHttp.put({ url: Api.teamEdit, params});
+export const teamEdit = (params) => defHttp.put({ url: Api.taskSubmit, params });
 /**
  * 区队删除
  */
-export const deleteTeam = (params) => defHttp.delete({ url: Api.deleteTeam, params }, { joinParamsToUrl: true });
+export const deleteTeam = (params) => defHttp.delete({ url: Api.deleteTeam, params }, { joinParamsToUrl: true });
+
+/**
+ * 瓦斯巡检任务明细列表分页查询
+ * @param params
+ */
+export const taskDetailsList = (params) => defHttp.get({ url: Api.taskDetailsList, params });
+/**
+ * 瓦斯巡检任务明细列表新增与删除
+ * @param params
+ */
+export const operateGasCheckTaskDetail = (params) => defHttp.post({ url: Api.operateGasCheckTaskDetail, params });

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

@@ -1,175 +1,370 @@
-import { BasicColumn } from '/@/components/Table';
+import { getAllUserInfo } from './gasInspect.api';
+import { BasicColumn, FormSchema } from '/@/components/Table';
+
 export const columns: BasicColumn[] = [
-    {
-        title: '序号',
-        width: 60,
-        align: 'center',
-        customRender: ({ index }: { index: number }) => `${index + 1}`
-    },
-    {
-        title: '巡检卡ID',
-        dataIndex: 'id',
-        key: 'id',
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    customRender: ({ index }: { index: number }) => `${index + 1}`,
+  },
+  {
+    title: '巡检卡ID',
+    dataIndex: 'id',
+    key: 'id',
+    align: 'center',
+  },
+  {
+    title: '地点',
+    dataIndex: 'strInstallPos',
+    key: 'strInstallPos',
+    align: 'center',
+  },
+  {
+    title: '巡检人',
+    children: [
+      {
+        title: '早班',
+        dataIndex: 'nameEarly',
+        key: 'nameEarly',
         align: 'center',
-    },
-    {
-        title: '地点',
-        dataIndex: 'strInstallPos',
-        key: 'strInstallPos',
-        align: 'center',
-    },
-    {
-        title: '巡检人',
-        children: [
-            {
-                title: '早班',
-                dataIndex: 'nameEarly',
-                key: 'nameEarly',
-                align: 'center',
-
-            },
-
-            {
-                title: '中班',
-                dataIndex: 'nameNoon',
-                key: 'nameNoon',
-                align: 'center',
-
-            },
-            {
-                title: '晚班',
-                dataIndex: 'nameNight',
-                key: 'nameNight',
-                align: 'center',
-
-            },
-        ],
-    },
-    {
-        title: '是否巡检',
-        children: [
-            {
-                title: '',
-                dataIndex: 'insType',
-                key: 'insType',
-                align: 'center',
-
-            },
-            {
-                title: '早班',
-                dataIndex: 'morning',
-                key: 'morning',
-                align: 'center',
-
-            },
+      },
 
-            {
-                title: '中班',
-                dataIndex: 'afterNoon',
-                key: 'afterNoon',
-                align: 'center',
-
-            },
-            {
-                title: '晚班',
-                dataIndex: 'evening',
-                key: 'eevening',
-                align: 'center',
-
-            },
-        ],
-    },
-    {
-        title: '操作',
-        dataIndex: 'action',
-        width: 250,
+      {
+        title: '中班',
+        dataIndex: 'nameNoon',
+        key: 'nameNoon',
         align: 'center',
-        slots: { customRender: 'action' },
-    },
-];
-export const columnsTask: BasicColumn[] = ([
-    {
-        title: '序号',
-        width: 60,
+      },
+      {
+        title: '晚班',
+        dataIndex: 'nameNight',
+        key: 'nameNight',
         align: 'center',
-        customRender: ({ index }: { index: number }) => `${index + 1}`
-    },
-    {
-        title: '所属队别',
-        dataIndex: 'name',
-        key: 'name',
+      },
+    ],
+  },
+  {
+    title: '是否巡检',
+    children: [
+      {
+        title: '',
+        dataIndex: 'insType',
+        key: 'insType',
         align: 'center',
-    },
-    {
-        title: '早班巡检',
-        dataIndex: 'accountEarly',
-        key: 'accountEarly',
+      },
+      {
+        title: '早班',
+        dataIndex: 'morning',
+        key: 'morning',
         align: 'center',
-    },
-    {
-        title: '中班巡检',
-        dataIndex: 'accountNoon',
-        key: 'accountNoon',
-        align: 'center',
-    },
-    {
-        title: '晚班巡检',
-        dataIndex: 'accountNight',
-        key: 'accountNight',
+      },
+
+      {
+        title: '中班',
+        dataIndex: 'afterNoon',
+        key: 'afterNoon',
         align: 'center',
-    },
-    {
-        title: '操作',
-        dataIndex: 'action',
-        width: 120,
+      },
+      {
+        title: '晚班',
+        dataIndex: 'evening',
+        key: 'eevening',
         align: 'center',
-        slots: { customRender: 'action' },
-    },
-])
+      },
+    ],
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 250,
+    align: 'center',
+    slots: { customRender: 'action' },
+  },
+];
+export const columnsTask: BasicColumn[] = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    customRender: ({ index }: { index: number }) => `${index + 1}`,
+  },
+  {
+    title: '所属队别',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center',
+  },
+  {
+    title: '早班巡检',
+    dataIndex: 'accountEarly',
+    key: 'accountEarly',
+    align: 'center',
+  },
+  {
+    title: '中班巡检',
+    dataIndex: 'accountNoon',
+    key: 'accountNoon',
+    align: 'center',
+  },
+  {
+    title: '晚班巡检',
+    dataIndex: 'accountNight',
+    key: 'accountNight',
+    align: 'center',
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 120,
+    align: 'center',
+    slots: { customRender: 'action' },
+  },
+];
 //区队管理列表列
 export const columnsTeam: BasicColumn[] = [
-    {
-        title: '序号',
-        width: 60,
-        align: 'center',
-        customRender: ({ index }: { index: number }) => `${index + 1}`
-    },
-    {
-        title: 'ID',
-        dataIndex: 'id',
-        key: 'id',
-        align: 'center',
-    },
-    {
-        title: '区队',
-        dataIndex: 'name',
-        key: 'name',
-        align: 'center',
-    },
-   
-    {
-        title: '操作',
-        dataIndex: 'action',
-        width: 180,
-        align: 'center',
-        slots: { customRender: 'action' },
-    },
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    customRender: ({ index }: { index: number }) => `${index + 1}`,
+  },
+  {
+    title: 'ID',
+    dataIndex: 'id',
+    key: 'id',
+    align: 'center',
+  },
+  {
+    title: '区队',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center',
+  },
+
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 180,
+    align: 'center',
+    slots: { customRender: 'action' },
+  },
 ];
 //分页参数
 export const pagination = {
-    current: 1, // 当前页码
-    pageSize: 10, // 每页显示条数
-    total: 0, // 总条目数，后端返回
-    // showTotal: (total, range) => `${range[0]}-${range[1]} 条，总共 ${total} 条`, // 分页右下角显示信息
-    showSizeChanger: true, // 是否可改变每页显示条数
-    pageSizeOptions: ['10', '20', '50'], // 可选的每页显示条数
+  current: 1, // 当前页码
+  pageSize: 10, // 每页显示条数
+  total: 0, // 总条目数，后端返回
+  // showTotal: (total, range) => `${range[0]}-${range[1]} 条，总共 ${total} 条`, // 分页右下角显示信息
+  showSizeChanger: true, // 是否可改变每页显示条数
+  pageSizeOptions: ['10', '20', '50'], // 可选的每页显示条数
 };
 //区队管理分页参数
 export const paginationTeam = {
-    current: 1, // 当前页码
-    pageSize: 5, // 每页显示条数
-    total: 0, // 总条目数，后端返回
-    // showTotal: (total, range) => `${range[0]}-${range[1]} 条，总共 ${total} 条`, // 分页右下角显示信息
-    showSizeChanger: true, // 是否可改变每页显示条数
-    pageSizeOptions: ['5','10', '20', '50'], // 可选的每页显示条数
+  current: 1, // 当前页码
+  pageSize: 5, // 每页显示条数
+  total: 0, // 总条目数，后端返回
+  // showTotal: (total, range) => `${range[0]}-${range[1]} 条，总共 ${total} 条`, // 分页右下角显示信息
+  showSizeChanger: true, // 是否可改变每页显示条数
+  pageSizeOptions: ['5', '10', '20', '50'], // 可选的每页显示条数
 };
+
+// 任务表格
+export const taskColumns: BasicColumn[] = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    customRender: ({ index }: { index: number }) => `${index + 1}`,
+  },
+  {
+    title: 'ID',
+    dataIndex: 'id',
+    key: 'id',
+    align: 'center',
+  },
+  {
+    title: '任务名称',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center',
+  },
+  {
+    title: '早班巡检人账号',
+    dataIndex: 'accountEarly',
+    key: 'accountEarly',
+    align: 'center',
+    edit: true,
+    editComponent: 'ApiSelect',
+    editComponentProps: {
+      api: getAllUserInfo,
+      labelField: 'realname',
+      valueField: 'id',
+    },
+  },
+  {
+    title: '午班巡检人账号',
+    dataIndex: 'accountNoon',
+    key: 'accountNoon',
+    align: 'center',
+    edit: true,
+    editComponent: 'ApiSelect',
+    editComponentProps: {
+      api: getAllUserInfo,
+      labelField: 'realname',
+      valueField: 'id',
+    },
+  },
+  {
+    title: '晚班巡检人账号',
+    dataIndex: 'accountNight',
+    key: 'accountNight',
+    align: 'center',
+    edit: true,
+    editComponent: 'ApiSelect',
+    editComponentProps: {
+      api: getAllUserInfo,
+      labelField: 'realname',
+      valueField: 'id',
+    },
+  },
+  {
+    title: '任务班次',
+    dataIndex: 'classType',
+    key: 'classType',
+    align: 'center',
+  },
+  {
+    title: '创建人',
+    dataIndex: 'createBy',
+    key: 'createBy',
+    align: 'center',
+  },
+  {
+    title: '创建日期',
+    dataIndex: 'createTime',
+    key: 'createTime',
+    align: 'center',
+  },
+];
+
+export const taskschemas: FormSchema[] = [
+  {
+    label: 'ID',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+  {
+    label: '任务名称',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '早班巡检人账号',
+    field: 'accountEarly',
+    component: 'ApiSelect',
+    componentProps: {
+      api: getAllUserInfo,
+      labelField: 'realname',
+      valueField: 'id',
+    },
+  },
+  {
+    label: '午班巡检人账号',
+    field: 'accountNoon',
+    component: 'ApiSelect',
+    componentProps: {
+      api: getAllUserInfo,
+      labelField: 'realname',
+      valueField: 'id',
+    },
+  },
+  {
+    label: '晚班巡检人账号',
+    field: 'accountNight',
+    component: 'ApiSelect',
+    componentProps: {
+      api: getAllUserInfo,
+      labelField: 'realname',
+      valueField: 'id',
+    },
+  },
+  {
+    label: '班类型',
+    field: 'classType',
+    component: 'Input',
+  },
+];
+
+// 任务详细表格
+export const taskDetailsColumns: BasicColumn[] = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    customRender: ({ index }: { index: number }) => `${index + 1}`,
+  },
+  {
+    title: 'ID',
+    dataIndex: 'id',
+    key: 'id',
+    align: 'center',
+  },
+  {
+    title: '巡检地址',
+    dataIndex: 'deviceName',
+    key: 'deviceName',
+    align: 'center',
+  },
+  {
+    title: '巡检次数',
+    dataIndex: 'checkNum',
+    key: 'checkNum',
+    align: 'center',
+  },
+  {
+    title: '任务名称',
+    dataIndex: 'taskName',
+    key: 'taskName',
+    align: 'center',
+  },
+  {
+    title: '任务班次',
+    dataIndex: 'classType',
+    key: 'classType',
+    align: 'center',
+  },
+  {
+    title: '总巡检数',
+    dataIndex: 'totalCheckNum',
+    key: 'totalCheckNum',
+    align: 'center',
+  },
+  {
+    title: '未巡检数',
+    dataIndex: 'missCheckNum',
+    key: 'missCheckNum',
+    align: 'center',
+  },
+  {
+    title: '已关联当前任务',
+    dataIndex: 'isSelect',
+    key: 'isSelect',
+    align: 'center',
+    format(text) {
+      if (text) return '是';
+      return '否';
+    },
+  },
+  {
+    title: '已关联其它任务',
+    dataIndex: 'isOtherSelect',
+    key: 'isOtherSelect',
+    align: 'center',
+    format(text) {
+      if (text) return '是';
+      return '否';
+    },
+  },
+];

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

@@ -0,0 +1,289 @@
+<!-- eslint-disable vue/multi-word-component-names -->
+<template>
+  <div class="gasReport">
+    <customHeader>瓦斯巡检任务管理</customHeader>
+    <div class="report-container">
+      <a-space class="search-area">
+        <a-button type="primary" preIcon="ant-design:plus-outlined" @click="handleEdit">新增任务</a-button>
+      </a-space>
+      <BasicTable @register="registerTable1">
+        <template #action="{ record }">
+          <a class="table-action-link" @click="handleManage(record)">管理</a>
+          <a class="table-action-link" @click="handleDetail(record)">详情</a>
+          <a class="table-action-link" @click="handleEdit(record)">编辑</a>
+          <a-popconfirm title="删除内容无法恢复，是否删除" ok-text="确定" cancel-text="取消" @confirm="handleDelete(record)">
+            <a class="table-action-link">删除</a>
+          </a-popconfirm>
+        </template>
+      </BasicTable>
+      <BasicModal title="任务表单" @register="registerModal1" @ok="handleSubmit">
+        <BasicForm @register="registerForm" />
+      </BasicModal>
+      <BasicModal title="任务详情列表" :width="1200" @register="registerModal2">
+        <BasicTable @register="registerTable2">
+          <!-- <template #action="{ record }"> </template> -->
+          <template #bodyCell="{ column, text }">
+            <template v-if="column.dataIndex == 'isSensor'">
+              <div v-if="text == '1'">
+                <div class="table-text text-y">是</div>
+              </div>
+              <div v-else>
+                <div class="table-text text-n">否</div>
+              </div>
+            </template>
+            <template v-if="column.dataIndex == 'checkState'">
+              <div v-if="text == '1'">
+                <div class="table-text text-y">已检</div>
+              </div>
+              <div v-else>
+                <div class="table-text text-n">未检</div>
+              </div>
+            </template>
+          </template>
+        </BasicTable>
+      </BasicModal>
+      <BasicModal :width="1200" @register="registerModal3">
+        <a-space class="search-area mb-10px">
+          <a-popconfirm title="确认操作" ok-text="确定" cancel-text="取消" @confirm="handlePatch('add')">
+            <a-button type="primary" preIcon="ant-design:plus-outlined">新增</a-button>
+          </a-popconfirm>
+          <a-popconfirm title="删除内容无法取消，是否删除" ok-text="确定" cancel-text="取消" @confirm="handlePatch('del')">
+            <a-button type="primary" preIcon="ant-design:close-outlined">删除</a-button>
+          </a-popconfirm>
+        </a-space>
+        <BasicTable :rowSelection="rowSelection" @register="registerTable3">
+          <!-- <template #action="{ record }"> </template> -->
+          <template #bodyCell="{ column, text }">
+            <template v-if="column.dataIndex == 'isSensor'">
+              <div v-if="text == '1'">
+                <div class="table-text text-y">是</div>
+              </div>
+              <div v-else>
+                <div class="table-text text-n">否</div>
+              </div>
+            </template>
+            <template v-if="column.dataIndex == 'checkState'">
+              <div v-if="text == '1'">
+                <div class="table-text text-y">已检</div>
+              </div>
+              <div v-else>
+                <div class="table-text text-n">未检</div>
+              </div>
+            </template>
+          </template>
+        </BasicTable>
+      </BasicModal>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+  import { ref, onMounted, nextTick } from 'vue';
+  import customHeader from '/@/components/vent/customHeader.vue';
+  import { taskColumns, pagination, taskschemas, taskDetailsColumns } from './gasInspect.data';
+  import { deleteTeam, operateGasCheckTaskDetail, taskDetailsList, teamAdd, teamEdit, teamList } from './gasInspect.api';
+  import { BasicTable } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { message } from 'ant-design-vue';
+  import { BasicModal, useModal } from '/@/components/Modal';
+  import { BasicForm, useForm } from '/@/components/Form';
+
+  // 任务列表
+  const { tableContext: tx1 } = useListPage({
+    tableProps: {
+      api: teamList,
+      columns: taskColumns,
+      pagination,
+      actionColumn: {
+        title: '操作',
+        dataIndex: 'action',
+        width: 250,
+        align: 'center',
+        slots: { customRender: 'action' },
+      },
+      showTableSetting: false,
+      useSearchForm: false,
+    },
+    pagination: true,
+  });
+  // 任务详情列表
+  const { tableContext: tx2 } = useListPage({
+    tableProps: {
+      api: taskDetailsList,
+      beforeFetch: (data) => {
+        return {
+          ...data,
+          taskId: selectedRow.value.id,
+        };
+      },
+      columns: taskDetailsColumns,
+      pagination,
+      showActionColumn: false,
+      showTableSetting: false,
+      useSearchForm: false,
+    },
+    pagination: true,
+  });
+  // 任务管理列表
+  const { tableContext: tx3 } = useListPage({
+    tableProps: {
+      api: taskDetailsList,
+      beforeFetch: (data) => {
+        return {
+          ...data,
+          taskId: selectedRow.value.id,
+        };
+      },
+      rowSelection: {
+        type: 'checkbox',
+        getCheckboxProps: (record) => {
+          return {
+            disabled: record.isOtherSelect,
+            name: record.id,
+          };
+        },
+      },
+      columns: taskDetailsColumns,
+      pagination,
+      showActionColumn: false,
+      showTableSetting: false,
+      useSearchForm: false,
+    },
+    pagination: true,
+  });
+  const [registerTable1, tableContext1] = tx1;
+  const [registerTable2] = tx2;
+  const [registerTable3, { getSelectRows, reload }, { rowSelection }] = tx3;
+  const [registerModal1, modalContext1] = useModal();
+  const [registerModal2, modalContext2] = useModal();
+  const [registerModal3, modalContext3] = useModal();
+  const [registerForm, formContext1] = useForm({
+    showActionButtonGroup: false,
+    schemas: taskschemas,
+    labelWidth: 170,
+  });
+
+  const selectedRow = ref<any>({});
+
+  // 任务编辑/新增
+  function handleEdit(record) {
+    modalContext1.openModal();
+    nextTick(async () => {
+      await formContext1.resetFields();
+      await formContext1.setFieldsValue(record);
+    });
+  }
+
+  // 任务删除
+  function handleDelete({ id }) {
+    deleteTeam({ id }).then(() => {
+      message.success('删除成功');
+    });
+  }
+
+  // 任务管理
+  function handleManage(record) {
+    selectedRow.value = record;
+    modalContext3.openModal();
+  }
+
+  // 详情管理
+  function handleDetail(record) {
+    selectedRow.value = record;
+    modalContext2.openModal();
+  }
+
+  // 关联明细
+  function handlePatch(mode) {
+    operateGasCheckTaskDetail({
+      taskId: selectedRow.value.id,
+      operateList: getSelectRows().map((e) => {
+        return {
+          deviceId: e.deviceId, //设备id（巡检地址id）
+          checkNum: e.checkNum, //巡检次数
+          operateType: mode, //操作类型，新增：add，删除：del
+        };
+      }),
+    }).then(() => {
+      message.success('操作成功');
+      reload();
+    });
+  }
+
+  function handleSubmit() {
+    formContext1.validate().then((formData) => {
+      if (formData.id) {
+        teamEdit(formData).then(() => {
+          modalContext1.closeModal();
+          tableContext1.reload();
+        });
+      } else {
+        teamAdd(formData).then(() => {
+          modalContext1.closeModal();
+          tableContext1.reload();
+        });
+      }
+    });
+  }
+
+  onMounted(() => {});
+</script>
+
+<style lang="less" scoped>
+  .gasReport {
+    width: 100%;
+    height: 100%;
+    padding: 80px 10px 15px 10px;
+    box-sizing: border-box;
+    position: relative;
+
+    .search-area {
+      margin: 20px 0px;
+
+      .area-item {
+        display: flex;
+        align-items: center;
+
+        .item-text {
+          color: #fff;
+        }
+      }
+    }
+
+    .table-text {
+      margin-bottom: 5px;
+    }
+
+    .text-y {
+      color: #0be716;
+    }
+
+    .text-n {
+      color: #ff0000;
+    }
+
+    .zxm-picker,
+    .zxm-input {
+      border: 1px solid #3ad8ff77 !important;
+      background-color: #ffffff00 !important;
+      color: #fff !important;
+    }
+  }
+
+  :deep(.zxm-table-thead > tr > th:last-child) {
+    border-right: 1px solid #91e9fe !important;
+  }
+
+  :deep(.zxm-picker-input > input) {
+    color: #fff;
+  }
+
+  :deep(.zxm-select:not(.zxm-select-customize-input) .zxm-select-selector) {
+    border: 1px solid #3ad8ff77 !important;
+    background-color: #ffffff00 !important;
+  }
+
+  :deep(.zxm-select-selection-item) {
+    color: #fff !important;
+  }
+</style>

src/views/vent/gas/gasInspectNonfc/components/addressAdd2.vue

@@ -0,0 +1,74 @@
+<template>
+  <div class="inspectEdit">
+    <a-form :model="formAddress" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 12 }" autocomplete="off">
+      <a-form-item label="巡检类型：">
+        <JDictSelectTag v-model:value="formAddress.insType" placeholder="请选择巡检类型" dictCode="ins_type" style="width: 220px" />
+      </a-form-item>
+      <a-form-item label="巡检区域：">
+        <a-input v-model:value="formAddress.strremark" style="width: 220px" />
+      </a-form-item>
+      <a-form-item label="巡检地址：">
+        <a-input v-model:value="formAddress.strinstallpos" style="width: 220px" />
+      </a-form-item>
+      <a-form-item label="是否有传感器：">
+        <a-checkbox v-model:checked="formAddress.isSensor" style="width: 220px" />
+      </a-form-item>
+    </a-form>
+    <div class="edit-btn">
+      <a-button type="primary" @click="confirmAddress">确定</a-button>
+      <a-button @click="cancelAddress">取消</a-button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+  import { reactive, onMounted } from 'vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+
+  let formAddress = reactive<any>({
+    insType: '',
+    strremark: '',
+    strinstallpos: '',
+    isSensor: false,
+  });
+  let $emit = defineEmits(['confirmAddress', 'cancelAddress']);
+
+  //确定
+  let confirmAddress = () => {
+    $emit('confirmAddress', formAddress);
+  };
+  //取消
+  let cancelAddress = () => {
+    formAddress = {
+      insType: '',
+      strremark: '',
+      strinstallpos: '',
+      isSensor: false,
+    };
+    $emit('cancelAddress');
+  };
+
+  onMounted(() => {});
+</script>
+
+<style lang="less" scoped>
+  .inspectEdit {
+    padding: 10px;
+    box-sizing: border-box;
+
+    .edit-btn {
+      display: flex;
+      justify-content: flex-end;
+
+      .zxm-btn {
+        margin: 0px 10px;
+      }
+    }
+  }
+
+  :deep(.zxm-input) {
+    color: #fff;
+    border: 1px solid #3ad8ff77 !important;
+    background-color: #ffffff00 !important;
+  }
+</style>

src/views/vent/gas/gasInspectNonfc/components/inspectEdit2.vue

@@ -0,0 +1,113 @@
+<template>
+  <div class="inspectEdit">
+    <a-form :model="formStateEdit" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 12 }" autocomplete="off">
+      <a-form-item label="瓦斯巡检卡ID：">
+        <a-input v-model:value="formStateEdit.id" disabled />
+      </a-form-item>
+      <a-form-item label="瓦斯巡检地点：">
+        <a-input v-model:value="formStateEdit.strinstallpos" placeholder="请输入瓦斯巡检地点" clearable />
+      </a-form-item>
+      <a-form-item label="所属区队：">
+        <a-select ref="select" v-model:value="formStateEdit.disTeamId" placeholder="请选择...">
+          <a-select-option v-for="(item, index) in qdList" :key="index">{{ item.label }}</a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item label="巡检类型：">
+        <JDictSelectTag v-model:value="formStateEdit.insType" placeholder="请选择巡检类型" dictCode="ins_type" style="width: 240px" />
+      </a-form-item>
+      <a-form-item label="是否有传感器：">
+        <a-checkbox v-model:checked="formStateEdit.isSensor" style="width: 220px" />
+      </a-form-item>
+    </a-form>
+    <div class="edit-btn">
+      <a-button type="primary" @click="confirmEdit">提交</a-button>
+      <a-button @click="cancelEdit">取消</a-button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+  import { ref, reactive, onMounted, watch } from 'vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { queryAllDisTeam } from '../gasInspectNonfc.api';
+
+  let props = defineProps({
+    inspectEditData: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+  });
+
+  let formStateEdit = reactive<any>({
+    id: '',
+    strinstallpos: '',
+    isSensor: false,
+    disTeamId: '',
+    insType: '',
+  });
+
+  let qdList = ref<any[]>([]); //区队下拉选项列表
+  let $emit = defineEmits(['confirmEdit', 'cancelEdit']);
+
+  //查询所有区队
+  async function queryAllDisTeamList() {
+    let res = await queryAllDisTeam();
+    if (res.length != 0) {
+      qdList.value = res.map((m) => {
+        return {
+          label: m.name,
+          value: m.id,
+        };
+      });
+    }
+  }
+  //编辑提交
+  let confirmEdit = () => {
+    $emit('confirmEdit', formStateEdit);
+  };
+  //编辑取消
+  let cancelEdit = () => {
+    formStateEdit = {
+      id: '',
+      strinstallpos: '',
+      isSensor: false,
+      disTeamId: '',
+      insType: '',
+    };
+    $emit('cancelEdit');
+  };
+  watch(
+    () => props.inspectEditData,
+    (newV) => {
+      formStateEdit = Object.assign({}, newV);
+    },
+    { immediate: true }
+  );
+  onMounted(() => {
+    queryAllDisTeamList();
+  });
+</script>
+
+<style lang="less" scoped>
+  .inspectEdit {
+    padding: 10px;
+    box-sizing: border-box;
+
+    .edit-btn {
+      display: flex;
+      justify-content: flex-end;
+
+      .zxm-btn {
+        margin: 0px 10px;
+      }
+    }
+  }
+
+  :deep(.zxm-input) {
+    color: #fff;
+    border: 1px solid #3ad8ff77 !important;
+    background-color: #ffffff00 !important;
+  }
+</style>

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

@@ -1,63 +1,63 @@
 import { defHttp } from '/@/utils/http/axios';
 
-
 enum Api {
-    list = '/safety/gasIns/list',//通过id（巡检卡id）查询
-    importByExcel='/safety/gasDayReport/importGasIns',//导入瓦斯巡检地址
-    exportGasByExcel='/safety/gasDayReport/exportGasIns',//导出瓦斯巡检地址
-    queryAllDisTeam='/safety/disTeamInfo/queryAllDisTeam',//查询所有区队
-    moveOrderNum='/safety/gasIns/moveOrderNum',//上下移接口
-    edit='/safety/gasIns/edit',//瓦斯巡检地点编辑
-    deleteCard='/safety/gasInsCard/delete',//瓦斯巡检卡删除
-    taskSubmit='/safety/disTeamInfo/edit',//任务管理下发
-    clearCardInfo='/safety/gasIns/delete',//瓦斯巡检卡信息删除
-    getAllUserInfo='/safety/gasInsCard/getAllUserInfo',//获取早中晚班巡检员列表
-    addGasReportAddress= '/safety/gasDayReport/addGasReportAddress'//新增瓦斯巡检地址
+  list = '/safety/gasIns/list', //通过id（巡检卡id）查询
+  importByExcel = '/safety/gasDayReport/importGasIns', //导入瓦斯巡检地址
+  exportGasByExcel = '/safety/gasDayReport/exportGasIns', //导出瓦斯巡检地址
+  queryAllDisTeam = '/safety/disTeamInfo/queryAllDisTeam', //查询所有区队
+  moveOrderNum = '/safety/gasIns/moveOrderNum', //上下移接口
+  edit = '/safety/gasIns/edit', //瓦斯巡检地点编辑
+  deleteCard = '/safety/gasInsCard/delete', //瓦斯巡检卡删除
+  taskSubmit = '/safety/disTeamInfo/edit', //任务管理下发
+  clearCardInfo = '/safety/gasIns/delete', //瓦斯巡检卡信息删除
+  getAllUserInfo = '/safety/gasInsCard/getAllUserInfo', //获取早中晚班巡检员列表
+  addGasReportAddress = '/safety/gasDayReport/addGasReportAddress', //新增瓦斯巡检地址
+  zipdownload = '/ventanaly-sharefile/fileServer/zipdownload',
 }
 
 /**
  * 新增瓦斯巡检地址
- * @param params 
+ * @param params
  */
-export const addGasReportAddress = (params) => defHttp.post({ url: Api.addGasReportAddress,params });
+export const addGasReportAddress = (params) => defHttp.post({ url: Api.addGasReportAddress, params });
 /**
  * 下载文件目录
  * @param params
  */
-export const zipdownload = (params) => defHttp.post({ url: Api.zipdownload, params, responseType: 'blob' },{ joinParamsToUrl: true });
+export const zipdownload = (params) => defHttp.post({ url: Api.zipdownload, params, responseType: 'blob' }, { joinParamsToUrl: true });
 /**
  * 通过id（巡检卡id）查询
  * @param params
  */
-export const list = (params) => defHttp.get({ url: Api.list,params },);
+export const list = (params) => defHttp.get({ url: Api.list, params });
 
 /**
  * 导入瓦斯巡检地址
- * @param params 
+ * @param params
  */
 export const importByExcel = (params) => defHttp.post({ headers: { 'Content-Type': 'multipart/form-data' }, url: Api.importByExcel, params });
 
 /**
  * 导出瓦斯巡检地址
- * @param params 
+ * @param params
  */
 export const exportGasByExcel = (params) => defHttp.get({ url: Api.exportGasByExcel, params, responseType: 'blob' });
 
 /**
  * 查询所有区队
- * @param params 
+ * @param params
  */
-export const queryAllDisTeam = () => defHttp.get({ url: Api.queryAllDisTeam, });
+export const queryAllDisTeam = () => defHttp.get({ url: Api.queryAllDisTeam });
 /**
  * 上下移接口
- * @param params 
+ * @param params
  */
-export const moveOrderNum = (params) => defHttp.post({ url: Api.moveOrderNum,params });
+export const moveOrderNum = (params) => defHttp.post({ url: Api.moveOrderNum, params });
 /**
  * 瓦斯巡检地点编辑
- * @param params 
+ * @param params
  */
-export const edit = (params) => defHttp.post({ url: Api.edit,params });
+export const edit = (params) => defHttp.post({ url: Api.edit, params });
 
 /**
  * 瓦斯巡检卡-删除
@@ -70,9 +70,9 @@ export const clearCardInfo = (params) => defHttp.delete({ url: Api.clearCardInfo
 /**
  * 获取早中晚班巡检员列表
  */
-export const getAllUserInfo = () => defHttp.get({ url: Api.getAllUserInfo, });
+export const getAllUserInfo = () => defHttp.get({ url: Api.getAllUserInfo });
 /**
  * 任务管理下发
- * @param params 
+ * @param params
  */
-export const taskSubmit = (params) => defHttp.post({ url: Api.taskSubmit,params });
+export const taskSubmit = (params) => defHttp.post({ url: Api.taskSubmit, params });

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

@@ -148,66 +148,66 @@ export const columns2: BasicColumn[] = [
     key: 'id',
     align: 'center',
   },
-  {
-    title: '任务名称',
-    dataIndex: 'taskName',
-    key: 'taskName',
-    align: 'center',
-  },
+  // {
+  //   title: '任务名称',
+  //   dataIndex: 'taskName',
+  //   key: 'taskName',
+  //   align: 'center',
+  // },
   {
     title: '巡检地址',
-    dataIndex: 'deviceName',
-    key: 'deviceName',
-    align: 'center',
-  },
-  {
-    title: '巡检次数',
-    dataIndex: 'checkNum',
-    key: 'checkNum',
-    align: 'center',
-  },
-  {
-    title: '班类型',
-    dataIndex: 'classType',
-    key: 'classType',
-    align: 'center',
-  },
-  {
-    title: '巡检状态',
-    dataIndex: 'checkState',
-    key: 'checkState',
+    dataIndex: 'strinstallpos',
+    key: 'strinstallpos',
     align: 'center',
   },
+  // {
+  //   title: '巡检次数',
+  //   dataIndex: 'checkNum',
+  //   key: 'checkNum',
+  //   align: 'center',
+  // },
+  // {
+  //   title: '班类型',
+  //   dataIndex: 'classType',
+  //   key: 'classType',
+  //   align: 'center',
+  // },
+  // {
+  //   title: '巡检状态',
+  //   dataIndex: 'checkState',
+  //   key: 'checkState',
+  //   align: 'center',
+  // },
   {
     title: '是否有传感器',
     dataIndex: 'isSensor',
     key: 'isSensor',
     align: 'center',
   },
-  {
-    title: '创建人',
-    dataIndex: 'createBy',
-    key: 'createBy',
-    align: 'center',
-  },
-  {
-    title: '创建日期',
-    dataIndex: 'createTime',
-    key: 'createTime',
-    align: 'center',
-  },
-  {
-    title: '更新人',
-    dataIndex: 'updateBy',
-    key: 'updateBy',
-    align: 'center',
-  },
-  {
-    title: '更新日期',
-    dataIndex: 'updateTime',
-    key: 'updateTime',
-    align: 'center',
-  },
+  // {
+  //   title: '创建人',
+  //   dataIndex: 'createBy',
+  //   key: 'createBy',
+  //   align: 'center',
+  // },
+  // {
+  //   title: '创建日期',
+  //   dataIndex: 'createTime',
+  //   key: 'createTime',
+  //   align: 'center',
+  // },
+  // {
+  //   title: '更新人',
+  //   dataIndex: 'updateBy',
+  //   key: 'updateBy',
+  //   align: 'center',
+  // },
+  // {
+  //   title: '更新日期',
+  //   dataIndex: 'updateTime',
+  //   key: 'updateTime',
+  //   align: 'center',
+  // },
   {
     title: '操作',
     dataIndex: 'action',

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

@@ -7,35 +7,16 @@
         <a-row>
           <a-col :span="4">
             <div class="area-item">
-              <div class="item-text">巡检卡ID：</div>
-              <a-input style="width: 240px" v-model:value="searchId" placeholder="请输入巡检卡ID" />
+              <div class="item-text">地点：</div>
+              <a-input style="width: 240px" v-model:value="searchParams" placeholder="请输入地点" />
             </div>
           </a-col>
           <a-col :span="20">
-            <a-button type="primary" preIcon="ant-design:search-outlined" style="margin-left: 10px" @click="getSearchCardId">查询</a-button>
-            <a-button preIcon="ant-design:sync-outlined" style="margin: 0px 15px" @click="getReset">重置</a-button>
-            <a-button type="primary" preIcon="ant-design:import-outlined" @click="getupload">导入</a-button>
-            <a-button type="primary" preIcon="ant-design:download-outlined" style="margin: 0px 15px" @click="getdownload">导出</a-button>
-            <a-dropdown>
-              <template #overlay>
-                <a-menu @click="handlerFilter">
-                  <a-menu-item key="1">
-                    <UserOutlined />
-                    一次
-                  </a-menu-item>
-                  <a-menu-divider />
-                  <a-menu-item key="2">
-                    <UserOutlined />
-                    两次
-                  </a-menu-item>
-                </a-menu>
-              </template>
-              <a-button type="primary">
-                巡检次数筛选
-                <DownOutlined />
-              </a-button>
-            </a-dropdown>
-            <a-button type="primary" preIcon="ant-design:plus-outlined" style="margin-left: 15px" @click="getTjAddress">新增瓦斯巡检地址</a-button>
+            <a-button type="primary" preIcon="ant-design:search-outlined" class="" @click="getSearchCardId">查询</a-button>
+            <a-button preIcon="ant-design:sync-outlined" class="ml-10px" @click="getReset">重置</a-button>
+            <a-button type="primary" preIcon="ant-design:import-outlined" class="ml-10px" @click="getupload">导入</a-button>
+            <a-button type="primary" preIcon="ant-design:download-outlined" class="ml-10px" @click="getdownload">导出</a-button>
+            <a-button type="primary" preIcon="ant-design:plus-outlined" class="ml-10px" @click="getTjAddress">新增瓦斯巡检地址</a-button>
           </a-col>
         </a-row>
       </div>
@@ -54,8 +35,6 @@
           <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>
         </template>
         <template #bodyCell="{ column, text }">
           <template v-if="column.dataIndex == 'isSensor'">
@@ -101,15 +80,15 @@
   import { ref, onMounted, reactive } from 'vue';
   import customHeader from '/@/components/vent/customHeader.vue';
   import inspectTask from './components/inspectTask.vue';
-  import inspectEdit from './components/inspectEdit.vue';
+  import inspectEdit from './components/inspectEdit2.vue';
   import uploadOrdown from './components/uploadOrdown.vue';
-  import addressAdd from './components/addressAdd.vue';
+  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';
 
   let keyActive = ref(0);
-  let searchId = ref('');
+  let searchParams = ref('');
   let tableData = ref<any[]>([]); //巡检列表
   let visibleTask = ref(false); //控制任务管理弹窗的显示与隐藏
   let titleTask = ref('');
@@ -166,9 +145,9 @@
     }
   }
 
-  //通过id（巡检卡id）查询
+  //通过地点查询
   async function queryByIdList() {
-    let res = await list({ id: searchId.value, pageNo: pagination.current, pageSize: pagination.pageSize });
+    let res = await list({ strinstallpos: searchParams.value, pageNo: pagination.current, pageSize: pagination.pageSize });
     keyActive.value = new Date().getTime();
     tableData.value = res.records.map((el: any) => {
       return {
@@ -188,7 +167,7 @@
   //重置
   let getReset = () => {
     pagination.current = 1;
-    searchId.value = '';
+    searchParams.value = '';
     queryByIdList();
   };
   //分页切换