建设用地开发完成情况

website/src/components/ghfxpj/gtkjfxyy/tdkflyqdfx/xzqView.vue

@@ -17,6 +17,7 @@ export default {
   props: {
     mapName: {
       type: String,
+      default:'开发利用强度'
     },
     jgsj: {
       type: Object,
@@ -42,7 +43,7 @@ export default {
           trigger: "item",
           formatter: function (params) {
             // console.log(params);
-            return params.name + "<br>开发利用强度：" + params.data.value
+            return `${params.name}<br>${prop.mapName}：${params.data.value}`
           },
         },
         series: [

website/src/components/ghfxpj/wtsbztyy/fxsz.vue

@@ -55,7 +55,9 @@
         class="max-width flex-box column padding-10 box-sizing"
         style="padding-top: 0"
       >
-        <div class="block-title margin-top-5">分析因子</div>
+        <div class="block-title margin-top-5">
+          {{ zytype == "7" ? "分析地类" : "分析因子" }}
+        </div>
         <div class="max-width flex-box wrap margin-top-10">
           <div
             class="city-item pointer"
@@ -91,25 +93,6 @@
         </div>
       </div>
       <div
-        v-if="fxdlList.length > 0"
-        class="max-width flex-box column padding-10 box-sizing"
-        style="padding-top: 0"
-      >
-        <div class="block-title margin-top-5">分析地类</div>
-        <div class="max-width flex-box wrap margin-top-10">
-          <div
-            class="city-item pointer"
-            v-for="item in fxdlList"
-            :key="item.id"
-            :class="form.act_yz == item.id ? 'act_yz' : ''"
-            @click="changeDl(item)"
-          >
-            {{ item.name }}
-          </div>
-        </div>
-      </div>
-      <div
-        v-if="zytype != '7'"
         class="max-width flex-box column padding-10 box-sizing"
         style="padding-top: 0"
       >
@@ -173,7 +156,6 @@ export default {
       fxyzList: [], // 分析因子列表
       yearList: [], // 分析年份列表
       fxwdList: [], // 分析维度列表
-      fxdlList: [], // 分析地类
       active_layout: true,
       downloadLoading: false,
       xzqList: [],
@@ -286,6 +268,7 @@ export default {
               res.data[0].children.map((item) => {
                 fxsz.xzqList.push(item);
               });
+              fxsz.getResultName();
             } else {
               res.data[0].children.map((item) => {
                 if (item.label === store.state.user.user.dept.district) {
@@ -293,6 +276,7 @@ export default {
                   item.children.map((item2) => {
                     fxsz.xzqList.push(item2);
                   });
+                  fxsz.getResultName();
                 }
               });
             }
@@ -309,13 +293,6 @@ export default {
             }
           }
         });
-        if (prop.zytype == "7") {
-          fxsz.fxdlList = [
-            { name: "所有建设用地", id: 0 },
-            { name: "商业服务业用地", id: 1 },
-            { name: "工矿用地", id: 2 },
-          ];
-        }
       },
       // 获取数据源
       getSJY() {
@@ -349,15 +326,15 @@ export default {
         if (!fxsz.form.act_xzqmc) {
           fxsz.form.act_xzqmc = fxsz.xzqList.find(
             (item) => item.value === fxsz.form.act_xzq
-          ).label;
+          )?.label;
         }
         let fxyzName = fxsz.fxyzList.find(
           (item) => item.id === fxsz.form.act_yz
         ).name;
         let fxwdName = fxsz.fxwdList.find(
           (item) => item.id === fxsz.form.act_wd
-        ).name;
-        fxsz.form.jgmc = `${fxsz.form.act_year}年${fxsz.form.act_xzqmc}${fxyzName}与${fxwdName}`;
+        )?.name;
+        fxsz.form.jgmc = `${fxsz.form.act_year}年${fxsz.form.act_xzqmc}${fxyzName}${fxwdName ? "与" + fxwdName : ""}`;
       },
       //#endregion
     });

website/src/views/ghfxpj/gtkjfxyy/jsydkfqk.vue

@@ -14,7 +14,7 @@
           ></Content>
         </el-col>
         <el-col :span="18">
-          <XzqView v-model:jgsj="jgsj"></XzqView>
+          <XzqView mapName="建设用地开发完成" v-model:jgsj="jgsj"></XzqView>
         </el-col>
       </el-row>
     </div>
@@ -45,7 +45,7 @@
         jgsj: {
           xzqdm: "150500",
           statist:
-            '[{"xzqdm":"150526","xzqmc":"扎鲁特旗","proportion":200,"status":"预警"},{"xzqdm":"150500","xzqmc":"通辽市","proportion":33207.98,"status":"正常"},{"xzqdm":"150526","xzqmc":"扎鲁特旗","proportion":334,"status":"预警"},{"xzqdm":"150525","xzqmc":"奈曼旗","proportion":0,"status":"正常"},{"xzqdm":"150524","xzqmc":"库伦旗","proportion":1064.01,"status":"正常"},{"xzqdm":"150521","xzqmc":"科尔沁左翼中旗","proportion":465.81,"status":"正常"},{"xzqdm":"150522","xzqmc":"科尔沁左翼后旗","proportion":6051.84,"status":"正常"},{"xzqdm":"150502","xzqmc":"科尔沁区","proportion":13983.85,"status":"正常"},{"xzqdm":"150523","xzqmc":"开鲁县","proportion":9415.12,"status":"正常"},{"xzqdm":"150581","xzqmc":"霍林郭勒市","proportion":888.76,"status":"正常"}]',
+            '[{"xzqdm":"150526","xzqmc":"扎鲁特旗","proportion":0,"status":"正常"},{"xzqdm":"150500","xzqmc":"通辽市","proportion":33207.98,"status":"正常"},{"xzqdm":"150526","xzqmc":"扎鲁特旗","proportion":0,"status":"正常"},{"xzqdm":"150525","xzqmc":"奈曼旗","proportion":0,"status":"正常"},{"xzqdm":"150524","xzqmc":"库伦旗","proportion":0,"status":"正常"},{"xzqdm":"150521","xzqmc":"科尔沁左翼中旗","proportion":0,"status":"正常"},{"xzqdm":"150522","xzqmc":"科尔沁左翼后旗","proportion":0,"status":"正常"},{"xzqdm":"150502","xzqmc":"科尔沁区","proportion":0,"status":"正常"},{"xzqdm":"150523","xzqmc":"开鲁县","proportion":0,"status":"正常"},{"xzqdm":"150581","xzqmc":"霍林郭勒市","proportion":0,"status":"正常"}]',
         },
         changeValue(site) {
           // if (site.checked && !arcMap.getLayerById(site.id)) {