Преглед изворни кода

refactor:重构预防检查

chauncey пре 10 месеци
родитељ
комит
fe597222d4

+ 8 - 11
src/views/disaster/disaster-precaution/PageTaskExecution.vue

@@ -102,12 +102,18 @@
 </template>
 
 <script setup lang="ts">
+  import { useRouter } from 'vue-router';
   import { ref, onMounted, reactive, onUnmounted } from 'vue';
+  import { ElMessage } from 'element-plus';
   import BasicTable from '@/components/BasicTable.vue';
   import ActionButton from '@/components/ActionButton.vue';
   import Search from '@/views/disaster/components/Search.vue';
   import InspectorSelect from '@/views/disaster/components/InspectorSelect.vue';
   import useTableConfig from '@/hooks/useTableConfigHook';
+  import { isToolTip } from './src/utils';
+  import type { TaskExecutionListResponse, TaskExecutionListQuery } from '@/types/disaster-precaution';
+  import type { QueryPageRequest } from '@/types/disaster';
+  import type { PersonGroupItem } from '@/types/person-group/type';
   import {
     getTaskExecutionList,
     getTaskInspectorList,
@@ -115,18 +121,9 @@
     withdrawTaskApproval,
     updateTaskInspector,
   } from '@/api/disaster-precaution';
-  import type { TaskExecutionListResponse } from '@/types/disaster-precaution';
-  import OverdueIcon from '@/assets/svg/overdue.svg';
-  import { TASK_STAGE } from './src/constants/task-execution';
-  import { INSPECT_TYPE_MAP, TASK_STAGE_MAP } from './src/constants/task-execution';
   import { TABLE_OPTIONS_EXECUTION, TASK_EXECUTION_TABLE_COLUMNS, TASK_EXECUTION_SEARCH_CONFIG } from './src/config';
-  import type { TaskExecutionListQuery } from '@/types/disaster-precaution';
-  import type { QueryPageRequest } from '@/types/disaster';
-  import { USER_TYPE } from './src/constants/task-execution';
-  import type { PersonGroupItem } from '@/types/person-group/type';
-  import { useRouter } from 'vue-router';
-  import { ElMessage } from 'element-plus';
-  import { isToolTip } from './src/utils/is-tooltip';
+  import { INSPECT_TYPE_MAP, TASK_STAGE_MAP, TASK_STAGE, USER_TYPE } from './src/constants/task-execution';
+  import OverdueIcon from '@/assets/svg/overdue.svg';
 
   const router = useRouter();
   const userInfo = ref(false);

+ 4 - 4
src/views/disaster/disaster-precaution/PageTaskExecutionDetail.vue

@@ -50,19 +50,19 @@
 </template>
 
 <script lang="ts" setup>
+  import { useRoute, useRouter } from 'vue-router';
   import { onMounted, ref, computed, reactive } from 'vue';
   import { ElMessage } from 'element-plus';
-  import { useRoute, useRouter } from 'vue-router';
-  import BackIcon from 'assets/svg/back.svg';
   import TemplateTableMerge from './src/components/TemplateTableMerge.vue';
-  import { getTaskExecutionDetail, saveTaskDetail, saveTaskApproval } from '@/api/disaster-precaution';
-  import { useUserInfoHook } from '@/views/disaster/hooks/userInfo';
+  import { useUserInfoHook } from '@/views/disaster/hooks';
   import type {
     TaskExecutionDetailResponse,
     TemplateDetailResponse,
     ContentItem,
     SaveTaskDetailRequest,
   } from '@/types/disaster-precaution';
+  import { getTaskExecutionDetail, saveTaskDetail, saveTaskApproval } from '@/api/disaster-precaution';
+  import BackIcon from 'assets/svg/back.svg';
 
   const { getUserFirstLevelTreeList, treeData, id: userId } = useUserInfoHook();
 

+ 4 - 4
src/views/disaster/disaster-precaution/PageTaskItem.vue

@@ -16,13 +16,13 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, computed, defineAsyncComponent } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
-  import BackIcon from 'assets/svg/back.svg';
+  import { ref, computed, defineAsyncComponent } from 'vue';
   import { ElMessage } from 'element-plus';
-  import { createTaskManagementItem, editTaskManagementItem } from '@/api/disaster-precaution';
-  import type { TaskManagementRuleForm } from './src/type';
   import UploadLoading from '@/components/UploadLoading.vue';
+  import type { TaskManagementRuleForm } from './src/type';
+  import { createTaskManagementItem, editTaskManagementItem } from '@/api/disaster-precaution';
+  import BackIcon from 'assets/svg/back.svg';
 
   const router = useRouter();
   const route = useRoute();

+ 13 - 9
src/views/disaster/disaster-precaution/PageTaskManagement.vue

@@ -135,23 +135,33 @@
 </template>
 
 <script setup lang="ts">
+  import { useRouter } from 'vue-router';
   import { ref, onMounted, reactive } from 'vue';
   import { Plus, Close } from '@element-plus/icons-vue';
+  import { ElMessage } from 'element-plus';
   import BasicTable from '@/components/BasicTable.vue';
   import ActionButton from '@/components/ActionButton.vue';
   import Search from '@/views/disaster/components/Search.vue';
   import useTableConfig from '@/hooks/useTableConfigHook';
+  import { useUserInfoHook } from '@/views/disaster/hooks';
+  import { openMessageBox } from '@/utils/element-plus/messageBox';
+  import { isToolTip } from './src/utils';
+  import type { TaskManagementListQuery, TaskManagementListResponse } from '@/types/disaster-precaution';
+  import type { QueryPageRequest } from '@/types/disaster';
   import {
     getTaskManagementList,
     deleteTaskManagementItem,
     withdrawTaskManagementItem,
     publishTaskManagementItem,
   } from '@/api/disaster-precaution';
-  import type { TaskManagementListQuery, TaskManagementListResponse } from '@/types/disaster-precaution';
   import OverdueIcon from '@/assets/svg/overdue.svg';
-  import { ElMessage } from 'element-plus';
   import { INSPECT_TYPE_MAP, TASK_STAGE_MAP, TASK_STAGE } from './src/constants/task-execution';
-  import { ACTIVE_STATUS, ACTIVE_STATUS_COLOR, ACTIVE_STATUS_MAP } from '@/views/disaster/constant';
+  import {
+    ACTIVE_STATUS,
+    ACTIVE_STATUS_COLOR,
+    ACTIVE_STATUS_MAP,
+    DISASTER_PERMISSIONS,
+  } from '@/views/disaster/constant';
   import {
     TABLE_OPTIONS_MANAGEMENT,
     TASK_MANAGEMENT_TABLE_COLUMNS,
@@ -159,12 +169,6 @@
     TABLE_MANAGEMENT_HEIGHT_DEFAULT,
     TABLE_MANAGEMENT_HEIGHT_NOT_PERMISSION,
   } from './src/config';
-  import { useRouter } from 'vue-router';
-  import type { QueryPageRequest } from '@/types/disaster';
-  import { DISASTER_PERMISSIONS } from '@/views/disaster/constant';
-  import { useUserInfoHook } from '@/views/disaster/hooks/userInfo';
-  import { openMessageBox } from '@/utils/element-plus/messageBox';
-  import { isToolTip } from './src/utils/is-tooltip';
 
   const { permissions } = useUserInfoHook();
   const router = useRouter();

+ 1 - 0
src/views/disaster/disaster-precaution/PageTaskTemplate.vue

@@ -24,6 +24,7 @@
 <script lang="ts" setup>
   import { useRouter } from 'vue-router';
   import { TASK_TEMPLATE_LIST } from './src/constants/template-detail';
+  
   const router = useRouter();
   const toTemplateDetail = (id: number) => {
     router.push({

+ 4 - 4
src/views/disaster/disaster-precaution/PageTaskTemplateDetail.vue

@@ -18,14 +18,14 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, computed, onMounted } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
-  import BackIcon from 'assets/svg/back.svg';
-  import { TASK_TEMPLATE_LIST } from './src/constants/template-detail';
+  import { ref, computed, onMounted } from 'vue';
   import TemplateTableMerge from './src/components/TemplateTableMerge.vue';
-  import { getTaskTemplateDetail } from '@/api/disaster-precaution';
   import type { SpanTableData } from '@/views/disaster/disaster-precaution/src/type';
   import type { ContentItem } from '@/types/disaster-precaution';
+  import { getTaskTemplateDetail } from '@/api/disaster-precaution';
+  import { TASK_TEMPLATE_LIST } from './src/constants/template-detail';
+  import BackIcon from 'assets/svg/back.svg';
 
   const resultData = ref<ContentItem>({} as ContentItem);
   const opinionData = ref<ContentItem>({} as ContentItem);

+ 4 - 4
src/views/disaster/disaster-precaution/src/components/CreateTaskItem.vue

@@ -36,16 +36,16 @@
 </template>
 
 <script setup lang="ts">
+  import { onMounted, ref } from 'vue';
   import BasicForm from '@/components/BasicForm.vue';
+  import GroupSelect from '@/views/disaster/components/GroupSelect.vue';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
+  import { useUserInfoHook, useDeptInfoHook, useGroupInfoHook } from '@/views/disaster/hooks';
+  import type { TaskManagementRuleForm } from '../type';
   import { TASK_MANAGEMENT_FROM_CONFIG_CREATE, TASK_MANAGEMENT_FROM_DATA, TASK_MANAGEMENT_FROM_RULES } from '../config';
-  import { onMounted, ref } from 'vue';
-  import { TaskManagementRuleForm } from '../type';
   import { INSPECT_TYPE_OPTIONS } from '../constants/task-execution';
   import { TASK_TEMPLATE_LIST } from '../constants/template-detail';
   import { IS_PUSH } from '@/views/disaster/constant';
-  import GroupSelect from '@/views/disaster/components/GroupSelect.vue';
-  import { useUserInfoHook, useDeptInfoHook, useGroupInfoHook } from '@/views/disaster/hooks';
 
   const { realname } = useUserInfoHook();
   const { getFirstLevelDepts, firstLevelDepts } = useDeptInfoHook();

+ 5 - 5
src/views/disaster/disaster-precaution/src/components/EditTaskItem.vue

@@ -25,17 +25,17 @@
 </template>
 
 <script setup lang="ts">
+  import { onMounted, ref } from 'vue';
   import BasicForm from '@/components/BasicForm.vue';
+  import GroupSelect from '@/views/disaster/components/GroupSelect.vue';
   import { useFormConfigHook } from '@/hooks/useFormConfigHook';
+  import { useGroupInfoHook } from '@/views/disaster/hooks';
+  import type { TaskManagementRuleForm } from '../type';
+  import { viewTaskManagementDetail } from '@/api/disaster-precaution';
   import { TASK_MANAGEMENT_FROM_CONFIG_EDIT, TASK_MANAGEMENT_FROM_DATA, TASK_MANAGEMENT_FROM_RULES } from '../config';
-  import { onMounted, ref } from 'vue';
-  import { TaskManagementRuleForm } from '../type';
   import { INSPECT_TYPE_OPTIONS } from '../constants/task-execution';
   import { TASK_TEMPLATE_LIST } from '../constants/template-detail';
   import { IS_PUSH } from '@/views/disaster/constant';
-  import { viewTaskManagementDetail } from '@/api/disaster-precaution';
-  import GroupSelect from '@/views/disaster/components/GroupSelect.vue';
-  import { useGroupInfoHook } from '@/views/disaster/hooks';
 
   const props = defineProps<{
     id: number;

+ 4 - 4
src/views/disaster/disaster-precaution/src/components/TemplateTableMerge.vue

@@ -128,13 +128,13 @@
 
 <script lang="ts" setup>
   import { ref, computed, watch } from 'vue';
-  import type { SpanTableData, MainRow, MergedRow } from '../type';
-  import { formatSpanTableData } from '../utils/format-data';
-  import { TASK_TEMPLATE_HEADER, TASK_TEMPLATE_MAIN_COLUMNS, MERGE_FIELDS } from '../constants/template-detail';
   import Compliance from './Compliance.vue';
   import ActualSituation from './ActualSituation.vue';
+  import { useUserInfoHook } from '@/views/disaster/hooks';
+  import { formatSpanTableData } from '../utils';
+  import type { SpanTableData, MainRow, MergedRow } from '../type';
   import type { ContentItem } from '@/types/disaster-precaution';
-  import { useUserInfoHook } from '@/views/disaster/hooks/userInfo';
+  import { TASK_TEMPLATE_HEADER, TASK_TEMPLATE_MAIN_COLUMNS, MERGE_FIELDS } from '../constants/template-detail';
   import { COMPLIANCE } from '../constants/template-detail';
   import ImageIcon from '../svg/image.svg';
 

+ 2 - 2
src/views/disaster/disaster-precaution/src/components/ViewTaskItem.vue

@@ -21,10 +21,10 @@
   import { useRoute } from 'vue-router';
   import { ref, onMounted } from 'vue';
   import TemplateTableMerge from './TemplateTableMerge.vue';
-  import { TASK_STAGE } from '../constants/task-execution';
-  import { getTaskExecutionDetail, getTaskTemplateDetail } from '@/api/disaster-precaution';
   import type { SpanTableData } from '@/views/disaster/disaster-precaution/src/type';
   import type { TemplateDetailResponse, ContentItem } from '@/types/disaster-precaution';
+  import { getTaskExecutionDetail, getTaskTemplateDetail } from '@/api/disaster-precaution';
+  import { TASK_STAGE } from '../constants/task-execution';
 
   const route = useRoute();
   const id = Number(route.query.id);

+ 4 - 0
src/views/disaster/disaster-precaution/src/utils/index.ts

@@ -0,0 +1,4 @@
+import { formatSpanTableData } from './format-data';
+import { isToolTip } from './is-tooltip';
+
+export { formatSpanTableData, isToolTip };