优化

src/types/components.d.ts

@@ -24,21 +24,13 @@ declare module 'vue' {
     DistributionMap: typeof import('./../components/Map/YztMap/DistributionMap.vue')['default']
     DrawMap: typeof import('./../components/Map/YztMap/DrawMap.vue')['default']
     Editor: typeof import('./../components/Editor/index.vue')['default']
-    ElAnchor: typeof import('element-plus/es')['ElAnchor']
-    ElAnchorLink: typeof import('element-plus/es')['ElAnchorLink']
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
-    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxButton: typeof import('element-plus/es')['ElCheckboxButton']
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
-    ElCollapse: typeof import('element-plus/es')['ElCollapse']
-    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
-    ElContainer: typeof import('element-plus/es')['ElContainer']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
     ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
@@ -51,41 +43,26 @@ declare module 'vue' {
     ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
-    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
-    ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
-    ElSegmented: typeof import('element-plus/es')['ElSegmented']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
-    ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
-    ElSlider: typeof import('element-plus/es')['ElSlider']
-    ElSpace: typeof import('element-plus/es')['ElSpace']
-    ElStep: typeof import('element-plus/es')['ElStep']
-    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
-    ElTimeline: typeof import('element-plus/es')['ElTimeline']
-    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
@@ -102,9 +79,6 @@ declare module 'vue' {
     HikvisionPlayer: typeof import('./../components/HKVideo/hikvision-player.vue')['default']
     HKVideo: typeof import('./../components/HKVideo/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
-    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
-    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
-    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']

src/views/dataFilling/fillingAdd.vue

@@ -15,7 +15,7 @@
         <el-button type="primary" @click="handleNewTemplate">重新加载</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" @click="handleSaveTemporarily(formRef, 1)">暂存</el-button>
+        <el-button type="primary" @click="handleSaveTemporarily(1)">暂存</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="primary" @click="handleSave(formRef,2)"> 发布 </el-button>
@@ -195,6 +195,9 @@ const handleSaveTemporarily = async (statuCode) => {
   }
 
   form.value.issued_status = statuCode;
+  if(!form.value.end_time) {
+    delete form.value.end_time;
+  }
   fillingAdd(form.value).then(() => {
     proxy.$modal.msgSuccess('暂存成功');
     emits('close');

src/views/dataFilling/tableDetails.vue

@@ -15,7 +15,7 @@
 <!--          <el-button v-if="is_filling_ended === 0" type="primary" @click="handleReport()">智能识别</el-button>-->
 <!--        </el-col>-->
         <el-col :span="1.5">
-          <el-button v-if="is_filling_ended === 0" type="primary" @click="handleSaveTemporarily(formRef,1)">暂存</el-button>
+          <el-button v-if="is_filling_ended === 0" type="primary" @click="handleSaveTemporarily(1)">暂存</el-button>
         </el-col>
 <!--        <el-col :span="1.5">-->
 <!--          <el-button v-if="reportInfo.issued_status === 2" type="primary" @click="handleData()">数据</el-button>-->
@@ -359,58 +359,40 @@ const handleReload = () => {
   alert('表格已清空');
 };
 
-const handleSaveTemporarily = async (formEl,statuCode) => {
-  if (!formEl) return;
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      if (hotData.value && hotData.value[0] && hotData.value[0].length > 0) {
-        const data2 = [];
-        hotData.value[0].forEach((item) => {
-          if (!!item) {
-            data2.push(item);
-          }
-        })
-        reportInfo.value.field_names = hotData.value;
+const handleSaveTemporarily = async (statuCode) => {
+  if (hotData.value && hotData.value[0] && hotData.value[0].length > 0) {
+    const data2 = [];
+    hotData.value[0].forEach((item) => {
+      if (!!item) {
+        data2.push(item);
       }
+    })
+    reportInfo.value.field_names = hotData.value;
+  }
 
-      reportInfo.value.issued_status = statuCode;
-      let tempHead = [];
-      if (!reportInfo.value.field_names) {
-        tempHead = [];
-      } else {
-        tempHead = reportInfo.value.field_names.flatMap(obj =>
-          Object.values(obj).filter(value => typeof value === "string")
-        );
-      }
+  reportInfo.value.issued_status = statuCode;
+  let tempHead = [];
+  if (!reportInfo.value.field_names) {
+    tempHead = [];
+  } else {
+    tempHead = reportInfo.value.field_names.flatMap(obj =>
+      Object.values(obj).filter(value => typeof value === "string")
+    );
+  }
 
-      let data = {
-        creator_name: reportInfo.value.creator_name,
-        creator_phone: reportInfo.value.creator_phone,
-        table_name: reportInfo.value.table_name,
-        status: reportInfo.value.issued_status,
-        period_type: reportInfo.value.period_type,
-        end_time: reportInfo.value.end_time,
-        new_fields: tempHead,
-        user_ids: reportInfo.value.user_ids
-      }
-      fillingChange(reportId.value, data).then(() => {
-        proxy.$modal.msgSuccess('暂存成功');
-        emits('close');
-      });
-    } else {
-      nextTick(() => {
-        let isError = document.getElementsByClassName('is-error');
-        isError[0].scrollIntoView({
-          // 滚动到指定节点
-          // 值有start,center,end，nearest，当前显示在视图区域中间
-          block: 'center',
-          // 值有auto、instant,smooth，缓动动画（当前是慢速的）
-          behavior: 'smooth'
-        });
-      });
-      proxy.$modal.msgError('表单校验失败');
-      return false;
-    }
+  let data = {
+    creator_name: reportInfo.value.creator_name,
+    creator_phone: reportInfo.value.creator_phone,
+    table_name: reportInfo.value.table_name,
+    status: reportInfo.value.issued_status,
+    period_type: reportInfo.value.period_type,
+    end_time: reportInfo.value.end_time,
+    new_fields: tempHead,
+    user_ids: reportInfo.value.user_ids
+  }
+  fillingChange(reportId.value, data).then(() => {
+    proxy.$modal.msgSuccess('暂存成功');
+    emits('close');
   });
 };
 

src/views/inspectionWork/completed.vue

@@ -43,6 +43,8 @@
 import { onMounted, reactive, ref, watch } from 'vue';
 import { useRouter } from 'vue-router';
 import { inspectorDivision, patrolNum } from '@/api/inspectionWork/inspector';
+import { fillingTable } from '@/api/dataFilling/fillingManage';
+import { download2 } from '@/utils/request';
 
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -134,6 +136,12 @@ const handleSelectionChange = (selection) => {
   ids.value = selection.map((item) => item.id);
 };
 
+const filename = ref('完成情况')
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
+const handleExport = () => {
+  download2(baseUrl + '/api/riskManagement/inspection/task/children/task/log/'+props.eventId+'/'+initFormData.task_status+'/export', filename.value + '.xlsx');
+};
+
 onMounted(async () => {
   await getTreeSelect();
   fetchUserData();

src/views/inspectionWork/patrolSubTasks.vue

@@ -235,6 +235,9 @@ const fetchWorkDetail = () => {
         }
 
         detailData.value = data; // 将转换后的数据赋值给detailData
+        if(data.cycle === "一次") {
+          detailData.value.corn_query = data.start_time
+        }
       } else {
         console.error(res.msg);
       }

src/views/inspectionWork/patrolTaskAdd.vue

@@ -28,9 +28,9 @@
                 format="YYYY-MM-DD HH:mm:ss"
                 date-format="YYYY/MM/DD ddd"
                 time-format="A hh:mm:ss"
-                v-if="form.cycle !== '3' && form.cycle !== '4'"
+                v-if="form.cycle !== '4'"
               />
-              <el-date-picker v-if="form.cycle === '3' || form.cycle === '4'" v-model="form.start_time" type="date" placeholder="选择日期" value-format="YYYY-MM-DD" style="width: 400px"></el-date-picker>
+              <el-date-picker v-if="form.cycle === '4'" v-model="form.start_time" type="date" placeholder="选择日期" value-format="YYYY-MM-DD" style="width: 400px"></el-date-picker>
 
             </el-form-item>
             <el-form-item label="巡查周期：" prop="cycle">
@@ -61,6 +61,9 @@
                 </el-radio-group>
               </div>
             </el-form-item>
+            <el-form-item v-if="form.cycle === '3'" label="巡检时间：" prop="corn_query">
+              <el-time-picker v-model="form.corn_query" value-format="hh:mm:ss" arrow-control placeholder="选择时间" style="width: 400px" />
+            </el-form-item>
             <el-form-item label="巡查范围：" prop="inspection_range">
               <el-radio-group v-model="form.inspection_range">
                 <el-radio value="0" size="large">市级</el-radio>
@@ -86,7 +89,7 @@ import { parseTime } from '@/utils/ruoyi';
 const demoFormRef = ref(null);
 const buttonLoading = ref(false);
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const emits = defineEmits(['close']);
+const emits = defineEmits(['close','refresh']);
 const timeFrame = ref('');
 let form = ref({
   id: '',
@@ -123,15 +126,14 @@ const submitForm = () => {
     form.value.end_time = parseTime(timeFrame.value[1], '{y}-{m}-{d}');
   }
   demoFormRef.value?.validate(async (valid) => {
-
     if (valid) {
       try {
         buttonLoading.value = true;
         if (form.value.cycle === '4') {
           form.value.end_time = form.value.start_time
         }
-        form.value.task_number ? await updatetask(form.value) : await addtask(form.value); //根据 form.value.planId 是否存在，调用 updateReport 或 addReport 方法
-        proxy?.$modal.msgSuccess(form.value.task_number ? '修改成功' : '新增成功');
+        await addtask(form.value);
+        proxy?.$modal.msgSuccess('新增成功');
         emits('refresh'); // 提交成功后通知父组件刷新
         emits('close'); // 关闭弹窗
       } finally {

src/views/inspectionWork/patrolTaskEdit.vue

@@ -27,10 +27,10 @@
                 end-placeholder="结束日期"
                 format="YYYY-MM-DD"
                 date-format="YYYY/MM/DD ddd"
-                v-if="form.cycle !== '3' && form.cycle !== '4'"
+                v-if="form.cycle !== '4'"
                 disabled
               />
-              <el-date-picker v-if="form.cycle === '3' || form.cycle === '4'" v-model="form.start_time" type="date" placeholder="选择日期" value-format="YYYY-MM-DD" style="width: 400px" disabled />
+              <el-date-picker v-if="form.cycle === '4'" v-model="form.start_time" type="date" placeholder="选择日期" value-format="YYYY-MM-DD" style="width: 400px" disabled />
 
             </el-form-item>
             <el-form-item label="巡查周期：" prop="cycle">

src/views/inspectionWork/rescueResourcesAdd.vue

@@ -23,9 +23,9 @@
                 format="YYYY-MM-DD HH:mm:ss"
                 date-format="YYYY/MM/DD ddd"
                 time-format="A hh:mm:ss"
-                v-if="form.cycle !== '3' && form.cycle !== '4'"
+                v-if="form.cycle !== '4'"
               />
-              <el-date-picker v-if="form.cycle === '3' || form.cycle === '4'" v-model="form.start_time" type="date" placeholder="选择日期" value-format="YYYY-MM-DD" style="width: 400px"></el-date-picker>
+              <el-date-picker v-if="form.cycle === '4'" v-model="form.start_time" type="date" placeholder="选择日期" value-format="YYYY-MM-DD" style="width: 400px"></el-date-picker>
 <!--              <el-date-picker v-model="form.start_time" type="date" placeholder="选择开始日期" value-format="YYYY-MM-DD"></el-date-picker>至-->
 <!--              <el-date-picker v-model="form.end_time" type="date" placeholder="选择结束日期" value-format="YYYY-MM-DD"></el-date-picker>-->
             </el-form-item>
@@ -57,6 +57,9 @@
                 </el-radio-group>
               </div>
             </el-form-item>
+            <el-form-item v-if="form.cycle === '3'" label="巡检时间：" prop="corn_query">
+              <el-time-picker v-model="form.corn_query" value-format="hh:mm:ss" arrow-control placeholder="选择时间" style="width: 400px" />
+            </el-form-item>
             <el-form-item label="排查范围：" prop="task_range">
               <el-radio-group v-model="form.task_range">
                 <el-radio value="0" size="large">市级</el-radio>

src/views/inspectionWork/riskManagement.vue

@@ -94,9 +94,9 @@
                 format="YYYY-MM-DD HH:mm:ss"
                 date-format="YYYY/MM/DD ddd"
                 time-format="A hh:mm:ss"
-                v-if="form.cycle !== '3' && form.cycle !== '4'"
+                v-if="form.cycle !== '4'"
               />
-              <el-date-picker v-if="form.cycle === '3' || form.cycle === '4'" v-model="form.start_time" type="date" placeholder="选择日期" value-format="YYYY-MM-DD" style="width: 400px"></el-date-picker>
+              <el-date-picker v-if="form.cycle === '4'" v-model="form.start_time" type="date" placeholder="选择日期" value-format="YYYY-MM-DD" style="width: 400px"></el-date-picker>
 
             </el-form-item>
             <el-form-item label="排查周期：" prop="cycle">
@@ -127,8 +127,9 @@
                 </el-radio-group>
               </div>
             </el-form-item>
-            <el-form-item v-if="form.cycle === '3'" label="选择时间：" prop="corn_query">
-              <el-date-picker v-model="form.corn_query" type="datetime" placeholder="选择日期时间" format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+            <el-form-item v-if="form.cycle === '3'" label="巡检时间：" prop="corn_query">
+<!--              <el-date-picker v-model="form.corn_query" type="datetime" placeholder="选择时间" format="YYYY-MM-DD HH:mm:ss" style="width: 400px"></el-date-picker>-->
+              <el-time-picker v-model="form.corn_query" value-format="hh:mm:ss" arrow-control placeholder="选择时间" style="width: 400px" />
             </el-form-item>
             <el-form-item v-if="form.cycle === '4'" label="选择时间：" prop="corn_query">
               <el-date-picker v-model="form.corn_query" type="datetime" placeholder="选择日期时间" format="HH:mm:ss"></el-date-picker>
@@ -316,8 +317,8 @@ const submitForm = () => {
 // 重置表单数据和表单验证状态
 const resetForm = () => {
   form.value = {
-    // id: '',
-    task_number: '',
+    id: '',
+    // task_number: '',
     type: '',
     start_time: '',
     end_time: '',
@@ -325,6 +326,7 @@ const resetForm = () => {
     corn_query: '',
     task_range: ''
   };
+  timeFrame.value = '';
   demoFormRef.value?.resetFields(); // 重置表单的验证状态
 };
 

src/views/inspectionWork/riskdetails.vue

@@ -21,11 +21,11 @@
           </div>
           <div class="common-header-right">
             <el-button class="common-btn-text-primary" type="primary" @click="planUpdate()">
-              <i class="edit-icon2" />
+<!--              <i class="edit-icon2" />-->
               编辑
             </el-button>
             <el-button type="primary" @click="handlefinal">
-              <i class="close-icon" />
+<!--              <i class="close-icon" />-->
               完结任务
             </el-button>
             <el-button type="danger" @click="handleDelete"> 删除 </el-button>