From 965f7a2479a2cf7c1c56fb298e7fbb855c89e212 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期五, 12 八月 2022 19:05:57 +0800
Subject: [PATCH] lct
---
src/views/doublePrevent/riskLevel/event/components/safetyRiskEventDialog.vue | 39 ++++
src/views/system/role/index.vue | 2
src/views/system/department/index.vue | 2
src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue | 6
src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/components/rectifyDialog.vue | 31 +++
src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/index.vue | 11 +
src/views/doublePrevent/riskLevel/event/index.vue | 3
src/views/doublePrevent/riskLevel/action/components/riskControlMeasureDialog.vue | 43 ++++-
src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/components/workDialog.vue | 50 +++++-
src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/components/checkDialog.vue | 9
src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue | 4
src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue | 35 +++
src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/index.vue | 1
src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/index.vue | 2
src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/components/recordDialog.vue | 2
src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/components/reportDialog.vue | 20 +
src/utils/request.ts | 8
src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue | 9 +
src/views/doublePrevent/riskLevel/riskCheckUnit/index.vue | 6
.env.development | 7
src/views/doublePrevent/riskLevel/unit/components/safetyRiskAnalyseUnitDialog.vue | 45 ++++-
src/views/system/user/index.vue | 13
src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/index.vue | 13 +
src/views/doublePrevent/riskLevel/device/components/productionDeviceDialog.vue | 39 +++-
src/views/doublePrevent/riskLevel/riskCheckUnit/components/checkUnitDialog.vue | 29 +++
25 files changed, 345 insertions(+), 84 deletions(-)
diff --git a/.env.development b/.env.development
index ba35269..3d7bbdc 100644
--- a/.env.development
+++ b/.env.development
@@ -4,10 +4,13 @@
#VITE_API_URL = 'http://192.168.0.35:8008'
#李宇飞接口地址
-VITE_API_URL = 'http://192.168.0.29:8008'
+#VITE_API_URL = 'http://192.168.0.29:8008'
#黄振接口地址
-#VITE_API_URL = 'http://192.168.0.69:8008'
+#VITE_API_URL = 'http://192.168.0.179:8008'
+#施正红接口地址
+
+VITE_API_URL = 'http://192.168.0.69:8008'
#戚会山接口地址
#VITE_API_URL = 'http://192.168.0.52:8011/safeplatform'
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 14169b4..4abb65d 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -93,10 +93,10 @@
}, 1000);
} else if (error.message == 'Network Error') {
ElMessage.error('网络连接错误');
- setTimeout(() => {
- Session.clear();
- window.location.href = '/';
- }, 1000);
+ // setTimeout(() => {
+ // Session.clear();
+ // window.location.href = '/';
+ // }, 1000);
} else {
if (error.response.data) ElMessage.error(error.response.data.error);
else ElMessage.error('接口路径找不到');
diff --git a/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/components/recordDialog.vue b/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/components/recordDialog.vue
index 769959b..e22be03 100644
--- a/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/components/recordDialog.vue
+++ b/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/components/recordDialog.vue
@@ -13,7 +13,7 @@
</el-form>
</div>
</el-dialog>
- <el-dialog :title="title" v-model="isShowSubmitDialog" width="600px">
+ <el-dialog :title="title" v-model="isShowSubmitDialog" width="600px" :close-on-click-modal="false">
<el-form :model="submitForm" ref="rectifyFormRef" size="default" label-width="120px">
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
diff --git a/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/components/workDialog.vue b/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/components/workDialog.vue
index ca71159..63f6139 100644
--- a/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/components/workDialog.vue
+++ b/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/components/workDialog.vue
@@ -53,7 +53,7 @@
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="执行部门" prop="execDepId">
- <el-cascader :disabled="!disabled" @change="achieveUserList" :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable filterable class="input-add" v-model="workForm.execDepId"> </el-cascader>
+ <el-cascader :disabled="!disabled" :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable filterable class="input-add" v-model="workForm.execDepId"> </el-cascader>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
@@ -66,6 +66,26 @@
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="首次任务开始时间" prop="firstStartTime">
<el-date-picker :disabled="!disabled" class="input-add" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" v-model="workForm.firstStartTime" placeholder="请选择首次任务开始时间" clearable></el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20" v-show="personTime">
+ <el-form-item label="创建人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="workForm.createByUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20" v-show="personTime">
+ <el-form-item label="创建时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="workForm.gmtCreate" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="workForm.lastEditUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="workForm.gmtModitify" placeholder="请输入区域位置"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -88,6 +108,7 @@
interface stateType {
disabled: Boolean;
isShowWorkDialog: Boolean;
+ personTime: Boolean;
workForm: {
checkWorkType: number | null;
checkWorkName: string | null;
@@ -124,6 +145,7 @@
const state = reactive<stateType>({
title: '',
disabled: false,
+ personTime: false,
activeName: 'inspectionPoint',
checkWorkTypeList: [],
departmentList: [],
@@ -177,6 +199,7 @@
});
if (type === '新增') {
state.disabled = true;
+ state.personTime = false;
state.title = '新增排查任务';
state.workForm = {
checkWorkType: null,
@@ -193,10 +216,12 @@
};
} else if (type === '查看') {
state.disabled = false;
+ state.personTime = true;
state.title = '查看排查任务';
state.workForm = JSON.parse(JSON.stringify(value));
} else {
state.disabled = true;
+ state.personTime = false;
state.title = '修改排查任务';
state.workForm = JSON.parse(JSON.stringify(value));
}
@@ -248,18 +273,17 @@
});
};
- const achieveUserList = async () => {
- state.workForm.execUserId = null;
- const user: unknown = await getUserByDepartment(state.workForm.depId);
- state.userList = user as [];
- };
+ // const achieveUserList = async () => {
+ // state.workForm.execUserId = null;
+ // const user: unknown = await getUserByDepartment(state.workForm.depId);
+ // state.userList = user as [];
+ // };
return {
...toRefs(state),
workFormRef,
submitWork,
- openWorkDialog,
- achieveUserList
+ openWorkDialog
};
}
};
@@ -276,4 +300,14 @@
.filter-container {
padding: 10px 0px;
}
+:deep(.el-textarea.is-disabled .el-textarea__inner) {
+ background-color: var(--el-card-bg-color);
+ color: var(--el-input-text-color, var(--el-text-color-regular));
+}
+:deep(.el-input.is-disabled .el-input__inner) {
+ color: var(--el-input-text-color, var(--el-text-color-regular));
+}
+:deep(.el-input.is-disabled .el-input__wrapper) {
+ background-color: var(--el-card-bg-color);
+}
</style>
diff --git a/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/index.vue b/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/index.vue
index f10235d..9bdd104 100644
--- a/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/index.vue
+++ b/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/index.vue
@@ -348,4 +348,15 @@
});
</script>
-<style scoped></style>
+<style scoped>
+:deep(.el-textarea.is-disabled .el-textarea__inner) {
+ background-color: var(--el-card-bg-color);
+ color: var(--el-input-text-color, var(--el-text-color-regular));
+}
+:deep(.el-input.is-disabled .el-input__inner) {
+ color: var(--el-input-text-color, var(--el-text-color-regular));
+}
+:deep(.el-input.is-disabled .el-input__wrapper) {
+ background-color: var(--el-card-bg-color);
+}
+</style>
diff --git a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/components/checkDialog.vue b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/components/checkDialog.vue
index cae63b9..e225a9d 100644
--- a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/components/checkDialog.vue
+++ b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/components/checkDialog.vue
@@ -1,6 +1,6 @@
<template>
<div class="system-add-menu-container">
- <el-dialog :title="title" v-model="isShowCheckDialog" width="600px">
+ <el-dialog :title="title" v-model="isShowCheckDialog" width="600px" :close-on-click-modal="false">
<el-form :model="checkForm" :rules="checkFormRules" ref="checkFormRef" size="default" label-width="120px">
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@@ -17,7 +17,7 @@
</span>
</template>
</el-dialog>
- <el-dialog :title="title" v-model="isShowCheckInfoDialog" width="600px">
+ <el-dialog :title="title" v-model="isShowCheckInfoDialog" width="600px" :close-on-click-modal="false">
<el-form :model="checkInfoForm" ref="checkFormRef" size="default" label-width="120px">
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@@ -50,6 +50,11 @@
<el-input class="input-add" :disabled="true" type="number" v-model="checkInfoForm.cost" readonly> </el-input>
</el-form-item>
</el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+ <el-form-item label="验收人" prop="checkAcceptPerson">
+ <el-input class="input-add" :disabled="true" v-model="checkInfoForm.checkAcceptPerson" readonly />
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
</el-dialog>
diff --git a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/index.vue b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/index.vue
index a471d01..d87e15b 100644
--- a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/index.vue
+++ b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/index.vue
@@ -22,6 +22,7 @@
</div>
<el-table :data="checkData.data" style="width: 100%" fit highlight-current-row>
<el-table-column type="index" label="序号" width="60" />
+ <el-table-column prop="dangerCode" label="隐患名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="rectifyDesc" label="整改内容说明" show-overflow-tooltip min-width="150px"></el-table-column>
<el-table-column prop="applyTime" label="整改时间" show-overflow-tooltip min-width="150px"></el-table-column>
<el-table-column prop="rectifyType" label=" 整改类型" show-overflow-tooltip min-width="150px">
diff --git a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/components/rectifyDialog.vue b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/components/rectifyDialog.vue
index 9403e25..99f629d 100644
--- a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/components/rectifyDialog.vue
+++ b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/components/rectifyDialog.vue
@@ -1,6 +1,6 @@
<template>
<div class="system-add-menu-container">
- <el-dialog :title="title" v-model="isShowRectifyDialog" width="600px">
+ <el-dialog :title="title" v-model="isShowRectifyDialog" width="600px" :close-on-click-modal="false">
<el-form :model="rectifyForm" :rules="rectifyFormRules" ref="rectifyFormRef" size="default" label-width="120px">
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@@ -22,7 +22,7 @@
</span>
</template>
</el-dialog>
- <el-dialog :title="title" v-model="isShowDelayDialog" width="600px">
+ <el-dialog :title="title" v-model="isShowDelayDialog" width="600px" :close-on-click-modal="false">
<el-form :model="delayForm" :rules="delayFormRules" ref="rectifyFormRef" size="default" label-width="120px">
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@@ -44,7 +44,7 @@
</span>
</template>
</el-dialog>
- <el-dialog :title="title" v-model="isShowCheckInfoDialog" width="600px">
+ <el-dialog :title="title" v-model="isShowCheckInfoDialog" width="600px" :close-on-click-modal="false">
<el-form :model="checkInfoForm" ref="checkFormRef" size="default" label-width="120px">
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@@ -78,6 +78,26 @@
<el-input class="input-add" :disabled="!disabled" type="number" v-model="checkInfoForm.cost" readonly> </el-input>
</el-form-item>
</el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="创建人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="checkInfoForm.createByUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="创建时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="checkInfoForm.gmtCreate" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="checkInfoForm.lastEditUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="checkInfoForm.gmtModitify" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
</el-dialog>
@@ -89,6 +109,7 @@
interface stateType {
disabled: Boolean;
+ personTime: Boolean;
isShowRectifyDialog: Boolean;
isShowDelayDialog: Boolean;
isShowCheckInfoDialog: Boolean;
@@ -130,6 +151,7 @@
const state = reactive<stateType>({
title: '',
disabled: false,
+ personTime: false,
rectifyTypeList: [],
departmentList: [],
userList: [],
@@ -168,6 +190,7 @@
if (type === '延期') {
state.title = '延期';
state.disabled = true;
+ state.personTime = false;
state.isShowDelayDialog = true;
const delayForm = JSON.parse(JSON.stringify(value));
state.delayForm.id = delayForm.id;
@@ -176,12 +199,14 @@
state.delayForm.rectifyTime = null;
} else if (type === '查看') {
state.title = '查看';
+ state.personTime = true;
state.isShowCheckInfoDialog = true;
state.checkInfoForm.rectifyDepId = JSON.parse(JSON.stringify(value)).rectifyDepId;
await achieveUserList();
state.checkInfoForm = JSON.parse(JSON.stringify(value));
} else {
state.disabled = true;
+ state.personTime = false;
state.title = '整改';
state.isShowRectifyDialog = true;
const rectifyForm = JSON.parse(JSON.stringify(value));
diff --git a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/index.vue b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/index.vue
index abb1fef..ba8cd96 100644
--- a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/index.vue
+++ b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/index.vue
@@ -12,7 +12,12 @@
<span>整改部门：</span>
<el-cascader :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable filterable class="input-box" v-model="rectifyData.params.rectifyDepId"> </el-cascader>
</div>
-
+ <div class="basic-line">
+ <span>隐患状态：</span>
+ <el-select class="input-box" v-model="rectifyData.params.dangerStatus" placeholder="隐患状态" filterable clearable>
+ <el-option v-for="item in dangerStatusList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
+ </div>
<el-button size="default" type="primary" class="ml10" v-throttle @click="handleSearch">
<el-icon>
<ele-Search />
@@ -22,12 +27,12 @@
</div>
<el-table :data="rectifyData.data" style="width: 100%" fit highlight-current-row>
<el-table-column type="index" label="序号" width="60" />
+ <el-table-column prop="dangerCode" label="隐患名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="rectifyDesc" label="整改内容说明" show-overflow-tooltip></el-table-column>
<el-table-column prop="rectifyTime" label="整改期限" min-width="130px" show-overflow-tooltip>
<template #default="scope">
<span>{{ scope.row.rectifyTime }}</span>
- <span v-if="scope.row.dangerStatus === 2" class="overdue-img">逾期</span>
- <span v-if="scope.row.dangerStatus === 9" class="overdue-img">逾期</span>
+ <span v-if="scope.row.dangerStatus === 4" class="overdue-img">逾期</span>
</template>
</el-table-column>
<el-table-column prop="rectifyType" label=" 整改类型" show-overflow-tooltip>
diff --git a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/components/reportDialog.vue b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/components/reportDialog.vue
index 40b0a60..3cf8972 100644
--- a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/components/reportDialog.vue
+++ b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/components/reportDialog.vue
@@ -1,18 +1,18 @@
<template>
<div class="system-add-menu-container">
- <el-dialog :title="title" v-model="isShowReportDialog" width="50%">
+ <el-dialog :title="title" v-model="isShowReportDialog" width="50%" :close-on-click-modal="false">
<el-form :model="reportForm" :rules="reportFormRules" ref="reportFormRef" size="default" label-width="120px">
<el-tabs class="active" v-model="activeNameOne">
<el-tab-pane label="隐患信息" name="hiddenInfo">
<el-row :gutter="25">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
- <el-form-item label="隐患描述" prop="dangerDesc">
- <el-input class="input-add" :disabled="!disabled" v-model.trim="reportForm.dangerDesc" placeholder="请输入隐患情况描述" clearable></el-input>
+ <el-form-item label="隐患名称" prop="dangerCode">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="reportForm.dangerCode" placeholder="请输入隐患名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
- <el-form-item label="隐患名称" prop="dangerCode">
- <el-input class="input-add" :disabled="!disabled" v-model.trim="reportForm.dangerCode" placeholder="请输入隐患名称" clearable></el-input>
+ <el-form-item label="隐患描述" prop="dangerDesc">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="reportForm.dangerDesc" placeholder="请输入隐患情况描述" clearable></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
@@ -104,7 +104,7 @@
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="整改资金" prop="dangerResult">
- <el-input class="input-add" :disabled="!disabled" type="number" v-model="reportForm.cost" placeholder="请选择整改资金"> </el-input>
+ <el-input class="input-add" :disabled="!disabled" type="number" @input="onVerifyNumberPercentageFloat($event)" v-model="reportForm.cost" placeholder="请选择整改资金"> </el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
@@ -175,6 +175,7 @@
import { ElMessage } from 'element-plus';
import { hiddenReportApi } from '/@/api/doublePreventSystem/report';
import { getUserByDepartment } from '/@/assets/methods';
+import { verifyNumberIntegerAndFloat, verifyNumberPercentageFloat } from '../../../../../../utils/toolsValidate';
export default {
name: 'reportDialog',
setup(props: any, context: any) {
@@ -366,13 +367,18 @@
state.safetyRiskUnitData = state.allSafetyRiskUnitData.filter((item) => item.produceDeviceId === state.reportForm.produceDeviceId);
};
+ const onVerifyNumberPercentageFloat = (val: string) => {
+ state.reportForm.cost = JSON.parse(verifyNumberIntegerAndFloat(val));
+ };
+
return {
...toRefs(state),
changeUnit,
reportFormRef,
submitReport,
achieveUserList,
- openReportDialog
+ openReportDialog,
+ onVerifyNumberPercentageFloat
};
}
};
diff --git a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/index.vue b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/index.vue
index 37cb2c1..d958349 100644
--- a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/index.vue
+++ b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/index.vue
@@ -42,6 +42,8 @@
</div>
<el-table :data="reportData.data" style="width: 100%">
<el-table-column type="index" label="序号" width="60" />
+ <el-table-column prop="reportTime" label="上报时间" show-overflow-tooltip width="170px"></el-table-column>
+ <el-table-column prop="dangerCode" label="隐患名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="dangerDesc" label="隐患情况描述" show-overflow-tooltip></el-table-column>
<el-table-column prop="produceDeviceName" label="生产装置名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="riskUnitName" label="风险分析单元名称" show-overflow-tooltip></el-table-column>
diff --git a/src/views/doublePrevent/riskLevel/action/components/riskControlMeasureDialog.vue b/src/views/doublePrevent/riskLevel/action/components/riskControlMeasureDialog.vue
index ac7d844..f02b43d 100644
--- a/src/views/doublePrevent/riskLevel/action/components/riskControlMeasureDialog.vue
+++ b/src/views/doublePrevent/riskLevel/action/components/riskControlMeasureDialog.vue
@@ -1,54 +1,74 @@
<template>
<div class="system-add-menu-container">
- <el-dialog :title="title" v-model="isRiskControlMeasureDialog" width="600px">
+ <el-dialog :title="title" v-model="isRiskControlMeasureDialog" width="600px" :close-on-click-modal="false">
<el-form :model="riskControlMeasureForm" :rules="riskControlMeasureFormRules" ref="riskControlMeasureFormRef" size="default" label-width="160px">
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="风险事件名称" prop="riskEventId">
- <el-select class="input-length" :disabled="!disabled" v-model="riskControlMeasureForm.riskEventId" placeholder="请选择风险事件" clearable>
+ <el-select class="input-add" :disabled="!disabled" v-model="riskControlMeasureForm.riskEventId" placeholder="请选择风险事件" clearable>
<el-option v-for="item in allSafetyRiskEventData" :key="item.id" :label="item.riskEventName" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="风险措施编码" prop="controlMeasureCode">
- <el-input class="input-length" :disabled="!disabled" v-model.trim="riskControlMeasureForm.controlMeasureCode" placeholder="请输入风险措施编码"></el-input>
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="riskControlMeasureForm.controlMeasureCode" placeholder="请输入风险措施编码"></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="管控方式" prop="controlType">
- <el-select class="input-length" :disabled="!disabled" v-model="riskControlMeasureForm.controlType" placeholder="请选择管控方式" clearable>
+ <el-select class="input-add" :disabled="!disabled" v-model="riskControlMeasureForm.controlType" placeholder="请选择管控方式" clearable>
<el-option v-for="item in controlTypeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="管控内容" prop="checkContent">
- <el-input class="input-length" :disabled="!disabled" type="textarea" :rows="3" v-model.trim="riskControlMeasureForm.checkContent" placeholder="请输入管控内容" clearable> </el-input>
+ <el-input class="input-add" :disabled="!disabled" type="textarea" :rows="3" v-model.trim="riskControlMeasureForm.checkContent" placeholder="请输入管控内容" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="管控措施分类1" prop="classify1">
- <el-select class="input-length" :disabled="!disabled" v-model="riskControlMeasureForm.classify1" @change="changeClassifyTwoList" placeholder="请选择管控方式" clearable>
+ <el-select class="input-add" :disabled="!disabled" v-model="riskControlMeasureForm.classify1" @change="changeClassifyTwoList" placeholder="请选择管控方式" clearable>
<el-option v-for="item in classifyOneList" :key="item.id" :label="item.riskMeasureName" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="管控措施分类2" prop="classify2">
- <el-select class="input-length" :disabled="!disabled" v-model="riskControlMeasureForm.classify2" placeholder="请选择管控方式" clearable>
+ <el-select class="input-add" :disabled="!disabled" v-model="riskControlMeasureForm.classify2" placeholder="请选择管控方式" clearable>
<el-option v-for="item in classifyTwoList" :key="item.id" :label="item.riskMeasureName" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="管控措施分类3" prop="classify3">
- <el-input class="input-length" :disabled="!disabled" v-model.trim="riskControlMeasureForm.classify3" placeholder="请选择管控方式" clearable> </el-input>
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="riskControlMeasureForm.classify3" placeholder="请选择管控方式" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="措施说明" prop="measureDesc">
- <el-input class="input-length" :disabled="!disabled" type="textarea" :rows="3" v-model.trim="riskControlMeasureForm.measureDesc" placeholder="请输入措施说明" clearable> </el-input>
+ <el-input class="input-add" :disabled="!disabled" type="textarea" :rows="3" v-model.trim="riskControlMeasureForm.measureDesc" placeholder="请输入措施说明" clearable> </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="创建人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="riskControlMeasureForm.createByUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="创建时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="riskControlMeasureForm.gmtCreate" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="riskControlMeasureForm.lastEditUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="riskControlMeasureForm.gmtModitify" placeholder="请输入区域位置"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -67,6 +87,7 @@
interface stateType {
isRiskControlMeasureDialog: Boolean;
disabled: Boolean;
+ personTime: Boolean;
riskControlMeasureForm: {
riskEventId: number | null;
controlMeasureCode: string | null;
@@ -101,6 +122,7 @@
const state = reactive<stateType>({
title: '',
disabled: false,
+ personTime: false,
controlTypeList: [
{ id: 1, name: '自动化监控' },
{ id: 2, name: '隐患排查' }
@@ -144,6 +166,7 @@
});
if (type === '新增') {
state.disabled = true;
+ state.personTime = false;
state.title = '新增风险管控措施';
state.riskControlMeasureForm = {
riskEventId: null,
@@ -157,12 +180,14 @@
};
} else if (type === '查看') {
state.disabled = false;
+ state.personTime = true;
state.title = '修改风险管控措施';
state.riskControlMeasureForm.classify1 = JSON.parse(JSON.stringify(value)).classify1;
state.classifyTwoList = state.classifyTwoListAll.filter((item: any) => item.parentId === state.riskControlMeasureForm.classify1);
state.riskControlMeasureForm = JSON.parse(JSON.stringify(value));
} else {
state.disabled = true;
+ state.personTime = false;
state.title = '修改风险管控措施';
state.riskControlMeasureForm.classify1 = JSON.parse(JSON.stringify(value)).classify1;
state.classifyTwoList = state.classifyTwoListAll.filter((item: any) => item.parentId === state.riskControlMeasureForm.classify1);
diff --git a/src/views/doublePrevent/riskLevel/device/components/productionDeviceDialog.vue b/src/views/doublePrevent/riskLevel/device/components/productionDeviceDialog.vue
index cb1c0a9..497363d 100644
--- a/src/views/doublePrevent/riskLevel/device/components/productionDeviceDialog.vue
+++ b/src/views/doublePrevent/riskLevel/device/components/productionDeviceDialog.vue
@@ -5,25 +5,45 @@
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="生产装置名称" prop="produceDeviceName">
- <el-input class="input-length" :disabled="!disabled" v-model.trim="productionDeviceForm.produceDeviceName" placeholder="请输入生产装置名称" clearable></el-input>
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="productionDeviceForm.produceDeviceName" placeholder="请输入生产装置名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="所属部门" prop="depId">
- <el-cascader :options="departmentList" :disabled="!disabled" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable filterable style="width: 85%" v-model="productionDeviceForm.depId"> </el-cascader>
+ <el-cascader :options="departmentList" :disabled="!disabled" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable filterable style="width: 90%" v-model="productionDeviceForm.depId"> </el-cascader>
<!-- <el-select class="input-length" v-model="productionDeviceForm.depName" placeholder="请选择所属部门" clearable filterable></el-select>-->
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="风险等级" prop="riskLevel">
- <el-select class="input-length" :disabled="!disabled" v-model="productionDeviceForm.riskLevel" placeholder="请选择风险等级" clearable filterable>
+ <el-select class="input-add" :disabled="!disabled" v-model="productionDeviceForm.riskLevel" placeholder="请选择风险等级" clearable filterable>
<el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="区域位置" prop="location">
- <el-input class="input-length" :disabled="!disabled" v-model.trim="productionDeviceForm.location" type="textarea" placeholder="请输入区域位置" maxlength="150"></el-input>
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="productionDeviceForm.location" type="textarea" placeholder="请输入区域位置" maxlength="150"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="创建人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="productionDeviceForm.createByUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="创建时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="productionDeviceForm.gmtCreate" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="productionDeviceForm.lastEditUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="productionDeviceForm.gmtModitify" placeholder="请输入区域位置"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -42,6 +62,7 @@
interface stateType {
isShowProductionDeviceDialog: Boolean;
disabled: Boolean;
+ personTime: Boolean;
productionDeviceForm: {
produceDeviceName: string;
depId: number | null;
@@ -64,6 +85,7 @@
const state = reactive<stateType>({
title: '',
disabled: false,
+ personTime: false,
departmentList: [],
isShowProductionDeviceDialog: false,
levelList: [
@@ -95,6 +117,7 @@
});
if (type === '新增') {
state.disabled = true;
+ state.personTime = false;
state.title = '新增生产装置';
state.productionDeviceForm = {
produceDeviceName: '',
@@ -104,10 +127,12 @@
};
} else if (type === '查看') {
state.disabled = false;
+ state.personTime = true;
state.title = '查看生产装置';
state.productionDeviceForm = JSON.parse(JSON.stringify(value));
} else {
state.disabled = true;
+ state.personTime = false;
state.title = '修改生产装置';
state.productionDeviceForm = JSON.parse(JSON.stringify(value));
}
@@ -169,8 +194,4 @@
};
</script>
-<style scoped>
-.input-length {
- width: 85%;
-}
-</style>
+<style scoped></style>
diff --git a/src/views/doublePrevent/riskLevel/event/components/safetyRiskEventDialog.vue b/src/views/doublePrevent/riskLevel/event/components/safetyRiskEventDialog.vue
index 2eea0e1..48314ea 100644
--- a/src/views/doublePrevent/riskLevel/event/components/safetyRiskEventDialog.vue
+++ b/src/views/doublePrevent/riskLevel/event/components/safetyRiskEventDialog.vue
@@ -5,14 +5,39 @@
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="安全风险分析单元名称" prop="riskUnitId">
- <el-select class="input-length" :disabled="!disabled" v-model="safetyRiskEventForm.riskUnitId" placeholder="请输入安全风险分析单元名称">
+ <el-select class="input-add" :disabled="!disabled" v-model="safetyRiskEventForm.riskUnitId" placeholder="请输入安全风险分析单元名称">
<el-option v-for="item in allSafetyRiskEventData" :key="item.id" :label="item.riskUnitName" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="安全风险事件名称" prop="riskEventName">
- <el-input class="input-length" :disabled="!disabled" v-model.trim="safetyRiskEventForm.riskEventName" placeholder="请输入请输入安全风险事件名称" clearable></el-input>
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskEventForm.riskEventName" placeholder="请输入请输入安全风险事件名称" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+ <el-form-item label="可能造成得后果" prop="eventResult">
+ <el-input class="input-add" type="textarea" :rows="2" :disabled="!disabled" v-model.trim="safetyRiskEventForm.eventResult" placeholder="请输入请输入安全风险事件名称" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="创建人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskEventForm.createByUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="创建时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskEventForm.gmtCreate" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskEventForm.lastEditUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskEventForm.gmtModitify" placeholder="请输入区域位置"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -31,8 +56,10 @@
interface stateType {
isSafetyRiskEventDialog: Boolean;
disabled: Boolean;
+ personTime: Boolean;
safetyRiskEventForm: {
riskEventName: string | null;
+ eventResult: string | null;
riskUnitId: number | null;
};
title: string;
@@ -50,16 +77,19 @@
const state = reactive<stateType>({
title: '',
disabled: false,
+ personTime: false,
departmentList: [],
allSafetyRiskEventData: [],
isSafetyRiskEventDialog: false,
safetyRiskEventForm: {
riskEventName: null,
+ eventResult: null,
riskUnitId: null
},
safetyRiskEventFormRules: {
riskEventName: [{ required: true, message: '请填写安全风险分析对象编码', trigger: 'blur' }],
- riskUnitId: [{ required: true, message: '请填写安全风险分析单元名称', trigger: 'blur' }]
+ eventResult: [{ required: true, message: '请填写可能造成的后果', trigger: 'blur' }],
+ riskUnitId: [{ required: true, message: '请选择安全风险分析单元名称', trigger: 'change' }]
}
});
@@ -72,6 +102,7 @@
});
if (type === '新增') {
state.disabled = true;
+ state.personTime = false;
state.title = '新增风险事件';
state.safetyRiskEventForm = {
riskEventName: null,
@@ -79,10 +110,12 @@
};
} else if (type === '查看') {
state.disabled = false;
+ state.personTime = true;
state.title = '查看风险事件';
state.safetyRiskEventForm = JSON.parse(JSON.stringify(value));
} else {
state.disabled = true;
+ state.personTime = false;
state.title = '修改风险事件';
state.safetyRiskEventForm = JSON.parse(JSON.stringify(value));
}
diff --git a/src/views/doublePrevent/riskLevel/event/index.vue b/src/views/doublePrevent/riskLevel/event/index.vue
index cf18a4f..65cf780 100644
--- a/src/views/doublePrevent/riskLevel/event/index.vue
+++ b/src/views/doublePrevent/riskLevel/event/index.vue
@@ -4,7 +4,7 @@
<div class="system-user-search mb15">
<div class="basic-line">
<span>安全风险单元名称：</span>
- <el-select v-model="safetyRiskEventData.params.riskUnitId" class="input-box" placeholder="安全风险单元名称">
+ <el-select v-model="safetyRiskEventData.params.riskUnitId" class="input-box" placeholder="安全风险单元名称" clearable filterable>
<el-option v-for="item in allSafetyRiskEventData" :key="item.id" :label="item.riskUnitName" :value="item.id"></el-option>
</el-select>
</div>
@@ -27,6 +27,7 @@
<el-table-column type="index" label="序号" width="60" />
<el-table-column prop="riskUnitName" label="安全风险分析单元名称" width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="riskEventName" label="安全风险事件名称" width="180" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="eventResult" label="可能造成的后果" width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="createByUserName" label="创建人" show-overflow-tooltip></el-table-column>
<el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
<el-table-column prop="lastEditUserName" label="最后修改人" show-overflow-tooltip></el-table-column>
diff --git a/src/views/doublePrevent/riskLevel/riskCheckUnit/components/checkUnitDialog.vue b/src/views/doublePrevent/riskLevel/riskCheckUnit/components/checkUnitDialog.vue
index b1e6ca0..0a8d4f0 100644
--- a/src/views/doublePrevent/riskLevel/riskCheckUnit/components/checkUnitDialog.vue
+++ b/src/views/doublePrevent/riskLevel/riskCheckUnit/components/checkUnitDialog.vue
@@ -7,12 +7,32 @@
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="任务单元名称" prop="taskUnitName">
- <el-input class="input-length" :disabled="!disabled" v-model.trim="checkUnitForm.taskUnitName" placeholder="请输入任务单元名称" clearable></el-input>
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="checkUnitForm.taskUnitName" placeholder="请输入任务单元名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="任务单元说明" prop="note">
- <el-input class="input-length" :disabled="!disabled" v-model.trim="checkUnitForm.note" placeholder="请输入任务单元说明" clearable></el-input>
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="checkUnitForm.note" placeholder="请输入任务单元说明" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20" v-show="personTime">
+ <el-form-item label="创建人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="checkUnitForm.createByUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20" v-show="personTime">
+ <el-form-item label="创建时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="checkUnitForm.gmtCreate" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="checkUnitForm.lastEditUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="checkUnitForm.gmtModitify" placeholder="请输入区域位置"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -65,6 +85,7 @@
interface stateType {
isShowCheckUnitDialog: Boolean;
disabled: Boolean;
+ personTime: Boolean;
isShowSelectMeasureControlDialog: Boolean;
checkUnitForm: {
taskUnitName: string | null;
@@ -87,6 +108,7 @@
const state = reactive<stateType>({
title: '',
disabled: false,
+ personTime: false,
activeName: 'checkUnit',
measureData: [],
checkUnitData: [],
@@ -111,6 +133,7 @@
});
if (type === '新增') {
state.disabled = true;
+ state.personTime = false;
state.title = '新增隐患排查单元';
state.measureData = [];
state.checkUnitForm = {
@@ -120,11 +143,13 @@
};
} else if (type === '查看') {
state.disabled = false;
+ state.personTime = true;
state.title = '查看隐患排查单元';
state.checkUnitForm = JSON.parse(JSON.stringify(value));
state.measureData = state.checkUnitForm.measureList;
} else {
state.disabled = true;
+ state.personTime = false;
state.title = '修改隐患排查单元';
state.checkUnitForm = JSON.parse(JSON.stringify(value));
state.measureData = state.checkUnitForm.measureList;
diff --git a/src/views/doublePrevent/riskLevel/riskCheckUnit/index.vue b/src/views/doublePrevent/riskLevel/riskCheckUnit/index.vue
index 385a1da..ad9a72f 100644
--- a/src/views/doublePrevent/riskLevel/riskCheckUnit/index.vue
+++ b/src/views/doublePrevent/riskLevel/riskCheckUnit/index.vue
@@ -12,6 +12,10 @@
<!-- <span>部门：</span>-->
<!-- <el-cascader :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable filterable class="input-box" v-model="checkUnitData.params.depId"> </el-cascader>-->
<!-- </div>-->
+ <div class="basic-line">
+ <span>任务单元名称：</span>
+ <el-input class="input-box" v-model="checkUnitData.params.taskUnitName" placeholder="任务单元名称" clearable> </el-input>
+ </div>
<el-button size="default" type="primary" class="ml10" v-throttle @click="handleSearch">
<el-icon>
<ele-Search />
@@ -74,7 +78,7 @@
params: {
pageIndex: number;
pageSize: number;
- taskUnitId: number | null;
+ taskUnitName: number | null;
};
};
}
diff --git a/src/views/doublePrevent/riskLevel/unit/components/safetyRiskAnalyseUnitDialog.vue b/src/views/doublePrevent/riskLevel/unit/components/safetyRiskAnalyseUnitDialog.vue
index 28bf661..4723b27 100644
--- a/src/views/doublePrevent/riskLevel/unit/components/safetyRiskAnalyseUnitDialog.vue
+++ b/src/views/doublePrevent/riskLevel/unit/components/safetyRiskAnalyseUnitDialog.vue
@@ -4,32 +4,52 @@
<el-form :model="safetyRiskAnalyseUnitForm" :rules="safetyRiskAnalyseUnitFormRules" ref="safetyRiskAnalyseUnitFormRef" size="default" label-width="180px">
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
- <el-form-item label="安全风险分析对象编码" prop="riskCode">
- <el-input class="input-length" :disabled="!disabled" v-model.trim="safetyRiskAnalyseUnitForm.riskCode" placeholder="请输入安全风险分析对象编码"></el-input>
+ <el-form-item label="安全风险分析单元名称" prop="riskUnitName">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskAnalyseUnitForm.riskUnitName" placeholder="请输入安全风险分析单元名称"></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
- <el-form-item label="安全风险分析单元名称" prop="riskUnitName">
- <el-input class="input-length" :disabled="!disabled" v-model.trim="safetyRiskAnalyseUnitForm.riskUnitName" placeholder="请输入安全风险分析单元名称"></el-input>
+ <el-form-item label="安全风险分析对象编码" prop="riskCode">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskAnalyseUnitForm.riskCode" placeholder="请输入安全风险分析对象编码"></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="生产装置名称" prop="produceDeviceId">
- <el-select class="input-length" :disabled="!disabled" v-model="safetyRiskAnalyseUnitForm.produceDeviceId" placeholder="请输入生产装置名称" clearable>
+ <el-select class="input-add" :disabled="!disabled" v-model="safetyRiskAnalyseUnitForm.produceDeviceId" placeholder="请输入生产装置名称" clearable>
<el-option v-for="item in allProduceDeviceData" :key="item.id" :label="item.produceDeviceName" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="责任部门" prop="liableDepId">
- <el-cascader @change="achieveUserList" :disabled="!disabled" :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable filterable style="width: 85%" v-model="safetyRiskAnalyseUnitForm.liableDepId"> </el-cascader>
+ <el-cascader class="input-add" @change="achieveUserList" :disabled="!disabled" :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable filterable style="width: 85%" v-model="safetyRiskAnalyseUnitForm.liableDepId"> </el-cascader>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="责任人" prop="liablePersonId">
- <el-select class="input-length" :disabled="!disabled" v-model="safetyRiskAnalyseUnitForm.liablePersonId" placeholder="请选择责任人" clearable filterable>
+ <el-select class="input-add" :disabled="!disabled" v-model="safetyRiskAnalyseUnitForm.liablePersonId" placeholder="请选择责任人" clearable filterable>
<el-option v-for="item in userList" :key="item.uid" :label="item.realName" :value="item.uid"></el-option>
</el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="创建人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskAnalyseUnitForm.createByUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="创建时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskAnalyseUnitForm.gmtCreate" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskAnalyseUnitForm.lastEditUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskAnalyseUnitForm.gmtModitify" placeholder="请输入区域位置"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -48,6 +68,7 @@
interface stateType {
isSafetyRiskAnalyseUnitDialog: Boolean;
disabled: Boolean;
+ personTime: Boolean;
safetyRiskAnalyseUnitForm: {
riskCode: string | null;
riskUnitName: string | null;
@@ -73,6 +94,7 @@
const state = reactive<stateType>({
title: '',
disabled: false,
+ personTime: false,
userList: [],
departmentList: [],
allProduceDeviceData: [],
@@ -104,6 +126,7 @@
});
if (type === '新增') {
state.disabled = true;
+ state.personTime = false;
state.title = '新增风险分析单元';
state.safetyRiskAnalyseUnitForm = {
riskCode: null,
@@ -114,10 +137,12 @@
};
} else if (type === '查看') {
state.disabled = false;
+ state.personTime = true;
state.title = '查看风险分析单元';
state.safetyRiskAnalyseUnitForm = JSON.parse(JSON.stringify(value));
} else {
state.disabled = true;
+ state.personTime = false;
state.title = '修改风险分析单元';
state.safetyRiskAnalyseUnitForm = JSON.parse(JSON.stringify(value));
}
@@ -199,8 +224,4 @@
};
</script>
-<style scoped>
-.input-length {
- width: 85%;
-}
-</style>
+<style scoped></style>
diff --git a/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue b/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue
index 6316678..4540a29 100644
--- a/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue
+++ b/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue
@@ -80,12 +80,12 @@
const submitRFID = async () => {
RFIDFormRef.value.validate(async (valid: Boolean) => {
if (valid) {
- if (state.title === '新增巡检指标') {
+ if (state.title === '新增RFID') {
let res = await RFIDApi().addRFID(state.RFIDForm);
if (res.data.code === '200') {
ElMessage({
type: 'success',
- message: '巡检指标新增成功',
+ message: 'RFID新增成功',
duration: 2000
});
state.isShowRFIDDialog = false;
@@ -101,7 +101,7 @@
if (res.data.code === '200') {
ElMessage({
type: 'success',
- message: '巡检指标修改成功',
+ message: 'RFID修改成功',
duration: 2000
});
state.isShowRFIDDialog = false;
diff --git a/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue b/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue
index e61d78d..9b406f7 100644
--- a/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue
+++ b/src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue
@@ -247,6 +247,10 @@
giveClassGroup();
data.inspectTaskForm = JSON.parse(JSON.stringify(res.data.data));
} else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
}
})
.catch((error) => {});
diff --git a/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue b/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
index 8d6e281..3de28ea 100644
--- a/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
+++ b/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
@@ -394,7 +394,6 @@
};
const showInspectTaskDialog = (type: string, value: { id: number; uuid: string }, workTypeList: [], department: [], timeType: [], classGroupList: [], quotaList: [], inspectPointAllList: [], regionNameList: [], RFIDList: []) => {
- debugger;
data.regionNameList = regionNameList;
data.RFIDList = RFIDList;
data.quotaList = JSON.parse(JSON.stringify(quotaList));
@@ -435,6 +434,10 @@
giveClassGroup();
data.inspectTaskForm = JSON.parse(JSON.stringify(res.data.data));
} else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
}
})
.catch((error) => {});
@@ -447,6 +450,10 @@
if (res.data.code === '200') {
data.inspectTaskForm = JSON.parse(JSON.stringify(res.data.data));
} else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
}
})
.catch((error) => {});
diff --git a/src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue b/src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue
index 9dc80c7..b8603f1 100644
--- a/src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue
+++ b/src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue
@@ -85,7 +85,7 @@
<template #default="scope">
<el-button link type="primary" size="small" :icon="View" @click="openInspectTaskDialog('查看', scope.row)">查看</el-button>
<el-button link type="primary" size="small" :icon="Edit" @click="openInspectTaskDialog('修改', scope.row)">修改</el-button>
- <el-button link type="danger" size="small" :icon="Delete" @click="deleteInspectTask(scope.$index)">删除</el-button>
+ <el-button link type="danger" size="small" :icon="Delete" v-if="scope.row.taskUnitStatus === 2" @click="deleteInspectTask(scope.row)">删除</el-button>
<div @click="changeStatus(scope.row)">
<el-switch v-model="scope.row.taskUnitStatus" inline-prompt active-text="开" inactive-text="关" :active-value="1" :inactive-value="2" style="margin: 0 10px" />
</div>
@@ -295,6 +295,7 @@
.then(async () => {
let res = await inspectTaskApi().openOrCloseInspectTask({ id: value.id, taskUnitStatus: 2 });
if (res.data.code === '200') {
+ await getInspectionTask();
ElMessage({
type: 'success',
duration: 2000,
@@ -307,9 +308,7 @@
});
}
})
- .catch((error) => {
- debugger;
- });
+ .catch((error) => {});
} else {
ElMessageBox.confirm(`此操作将开启该巡检任务”，是否继续?`, '提示', {
confirmButtonText: '确认',
@@ -319,6 +318,7 @@
.then(async () => {
let res = await inspectTaskApi().openOrCloseInspectTask({ id: value.id, taskUnitStatus: 1 });
if (res.data.code === '200') {
+ await getInspectionTask();
ElMessage({
type: 'success',
duration: 2000,
@@ -334,6 +334,32 @@
.catch((error) => {});
}
await getInspectionTask();
+ };
+
+ // 删除
+ const deleteInspectTask = (row: any) => {
+ ElMessageBox.confirm(`此操作将永久删除该任务：“${row.unitName}”，是否继续?`, '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(async () => {
+ let res = await inspectTaskApi().deleteInspectTask({ id: row.id });
+ if (res.data.code === '200') {
+ ElMessage({
+ type: 'success',
+ duration: 2000,
+ message: '删除成功'
+ });
+ await getInspectionTask();
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ })
+ .catch(() => {});
};
const openInspectTaskDialog = (type: string, value: {}) => {
@@ -394,6 +420,7 @@
reset,
changeStatus,
parseNumber,
+ deleteInspectTask,
getInspectionTask,
onHandleSizeChange,
onHandleCurrentChange,
diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue
index 16fc3be..56443be 100644
--- a/src/views/system/department/index.vue
+++ b/src/views/system/department/index.vue
@@ -2,7 +2,7 @@
<div class="system-dept-container">
<el-card shadow="hover">
<div class="system-dept-search mb15">
- <el-input size="default" placeholder="请输入部门名称" style="max-width: 180px"> </el-input>
+ <!-- <el-input size="default" placeholder="请输入部门名称" style="max-width: 180px"> </el-input>-->
<el-button size="default" type="primary" class="ml10">
<el-icon>
<ele-Search />
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index e1af698..ae6ae53 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -2,7 +2,7 @@
<div class="system-role-container">
<el-card shadow="hover">
<div class="system-user-search mb15">
- <el-input size="default" placeholder="请输入角色名称" style="max-width: 180px"> </el-input>
+ <!-- <el-input size="default" placeholder="请输入角色名称" style="max-width: 180px"> </el-input>-->
<el-button size="default" type="primary" class="ml10" @click="handleSearch">
<el-icon>
<ele-Search />
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index abd65ec..2072e9e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -2,8 +2,9 @@
<div class="system-user-container">
<el-card shadow="hover">
<div class="system-user-search mb15">
- <el-input size="default" placeholder="请输入用户名称" style="max-width: 180px"> </el-input>
- <el-button size="default" type="primary" class="ml10">
+ <el-input size="default" v-model="userTableData.listQuery.searchParams.username" placeholder="请输入用户名称" style="max-width: 180px"> </el-input>
+ <el-input size="default" v-model="userTableData.listQuery.searchParams.realName" placeholder="请输入真实姓名" style="max-width: 180px; margin-left: 10px"> </el-input>
+ <el-button size="default" type="primary" class="ml10" @click="initUserTableData">
<el-icon>
<ele-Search />
</el-icon>
@@ -79,8 +80,8 @@
loading: boolean;
listQuery: {
searchParams: {
- username: string;
- realName: string;
+ username: string | null;
+ realName: string | null;
};
pageIndex: number;
pageSize: number;
@@ -102,8 +103,8 @@
loading: false,
listQuery: {
searchParams: {
- username: '',
- realName: ''
+ username: null,
+ realName: null
},
pageIndex: 1,
pageSize: 10
--
Gitblit v1.9.2