同步6/16

src/views/system/inspection/Task/addTask.vue

@@ -33,7 +33,14 @@
               range-separator="到"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
-              v-model="form.taskTime"
+              v-model="taskTime"
+              @update:model-value="
+                (val) => {
+                  if (val.length > 0) {
+                    form.taskTime = val.join(' - ');
+                  }
+                }
+              "
               type="daterange"
               format="YYYY-MM-DD"
               value-format="YYYY-MM-DD"
@@ -93,6 +100,7 @@ const form = ref({
   remindTime: '', // 提醒时间
   planId: '' // 计划路线id
 });
+const taskTime = ref([]);
 const rules = ref({
   taskName: [{ required: true, message: '请输入巡检任务名称', trigger: 'blur' }],
   taskTime: [{ required: true, message: '请选择巡检任务时间', trigger: 'blur' }],
@@ -134,10 +142,11 @@ async function init() {
         id: res.data.id,
         taskName: res.data.taskName, // 巡检计划名称
         inspectorId: res.data.inspectorId, // 巡检人员
-        taskTime: res.data.taskTime, // 巡检人员
+        taskTime: '', // 巡检人员
         remindTime: res.data.remindTime, // 提醒时间
         planId: res.data.planId // 计划路线id
       };
+      taskTime.value = res.data.taskTime ? res.data.taskTime.split(' - ') : [];
       checkoutUserlist.value = Array.isArray(res.data.inspectorInfo) ? res.data.inspectorInfo : [res.data.inspectorInfo];
       handlChangeMap(res.data.planId);
     });
@@ -239,11 +248,13 @@ function handleRoute(route: RouteVO) {
   maploading.value = false;
 }
 
+const aloaderkey = import.meta.env.VITE_GCJ02_KEY_GD;
+const VITE_GCJ02_JS_CODE_GD = import.meta.env.VITE_GCJ02_JS_CODE_GD;
 onMounted(async () => {
   await nextTick();
-  window._AMapSecurityConfig = { securityJsCode: '09534b3534d8da53968529a9ce164118' };
+  window._AMapSecurityConfig = { securityJsCode: VITE_GCJ02_JS_CODE_GD };
   AMapLoader.load({
-    key: '8e302fe1be5f4db62bc734db23dca149',
+    key: aloaderkey,
     version: '2.0',
     plugins: ['AMap.Scale', 'AMap.Marker']
   }).then(async (AMap) => {
@@ -258,6 +269,11 @@ onMounted(async () => {
 });
 const formRef = ref();
 function submit() {
+  if (taskTime.value.length > 0) {
+    form.value.taskTime = taskTime.value.join(' - ');
+  } else {
+    form.value.taskTime = '';
+  }
   form.value.inspectorId = checkoutUserlist.value.map((item) => item.userId).join(',');
   formRef.value?.validate(async (valid: boolean) => {
     if (valid) {

src/views/system/inspection/Task/index.vue

@@ -63,11 +63,6 @@
         <el-table-column label="巡检任务名称" align="center" prop="taskName" />
         <el-table-column label="巡检人员" align="center" prop="inspectorName" />
         <el-table-column label="起止日期" align="center" prop="taskTime" />
-        <el-table-column label="巡检设置" align="center" prop="inspectSetting">
-          <template #default="scope">
-            <dict-tag :options="com_inspection_plan_setting" :value="scope.row.inspectSetting"></dict-tag>
-          </template>
-        </el-table-column>
         <el-table-column label="状态" align="center" prop="status">
           <template #default="scope">
             <dict-tag :options="com_inspection_task_status" :value="scope.row.status"></dict-tag>
@@ -78,7 +73,7 @@
             <dict-tag :options="com_inspection_remind_tiime" :value="scope.row.remindTime"></dict-tag>
           </template>
         </el-table-column>
-        <el-table-column label="关联巡检计划" align="center" prop="planId" />
+        <el-table-column label="关联巡检计划" align="center" prop="planName" />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:task:edit']">编辑</el-button>
@@ -99,7 +94,6 @@ import { checkPermi } from '@/utils/permission';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { com_inspection_task_status } = toRefs<any>(proxy?.useDict('com_inspection_task_status'));
-const { com_inspection_plan_setting } = toRefs<any>(proxy?.useDict('com_inspection_plan_setting'));
 const { com_inspection_remind_tiime } = toRefs<any>(proxy?.useDict('com_inspection_remind_tiime'));
 const router = useRouter();
 const taskList = ref<TaskVO[]>([]);
@@ -143,16 +137,14 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询巡检任务列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listTask(queryParams.value);
-  taskList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-};
-
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
+  listTask(queryParams.value)
+    .then((res) => {
+      taskList.value = res.rows;
+      total.value = res.total;
+    })
+    .finally(() => {
+      loading.value = false;
+    });
 };
 
 /** 表单重置 */
@@ -189,27 +181,11 @@ const handleAdd = () => {
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: TaskVO) => {
+  const _ids = row?.id || ids.value[0];
   router.push({
     path: '/inspection/editTask',
     query: {
-      id: row.id
-    }
-  });
-};
-
-/** 提交按钮 */
-const submitForm = () => {
-  taskFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.id) {
-        await updateTask(form.value).finally(() => (buttonLoading.value = false));
-      } else {
-        await addTask(form.value).finally(() => (buttonLoading.value = false));
-      }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
+      id: _ids
     }
   });
 };
@@ -223,17 +199,6 @@ const handleDelete = async (row?: TaskVO) => {
   await getList();
 };
 
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'system/task/export',
-    {
-      ...queryParams.value
-    },
-    `task_${new Date().getTime()}.xlsx`
-  );
-};
-
 onMounted(() => {
   getList();
 });