diff --git a/src/api/data/videoInspection.ts b/src/api/data/videoInspection.ts index 5ea1332..a4f9df7 100644 --- a/src/api/data/videoInspection.ts +++ b/src/api/data/videoInspection.ts @@ -5,4 +5,10 @@ export function listVideoInspection(query) { url: `/videoInspection`, query: query }); +} + +export function getVideoInspectionInfo(id) { + return request.get({ + url: `/videoInspection/${id}` + }); } \ No newline at end of file diff --git a/src/components/home/work/index.vue b/src/components/home/work/index.vue index 09679f2..b938e7c 100644 --- a/src/components/home/work/index.vue +++ b/src/components/home/work/index.vue @@ -39,7 +39,7 @@ 通知提醒 -
+
@@ -73,15 +73,16 @@ function getList() { }); } +const alarmLoading = ref(true) function getAlarmList() { - loading.value = true + alarmLoading.value = true alarmNotificationPageByTodo({ current: 1, size: 100, }).then((data) => { alarms.value = data.records; myAlarmTotal.value = data.total - loading.value = false + alarmLoading.value = false }); } diff --git a/src/components/negative/description.vue b/src/components/negative/description.vue index 68af23f..d28125e 100644 --- a/src/components/negative/description.vue +++ b/src/components/negative/description.vue @@ -10,9 +10,9 @@ {{ negative.discoveryTime }}
-
+
- {{ negative.happenTime || '/' }} + {{ negative.happenTime }}
@@ -52,9 +52,9 @@
-
+
- {{ negative.caseNumber || '/' }} + {{ negative.caseNumber }}
diff --git a/src/components/negative/verify.vue b/src/components/negative/verify.vue index 9f210b5..87ac998 100644 --- a/src/components/negative/verify.vue +++ b/src/components/negative/verify.vue @@ -43,12 +43,17 @@ v-model="form.checkStatus" @change="(val) => handleChangeCheckStatus(val, item)" > + 属实 + 基本属实 + 不属实 {{ item.dictLabel }} - + value="4" + v-if=" + negative.problemSourcesCode === + ProblemSources.XF12337 + " + >无法办理 @@ -62,7 +67,7 @@ message: '请选择是否整改', trigger: ['blur'], }" - v-if="form.checkStatus !== InspectCase.FALSE" + v-if="form.checkStatus !== InspectCase.FALSE && form.checkStatus !== InspectCase.UNABLE" > - + - -
- +
-
-
-
- 涉及人员{{ - form.blames - .filter( - (blame) => - blame.type === BlameType.PERSONAL - ) - .indexOf(item) + 1 - }} -
- 删除 - -
- - - - - - - - - - - - - - - - +
+
+
+ 涉及人员{{ + form.blames + .filter( + (blame) => + blame.type === + BlameType.PERSONAL + ) + .indexOf(item) + 1 + }} +
+ 删除 + +
+ + + + + + + + + + + + + + + + - - + + + {{ item.dictLabel }} + + + + + + +
- +
+
+ +
+ + + +
+
+ {{ + problem.oneLevelContent + ? problem.oneLevelContent + + " / " + : "" + }} + {{ + problem.twoLevelContent + ? problem.twoLevelContent + + " / " + : "" + }} + {{ + problem.threeLevelContent + }} +
+
+ +
+ + + 删除问题 + + + + 添加问题 + +
+
+ +
+
+ + + - {{ item.dictLabel }} - - - - - - -
- + {{ item.dictLabel }} + + + + + -
+
- -
- {{ item.dictLabel }} + + + + - - -
-
- {{ - problem.oneLevelContent - ? problem.oneLevelContent + - " / " - : "" - }} - {{ - problem.twoLevelContent - ? problem.twoLevelContent + - " / " - : "" - }} - {{ - problem.threeLevelContent - }} -
+ placeholder="请输入其他主观方面" + style="width: 120px" + /> +
+
+ -
- + + + + + + + + +
+
+ + + 添加涉及人员 + +
+ + + +
+
+
涉及领导{{ index + 1 }}
+ 删除 +
- - - - - + + + + + + + + + + + + + + + + + + + + + + - {{ item.dictLabel }} - - - - - - -
{{ item.dictLabel }} - + + - - -
-
-
+ + + - - - - - - - - item.type === BlameType.DEPARTMENT ).length === 0 ) { @@ -1382,13 +1453,15 @@ watch( form.value.blameLeaders = []; } if (val === AccountabilityTarget.PERSONAL_AND_DEPARTMENT) { - if (form.value.blames.filter( + if ( + form.value.blames.filter( (item) => item.type === BlameType.PERSONAL ).length === 0 ) { handleAddPersonal(); } - if (form.value.blames.filter( + if ( + form.value.blames.filter( (item) => item.type === BlameType.DEPARTMENT ).length === 0 ) { diff --git a/src/enums/dictEnums.ts b/src/enums/dictEnums.ts index 595f102..a5c0044 100644 --- a/src/enums/dictEnums.ts +++ b/src/enums/dictEnums.ts @@ -6,7 +6,9 @@ export enum InspectCase { // 部分属实 PARTIALLY_TRUE = '2', // 不属实 - FALSE = '3' + FALSE = '3', + // 无法办理 + UNABLE = '4' } // 是否整改 diff --git a/src/views/books/Ajhc.vue b/src/views/books/Ajhc.vue index f937710..0d1d430 100644 --- a/src/views/books/Ajhc.vue +++ b/src/views/books/Ajhc.vue @@ -61,7 +61,9 @@
- + 数据导出
@@ -204,6 +206,10 @@ function handleAction(row) { show.value = true; activeNegativeId.value = row.id; } + +function handleExport() { + window.open(`${BASE_PATH}/negative/books/export/ajhc?` + new URLSearchParams(query.value).toString()) +} \ No newline at end of file diff --git a/src/views/books/Gabxf.vue b/src/views/books/Gabxf.vue index 5931058..613258f 100644 --- a/src/views/books/Gabxf.vue +++ b/src/views/books/Gabxf.vue @@ -314,7 +314,8 @@ function handleAction(row) { } function handleExport() { - window.open(`${BASE_PATH}/negative/books/export/xf/${ProblemSources.GABXF}`) + + window.open(`${BASE_PATH}/negative/books/export/xf/${ProblemSources.GABXF}?` + new URLSearchParams(query.value).toString()) } \ No newline at end of file diff --git a/src/views/system/DepartMaping.vue b/src/views/system/DepartMaping.vue index 6f103a5..40da0be 100644 --- a/src/views/system/DepartMaping.vue +++ b/src/views/system/DepartMaping.vue @@ -1,9 +1,13 @@