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

src/views/yingji/echarts/executive.vue

@@ -71,11 +71,11 @@ export default {
     },
     getData(e) {
       if (e.length == 1) {
-        this.$emit("quhua", e[0].slice(0, 8));
+        this.$emit("quhua", e[0].slice(1, 8));
       } else if (e.length == 2 && e[0] == e[1]) {
-        this.$emit("quhua", e[0].slice(0, 8));
+        this.$emit("quhua", e[0].slice(1, 8));
       } else {
-        this.$emit("quhua", e[1].slice(0, 11));
+        this.$emit("quhua", e[1].slice(1, 11));
       }
     },
   },

src/views/yingji/enterprise.vue

@@ -35,7 +35,7 @@
             </el-option>
           </el-select>
         </div>
-        <div class="select-input">
+        <!-- <div class="select-input">
           <div class="select-span">是否重点:</div>
           <el-select v-model="form.isPoint" placeholder="请选择">
             <el-option
@@ -46,6 +46,18 @@
             >
             </el-option>
           </el-select>
+        </div> -->
+        <div class="select-input">
+          <div class="select-span">企业分色:</div>
+          <el-select v-model="form.entprColor" placeholder="请选择">
+            <el-option
+              v-for="item in dict.type.entpr_color"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </div>
       </div>
       <div class="two-line">
@@ -62,19 +74,8 @@
               </el-option>
             </el-select>
           </div>
-          <div class="select-input">
-            <div class="select-span">企业分色:</div>
-            <el-select v-model="form.entprColor" placeholder="请选择">
-              <el-option
-                v-for="item in dict.type.entpr_color"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </div>
-          <div class="input-input">
+
+          <div class="input-input" style="margin-left: 10px;">
             <div class="select-span">统一社会信用代码:</div>
             <el-input
               v-model="form.uscCode"
@@ -737,7 +738,7 @@ export default {
         subdistrict: "",
         frimType: "",
         indusTypeClass: "",
-        isPoint: "",
+        // isPoint: "",
         majorHazardLevel: "",
         entprColor: "",
         uscCode: "",
@@ -927,7 +928,7 @@ export default {
       .two-line-left {
         display: flex;
         align-items: center;
-        justify-content: space-between;
+        // justify-content: space-between;
         padding-right: 50px;
         width: 88%;
         .input-input {