[Mod 0000] 修改瓦斯巡检

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

@@ -177,61 +177,61 @@ export const taskColumns: BasicColumn[] = [
     align: 'center',
     customRender: ({ index }: { index: number }) => `${index + 1}`,
   },
-  {
-    title: 'ID',
-    dataIndex: 'id',
-    key: 'id',
-    align: 'center',
-  },
+  // {
+  //   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: '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',
+    dataIndex: 'classType_dictText',
+    key: 'classType_dictText',
     align: 'center',
   },
   {
@@ -272,45 +272,45 @@ export const taskschemas: FormSchema[] = [
     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: '班类型',
+  // {
+  //   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[] = [
+export const taskManageColumns: BasicColumn[] = [
   {
     title: '序号',
     width: 60,
@@ -318,16 +318,11 @@ export const taskDetailsColumns: BasicColumn[] = [
     customRender: ({ index }: { index: number }) => `${index + 1}`,
   },
   {
-    title: 'ID',
-    dataIndex: 'deviceId',
-    key: 'deviceId',
-    align: 'center',
-  },
-  {
     title: '巡检地址',
     dataIndex: 'deviceName',
     key: 'deviceName',
     align: 'center',
+    width: 300,
   },
   {
     title: '巡检次数',
@@ -343,8 +338,8 @@ export const taskDetailsColumns: BasicColumn[] = [
   },
   {
     title: '任务班次',
-    dataIndex: 'classType',
-    key: 'classType',
+    dataIndex: 'classType_dictText',
+    key: 'classType_dictText',
     align: 'center',
   },
   {
@@ -352,19 +347,52 @@ export const taskDetailsColumns: BasicColumn[] = [
     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 '否';
-    },
+  },
+];
+
+// 任务详细表格
+export const taskDetailsColumns: BasicColumn[] = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    customRender: ({ index }: { index: number }) => `${index + 1}`,
+  },
+  {
+    title: '巡检地址',
+    dataIndex: 'deviceName',
+    key: 'deviceName',
+    align: 'center',
+    width: 300,
+  },
+  {
+    title: '巡检次数',
+    dataIndex: 'checkNum',
+    key: 'checkNum',
+    align: 'center',
+  },
+  {
+    title: '任务名称',
+    dataIndex: 'taskName',
+    key: 'taskName',
+    align: 'center',
+  },
+  {
+    title: '任务班次',
+    dataIndex: 'classType_dictText',
+    key: 'classType_dictText',
+    align: 'center',
+  },
+  {
+    title: '巡检状态',
+    dataIndex: 'checkState',
+    key: 'checkState',
+    align: 'center',
   },
 ];

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

@@ -16,34 +16,34 @@
           </a-popconfirm>
         </template>
       </BasicTable>
-      <BasicModal title="任务表单" @register="registerModal1" @ok="handleSubmit">
+      <BasicModal :destroy-on-close="true" title="任务表单" @register="registerModal1" @ok="handleSubmit">
         <BasicForm @register="registerForm" />
       </BasicModal>
-      <BasicModal title="任务详情列表" :show-cancel-btn="false" :width="1200" @register="registerModal2">
+      <BasicModal :destroy-on-close="true" title="任务详情列表" :show-ok-btn="false" :width="1200" @register="registerModal2">
+        <a-space class="search-area mb-10px">
+          <div class="item-text">巡检地址：</div>
+          <a-input style="width: 240px" v-model:value="searchParams2.deviceName" placeholder="请输入巡检地址" />
+          <a-button type="primary" preIcon="ant-design:search-outlined" class="ml-10px" @click="tableContext2.reload()">查询</a-button>
+        </a-space>
         <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 v-if="text == true">
+                <div class="table-text color-green">已检</div>
               </div>
               <div v-else>
-                <div class="table-text text-n">未检</div>
+                <div class="table-text color-red">未检</div>
               </div>
             </template>
           </template>
         </BasicTable>
       </BasicModal>
-      <BasicModal :width="1200" :show-cancel-btn="false" @register="registerModal3">
+      <BasicModal :destroy-on-close="true" :width="1200" :show-ok-btn="false" @register="registerModal3">
         <a-space class="search-area mb-10px">
+          <div class="item-text">巡检地址：</div>
+          <a-input style="width: 240px" v-model:value="searchParams3.deviceName" placeholder="请输入巡检地址" />
+          <a-button type="primary" preIcon="ant-design:search-outlined" class="ml-10px" @click="reload()">查询</a-button>
           <a-popconfirm title="确认操作" ok-text="确定" cancel-text="取消" @confirm="handlePatch('add')">
             <a-button type="primary" preIcon="ant-design:plus-outlined">添加</a-button>
           </a-popconfirm>
@@ -54,20 +54,20 @@
         <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>
+            <template v-if="column.dataIndex == 'isSelect'">
+              <div v-if="text == true">
+                <div class="table-text color-green">是</div>
               </div>
               <div v-else>
-                <div class="table-text text-n">否</div>
+                <div class="table-text">否</div>
               </div>
             </template>
-            <template v-if="column.dataIndex == 'checkState'">
-              <div v-if="text == '1'">
-                <div class="table-text text-y">已检</div>
+            <template v-if="column.dataIndex == 'isOtherSelect'">
+              <div v-if="text == true">
+                <div class="table-text color-green">是</div>
               </div>
               <div v-else>
-                <div class="table-text text-n">未检</div>
+                <div class="table-text">否</div>
               </div>
             </template>
           </template>
@@ -80,7 +80,7 @@
 <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 { taskColumns, pagination, taskschemas, taskDetailsColumns, taskManageColumns } from './gasInspect.data';
   import { deleteTeam, getManageTasklist, operateGasCheckTaskDetail, taskDetailsList, teamAdd, teamEdit, teamList } from './gasInspect.api';
   import { BasicTable } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
@@ -107,9 +107,10 @@
     pagination: true,
   });
   // 任务详情列表
+  const searchParams2 = ref<any>({ deviceName: '' });
   const { tableContext: tx2 } = useListPage({
     tableProps: {
-      api: taskDetailsList,
+      api: () => taskDetailsList({ taskId: selectedRow.value.id, ...searchParams2.value }),
       columns: taskDetailsColumns,
       pagination,
       showActionColumn: false,
@@ -119,9 +120,10 @@
     pagination: true,
   });
   // 任务管理列表
+  const searchParams3 = ref<any>({ deviceName: '' });
   const { tableContext: tx3 } = useListPage({
     tableProps: {
-      api: () => getManageTasklist({ taskId: selectedRow.value.id }).then((r) => r.map((e, i) => ({ id: i, ...e }))),
+      api: () => getManageTasklist({ taskId: selectedRow.value.id, ...searchParams3.value }).then((r) => r.map((e, i) => ({ id: i, ...e }))),
       rowSelection: {
         type: 'checkbox',
         getCheckboxProps: (record) => {
@@ -130,7 +132,7 @@
           };
         },
       },
-      columns: taskDetailsColumns,
+      columns: taskManageColumns,
       pagination,
       showActionColumn: false,
       showTableSetting: false,
@@ -139,7 +141,7 @@
     pagination: true,
   });
   const [registerTable1, tableContext1] = tx1;
-  const [registerTable2] = tx2;
+  const [registerTable2, tableContext2] = tx2;
   const [registerTable3, { reload }, { rowSelection, selectedRows }] = tx3;
   const [registerModal1, modalContext1] = useModal();
   const [registerModal2, modalContext2] = useModal();

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

@@ -1,16 +1,14 @@
 <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-form-item v-show="false" 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 label="巡检区域：">
+        <a-input v-model:value="formStateEdit.strremark" style="width: 220px" />
       </a-form-item>
       <a-form-item label="巡检类型：">
         <JDictSelectTag v-model:value="formStateEdit.insType" placeholder="请选择巡检类型" dictCode="ins_type" style="width: 240px" />

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

@@ -142,12 +142,12 @@ export const columns2: BasicColumn[] = [
     align: 'center',
     customRender: ({ index }: { index: number }) => `${index + 1}`,
   },
-  {
-    title: 'ID',
-    dataIndex: 'id',
-    key: 'id',
-    align: 'center',
-  },
+  // {
+  //   title: 'ID',
+  //   dataIndex: 'id',
+  //   key: 'id',
+  //   align: 'center',
+  // },
   // {
   //   title: '任务名称',
   //   dataIndex: 'taskName',
@@ -160,6 +160,18 @@ export const columns2: BasicColumn[] = [
     key: 'strinstallpos',
     align: 'center',
   },
+  {
+    title: '巡检区域',
+    dataIndex: 'strremark',
+    key: 'strremark',
+    align: 'center',
+  },
+  {
+    title: '巡检类型',
+    dataIndex: 'insType',
+    key: 'insType',
+    align: 'center',
+  },
   // {
   //   title: '巡检次数',
   //   dataIndex: 'checkNum',

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

@@ -39,18 +39,18 @@
         <template #bodyCell="{ column, text }">
           <template v-if="column.dataIndex == 'isSensor'">
             <div v-if="text == '1'">
-              <div class="table-text text-y">是</div>
+              <div class="table-text">是</div>
             </div>
             <div v-else>
-              <div class="table-text text-n">否</div>
+              <div class="table-text">否</div>
             </div>
           </template>
           <template v-if="column.dataIndex == 'checkState'">
             <div v-if="text == '1'">
-              <div class="table-text text-y">已检</div>
+              <div class="table-text">已检</div>
             </div>
             <div v-else>
-              <div class="table-text text-n">未检</div>
+              <div class="table-text">未检</div>
             </div>
           </template>
         </template>