Browse Source

fix: 优化风险值输入框,去除禁用状态并简化代码

sunqijun 2 months ago
parent
commit
f12bfb2a14

+ 2 - 14
src/views/production-safety/risk-identification-and-control/hazard-manage/add.vue

@@ -119,13 +119,7 @@
           <el-input-number :step="1" :precision="0" v-model="formValue.inherentRiskS" :min="1" style="width: 330px" />
         </el-form-item>
         <el-form-item label="风险值(R)" prop="inherentRiskR">
-          <el-input
-            v-model="formValue.inherentRiskR"
-            size="large"
-            disabled
-            placeholder="自动计算: M×E×S"
-            style="width: 330px"
-          />
+          <el-input v-model="formValue.inherentRiskR" size="large" placeholder="自动计算: M×E×S" style="width: 330px" />
         </el-form-item>
         <el-form-item label="风险等级" prop="inherentRiskLevel">
           <el-select v-model="formValue.inherentRiskLevel" size="large" placeholder="请选择" style="width: 330px">
@@ -230,13 +224,7 @@
           <el-input-number :step="1" :precision="0" v-model="formValue.controlRiskS" :min="1" style="width: 330px" />
         </el-form-item>
         <el-form-item label="风险值(R)" prop="controlRiskR">
-          <el-input
-            v-model="formValue.controlRiskR"
-            size="large"
-            disabled
-            placeholder="自动计算: M×E×S"
-            style="width: 330px"
-          />
+          <el-input v-model="formValue.controlRiskR" size="large" placeholder="自动计算: M×E×S" style="width: 330px" />
         </el-form-item>
         <el-form-item label="风险等级" prop="controlRiskLevel">
           <el-select v-model="formValue.controlRiskLevel" size="large" placeholder="请选择" style="width: 330px">

+ 17 - 3
src/views/production-safety/risk-identification-and-control/hazard-manage/create-plan.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="safety-platform-container">
+    <div class="flex"> <BreadcrumbBack /><span class="breadcrumb-title">创建计划和方案</span> </div>
     <header class="safety-platform-container__header">
       <div class="breadcrumb-title"> {{ detailData?.hazardName }} </div>
       <div class="detail-content">
@@ -7,7 +8,7 @@
         <span>创建人:{{ detailData?.createdByName }} </span>
         <span>创建时间:{{ detailData?.createdAt }} </span>
       </div>
-      <el-tabs v-model="activeTab">
+      <el-tabs v-model="activeTab" @tab-click="clickTab">
         <el-tab-pane label="全部" name="" />
         <el-tab-pane label="待开始" :name="1" />
         <el-tab-pane label="进行中" :name="2" />
@@ -71,8 +72,8 @@
           </el-table-column>
 
           <el-table-column label="状态" prop="statusName" width="100" />
-          <el-table-column label="执行部门" prop="executorName" width="180" />
-          <el-table-column label="执行人" prop="executor" width="130" />
+          <el-table-column label="执行部门" prop="execDepartment" width="180" />
+          <el-table-column label="执行人" prop="executorName" width="130" />
           <el-table-column label="计划/方案描述" prop="planContent" width="180" />
           <el-table-column label="计划开始时间" prop="planStartDate" width="220" />
           <el-table-column label="计划结束时间" prop="planEndDate" width="220" />
@@ -212,6 +213,11 @@
       });
   };
 
+  const clickTab = (tab) => {
+    queryParams.queryParam.status = activeTab.value;
+    queryParams.pageNumber = 1;
+    queryTableList();
+  };
   const handleSizeChange = (value) => {};
   const handleCurrentChange = (value) => {
     queryParams.pageNumber = value;
@@ -325,4 +331,12 @@
     display: flex;
     justify-content: flex-end;
   }
+  .flex {
+    display: flex;
+    align-items: center;
+    gap: 16px;
+    padding: 16px 22px;
+    flex-shrink: 0;
+    background-color: white;
+  }
 </style>

+ 2 - 14
src/views/production-safety/risk-identification-and-control/hazard-manage/edit.vue

@@ -119,13 +119,7 @@
           <el-input-number :step="1" :precision="0" v-model="formValue.inherentRiskS" :min="1" style="width: 330px" />
         </el-form-item>
         <el-form-item label="风险值(R)" prop="inherentRiskR">
-          <el-input
-            v-model="formValue.inherentRiskR"
-            size="large"
-            disabled
-            placeholder="自动计算: M×E×S"
-            style="width: 330px"
-          />
+          <el-input v-model="formValue.inherentRiskR" size="large" placeholder="自动计算: M×E×S" style="width: 330px" />
         </el-form-item>
         <el-form-item label="风险等级" prop="inherentRiskLevel">
           <el-select v-model="formValue.inherentRiskLevel" size="large" placeholder="请选择" style="width: 330px">
@@ -230,13 +224,7 @@
           <el-input-number :step="1" :precision="0" v-model="formValue.controlRiskS" :min="1" style="width: 330px" />
         </el-form-item>
         <el-form-item label="风险值(R)" prop="controlRiskR">
-          <el-input
-            v-model="formValue.controlRiskR"
-            size="large"
-            disabled
-            placeholder="自动计算: M×E×S"
-            style="width: 330px"
-          />
+          <el-input v-model="formValue.controlRiskR" size="large" placeholder="自动计算: M×E×S" style="width: 330px" />
         </el-form-item>
         <el-form-item label="风险等级" prop="controlRiskLevel">
           <el-select v-model="formValue.controlRiskLevel" size="large" placeholder="请选择" style="width: 330px">