From ac46c36a9a4c6b1058eaed9ed1e3b056fe92d0cc Mon Sep 17 00:00:00 2001
From: laozt <2721205210@qq.com>
Date: Thu, 21 Dec 2023 16:35:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/AddDialog/tab1.vue | 39 ++++++++++++++++++++++---
 src/views/components/AddDialog/tab2.vue | 31 ++++++++++++++++++++
 src/views/yingji/planManage.vue         |  7 +++--
 3 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/src/views/components/AddDialog/tab1.vue b/src/views/components/AddDialog/tab1.vue
index 784f30d..80c2d3b 100644
--- a/src/views/components/AddDialog/tab1.vue
+++ b/src/views/components/AddDialog/tab1.vue
@@ -38,6 +38,34 @@
             placeholder="请输入统一信用代码"
             clearable
           />
+        </el-form-item>
+         <el-form-item label="安全风险等级" prop="riskLevel">
+          <el-select
+            v-model="queryParams.riskLevel"
+            placeholder="请输入安全风险等级"
+          >
+            <el-option
+              v-for="item in dict.type.dict_risk_level"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标准化等级" prop="standLevel">
+          <el-select
+            v-model="queryParams.standLevel"
+            placeholder="请输入标准化等级"
+          >
+            <el-option
+              v-for="item in dict.type.dict_stand_level"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
           <el-button
@@ -54,7 +82,7 @@
       </el-form>
     </div>
     <div class="tables" v-loading="loading">
-      <el-table v-loading="loading" :data="newList" height="400">
+      <el-table v-loading="loading" :data="newList" height="380">
         <el-table-column
           label="企业名称"
           align="center"
@@ -168,6 +196,8 @@ export default {
     "is_point",
     "entpr_color",
     "major_hazard_level",
+        "dict_risk_level",
+    "dict_stand_level",
   ],
   components: { firmDialog, executive },
   data() {
@@ -205,6 +235,7 @@ export default {
         updateId: null,
         userId: null,
         deptId: null,
+              isPoint: 1,
       },
       // 表单参数
       form: {},
@@ -420,7 +451,7 @@ export default {
     }
   }
   .content {
-    // padding: 15px 10px;
+    padding: 15px 10px;
     .module {
       padding-bottom: 15px;
       display: flex;
@@ -470,8 +501,8 @@ export default {
       align-items: center;
       justify-content: space-between;
       flex-wrap: wrap;
-      // padding-top: 10px;
-      // padding-bottom: 10px;
+      padding-top: 10px;
+      padding-bottom: 10px;
       .btn-search {
         background: #2378ec;
         color: #ffffff;
diff --git a/src/views/components/AddDialog/tab2.vue b/src/views/components/AddDialog/tab2.vue
index d86f8b3..b1e36e7 100644
--- a/src/views/components/AddDialog/tab2.vue
+++ b/src/views/components/AddDialog/tab2.vue
@@ -39,6 +39,34 @@
             clearable
           />
         </el-form-item>
+        <el-form-item label="安全风险等级" prop="riskLevel">
+          <el-select
+            v-model="queryParams.riskLevel"
+            placeholder="请输入安全风险等级"
+          >
+            <el-option
+              v-for="item in dict.type.dict_risk_level"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标准化等级" prop="standLevel">
+          <el-select
+            v-model="queryParams.standLevel"
+            placeholder="请输入标准化等级"
+          >
+            <el-option
+              v-for="item in dict.type.dict_stand_level"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button
             class="btn-search"
@@ -168,6 +196,8 @@ export default {
     "is_point",
     "entpr_color",
     "major_hazard_level",
+    "dict_risk_level",
+    "dict_stand_level",
   ],
   components: { firmDialog, executive },
   data() {
@@ -205,6 +235,7 @@ export default {
         updateId: null,
         userId: null,
         deptId: null,
+        isPoint: 2,
       },
       // 表单参数
       form: {},
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index 3687bf3..96628cf 100644
--- a/src/views/yingji/planManage.vue
+++ b/src/views/yingji/planManage.vue
@@ -56,11 +56,11 @@
         <el-form-item label="执法层级" prop="lawHierarchy">
           <el-select
             v-model="queryParams.lawHierarchy"
+            placeholder="请选择执法层级"
             filterable
-            placeholder="请选择"
           >
             <el-option
-              v-for="item in lawHierarchys"
+              v-for="item in dict.type.dict_law_hierarchy"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -199,6 +199,7 @@ import { mapState } from "vuex";
 
 export default {
   components: { AddDialog, InfoDialog, executive, EditDialog },
+  dicts: ["dict_law_hierarchy"],
   data() {
     return {
       lawHierarchys: [
@@ -374,6 +375,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.plannedMonth = "";
       this.$refs.executive.onClear();
       this.handleQuery();
     },
@@ -467,6 +469,7 @@ export default {
     if (userInfo.lawLevel == "县级" || userInfo.lawLevel == "镇级") {
       this.queryParams.district = userInfo.permissionCode;
     }
+    this.queryParams.plannedYear = this.$moment(new Date()).format("yyyy");
     // 初始化
     this.getList();
   },