同步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) {