From 7f53e60aa7ecd861cddd329d178d3a4ee58c105f Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 30 一月 2026 16:24:39 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management into dev_New
---
src/views/safeProduction/emergencyPlanReview/index.vue | 107 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 72 insertions(+), 35 deletions(-)
diff --git a/src/views/safeProduction/emergencyPlanReview/index.vue b/src/views/safeProduction/emergencyPlanReview/index.vue
index 07bf56e..93658d4 100644
--- a/src/views/safeProduction/emergencyPlanReview/index.vue
+++ b/src/views/safeProduction/emergencyPlanReview/index.vue
@@ -52,17 +52,18 @@
<el-form ref="formRef"
:model="form"
:rules="rules"
- label-width="120px">
+ label-position="top"
+ label-width="150px">
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="搴旀�ラ妗堢紪鐮�"
+ <el-form-item label="搴旀�ラ妗堢紪鐮侊細"
prop="planCode">
<el-input v-model="form.planCode"
placeholder="璇疯緭鍏ュ簲鎬ラ妗堢紪鐮�" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="搴旀�ラ妗堝悕绉�"
+ <el-form-item label="搴旀�ラ妗堝悕绉帮細"
prop="planName">
<el-input v-model="form.planName"
placeholder="璇疯緭鍏ュ簲鎬ラ妗堝悕绉�" />
@@ -99,7 +100,7 @@
</el-row>
<el-row :gutter="20">
<el-col :span="12">
- <el-form-item label="棰勬绫诲瀷"
+ <el-form-item label="棰勬绫诲瀷锛�"
prop="planType">
<el-select v-model="form.planType"
placeholder="璇烽�夋嫨棰勬绫诲瀷"
@@ -112,14 +113,14 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="澶囨敞"
+ <el-form-item label="澶囨敞锛�"
prop="remark">
<el-input v-model="form.remark"
placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
</el-col>
</el-row>
- <el-form-item label="閫傜敤鑼冨洿"
+ <el-form-item label="閫傜敤鑼冨洿锛�"
prop="applyScope">
<el-checkbox-group v-model="form.applyScope">
<el-checkbox label="all">鍏ㄤ綋鍛樺伐</el-checkbox>
@@ -129,7 +130,7 @@
<el-checkbox label="tech">鎶�鏈儴闂�</el-checkbox>
</el-checkbox-group>
</el-form-item>
- <el-form-item label="搴旀�ュ缃楠�"
+ <el-form-item label="搴旀�ュ缃楠わ細"
prop="execSteps">
<div class="exec-steps-container"
style="width:100%">
@@ -192,7 +193,7 @@
{{ currentKnowledge.coreResponsorUserName }}
</el-descriptions-item>
<el-descriptions-item label="棰勬绫诲瀷">
- <el-tag type="warning"> {{ currentKnowledge.planType }}</el-tag>
+ <el-tag type="warning"> {{ emergencyPlanTypeLabel(currentKnowledge.planType) }}</el-tag>
</el-descriptions-item>
<el-descriptions-item label="澶囨敞">
{{ currentKnowledge.remark }}
@@ -216,7 +217,7 @@
<div v-for="(step, index) in JSON.parse(currentKnowledge.execSteps)"
:key="index"
class="exec-step-view">
- <span class="step-number">{{ index + 1 }}.</span>
+ <!-- <span class="step-number">{{ index + 1 }}.</span> -->
<span class="step-title">{{ step.step }}锛�</span>
<span>{{ step.description }}</span>
</div>
@@ -352,6 +353,9 @@
label: "棰勬绫诲瀷",
prop: "planType",
showOverflowTooltip: true,
+ formatData: params => {
+ return emergencyPlanTypeLabel(params);
+ },
},
{
label: "澶囨敞",
@@ -569,20 +573,17 @@
};
return timeMap[efficiency] || "鏈煡";
};
- const emergencyPlanTypeOptions = computed(() => [
- {
- value: "棰勯槻鎬у簲鎬ラ妗�",
- label: "棰勯槻鎬у簲鎬ラ妗�",
- },
- {
- value: "搴旀�ュ鐞嗛妗�",
- label: "搴旀�ュ鐞嗛妗�",
- },
- {
- value: "鎭㈠鎬у簲鎬ラ妗�",
- label: "鎭㈠鎬у簲鎬ラ妗�",
- },
- ]);
+ const { proxy } = getCurrentInstance();
+ const { emergency_plan_type } = proxy.useDict("emergency_plan_type");
+ const emergencyPlanTypeOptions = computed(
+ () => emergency_plan_type?.value || []
+ );
+ const emergencyPlanTypeLabel = val => {
+ const item = emergencyPlanTypeOptions.value.find(
+ i => String(i.value) === String(val)
+ );
+ return item ? item.label : val;
+ };
// 鎻愪氦搴旀�ラ妗堣〃鍗�
const submitForm = async () => {
try {
@@ -664,8 +665,6 @@
};
// 瀵煎嚭
- const { proxy } = getCurrentInstance();
- const { knowledge_type } = proxy.useDict("knowledge_type");
// 瀛楀吀宸ュ叿
const knowledgeTypeOptions = computed(() => knowledge_type?.value || []);
@@ -766,45 +765,83 @@
.exec-steps-container {
border: 1px solid #e4e7ed;
- border-radius: 4px;
- padding: 15px;
+ border-radius: 8px;
+ padding: 20px;
background-color: #f9fafc;
+ margin-top: 10px;
}
.exec-step-item {
- margin-bottom: 10px;
- padding: 10px;
+ margin-bottom: 12px;
+ padding: 12px;
background-color: #ffffff;
border: 1px solid #e4e7ed;
- border-radius: 4px;
+ border-radius: 6px;
+ transition: all 0.3s ease;
+ }
+
+ .exec-step-item:hover {
+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+ border-color: #c6e2ff;
}
.step-header {
display: flex;
align-items: flex-start;
flex-direction: column;
+ gap: 8px;
}
.exec-step-view {
- margin-bottom: 8px;
- padding-left: 20px;
+ margin-bottom: 16px;
+ padding-left: 24px;
position: relative;
+ line-height: 1.6;
+ }
+
+ .exec-step-view::before {
+ content: "";
+ position: absolute;
+ left: 10px;
+ top: 20px;
+ bottom: -16px;
+ width: 2px;
+ background-color: #eaeaea;
+ }
+
+ .exec-step-view:last-child::before {
+ display: none;
}
.step-number {
position: absolute;
left: 0;
+ top: 0;
+ width: 20px;
+ height: 20px;
+ line-height: 20px;
+ text-align: center;
font-weight: bold;
- color: #409eff;
+ color: #ffffff;
+ background-color: #409eff;
+ border-radius: 50%;
+ font-size: 12px;
+ z-index: 1;
}
.step-title {
- font-weight: bold;
- margin-right: 5px;
+ font-weight: 600;
+ margin-right: 8px;
+ color: #395a9c;
}
.no-data {
color: #909399;
font-style: italic;
+ text-align: center;
+ padding: 20px;
+ background-color: #f8f9fa;
+ border-radius: 4px;
+ margin-top: 10px;
}
</style>
--
Gitblit v1.9.3