From 6e1be6afed910d217199278bb3f89d8922dfc5af Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 03 八月 2022 19:17:56 +0800
Subject: [PATCH] 双重预防系统
---
src/views/doublePrevent/riskLevel/event/components/safetyRiskEventDialog.vue | 2
src/api/doublePreventSystem/record/index.ts | 5
src/views/intellectInspect/inspectBasic/facility/components/facilityAreaDialog.vue | 23 ---
src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue | 2
src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/components/rectifyDialog.vue | 4
src/views/doublePrevent/riskLevel/event/index.vue | 2
src/api/doublePreventSystem/work/index.ts | 2
src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/index.vue | 67 ++++++++++-
src/views/doublePrevent/riskLevel/action/components/riskControlMeasureDialog.vue | 4
src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/components/workDialog.vue | 37 ++----
src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/components/checkDialog.vue | 2
src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/components/recordDialog.vue | 2
src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/components/reportDialog.vue | 2
src/utils/request.ts | 12 -
src/views/intellectInspect/inspectBasic/inspectPoint/components/inspectPointDialog.vue | 2
src/views/system/user/component/userDialog.vue | 2
src/views/intellectInspect/inspectBasic/inspectTarget/components/inspectTargetDialog.vue | 23 ---
src/views/doublePrevent/riskLevel/map/components/rectifyDialog.vue | 2
src/views/doublePrevent/riskLevel/riskCheckUnit/index.vue | 20 +-
.env.development | 4
src/views/doublePrevent/riskLevel/unit/components/safetyRiskAnalyseUnitDialog.vue | 2
src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/index.vue | 81 ++++++++++++-
src/views/doublePrevent/riskLevel/device/components/productionDeviceDialog.vue | 2
src/views/doublePrevent/riskLevel/device/index.vue | 6
src/App.vue | 28 ++--
src/views/doublePrevent/riskLevel/riskCheckUnit/components/checkUnitDialog.vue | 5
26 files changed, 210 insertions(+), 133 deletions(-)
diff --git a/.env.development b/.env.development
index c21398b..b1428e8 100644
--- a/.env.development
+++ b/.env.development
@@ -2,6 +2,6 @@
ENV = 'development'
# 本地环境接口地址
-VITE_API_URL = 'http://192.168.0.35:8008'
+#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.69:8008'
+VITE_API_URL = 'http://192.168.0.69:8008'
diff --git a/src/App.vue b/src/App.vue
index 5e39821..c7c8d13 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,20 +4,20 @@
<!-- <router-view v-if="!$route.meta.iskeepAlive" :key="$route.id"></router-view>-->
<!-- </keep-alive>-->
<!-- </transition>-->
- <router-view v-if="!$route.meta.iskeepAlive" v-slot="{ Component }">
- <transition name="fade" mode="in-out">
- <keep-alive :exclude="excludeList" :include="includeList">
- <component :is="Component" :key="$route.id"></component>
- </keep-alive>
- </transition>
- </router-view>
- <!-- <el-config-provider :size="getGlobalComponentSize" :locale="i18nLocale">-->
- <!-- <router-view v-show="themeConfig.lockScreenTime > 1" />-->
- <!-- <router-view v-show="themeConfig.lockScreenTime > 1" />-->
- <!-- <LockScreen v-if="themeConfig.isLockScreen" />-->
- <!-- <Setings ref="setingsRef" v-show="themeConfig.lockScreenTime > 1" />-->
- <!-- <CloseFull v-if="!themeConfig.isLockScreen" />-->
- <!-- </el-config-provider>-->
+ <!-- <router-view v-if="!$route.meta.iskeepAlive" v-slot="{ Component }">-->
+ <!-- <transition name="fade" mode="in-out">-->
+ <!-- <keep-alive :exclude="excludeList" :include="includeList">-->
+ <!-- <component :is="Component" :key="$route.id"></component>-->
+ <!-- </keep-alive>-->
+ <!-- </transition>-->
+ <!-- </router-view>-->
+ <el-config-provider :size="getGlobalComponentSize" :locale="i18nLocale">
+ <router-view v-show="themeConfig.lockScreenTime > 1" />
+ <router-view v-show="themeConfig.lockScreenTime > 1" />
+ <LockScreen v-if="themeConfig.isLockScreen" />
+ <Setings ref="setingsRef" v-show="themeConfig.lockScreenTime > 1" />
+ <CloseFull v-if="!themeConfig.isLockScreen" />
+ </el-config-provider>
</template>
<script lang="ts">
diff --git a/src/api/doublePreventSystem/record/index.ts b/src/api/doublePreventSystem/record/index.ts
index 551ffce..2ee8ad4 100644
--- a/src/api/doublePreventSystem/record/index.ts
+++ b/src/api/doublePreventSystem/record/index.ts
@@ -20,10 +20,9 @@
});
},
- // v1
- deleteRecord: (data: object) => {
+ getTask: (data: object) => {
return request({
- url: `/prevent/checkWork/delete/deleteCheckWork`,
+ url: `/prevent/checkTask/update/taskToUser`,
method: 'post',
data: data
});
diff --git a/src/api/doublePreventSystem/work/index.ts b/src/api/doublePreventSystem/work/index.ts
index 73968ce..71a64bd 100644
--- a/src/api/doublePreventSystem/work/index.ts
+++ b/src/api/doublePreventSystem/work/index.ts
@@ -21,7 +21,7 @@
// v1
modWork: (data: object) => {
return request({
- url: `/prevent/checkTask/update/updateCheckWork`,
+ url: `/prevent/checkWork/update/updateCheckWork`,
method: 'post',
data: data
});
diff --git a/src/utils/request.ts b/src/utils/request.ts
index cde3406..f373abb 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -51,16 +51,12 @@
// 对响应数据做点什么
if (response.data.code && response.data.code === 'A0213') {
ElMessage.error('用户uid不存在');
- setTimeout(() => {
- Session.clear();
- window.location.href = '/';
- }, 2000);
+ Session.clear();
+ window.location.href = '/';
} else if (response.data.code && response.data.code === 'A0215') {
ElMessage.error('token失效');
- setTimeout(() => {
- Session.clear();
- window.location.href = '/';
- }, 2000);
+ Session.clear();
+ window.location.href = '/';
}
// if(response.data.code && response.data.code !== '200'){
return Promise.resolve(response);
diff --git a/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/components/recordDialog.vue b/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/components/recordDialog.vue
index 3da2391..90cfdaa 100644
--- a/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/components/recordDialog.vue
+++ b/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/components/recordDialog.vue
@@ -28,7 +28,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="isShowSubmitDialog = !isShowSubmitDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitRecord" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitRecord" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
diff --git a/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/index.vue b/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/index.vue
index fc59c00..916b8c0 100644
--- a/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/index.vue
+++ b/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkTask/index.vue
@@ -34,6 +34,13 @@
<el-table :data="scope.row.checkContent" style="width: 100%">
<el-table-column label="序号" type="index" width="150" align="center"> </el-table-column>
<el-table-column label="检查内容" prop="checkContent" align="center"> </el-table-column>
+ <el-table-column label="检查结果" prop="checkResult" align="center">
+ <template #default="scope">
+ <el-tag :type="scope.row.checkResult === 1 ? 'success' : scope.row.checkResult === 2 ? 'danger' : 'info'">
+ {{ parseNumber(scope.row.checkResult, '检查结果') }}
+ </el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
<template #default="scope">
<el-button size="small" text type="primary" :icon="View" @click="onOpenDialogRef('查看', scope.row)">查看</el-button>
@@ -45,15 +52,30 @@
</el-table-column>
<el-table-column type="index" label="序号" width="60" />
<el-table-column prop="taskCode" label="排查名称" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="execDepId" label="执行部门" show-overflow-tooltip>
+ <template #default="scope">
+ {{ parseNumber(scope.row.execDepId, '执行部门') }}
+ </template>
+ </el-table-column>
<el-table-column prop="taskStatus" label="状态" show-overflow-tooltip>
<template #default="scope">
{{ parseNumber(scope.row.taskStatus, '状态') }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="taskBelong" label="是否认领" show-overflow-tooltip>
+ <template #default="scope">
+ {{ parseNumber(scope.row.taskBelong, '认领状态') }}
</template>
</el-table-column>
<el-table-column prop="createUserName" 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>
<el-table-column prop="gmtModitify" label="最后修改时间" show-overflow-tooltip></el-table-column>
+ <el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
+ <template #default="scope">
+ <el-button size="small" text type="primary" v-show="scope.row.taskStatus === 1 || scope.row.taskStatus === 4" :icon="Check" @click="onHandleTask(scope.row)">任务认领</el-button>
+ </template>
+ </el-table-column>
</el-table>
<br />
<el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" :pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="recordData.params.pageIndex" background v-model:page-size="recordData.params.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="recordData.total" class="page-position"> </el-pagination>
@@ -97,7 +119,9 @@
};
taskUnitList: [];
departmentList: Array<DepartmentState>;
+ departmentRecursionList: Array<DepartmentState>;
resultList: Array<levelListState>;
+ checkResultList: Array<levelListState>;
taskStatusList: Array<levelListState>;
taskTypeList: Array<levelListState>;
}
@@ -105,7 +129,10 @@
id: number;
name: string;
}
-interface DepartmentState {}
+interface DepartmentState {
+ depId: number;
+ depName: string;
+}
export default defineComponent({
name: 'record',
@@ -127,11 +154,17 @@
},
taskUnitList: [],
departmentList: [],
+ departmentRecursionList: [],
resultList: [
{ id: 1, name: '正常' },
{ id: 2, name: '存在隐患' },
{ id: 3, name: '未排查' },
{ id: 4, name: '其他' }
+ ],
+ checkResultList: [
+ { id: 1, name: '正常' },
+ { id: 2, name: '异常' },
+ { id: 3, name: '未处理' }
],
taskStatusList: [
{ id: 1, name: '待排查' },
@@ -163,6 +196,7 @@
let res = await departmentApi().getDepartmentList();
if (res.data.code === '200') {
state.departmentList = res.data.data;
+ recursion(state.departmentList);
} else {
ElMessage({
type: 'warning',
@@ -188,19 +222,19 @@
recordDialogRef.value.openRecordDialog(type, value);
};
// 删除角色
- const onDelRecord = (row: any) => {
- ElMessageBox.confirm(`此操作将永久删除该条生产装置：“${row.produceDeviceName}”，是否继续?`, '提示', {
+ const onHandleTask = (row: any) => {
+ ElMessageBox.confirm(`此操作将认领该任务：“${row.taskCode}”，是否继续?`, '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning'
})
.then(async () => {
- let res = await recordApi().deleterecord({ id: row.id });
+ let res = await recordApi().getTask({ id: row.id });
if (res.data.code === '200') {
ElMessage({
type: 'success',
duration: 2000,
- message: '删除成功'
+ message: '认领成功'
});
await initRecordTableData();
} else {
@@ -227,9 +261,30 @@
initRecordTableData();
};
+ const recursion = (value: any) => {
+ for (let i of value) {
+ if (i.children.length !== 0) {
+ state.departmentRecursionList.push(i);
+ recursion(i.children);
+ } else {
+ state.departmentRecursionList.push(i);
+ }
+ }
+ };
+
const parseNumber = (value: string | number, type: string) => {
if (type === '状态') {
return state.taskStatusList.find((item) => item.id === value)?.name;
+ } else if (type === '执行部门') {
+ return state.departmentRecursionList.find((item) => item.depId === value)?.depName;
+ } else if (type === '检查结果') {
+ return state.checkResultList.find((item) => item.id === value)?.name;
+ } else {
+ if (value === 1) {
+ return '未认领';
+ } else {
+ return '已认领';
+ }
}
};
@@ -247,7 +302,7 @@
handleSearch,
onOpenDialogRef,
onHandleSizeChange,
- onDelRecord,
+ onHandleTask,
onHandleCurrentChange,
recordDialog,
recordDialogRef,
diff --git a/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/components/workDialog.vue b/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/components/workDialog.vue
index 5cff750..e187100 100644
--- a/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/components/workDialog.vue
+++ b/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/components/workDialog.vue
@@ -14,18 +14,7 @@
<el-input class="input-add" v-model.trim="workForm.checkWorkName" 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="depId">
- <el-cascader @change="achieveUserList" :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable filterable class="input-add" v-model="workForm.depId"> </el-cascader>
- </el-form-item>
- </el-col>
- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
- <el-form-item label="执行人" prop="execUserId">
- <el-select class="input-add" v-model="workForm.execUserId" placeholder="请输入执行人" clearable filterable>
- <el-option v-for="item in userList" :key="item.uid" :label="item.username" :value="item.uid"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
+
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="排查周期" prop="checkCycle">
<el-input class="input-add" type="number" v-model.trim="workForm.checkCycle" placeholder="请输入排查周期" clearable></el-input>
@@ -63,6 +52,11 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
+ <el-form-item label="执行部门" prop="execDepId">
+ <el-cascader @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-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
<el-form-item label="任务单元" prop="taskUnitId">
<el-select class="input-add" v-model="workForm.taskUnitId" placeholder="请输入任务单元" clearable filterable>
<el-option v-for="item in taskUnitList" :key="item.id" :label="item.taskUnitName" :value="item.id"></el-option>
@@ -81,7 +75,7 @@
<template #footer>
<span class="dialog-footer" v-show="disabled">
<el-button @click="isShowWorkDialog = !isShowWorkDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitWork" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitWork" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
@@ -98,14 +92,13 @@
checkWorkType: number | null;
checkWorkName: string | null;
taskUnitId: number | null;
- execUserId: number | null;
+ execDepId: number | null;
checkCycle: number | null;
checkCycleUnit: number | null;
validTime: number | null;
validTimeUnit: number | null;
noticeTime: number | null;
noticeTimeUnit: number | null;
- depId: number | null;
firstStartTime: string | null;
};
title: string;
@@ -148,15 +141,14 @@
checkWorkType: null,
checkWorkName: null,
taskUnitId: null,
- execUserId: null,
+ execDepId: null,
checkCycle: null,
checkCycleUnit: null,
validTime: null,
validTimeUnit: null,
noticeTime: null,
noticeTimeUnit: null,
- firstStartTime: null,
- depId: null
+ firstStartTime: null
},
workFormRules: {
checkWorkType: [{ required: true, message: '请填写排查作业类型', trigger: 'change' }],
@@ -190,27 +182,22 @@
checkWorkType: null,
checkWorkName: null,
taskUnitId: null,
- execUserId: null,
+ execDepId: null,
checkCycle: null,
checkCycleUnit: null,
validTime: null,
validTimeUnit: null,
noticeTime: null,
noticeTimeUnit: null,
- firstStartTime: null,
- depId: null
+ firstStartTime: null
};
} else if (type === '查看') {
state.disabled = false;
state.title = '查看排查任务';
- state.workForm.depId = JSON.parse(JSON.stringify(value)).depId;
- await achieveUserList();
state.workForm = JSON.parse(JSON.stringify(value));
} else {
state.disabled = true;
state.title = '修改排查任务';
- state.workForm.depId = JSON.parse(JSON.stringify(value)).depId;
- await achieveUserList();
state.workForm = JSON.parse(JSON.stringify(value));
}
};
diff --git a/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/index.vue b/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/index.vue
index 4fab516..a452740 100644
--- a/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/index.vue
+++ b/src/views/doublePrevent/riskCheckManage/checkTaskManage/checkWork/index.vue
@@ -41,7 +41,11 @@
</template>
</el-table-column>
<el-table-column prop="taskUnitName" label="任务单元" show-overflow-tooltip></el-table-column>
- <el-table-column prop="execUserName" label="执行人" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="execDepId" label="执行部门" show-overflow-tooltip>
+ <template #default="scope">
+ {{ parseNumber(scope.row.execDepId, '执行部门') }}
+ </template>
+ </el-table-column>
<el-table-column prop="checkCycle" label="排查周期" show-overflow-tooltip>
<template #default="scope">
<span>
@@ -52,13 +56,23 @@
</span>
</template>
</el-table-column>
- <el-table-column prop="validTime" label="排查周期" show-overflow-tooltip>
+ <el-table-column prop="validTime" label="有效时间" show-overflow-tooltip>
<template #default="scope">
<span>
{{ scope.row.validTime }}
</span>
<span>
{{ parseNumber(scope.row.validTimeUnit, '排查周期') }}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="validTime" label="提醒时间" show-overflow-tooltip>
+ <template #default="scope">
+ <span>
+ {{ scope.row.noticeTime }}
+ </span>
+ <span>
+ {{ parseNumber(scope.row.noticeTimeUnit, '排查周期') }}
</span>
</template>
</el-table-column>
@@ -109,14 +123,15 @@
params: {
pageIndex: number;
pageSize: number;
- checkWorkType: number | null;
- checkWorkStatus: number | null;
+ checkWorkType: number | null | '';
+ checkWorkStatus: number | null | '';
checkWorkName: string | null;
};
};
timeType: Array<levelListState>;
taskUnitList: Array<taskUnit>;
departmentList: Array<DepartmentState>;
+ departmentRecursionList: Array<DepartmentState>;
checkWorkTypeList: Array<levelListState>;
checkWorkStatusList: Array<levelListState>;
}
@@ -124,7 +139,11 @@
id: number;
name: string;
}
-interface DepartmentState {}
+interface DepartmentState {
+ depId: number;
+ depName: string;
+ children: Array<DepartmentState>;
+}
interface taskUnit {
id: number;
taskUnitName: string;
@@ -150,14 +169,14 @@
},
taskUnitList: [],
departmentList: [],
+ departmentRecursionList: [],
checkWorkTypeList: [
{ id: 1, name: '日常作业' },
{ id: 2, name: '周期作业' }
],
checkWorkStatusList: [
{ id: 1, name: '开启' },
- { id: 2, name: '关闭' },
- { id: 2, name: '过期' }
+ { id: 2, name: '关闭' }
],
timeType: [
{ id: 1, name: '分' },
@@ -169,6 +188,8 @@
});
// 初始化表格数据
const initWorkTableData = async () => {
+ state.workData.params.checkWorkType = state.workData.params.checkWorkType === '' ? null : state.workData.params.checkWorkType;
+ state.workData.params.checkWorkStatus = state.workData.params.checkWorkStatus === '' ? null : state.workData.params.checkWorkStatus;
let res = await workApi().getWorkList(state.workData.params);
if (res.data.code === '200') {
state.workData.data = res.data.data;
@@ -186,6 +207,7 @@
let res = await departmentApi().getDepartmentList();
if (res.data.code === '200') {
state.departmentList = res.data.data;
+ recursion(state.departmentList);
} else {
ElMessage({
type: 'warning',
@@ -236,14 +258,57 @@
.catch(() => {});
};
- const parseNumber = (value: string | number, type: string) => {
+ const recursion = (value: any) => {
+ for (let i of value) {
+ if (i.children.length !== 0) {
+ state.departmentRecursionList.push(i);
+ recursion(i.children);
+ } else {
+ state.departmentRecursionList.push(i);
+ }
+ }
+ };
+
+ const parseNumber = (value: number, type: string) => {
if (type === '排查类型') {
return state.checkWorkTypeList.find((item) => item.id === value)?.name;
} else if (type === '排查周期') {
return state.timeType.find((item) => item.id == value)?.name;
+ } else if (type === '执行部门') {
+ return state.departmentRecursionList.find((item) => item.depId === value)?.depName;
+ // return state.departmentList.find((item: any) => {
+ // if (item.children.length !== 0) {
+ // if (item.depId === value) {
+ // return item;
+ // } else {
+ // return recursion(item.children, value);
+ // }
+ // } else {
+ // if (item.depId === value) {
+ // return item;
+ // }
+ // }
+ // })?.depName;
}
};
+ // const recursion = (children: any, value: number | string) => {
+ // debugger;
+ // return children.find((item: any) => {
+ // if (item.children.length !== 0) {
+ // if (item.depId === value) {
+ // return item;
+ // } else {
+ // return recursion(item.children, value);
+ // }
+ // } else {
+ // if (item.depId === value) {
+ // return item;
+ // }
+ // }
+ // });
+ // };
+
const handleSearch = () => {
initWorkTableData();
};
diff --git a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/components/checkDialog.vue b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/components/checkDialog.vue
index 9e60143..fd981ae 100644
--- a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/components/checkDialog.vue
+++ b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenCheck/components/checkDialog.vue
@@ -13,7 +13,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="isShowCheckDialog = !isShowCheckDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitCheck" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitCheck" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
diff --git a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/components/rectifyDialog.vue b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/components/rectifyDialog.vue
index dcd8dd1..afb11d9 100644
--- a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/components/rectifyDialog.vue
+++ b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/components/rectifyDialog.vue
@@ -18,7 +18,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="isShowRectifyDialog = !isShowRectifyDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitRectify" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitRectify" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
@@ -40,7 +40,7 @@
<template #footer>
<span class="dialog-footer" v-show="disabled">
<el-button @click="isShowDelayDialog = !isShowDelayDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitDelay" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitDelay" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
diff --git a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/components/reportDialog.vue b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/components/reportDialog.vue
index b2a509c..f822e15 100644
--- a/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/components/reportDialog.vue
+++ b/src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenReport/components/reportDialog.vue
@@ -119,7 +119,7 @@
<template #footer>
<span class="dialog-footer" v-show="disabled">
<el-button @click="isShowReportDialog = !isShowReportDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitReport" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitReport" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
diff --git a/src/views/doublePrevent/riskLevel/action/components/riskControlMeasureDialog.vue b/src/views/doublePrevent/riskLevel/action/components/riskControlMeasureDialog.vue
index ac23357..72818ae 100644
--- a/src/views/doublePrevent/riskLevel/action/components/riskControlMeasureDialog.vue
+++ b/src/views/doublePrevent/riskLevel/action/components/riskControlMeasureDialog.vue
@@ -29,7 +29,7 @@
</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" v-model.trim="riskControlMeasureForm.classify1" @change="changeClassifyTwoList" placeholder="请选择管控方式" clearable>
+ <el-select class="input-length" 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>
@@ -56,7 +56,7 @@
<template #footer>
<span class="dialog-footer" v-show="disabled">
<el-button @click="isRiskControlMeasureDialog = !isRiskControlMeasureDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitRiskControlMeasureDialog" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitRiskControlMeasureDialog" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
diff --git a/src/views/doublePrevent/riskLevel/device/components/productionDeviceDialog.vue b/src/views/doublePrevent/riskLevel/device/components/productionDeviceDialog.vue
index c64cc93..5ad24bd 100644
--- a/src/views/doublePrevent/riskLevel/device/components/productionDeviceDialog.vue
+++ b/src/views/doublePrevent/riskLevel/device/components/productionDeviceDialog.vue
@@ -31,7 +31,7 @@
<template #footer>
<span class="dialog-footer" v-show="disabled">
<el-button @click="isShowProductionDeviceDialog = !isShowProductionDeviceDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitProductionDevice" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitProductionDevice" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
diff --git a/src/views/doublePrevent/riskLevel/device/index.vue b/src/views/doublePrevent/riskLevel/device/index.vue
index 22507af..4dbb256 100644
--- a/src/views/doublePrevent/riskLevel/device/index.vue
+++ b/src/views/doublePrevent/riskLevel/device/index.vue
@@ -90,9 +90,9 @@
params: {
pageIndex: number;
pageSize: number;
- riskLevel: number | null;
+ riskLevel: number | null | '';
status: number;
- depId: number | null;
+ depId: number | null | '';
location: string | null;
produceDeviceName: string | null;
};
@@ -141,6 +141,8 @@
});
// 初始化表格数据
const initProductionDeviceTableData = async () => {
+ state.productionDeviceData.params.riskLevel = state.productionDeviceData.params.riskLevel === '' ? null : state.productionDeviceData.params.riskLevel;
+ state.productionDeviceData.params.depId = state.productionDeviceData.params.depId === '' ? null : state.productionDeviceData.params.depId;
let res = await productionDeviceApi().getProductionDeviceList(state.productionDeviceData.params);
if (res.data.code === '200') {
state.productionDeviceData.data = res.data.data;
diff --git a/src/views/doublePrevent/riskLevel/event/components/safetyRiskEventDialog.vue b/src/views/doublePrevent/riskLevel/event/components/safetyRiskEventDialog.vue
index 8b46755..80d88b3 100644
--- a/src/views/doublePrevent/riskLevel/event/components/safetyRiskEventDialog.vue
+++ b/src/views/doublePrevent/riskLevel/event/components/safetyRiskEventDialog.vue
@@ -20,7 +20,7 @@
<template #footer>
<span class="dialog-footer" v-show="disabled">
<el-button @click="isSafetyRiskEventDialog = !isSafetyRiskEventDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitSafetyRiskEventDialog" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitSafetyRiskEventDialog" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
diff --git a/src/views/doublePrevent/riskLevel/event/index.vue b/src/views/doublePrevent/riskLevel/event/index.vue
index 6ba9efe..c3210a3 100644
--- a/src/views/doublePrevent/riskLevel/event/index.vue
+++ b/src/views/doublePrevent/riskLevel/event/index.vue
@@ -117,7 +117,7 @@
const getAllSafetyRiskEventData = async () => {
let res = await safetyRiskAnalyseUnitApi().getAllSafetyRiskAnalyseUnitList();
if (res.data.code === '200') {
- state.allSafetyRiskEventData = res.data.data;
+ state.allSafetyRiskEventData = JSON.parse(JSON.stringify(res.data.data));
} else {
ElMessage({
type: 'warning',
diff --git a/src/views/doublePrevent/riskLevel/map/components/rectifyDialog.vue b/src/views/doublePrevent/riskLevel/map/components/rectifyDialog.vue
index 8d06ee0..7f76331 100644
--- a/src/views/doublePrevent/riskLevel/map/components/rectifyDialog.vue
+++ b/src/views/doublePrevent/riskLevel/map/components/rectifyDialog.vue
@@ -106,7 +106,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="isShowReportDialog = !isShowReportDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitReport" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitReport" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
diff --git a/src/views/doublePrevent/riskLevel/riskCheckUnit/components/checkUnitDialog.vue b/src/views/doublePrevent/riskLevel/riskCheckUnit/components/checkUnitDialog.vue
index 99671b4..903bfc2 100644
--- a/src/views/doublePrevent/riskLevel/riskCheckUnit/components/checkUnitDialog.vue
+++ b/src/views/doublePrevent/riskLevel/riskCheckUnit/components/checkUnitDialog.vue
@@ -47,7 +47,7 @@
<template #footer>
<span class="dialog-footer" v-show="disabled">
<el-button @click="isShowCheckUnitDialog = !isShowCheckUnitDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitCheckUnit" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitCheckUnit" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
@@ -112,6 +112,7 @@
if (type === '新增') {
state.disabled = true;
state.title = '新增隐患排查单元';
+ state.measureData = [];
state.checkUnitForm = {
taskUnitName: null,
note: null,
@@ -121,10 +122,12 @@
state.disabled = false;
state.title = '查看隐患排查单元';
state.checkUnitForm = JSON.parse(JSON.stringify(value));
+ state.measureData = state.checkUnitForm.measureList;
} else {
state.disabled = true;
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 3e8ed4d..5957cd3 100644
--- a/src/views/doublePrevent/riskLevel/riskCheckUnit/index.vue
+++ b/src/views/doublePrevent/riskLevel/riskCheckUnit/index.vue
@@ -2,16 +2,16 @@
<div class="system-role-container">
<el-card shadow="hover">
<div class="system-user-search mb15">
- <div class="basic-line">
- <span>风险等级：</span>
- <el-select v-model="checkUnitData.params.riskLevel" clearable filterable class="input-box" placeholder="请选择风险等级">
- <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.id"></el-option>
- </el-select>
- </div>
- <div class="basic-line">
- <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-select v-model="checkUnitData.params.riskLevel" clearable filterable class="input-box" placeholder="请选择风险等级">-->
+ <!-- <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.id"></el-option>-->
+ <!-- </el-select>-->
+ <!-- </div>-->
+ <!-- <div class="basic-line">-->
+ <!-- <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>-->
<el-button size="default" type="primary" class="ml10" v-throttle @click="handleSearch">
<el-icon>
<ele-Search />
diff --git a/src/views/doublePrevent/riskLevel/unit/components/safetyRiskAnalyseUnitDialog.vue b/src/views/doublePrevent/riskLevel/unit/components/safetyRiskAnalyseUnitDialog.vue
index 0b62ec5..d1e6f10 100644
--- a/src/views/doublePrevent/riskLevel/unit/components/safetyRiskAnalyseUnitDialog.vue
+++ b/src/views/doublePrevent/riskLevel/unit/components/safetyRiskAnalyseUnitDialog.vue
@@ -37,7 +37,7 @@
<template #footer>
<span class="dialog-footer" v-show="disabled">
<el-button @click="isSafetyRiskAnalyseUnitDialog = !isSafetyRiskAnalyseUnitDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitSafetyRiskAnalyseUnitDialog" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitSafetyRiskAnalyseUnitDialog" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
diff --git a/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue b/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue
index 6de5818..1d2e3d8 100644
--- a/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue
+++ b/src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue
@@ -18,7 +18,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="isShowRFIDDialog = !isShowRFIDDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitRFID" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitRFID" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
diff --git a/src/views/intellectInspect/inspectBasic/facility/components/facilityAreaDialog.vue b/src/views/intellectInspect/inspectBasic/facility/components/facilityAreaDialog.vue
index e7a283f..1e9ede6 100644
--- a/src/views/intellectInspect/inspectBasic/facility/components/facilityAreaDialog.vue
+++ b/src/views/intellectInspect/inspectBasic/facility/components/facilityAreaDialog.vue
@@ -5,23 +5,12 @@
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="设备区域名称" prop="region">
- <el-input
- class="input-length"
- v-model.trim="facilityAreaForm.region"
- placeholder="请输入设备区域名称"
- clearable
- ></el-input>
+ <el-input class="input-length" v-model.trim="facilityAreaForm.region" 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="regionTypeId">
- <el-select
- class="input-length"
- v-model="facilityAreaForm.regionTypeId"
- placeholder="请选择设备区域类型"
- clearable
- filterable
- >
+ <el-select class="input-length" v-model="facilityAreaForm.regionTypeId" placeholder="请选择设备区域类型" clearable filterable>
<el-option v-for="item in facilityAreaTypeList" :key="item.id" :label="item.regionType" :value="item.id"></el-option>
</el-select>
</el-form-item>
@@ -31,7 +20,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="isShowFacilityAreaDialog = !isShowFacilityAreaDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitFacilityArea" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitFacilityArea" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
@@ -76,11 +65,7 @@
});
//打开模态框
- const openFacilityAreaDialog = (
- type: string,
- value: { id: number; region: string; regionTypeId: number },
- facilityAreaTypeList: Array<facilityAreaTypeState>
- ) => {
+ const openFacilityAreaDialog = (type: string, value: { id: number; region: string; regionTypeId: number }, facilityAreaTypeList: Array<facilityAreaTypeState>) => {
state.isShowFacilityAreaDialog = true;
state.facilityAreaTypeList = facilityAreaTypeList.filter((item) => item.regionType !== '所有类型');
setTimeout(() => {
diff --git a/src/views/intellectInspect/inspectBasic/inspectPoint/components/inspectPointDialog.vue b/src/views/intellectInspect/inspectBasic/inspectPoint/components/inspectPointDialog.vue
index 5a53ccd..1184f3c 100644
--- a/src/views/intellectInspect/inspectBasic/inspectPoint/components/inspectPointDialog.vue
+++ b/src/views/intellectInspect/inspectBasic/inspectPoint/components/inspectPointDialog.vue
@@ -27,7 +27,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="isShowInspectPointDialog = !isShowInspectPointDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitInspectPoint" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitInspectPoint" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
diff --git a/src/views/intellectInspect/inspectBasic/inspectTarget/components/inspectTargetDialog.vue b/src/views/intellectInspect/inspectBasic/inspectTarget/components/inspectTargetDialog.vue
index 4fff37e..b7a96b1 100644
--- a/src/views/intellectInspect/inspectBasic/inspectTarget/components/inspectTargetDialog.vue
+++ b/src/views/intellectInspect/inspectBasic/inspectTarget/components/inspectTargetDialog.vue
@@ -10,27 +10,14 @@
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="指标类型" prop="quotaTypeId">
- <el-select
- class="input-length"
- v-model="inspectTargetForm.quotaTypeId"
- @change="changeQuotaUnit"
- placeholder="请选择指标类型"
- clearable
- filterable
- >
+ <el-select class="input-length" v-model="inspectTargetForm.quotaTypeId" @change="changeQuotaUnit" placeholder="请选择指标类型" clearable filterable>
<el-option v-for="item in quotaTypeList" :key="item.id" :label="item.type" :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="quotaUnit">
- <el-input
- class="input-length"
- v-model.trim="inspectTargetForm.quotaUnit"
- type="textarea"
- placeholder="请输入指标单位"
- maxlength="150"
- ></el-input>
+ <el-input class="input-length" v-model.trim="inspectTargetForm.quotaUnit" type="textarea" placeholder="请输入指标单位" maxlength="150"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -38,7 +25,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="isShowInspectTargetDialog = !isShowInspectTargetDialog" size="default">取 消</el-button>
- <el-button type="primary" @click="submitInspectTarget" v-throttle size="default">确 实</el-button>
+ <el-button type="primary" @click="submitInspectTarget" v-throttle size="default">确 定</el-button>
</span>
</template>
</el-dialog>
@@ -116,9 +103,7 @@
};
const changeQuotaUnit = () => {
- state.inspectTargetForm.quotaUnit = JSON.parse(JSON.stringify(state.quotaTypeList)).find(
- (item: any) => item.id === state.inspectTargetForm.quotaTypeId
- ).unit;
+ state.inspectTargetForm.quotaUnit = JSON.parse(JSON.stringify(state.quotaTypeList)).find((item: any) => item.id === state.inspectTargetForm.quotaTypeId).unit;
};
//新增修改提交
diff --git a/src/views/system/user/component/userDialog.vue b/src/views/system/user/component/userDialog.vue
index 243a2bf..3da423e 100644
--- a/src/views/system/user/component/userDialog.vue
+++ b/src/views/system/user/component/userDialog.vue
@@ -67,7 +67,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="isShowUserDialog = !isShowUserDialog" size="default">取 消</el-button>
- <el-button type="primary" v-throttle @click="onSubmit" size="default">新 增</el-button>
+ <el-button type="primary" v-throttle @click="onSubmit" size="default">确 定</el-button>
</span>
</template>
</el-dialog>
--
Gitblit v1.9.2