Merge branch 'dhy' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/suzhouyingjiPC

src/layout/newyjLayout.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="big-container">
-    <div class="left-menu">
+    <div class="left-menu" >
       <nav class="menu-headers">
         <div>
           <img src="../assets/images/logo.png" alt="" />
@@ -8,28 +8,30 @@
         <div class="nav-text">苏州市应急</div>
         <div class="nav-text">执法计划管理系统</div>
       </nav>
-      <div
-        v-for="(item, index) in newRouter"
-        :key="index"
-        @click="changePath(index, item)"
-      >
-        <!-- 标题分割线 -->
-        <div class="subLine1" v-if="index == 0"></div>
+      <div >
         <div
-          class="sub-item"
-          :class="routerIndex == index ? 'activeColor' : ''"
+          v-for="(item, index) in newRouter"
+          :key="index"
+          @click="changePath(index, item)"
         >
-          <div class="activeBox" v-show="index == routerIndex"></div>
+          <!-- 标题分割线 -->
+          <div class="subLine1" v-if="index == 0"></div>
           <div
-            class="item-img"
-            :style="`background-image:url(${
-              routerIndex == index ? item.icon2 : item.icon1
-            })`"
-          ></div>
-          {{ item.name }}
+            class="sub-item"
+            :class="routerIndex == index ? 'activeColor' : ''"
+          >
+            <div class="activeBox" v-show="index == routerIndex"></div>
+            <div
+              class="item-img"
+              :style="`background-image:url(${
+                routerIndex == index ? item.icon2 : item.icon1
+              })`"
+            ></div>
+            {{ item.name }}
+          </div>
+          <!-- 菜单分割线 -->
+          <div class="subLine2"></div>
         </div>
-        <!-- 菜单分割线 -->
-        <div class="subLine2"></div>
       </div>
     </div>
     <div class="right-view">

src/views/yingji/enterprise.vue

@@ -149,7 +149,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="entprColor"
+          prop="entprcolor"
           label="企业分色"
           header-align="center"
         >
@@ -220,13 +220,7 @@
                 v-for="(item, index) in listDes"
                 :key="index"
               >
-                {{
-                  item.value == "null"
-                    ? ""
-                    : item.value == "false"
-                    ? "暂无"
-                    : item.value
-                }}
+                {{ item.value }}
               </el-descriptions-item>
             </el-descriptions>
           </div>
@@ -307,11 +301,11 @@ export default {
           label: "注册安全工程师人员数量",
           value: "",
         },
-        {
-          eng: "doublePreven",
-          label: "是否开展双重预防机制",
-          value: "",
-        },
+        // {
+        //   eng: "doublePreven",
+        //   label: "是否开展双重预防机制",
+        //   value: "",
+        // },
         {
           eng: "ecoTypeLarge",
           label: "经济类型大类",
@@ -328,25 +322,25 @@ export default {
           value: "",
         },
         {
-          eng: "enterColorChart",
-          label: "企业分色图",
-          value: "",
-        },
-        {
-          eng: "entprId",
-          label: "企业ID",
+          eng: "entprcolor",
+          label: "企业分色",
           value: "",
         },
+        // {
+        //   eng: "entprId",
+        //   label: "企业ID",
+        //   value: "",
+        // },
         {
           eng: "entprName",
           label: "企业名称",
           value: "",
         },
-        {
-          eng: "entprPlaneGragh",
-          label: "企业平面图",
-          value: "",
-        },
+        // {
+        //   eng: "entprPlaneGragh",
+        //   label: "企业平面图",
+        //   value: "",
+        // },
         {
           eng: "floorArea",
           label: "占地面积（㎡）",
@@ -387,26 +381,26 @@ export default {
           label: "行业类别门类",
           value: "",
         },
-        {
-          eng: "indusTypeLagre",
-          label: "行业类别大类",
-          value: "",
-        },
-        {
-          eng: "indusTypeMiddle",
-          label: "行业类别中类",
-          value: "",
-        },
-        {
-          eng: "indusTypeSmall",
-          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: "数据年份",
@@ -554,16 +548,16 @@ export default {
           label: "是否为国有企业",
           value: "",
         },
-        {
-          eng: "supervisionLarge",
-          label: "行业监管大类",
-          value: "",
-        },
-        {
-          eng: "supervisionSmall",
-          label: "行业监管小类",
-          value: "",
-        },
+        // {
+        //   eng: "supervisionLarge",
+        //   label: "行业监管大类",
+        //   value: "",
+        // },
+        // {
+        //   eng: "supervisionSmall",
+        //   label: "行业监管小类",
+        //   value: "",
+        // },
         {
           eng: "uscCode",
           label: "统一社会信用代码",
@@ -706,6 +700,12 @@ export default {
             value1.value
           );
         }
+        if (value1.value == null ) {
+          this.listDes[index1].value = '/'
+        }
+        if ( value1.value == 'false') {
+          this.listDes[index1].value = '否'
+        }
       });
     },
     quhua(e) {