From 50d33c74675a9d9eee957a685d9e55b77974f6f9 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期五, 06 一月 2023 16:44:06 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/doublePrevent/riskLevel/action/index.vue | 106 ++++++++++++++++++++++++++++++----------------------
1 files changed, 61 insertions(+), 45 deletions(-)
diff --git a/src/views/doublePrevent/riskLevel/action/index.vue b/src/views/doublePrevent/riskLevel/action/index.vue
index 95634b0..0629615 100644
--- a/src/views/doublePrevent/riskLevel/action/index.vue
+++ b/src/views/doublePrevent/riskLevel/action/index.vue
@@ -31,10 +31,22 @@
<el-table-column type="index" label="序号" width="60" />
<el-table-column prop="riskEventName" label="安全风险事件名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="controlMeasureCode" label="风控措施编码" show-overflow-tooltip></el-table-column>
- <el-table-column prop="controlType" label="管控方式" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="controlType" label="管控方式" show-overflow-tooltip>
+ <template #default="scope">
+ {{ parseNumber(scope.row.controlType, '管控方式') }}
+ </template>
+ </el-table-column>
<el-table-column prop="checkContent" label="管控内容" show-overflow-tooltip></el-table-column>
- <el-table-column prop="classify1" label="管控措施分类1" show-overflow-tooltip></el-table-column>
- <el-table-column prop="classify2" label="管控措施分类2" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="classify1" label="管控措施分类1" show-overflow-tooltip>
+ <template #default="scope">
+ {{ parseNumber(scope.row.classify1, '管控措施分类1') }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="classify2" label="管控措施分类2" show-overflow-tooltip>
+ <template #default="scope">
+ {{ parseNumber(scope.row.classify2, '管控措施分类2') }}
+ </template>
+ </el-table-column>
<el-table-column prop="classify3" label="管控措施分类3" show-overflow-tooltip></el-table-column>
<el-table-column prop="measureDesc" label="措施说明" show-overflow-tooltip></el-table-column>
<el-table-column prop="createByUserName" label="创建人" show-overflow-tooltip></el-table-column>
@@ -45,27 +57,16 @@
</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="操作" width="150">
+ <el-table-column label="操作" width="200" align="center">
<template #default="scope">
- <el-button size="small" text type="primary" @click="onOpenDialogRef('修改', scope.row)">修改</el-button>
- <el-button size="small" text type="danger" @click="onDelRiskControlMeasure(scope.row)">删除</el-button>
+ <el-button size="small" text type="primary" :icon="View" @click="onOpenDialogRef('查看', scope.row)">查看</el-button>
+ <el-button size="small" text type="primary" :icon="Edit" @click="onOpenDialogRef('修改', scope.row)">修改</el-button>
+ <el-button size="small" text type="danger" :icon="Delete" @click="onDelRiskControlMeasure(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<br />
- <el-pagination
- @size-change="onHandleSizeChange"
- @current-change="onHandleCurrentChange"
- class="page-position"
- :pager-count="5"
- :page-sizes="[10, 20, 30]"
- v-model:current-page="riskControlMeasureData.params.pageIndex"
- background
- v-model:page-size="riskControlMeasureData.params.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="riskControlMeasureData.total"
- >
- </el-pagination>
+ <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="page-position" :pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="riskControlMeasureData.params.pageIndex" background v-model:page-size="riskControlMeasureData.params.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="riskControlMeasureData.total"> </el-pagination>
<br />
<br />
</el-card>
@@ -79,6 +80,7 @@
import riskControlMeasureDialog from './components/riskControlMeasureDialog.vue';
import { riskControlMeasureApi } from '/@/api/doublePreventSystem/riskControlMeasure/index.ts';
import { safetyRiskEventApi } from '/@/api/doublePreventSystem/safetyRiskEvent';
+import { Edit, Delete, View } from '@element-plus/icons-vue';
// 定义接口来定义对象的类型
interface TableData {
@@ -103,12 +105,18 @@
};
controlTypeList: Array<controlTypeType>;
classifyOneList: Array<classifyOneType>;
- classifyTwoList: Array<classifyTwoType>;
+ classifyTwoList: Array<classifyOneType>;
allSafetyRiskEventData: Array<SafetyRiskEventDataState>;
}
-interface controlTypeType {}
-interface classifyOneType {}
-interface classifyTwoType {}
+interface controlTypeType {
+ id: number;
+ name: string;
+}
+interface classifyOneType {
+ id: number;
+ riskMeasureName: string;
+}
+
interface SafetyRiskEventDataState {}
// interface controlTypeListType {
@@ -144,7 +152,7 @@
export default {
name: 'riskControlMeasure',
- components: { riskControlMeasureDialog },
+ components: { riskControlMeasureDialog, Edit, Delete, View },
setup() {
const riskControlMeasureDialogRef = ref();
const state = reactive<TableDataState>({
@@ -186,18 +194,7 @@
const dateFormat = (fmt: any, date: any) => {
date = new Date(date);
- fmt =
- date.getFullYear() +
- '-' +
- (date.getMonth() + 1) +
- '-' +
- date.getDate() +
- ' ' +
- date.getHours().toString() +
- ':' +
- (date.getMinutes().toString() === '0' ? '00' : date.getMinutes().toString()) +
- ':' +
- (date.getSeconds().toString() === '0' ? '00' : date.getMinutes().toString());
+ fmt = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + ' ' + date.getHours().toString() + ':' + (date.getMinutes().toString() === '0' ? '00' : date.getMinutes().toString()) + ':' + (date.getSeconds().toString() === '0' ? '00' : date.getMinutes().toString());
return fmt;
};
@@ -230,18 +227,12 @@
// 打开生产装置弹窗
const onOpenDialogRef = (type: string, value: any) => {
- riskControlMeasureDialogRef.value.openSafetyRiskEventDialog(
- type,
- value,
- state.allSafetyRiskEventData,
- state.classifyOneList,
- state.classifyTwoList
- );
+ riskControlMeasureDialogRef.value.openSafetyRiskEventDialog(type, value, state.allSafetyRiskEventData, state.classifyOneList, state.classifyTwoList);
};
// 删除角色
const onDelRiskControlMeasure = (row: any) => {
- ElMessageBox.confirm(`此操作将永久删除该条风险管控措施：“${row.produceDeviceName}”，是否继续?`, '提示', {
+ ElMessageBox.confirm(`此操作将永久删除该条风险管控措施：“${row.checkContent}”，是否继续?`, '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning'
@@ -263,6 +254,16 @@
}
})
.catch(() => {});
+ };
+
+ const parseNumber = (value: string | number, type: string) => {
+ if (type === '管控方式') {
+ return state.controlTypeList.find((item) => item.id === value)?.name;
+ } else if (type === '管控措施分类1') {
+ return state.classifyOneList.find((item) => item.id === value)?.riskMeasureName;
+ } else {
+ return state.classifyTwoList.find((item) => item.id === value)?.riskMeasureName;
+ }
};
const handleSearch = () => {
@@ -289,8 +290,12 @@
});
return {
+ Edit,
+ Delete,
+ View,
dateFormat,
handleSearch,
+ parseNumber,
onOpenDialogRef,
onHandleSizeChange,
onDelRiskControlMeasure,
@@ -304,4 +309,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>
--
Gitblit v1.9.2