1

src/views/distributionnetwork/secure/components/WorkPlanDetailModel.vue

@@ -27,7 +27,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24" v-if="type == 3">
-            <el-form-item label="作业风险">
+            <el-form-item label="风险类型">
               <div v-for="(ite, i) in riskTypeList" :key="i">
                 <span v-if="ite.roleCode == form.riskType">
                   <el-tag type="danger" effect="dark">{{
@@ -37,8 +37,8 @@
               </div>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="type == 3 || type == 4">
-            <el-form-item label="风险类型">
+          <el-col :span="24" v-if="type == 4">
+            <el-form-item label="异常类型">
               <div v-for="(ite, i) in exceptionTypeList" :key="i">
                 <span v-if="ite.dictValue == form.exceptionType">
                   <el-tag type="danger" effect="dark">{{

src/views/home/components/map/index.vue

@@ -134,15 +134,15 @@ export default {
                 "-作业数量 " +
                 `<span class="orange">${this.dataMap[key] || 0}</span> <br/>`;
             });
-            return str;
-            // const v = Array.isArray(params.value)
-            //   ? params.value[2]
-            //   : params.value;
-            // return (
-            //   params.name +
-            //   "-作业数量 " +
-            //   `<span class="orange">${v || 0}</span> <br/>`
-            // );
+            const v = Array.isArray(params.value)
+              ? params.value[2]
+              : params.value;
+
+            return this.currentMap == "衡阳市"
+              ? str
+              : params.name +
+                  "-作业数量 " +
+                  `<span class="orange">${v || 0}</span> <br/>`;
           },
         },
         // visualMap: {