diff --git a/src/views/components/firmDialog/index.vue b/src/views/components/firmDialog/index.vue
index 1c113ba..acd6e4f 100644
--- a/src/views/components/firmDialog/index.vue
+++ b/src/views/components/firmDialog/index.vue
@@ -20,18 +20,12 @@
         <div class="filtrate">
           <el-descriptions :column="2" border>
             <el-descriptions-item
-              :label="item.label"
-              v-for="(item, index) in listDes"
-              :key="index"
-            >
-              {{
-                item.value == "null"
-                  ? ""
-                  : item.value == "false"
-                  ? "暂无"
-                  : item.value
-              }}
-            </el-descriptions-item>
+                :label="item.label"
+                v-for="(item, index) in listDes"
+                :key="index"
+              >
+                {{ item.value}}
+              </el-descriptions-item>
           </el-descriptions>
         </div>
       </div>
@@ -40,6 +34,18 @@
 </template>
 <script>
 export default {
+  dicts: [
+    "economic_categories",
+    "economic_subcategory",
+    "special_governance",
+    "enterprise_status",
+    "standardization_level",
+    "safety_level",
+    "category",
+    "major_hazard_level",
+    "entpr_color",
+    "is_point",
+  ],
   data() {
     return {
       addShow: false,
@@ -89,9 +95,19 @@ export default {
           label: "注册安全工程师人员数量",
           value: "",
         },
+        // {
+        //   eng: "doublePreven",
+        //   label: "是否开展双重预防机制",
+        //   value: "",
+        // },
         {
-          eng: "doublePreven",
-          label: "是否开展双重预防机制",
+          eng: "ecoTypeLarge",
+          label: "经济类型大类",
+          value: "",
+        },
+        {
+          eng: "ecoTypeSmall",
+          label: "经济类型小类",
           value: "",
         },
         {
@@ -100,20 +116,25 @@ export default {
           value: "",
         },
         {
-          eng: "enterColorChart",
-          label: "企业分色图",
+          eng: "entprcolor",
+          label: "企业分色",
           value: "",
         },
+        // {
+        //   eng: "entprId",
+        //   label: "企业ID",
+        //   value: "",
+        // },
         {
           eng: "entprName",
           label: "企业名称",
           value: "",
         },
-        {
-          eng: "entprPlaneGragh",
-          label: "企业平面图",
-          value: "",
-        },
+        // {
+        //   eng: "entprPlaneGragh",
+        //   label: "企业平面图",
+        //   value: "",
+        // },
         {
           eng: "floorArea",
           label: "占地面积（㎡）",
@@ -154,11 +175,26 @@ export default {
           label: "行业类别门类",
           value: "",
         },
-        {
-          eng: "industryRefer",
-          label: "工贸涉及(专项治理类别)",
-          value: "",
-        },
+        // {
+        //   eng: "indusTypeLagre",
+        //   label: "行业类别大类",
+        //   value: "",
+        // },
+        // {
+        //   eng: "indusTypeMiddle",
+        //   label: "行业类别中类",
+        //   value: "",
+        // },
+        // {
+        //   eng: "indusTypeSmall",
+        //   label: "行业类别小类",
+        //   value: "",
+        // },
+        // {
+        //   eng: "industryRefer",
+        //   label: "工贸涉及(专项治理类别)",
+        //   value: "",
+        // },
         {
           eng: "infoYear",
           label: "数据年份",
@@ -306,86 +342,89 @@ export default {
           label: "是否为国有企业",
           value: "",
         },
-        {
-          eng: "supervisionLarge",
-          label: "行业监管大类",
-          value: "",
-        },
-        {
-          eng: "supervisionSmall",
-          label: "行业监管小类",
-          value: "",
-        },
+        // {
+        //   eng: "supervisionLarge",
+        //   label: "行业监管大类",
+        //   value: "",
+        // },
+        // {
+        //   eng: "supervisionSmall",
+        //   label: "行业监管小类",
+        //   value: "",
+        // },
         {
           eng: "uscCode",
           label: "统一社会信用代码",
           value: "",
         },
       ],
+      details:null
     }
   },
   methods:{
     async open(option) {
       this.addShow = true;
-      const { bizAddr,
-              bossEmail,
-              bossMobtel,
-              bossTel,
-              businessScope,
-              contactEmail,
-              contactQq,
-              contactTel,
-              cseNum,
-              doublePreven,
-              employeeNum,
-              enterColorChart,
-              entprName,
-              entprPlaneGragh,
-              floorArea,
-              fullEmegNum,
-              fullSafety,
-              fullSafetyNum,
-              gridCode,
-              gridEntprStatus,
-              groupCompName,
-              indusTypeClass,
-              industryRefer,
-              infoYear,
-              isPoint,
-              latitudeGps,
-              legalPerson,
-              localSafetyAdmin,
-              longitudeGps,
-              mainProduct,
-              majorHazardInstallations,
-              majorHazardLevel,
-              operatingStatus,
-              parentCompName,
-              partSafetyNum,
-              regAddr,
-              regCapi,
-              safetyDepart,
-              safetyDepartDuty,
-              safetyDepartName,
-              safetyDepartNum,
-              safetyEmail,
-              safetyManager,
-              safetyMobtel,
-              safetySupervisionLevel,
-              safetyTel,
-              setupDate,
-              sourceData,
-              specialGovernance,
-              speclalOperationNum,
-              standLevel,
-              stateOwed,
-              supervisionLarge,
-              supervisionSmall,
-              uscCode } = option
-      this.changeDescriptions(this.listDes,option)
+      this.look(option)
+      // const { bizAddr,
+      //         bossEmail,
+      //         bossMobtel,
+      //         bossTel,
+      //         businessScope,
+      //         contactEmail,
+      //         contactQq,
+      //         contactTel,
+      //         cseNum,
+      //         doublePreven,
+      //         employeeNum,
+      //         enterColorChart,
+      //         entprName,
+      //         entprPlaneGragh,
+      //         floorArea,
+      //         fullEmegNum,
+      //         fullSafety,
+      //         fullSafetyNum,
+      //         gridCode,
+      //         gridEntprStatus,
+      //         groupCompName,
+      //         indusTypeClass,
+      //         industryRefer,
+      //         infoYear,
+      //         isPoint,
+      //         latitudeGps,
+      //         legalPerson,
+      //         localSafetyAdmin,
+      //         longitudeGps,
+      //         mainProduct,
+      //         majorHazardInstallations,
+      //         majorHazardLevel,
+      //         operatingStatus,
+      //         parentCompName,
+      //         partSafetyNum,
+      //         regAddr,
+      //         regCapi,
+      //         safetyDepart,
+      //         safetyDepartDuty,
+      //         safetyDepartName,
+      //         safetyDepartNum,
+      //         safetyEmail,
+      //         safetyManager,
+      //         safetyMobtel,
+      //         safetySupervisionLevel,
+      //         safetyTel,
+      //         setupDate,
+      //         sourceData,
+      //         specialGovernance,
+      //         speclalOperationNum,
+      //         standLevel,
+      //         stateOwed,
+      //         supervisionLarge,
+      //         supervisionSmall,
+      //         uscCode } = option
+      // this.changeDescriptions(this.listDes,option)
     },
     Close(item) {
       this.addShow = false;
+      this.details = null
     },
     changeDescriptions(arr,arr2){
       for (let key in arr2) {
@@ -400,7 +439,105 @@ export default {
           })
         }
       }
-    }
+    },
+    filterTable(a, b) {
+      if (!b) return;
+      return this.selectDictLabel(a, b);
+    },
+    look(e) {
+      this.details = e;
+      // console.log(e)
+      for (let key in this.details) {
+        this.listDes.forEach((value1, index1) => {
+          if (key == value1.eng) {
+            this.listDes[index1].value = this.details[key] == '无' ? '/' : this.details[key];
+            return;
+          }
+        });
+      }
+      this.listDes.forEach((value1, index1) => {
+        //重大危险源等级
+        if (value1.eng == "majorHazardLevel") {
+          this.listDes[index1].value = this.filterTable(
+            this.dict.type.major_hazard_level,
+            value1.value
+          );
+        }
+        //经济类型大类
+        if (value1.eng == "ecoTypeLarge") {
+          this.listDes[index1].value = this.filterTable(
+            this.dict.type.economic_categories,
+            value1.value
+          );
+        }
+        //经济类型小类
+        if (value1.eng == "ecoTypeSmall") {
+          this.listDes[index1].value = this.filterTable(
+            this.dict.type.economic_subcategory,
+            value1.value
+          );
+        }
+        //专项治理类别
+        if (value1.eng == "specialGovernance") {
+          this.listDes[index1].value = this.filterTable(
+            this.dict.type.special_governance,
+            value1.value
+          );
+        }
+        //隶属关系
+        //企业经营状态
+        if (value1.eng == "operatingStatus") {
+          this.listDes[index1].value = this.filterTable(
+            this.dict.type.enterprise_status,
+            value1.value
+          );
+        }
+        //标准化等级
+        if (value1.eng == "standLevel") {
+          this.listDes[index1].value = this.filterTable(
+            this.dict.type.standardization_level,
+            value1.value
+          );
+        }
+        //安全监管等级
+        if (value1.eng == "safetySupervisionLevel") {
+          this.listDes[index1].value = this.filterTable(
+            this.dict.type.safety_level,
+            value1.value
+          );
+        }
+        //检查来源
+        //文书类型
+        // 检查方式
+        // 企业分色
+        if (value1.eng == "entprColor") {
+          this.listDes[index1].value = this.filterTable(
+            this.dict.type.entpr_color,
+            value1.value
+          );
+        }
+        // 行业类型
+        if (value1.eng == "indusTypeClass") {
+          this.listDes[index1].value = this.filterTable(
+            this.dict.type.category,
+            value1.value
+          );
+        }
+        //是否重点
+        if (value1.eng == "isPoint") {
+          this.listDes[index1].value = this.filterTable(
+            this.dict.type.is_point,
+            value1.value
+          );
+        }
+        if (value1.value == null ) {
+          this.listDes[index1].value = '/'
+        }
+        if ( value1.value == 'false') {
+          this.listDes[index1].value = '否'
+        }
+      });
+    },
   },
 }
 </script>
diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue
index d7c1e18..973c2e1 100644
--- a/src/views/yingji/enterprise.vue
+++ b/src/views/yingji/enterprise.vue
@@ -620,7 +620,7 @@ export default {
       for (let key in this.details) {
         this.listDes.forEach((value1, index1) => {
           if (key == value1.eng) {
-            this.listDes[index1].value = this.details[key];
+            this.listDes[index1].value = this.details[key] == '无' ? '/' : this.details[key];
             return;
           }
         });
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index 7b6a0f8..0e31f62 100644
--- a/src/views/yingji/planManage.vue
+++ b/src/views/yingji/planManage.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-04 10:20:06
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-29 15:40:31
+ * @LastEditTime: 2023-09-29 16:20:31
 -->
 <template>
     <div class="plan-management">
@@ -461,9 +461,9 @@
         let res = await this.$api.yingji.planmx(pages);
         if(res.code == 200) {
           this.loading = false;
+          this.tableData = res.data.list;
+          this.total = res.data.total
         }
-        this.tableData = res.data.list;
-        this.total = res.data.total
       },
       commentData(item,dept){
         // if(dept.ancestors.split(',').length == 3) {