diff --git a/.env.development b/.env.development
index e5ac055..26d386d 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源项目管理平台
VITE_APP_ENV = 'development'
# 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.2:8899'
+VITE_APP_BASE_API = 'http://192.168.110.6:8899'
# 应用访问路径 例如使用前缀 /admin/
VITE_APP_CONTEXT_PATH = '/'
diff --git a/src/api/safety/safetyInspection/types.ts b/src/api/safety/safetyInspection/types.ts
index 2400920..8552f79 100644
--- a/src/api/safety/safetyInspection/types.ts
+++ b/src/api/safety/safetyInspection/types.ts
@@ -49,6 +49,11 @@ export interface SafetyInspectionVO {
*/
correctorName: string;
+ /**
+ * 整改期限
+ */
+ rectificationDeadline: string;
+
/**
* 是否回复（1回复 2不回复）
*/
@@ -171,6 +176,11 @@ export interface SafetyInspectionForm extends BaseEntity {
*/
correctorId?: string | number;
+ /**
+ * 整改期限
+ */
+ rectificationDeadline: string;
+
/**
* 是否回复（1回复 2不回复）
*/
diff --git a/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue b/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
index d9f4810..aa8dacb 100644
--- a/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
+++ b/src/views/safety/safetyInspection/component/SafetyInspectionDetailDialog.vue
@@ -16,7 +16,9 @@
{{ safetyInspectionDetail?.checkTime }}
{{ safetyInspectionDetail?.creatorName }}
{{ safetyInspectionDetail?.correctorName }}
- {{ safetyInspectionDetail?.rectificationTime }}
+
+ {{ dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日') }}
+
巡检结果
@@ -78,6 +80,7 @@ import { SafetyInspectionVO } from '@/api/safety/safetyInspection/types';
import { getSafetyInspection } from '@/api/safety/safetyInspection';
import { listByIds } from '@/api/system/oss';
import { OssVO } from '@/api/system/oss/types';
+import dayjs from 'dayjs';
interface Props {
safetyInspectionId?: string | number;
@@ -121,6 +124,8 @@ watch(
() => props.safetyInspectionId,
(newId, oldId) => {
if (newId !== oldId) {
+ checkFileList.value = undefined;
+ rectificationFileList.value = undefined;
get();
}
}
diff --git a/src/views/safety/safetyInspection/index.vue b/src/views/safety/safetyInspection/index.vue
index aaa484b..1a5d85d 100644
--- a/src/views/safety/safetyInspection/index.vue
+++ b/src/views/safety/safetyInspection/index.vue
@@ -14,21 +14,11 @@
-
-
-
-
-
-
-
-
-
-
搜索
重置
@@ -82,21 +72,15 @@
-
-
-
- {{ parseTime(scope.row.reviewTime, '{y}-{m}-{d}') }}
-
-
-
+
-
+
详情
@@ -114,8 +98,8 @@
-
-
+
+
@@ -139,51 +123,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+
@@ -250,6 +203,7 @@ const initFormData: SafetyInspectionForm = {
inspectionResult: undefined,
teamId: undefined,
correctorId: undefined,
+ rectificationDeadline: undefined,
isReply: undefined,
replyDate: undefined,
status: undefined,
@@ -292,7 +246,9 @@ const data = reactive>({
},
rules: {
id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
- projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }]
+ projectId: [{ required: true, message: '项目ID不能为空', trigger: 'blur' }],
+ checkType: [{ required: true, message: '检查类型不能为空', trigger: 'blur' }],
+ violationType: [{ required: true, message: '违章类型不能为空', trigger: 'blur' }]
}
});
diff --git a/src/views/safety/safetyLog/component/SafetyLogDetailDialog.vue b/src/views/safety/safetyLog/component/SafetyLogDetailDialog.vue
index 9582b0e..cadd346 100644
--- a/src/views/safety/safetyLog/component/SafetyLogDetailDialog.vue
+++ b/src/views/safety/safetyLog/component/SafetyLogDetailDialog.vue
@@ -95,6 +95,7 @@ watch(
() => props.safetyLogId,
(newId, oldId) => {
if (newId !== oldId) {
+ fileList.value = undefined;
get();
}
}