Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/components/Query/clickQuery/CockpitVector.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="CockpitVectorBox">
-    
+
     <div class="cockpit_vector">
       <div class="list_vector list_vector_multi" v-for="(item, index ) in store.state.vectorData" :key="index"
-        v-if="item.name != 'geom'">
+        v-if="item.name != 'geom' && item.id != 'id' && item.type != 'type'">
         <div class="filed_box">
           {{ item.name }}
         </div>

src/components/Query/clickQuery/clickQuery.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="sm-panel sm-function-module-query" v-show="PoinyQueryShow">
+  <div class="sm-panel sm-function-module-query" v-show="PoinyQueryShow && (store.state.cockpit_vector.title ? !store.state.viewer_flag : true)">
     <div class="sm-panel-header">
       <span>{{ Resource.PoinyQuery }}</span>
       <span class="closeBtn" @click="toggleVisibility">&times;</span>

src/store/store.js

@@ -40,6 +40,7 @@ var store2 = {
         sceneLayerlist: [],
         flattenNames: [],//存储压平的名称数组
         cockpit_date: null,
+        cockpit_region: {id:'4602'},//行政区划
         viewer_flag: true,
         xzqh_flag: true,
         query_pick_pane: [],
@@ -269,7 +270,11 @@ var store2 = {
         this.state.cockpit_date = newValue;
     }, setCockpitGkzb(newValue) {
         this.state.cockpit_gkzb = newValue;
-    }, setViewerFlagb(newValue) {
+    }, 
+    setCockpitRegion(newValue) {
+        this.state.cockpit_region = newValue;
+    }, 
+    setViewerFlagb(newValue) {
         this.state.viewer_flag = newValue;
     },
     // 中图添加夜景

src/views/cockpit/borderTemplate.vue

@@ -4,6 +4,7 @@
       <div>
         <div class="icon"></div>
         <span>{{ titleName }}</span>
+        <span class="region">{{ store.state.cockpit_region.name }}</span>
       </div>
       <slot name="title"></slot>
     </div>
@@ -56,7 +57,11 @@ export default {
       font-weight: bold;
       position: relative;
       bottom: -0.3rem;
-      left: 2.4rem;
+      left: 2.7rem;
+    }
+    .region{
+        font-weight: 500;
+        margin-left: 10px;
     }
 
     .selectTab {

src/views/cockpit/common/Title.vue

@@ -2,6 +2,9 @@
     <div class="title">
         <div class="icon"></div>
         <span>{{ title }}</span>
+        <span class="region" v-if="title != '空间规划指标'">
+           {{ store.state.cockpit_region.name }}
+        </span>
     </div>
 </template>
 
@@ -56,5 +59,9 @@ export default {
         font-weight: bold;
         margin-left: 2.7rem;
     }
+    .region{
+        font-weight: 500;
+        margin-left: 10px;
+    }
 }
 </style>

src/views/cockpit/common/VectorSpace/BoxCommonVector.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="BoxCommonVector">
+    <div class="BoxCommonVector" v-if="title">
         <div class="innerContainerVector leftPaneVector">
 
             <h2 class="PangetitleVector">
@@ -57,7 +57,7 @@ export default {
         draw_vector_tdgy_gy_jd(data) {
             // tdsy.remove();
             data.forEach((res) => {
-                res.type = '国有建设用地完成项目'
+                res.type = this.title
                 if (res.geom) {
                     res.geom.coordinates.forEach((res_coordinates) => {
                         let arrayt = [];
@@ -264,6 +264,10 @@ export default {
                   val0: word,
 
                 }
+                if(this.title == '土地供应完成项目' || this.title == '山水工程完成项目'){
+                    gy_ju.beginTime = undefined
+                    gy_ju.endTime = undefined
+                }
 
                 // let bj_sl = {
                 //   beginTime: store.state.cockpit_date[0],
@@ -297,6 +301,10 @@ export default {
         endTime: store.state.cockpit_date[1],
         id: params ? params.id : "4602",
       };
+      if(this.title == '土地供应完成项目' || this.title == '山水工程完成项目'){
+            obj.beginTime = undefined
+            obj.endTime = undefined
+        }
       let data = await QueryList(obj);
       data.data.map((res) => {
         if (res.geom) {
@@ -324,7 +332,6 @@ export default {
             }else {
               this.init_vector()
             }
-            
         },
         active_dableData(newVal, oldVal) {
             this.draw_vector_tdgy_gy_jd(newVal);

src/views/cockpit/gdbh.vue

@@ -20,7 +20,7 @@
             </div>
             <div class="text_back">
               <p>建设用地占用耕地</p>
-              <span>43.94</span>km²
+              <span>{{ balanceData.zy_gdmj }}</span>km²
 
             </div>
           </div>
@@ -32,7 +32,7 @@
             </div>
             <div class="text_back">
               <p>补充耕地</p>
-              <span>43.94</span>km²
+              <span>{{ balanceData.cb_gdmj }}</span>km²
 
             </div>
           </div>
@@ -48,7 +48,7 @@
                 <br>
 
                 <span class="zbph_value_unit">
-                  <span class="zbph_value">32.70</span>
+                  <span class="zbph_value">{{ balanceData.zy_st }}</span>
                   <span class="zbph_unit">km²</span>
                 </span>
               </li>
@@ -60,7 +60,7 @@
                 <br>
 
                 <span class="zbph_value_unit">
-                  <span class="zbph_value">623.11</span>
+                  <span class="zbph_value">{{ balanceData.zy_cn }}</span>
                   <span class="zbph_unit">吨</span>
                 </span>
               </li>
@@ -76,7 +76,7 @@
                 <br>
 
                 <span class="zbph_value_unit">
-                  <span class="zbph_value">32.70</span>
+                  <span class="zbph_value">{{ balanceData.cb_st }}</span>
                   <span class="zbph_unit">km²</span>
                 </span>
               </li>
@@ -88,7 +88,7 @@
                 <br>
 
                 <span class="zbph_value_unit">
-                  <span class="zbph_value">637.17</span>
+                  <span class="zbph_value">{{ balanceData.cb_cn }}</span>
                   <span class="zbph_unit">吨</span>
                 </span>
               </li>
@@ -208,6 +208,29 @@ export default {
         { value: "zbph", label: "占补平衡" },
         { value: "jcph", label: "进出平衡" },
       ],
+      zbpg_hz: {
+        zygd: {
+          qzst: 0,
+          sslscn: 0,
+          mj: 0,
+        },
+        bcgd: {
+          qzst: 0,
+          tslscn: 0,
+          mj: 0,
+        }
+
+      },
+      balanceData:{
+        cb_cn:0,
+        cb_gdm: 0,
+        cb_st: 0,
+        create_time: "20240101",
+        id: "4602",
+        zy_cn:0,
+        zy_gdmj: 0,
+        zy_st:0
+      },//占补平衡数据存储
     };
   },
   //监听属性 类似于data概念
@@ -220,8 +243,10 @@ export default {
     async init_info(params) {
       const that = this;
       let obj = {
-        jscType: 'sc_gdbh_xz_dlbm',
-        id: params ? params.id : '4602'
+        jscType: 'jsc_gdbh_zbph_hz',
+        id: params ? params.id : '4602',
+        beginTime: params ? params.beginTime : store.state.cockpit_date[0],
+        endTime: params ? params.endTime : store.state.cockpit_date[1],
       };
       let data = await QueryOne(obj);
       store.state.cockpit_gdbh.gdxz.title = data.data
@@ -313,7 +338,29 @@ export default {
       store.state.cockpit_gdbh.gdxz.list.yData = yData;
 
       this.init_gdxz_echart();
-    }, async init_zbph(params) {
+    },
+    async init_zbph_hz(params) {
+      const that = this;
+      let obj = {
+        jscType: 'jsc_gdbh_zbph_hz',
+        id: params ? params.id : '4602',
+        beginTime: params ? params.beginTime : store.state.cockpit_date[0],
+        endTime: params ? params.endTime : store.state.cockpit_date[1],
+      };
+      let data = await QueryOne(obj);
+      this.balanceData = data.data
+      // this.zbpg_hz.zygd.qzst = data.data.zy_st
+      // this.zbpg_hz.zygd.mj = data.data.zy_gdmj
+      // this.zbpg_hz.zygd.sslscn = data.data.zy_cn
+
+      // this.zbpg_hz.bcgd.qzst = data.data.cb_st
+      // this.zbpg_hz.bcgd.mj = data.data.cb_gdmj
+      // this.zbpg_hz.bcgd.tslscn = data.data.cb_cn
+      // console.log('this.zbpg_hz: ', this.zbpg_hz);
+
+      // store.state.cockpit_gdbh.zbph.bcgd = data.data
+    },
+    async init_zbph(params) {
       const that = this;
       let obj = {
         jscType: 'jsc_gdbh_zbph_gdbc',
@@ -598,7 +645,8 @@ export default {
       this.init_gdxz_echart();
       this.init_zbph();
       this.init_jcpg();
-
+      this.init_zbph_hz();
+      
     })
   },
 };

src/views/cockpit/hysy.vue

@@ -1,9 +1,6 @@
 <template>
     <div class="hysy">
-        <div class="title">
-            <div class="icon"></div>
-            <span>重点用地监管</span>
-        </div>
+        <Title title='重点用地监管'></Title>
         <div class="selectTab">
 
             <el-select v-model="left_value" placeholder="请选择" :popper-append-to-body="false" @change="changeChartsLeft">
@@ -40,9 +37,9 @@
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
 import { QueryOne, QueryList } from "../../api/cockpitNew";
 import DiscountedAColumnar from './common/DiscountedAColumnar.vue';
-
+import Title from './common/Title.vue';
 export default {
-    components: { DiscountedAColumnar },
+    components: { DiscountedAColumnar, Title },
     data() {
         return {
             activeName: 'first',
@@ -371,28 +368,28 @@ export default {
 
 
 
-.title {
-
-    border-width: 0px;
-    width: 100%;
-    height: 36px;
-    background: no-repeat;
-    background-size: 100% 100%;
-    background-image: url("/static/images/overview/titlebox.gif");
-    // background-size: 100% 100%;
-    display: flex;
-    justify-content: space-between;
-    position: relative;
-
-    span {
-        color: #fff;
-        font-size: 14px;
-        font-weight: bold;
-        position: absolute;
-        top: 0.3rem;
-        left: 2.5rem;
-    }
-}
+// .title {
+
+//     border-width: 0px;
+//     width: 100%;
+//     height: 36px;
+//     background: no-repeat;
+//     background-size: 100% 100%;
+//     background-image: url("/static/images/overview/titlebox.gif");
+//     // background-size: 100% 100%;
+//     display: flex;
+//     justify-content: space-between;
+//     position: relative;
+
+//     span {
+//         color: #fff;
+//         font-size: 14px;
+//         font-weight: bold;
+//         position: absolute;
+//         top: 0.3rem;
+//         left: 2.5rem;
+//     }
+// }
 
 .text {
     display: inline-block;

src/views/cockpit/kjgh.vue

@@ -3,7 +3,7 @@
     <Title :title="'空间规划指标'"></Title>
 
     <div class="content">
-      <div class="item">
+      <!-- <div class="item">
         <div class="icon">
           <div class="icon_zxkg">
 
@@ -14,8 +14,8 @@
           <span>{{ store.state.cockpit_gkzb.tbmj_ys }}</span>k㎡
 
         </div>
-      </div>
-      <div class="item">
+      </div> -->
+      <div class="item item100">
         <div class="icon">
           <div class="icon_yrkkg">
 
@@ -173,17 +173,20 @@ export default {
 .content {
   position: absolute;
   left: 1%;
-  width: 500px;
+  width: 100%;
   top: 18%;
 }
 
 .item {
-  width: 45%;
+  width: 49%;
   height: 30%;
   display: inline-block;
   // border: #00FFFF 1px solid;
 
 }
+.item100{
+  margin-left: 25%;
+}
 
 .icon {
   width: 50px;
@@ -316,7 +319,7 @@ export default {
 .text {
   display: inline-block;
   // border: #00FFFF 1px solid;
-  width: 170px;
+  width: 130px;
 
   p {
     font-kerning: normal;

src/views/cockpit/stxf.vue

@@ -10,11 +10,12 @@
       </div>
     </template>
     <div class="stacontent">
-      <div class="item" v-for="(sd, index) in sdlist[tab]" :key="index">
+      <div class="item" v-for="(sd, index) in sdlist[tab]" :key="index" :class="{cursor: sd.view}" @click="draw_vector(sd)">
         <div class="itembg"></div>
         <div class="text">{{ sd.name }}</div>
         <span>{{ sdata[tab][sd.prop] || 0 }}</span>
         {{ sd.unit }}
+        <i v-if="sd.view" style="pointer-events:all" :class="{ 'el-icon-view': true }"></i>
       </div>
     </div>
 
@@ -25,7 +26,7 @@
       <div class="content">
 
         <div class="infoLIst content" ref="contentRef">
-          <div class="infoItem" v-for="(item, index) in store.state.cockpit_stxf.ssgc.list" :key="index">
+          <div class="infoItem" v-for="(item, index) in store.state.cockpit_stxf.ssgc.list" :key="index" >
             <div class="itemIcon">
               <span>
                 {{ index + 1 }}
@@ -38,6 +39,7 @@
                 <span><span class="font_color">投资金额</span>{{ item.tzje }}万元</span>
               </p>
             </div>
+            <div :class="item.geom != '' ? 'itemAdress' : 'itemAdress2'" @click="goDetail(item)"></div>
           </div>
         </div>
       </div>
@@ -51,7 +53,7 @@
 import borderTemplate from "./borderTemplate.vue";
 import { QueryOne, QueryList } from "../../api/cockpitNew";
 import pie3d from "../../components/echartsTemplate/3dPie.vue";
-
+import parse from "wellknown";
 export default {
   components: { borderTemplate, pie3d },
   data() {
@@ -70,7 +72,7 @@ export default {
           { name: "总投资", prop: "tzje", unit: "亿元" },
         ],
         ssxf: [
-          { name: "2023-2025年项目", prop: "xzqhdm_number", unit: "个" },
+          { name: "2023-2025年项目", prop: "xzqhdm_number", unit: "个", view:true },
           { name: "整治面积", prop: "zlmj", unit: "公顷" },
           { name: "总投资", prop: "tzje", unit: "亿元" },
         ],
@@ -103,6 +105,11 @@ export default {
         id: params ? params.id : '4602'
 
       });
+      res.data.map((res) => {
+        if (res.geom) {
+          res.geom = parse(res.geom.split(";")[1]);
+        }
+      });
       store.state.cockpit_stxf.ssgc.list = res.data
 
 
@@ -213,6 +220,22 @@ export default {
       self.$refs.contentRef.addEventListener('mouseout', function () {
         self.timer = setInterval(setInter, 100)
       })
+    },
+    goDetail(item){
+      console.log(item,'/////')
+    },
+    draw_vector(sd) {
+      if (sd.view) {
+        store.setViewerFlagb(false);
+        store.setToolBarShow(false);
+        store.setXzqh_flag(false);
+        store.setCockpit_vector({
+          title: "山水工程完成项目",
+          tableData: store.state.cockpit_stxf.ssgc.list,
+          tablejscType: `jsc_stxf_ywlx_ssxfmx`,
+          columns: ['区县编码','区县编码名称','项目名称','投资金额(万元)','治理时间','治理进度','治理面积(公顷)','备注'],
+        });
+      }
     }
   },
   mounted() {
@@ -256,6 +279,7 @@ export default {
     left: 10px;
     background: no-repeat;
     background-image: url("/static/images/overview/Tab.png");
+    pointer-events: none;
   }
 
   .text {
@@ -271,6 +295,9 @@ export default {
     line-height: 18px;
   }
 }
+.cursor {
+  cursor: pointer;
+}
 
 
 #stxf_echart_tdzz {
@@ -323,8 +350,7 @@ export default {
     }
 
     .itemCon {
-
-      // width: 13.5rem;
+      width: 21rem;
       // height: 1.55rem;
       // background-color: #faa012;
       // line-height: 1.55rem;
@@ -358,6 +384,21 @@ export default {
       }
     }
 
+    .itemAdress {
+      width: 1.5rem;
+      height: 1.7rem;
+      background: url("/static/images/overview/iconDW.png") no-repeat;
+      background-size: 100% 100%;
+      margin: 0.5rem;
+      cursor: pointer;
+    }
+
+    .itemAdress2 {
+      width: 1.5rem;
+      height: 1.7rem;
+      margin: 0.5rem;
+    }
+
     .itemStatus1 {
       background: url("/static/images/overview/yrsIcon.png") no-repeat;
       background-size: 100% 100%;

src/views/cockpit/tdsy.vue

@@ -1,11 +1,12 @@
 <template>
   <div class="tdsy">
     <div class="box1">
+      <Title title='资源供应'></Title>
       <div class="title">
-        <div>
+        <!-- <div>
           <div class="icon"></div>
           <span>资源供应</span>
-        </div>
+        </div> -->
 
         <div class="selectTab left_tab">
           <el-select v-model="left_value" placeholder="请选择" :popper-append-to-body="false" @change="changeChartsLeft">
@@ -125,13 +126,13 @@ import { QueryOne, QueryList } from "../../api/cockpitNew";
 import pie3d from "../../components/echartsTemplate/3dPie.vue";
 import DialWatch from "./common/DialWatch.vue";
 import Graph3D from "./common/Graph3D.vue";
-
+import Title from './common/Title.vue';
 import parse from "wellknown";
 import * as tdsy from "./js/tdsy";
 let dataSources = {};
 import { mapState, mapGetters } from "vuex";
 export default {
-  components: { pie3d, DialWatch, Graph3D },
+  components: { pie3d, DialWatch, Graph3D, Title },
   data() {
     return {
       vector_data: null,
@@ -1157,6 +1158,7 @@ export default {
       store.setCockpit_vector({
         title: "土地供应完成项目",
         tableData: this.vector_data,
+        tablejscType: 'jsc_tdgy_gy_zbmx',
         columns: [
           "项目名称",
           "土地用途",
@@ -1240,23 +1242,23 @@ export default {
     box-shadow: none;
 
     .title {
-      border-width: 0px;
-      width: 100%;
-      height: 36px;
-      background: no-repeat;
-      background-image: url("/static/images/overview/titlebox.gif");
+      // border-width: 0px;
+      // width: 100%;
+      // height: 36px;
+      // background: no-repeat;
+      // background-image: url("/static/images/overview/titlebox.gif");
       // background-size: 100% 100%;
-      display: flex;
+      // display: flex;
       justify-content: space-between;
       position: relative;
 
-      span {
-        color: #fff;
-        font-size: 14px;
-        font-weight: bold;
-        position: relative;
-        bottom: 1.8rem;
-      }
+      // span {
+      //   color: #fff;
+      //   font-size: 14px;
+      //   font-weight: bold;
+      //   position: relative;
+      //   bottom: 1.8rem;
+      // }
     }
 
     .left_tab {

src/views/complianceAnalysis/components/scjg.vue

@@ -139,7 +139,7 @@ export default {
         this.echarts[i].dataList.forEach((child, ci) => {
           this.changeDataSources({ ...child, iseyes }, colors[ci]);
         });
-      this.lForEach(this.echarts[i].lchildren, iseyes, "sources");
+      this.lForEach(this.echarts[i].lchildren, "sources", iseyes);
       // }
       // emit("eyesChaneg");
     },
@@ -171,13 +171,18 @@ export default {
         }
       });
     },
-    changeDataSources({ geom, id, iseyes }, color) {
-      if (dataSourceList[id]) {
+    changeDataSources({ geom, id, iseyes, iszoom }, color) {
+      if (iszoom) {
+        this.zoomTo(id);
+      } else if (dataSourceList[id]) {
         dataSourceList[id].show = iseyes;
       } else if (geom) {
         this.addPolygon(geom, id, color);
       }
     },
+    zoomTo(id) {
+      if (dataSourceList[id]) viewer.zoomTo(dataSourceList[id]);
+    },
     setEchart(data, id, childid) {
       this.$nextTick(() => {
         let type = data.length <= 6 ? "horizontal" : "vertical";

src/views/complianceAnalysis/components/scjgContent.vue

@@ -62,9 +62,9 @@ export default {
       }
     },
     mapviewClick(ldata) {
-      if (ldata.iseyes == undefined || !this.piseyes) ldata.iseyes = true;
-      this.$set(ldata, "iseyes", !ldata.iseyes);
-      this.mapview(ldata);
+      // if (ldata.iseyes == undefined || !this.piseyes) ldata.iseyes = true;
+      // this.$set(ldata, "iseyes", !ldata.iseyes);
+      this.mapview({ ...ldata, iszoom: true });
     },
     mapview(data) {
       this.$emit("mapview", data);

src/views/complianceAnalysis/index.vue

@@ -22,7 +22,7 @@
           ></Lsjl>
         </el-tab-pane>
         <el-tab-pane
-          label="检查结果"
+          label="分析结果"
           name="scjg"
           :disabled="activeTabs != 'scjg'"
         >

src/views/siteselection/components/fzxz.vue

@@ -86,9 +86,9 @@
           <el-checkbox v-model="ruleForm.useLandType">
             是否与控规用地性质一致</el-checkbox
           >
-          <el-checkbox v-model="ruleForm.useMultiple"
+          <!-- <el-checkbox v-model="ruleForm.useMultiple"
             >是否允许选出多个分散地块。</el-checkbox
-          >
+          > -->
           <div v-if="ruleForm.useMultiple">
             请输入地块间最大距离
             <el-input
@@ -119,12 +119,9 @@
           </template>
         </el-table-column>
 
-        <el-table-column
-          label="约束值(m/°)"
-          show-overflow-tooltip
-        >
-        <template slot-scope="scope">
-            <span>{{scope.row.conditionInfo.defaultValue }}</span>
+        <el-table-column label="约束值(m/°)" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.conditionInfo.defaultValue }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -162,10 +159,10 @@ export default {
       checkbox_data: 0,
       ruleForm: {
         xzmj: 0,
-        xmmc: "",
-        jsdw: "",
+        xmmc: "规划选址项目_" + this.getCurrentDateTime(),
+        jsdw: "建设单位",
         // xmlx: "",
-        ydlx: "",
+        ydlx: ["07", "0701"],//默认为城镇住宅用地
         ydmjbegin: "", //用地面积开始
         ydmjend: "", //用地面积结束
         sjy: "", //数据源
@@ -180,7 +177,7 @@ export default {
           { required: true, message: "请输入项目名称", trigger: "blur" },
           { min: 3, max: 10, message: "长度在 3 到 5 个字符", trigger: "blur" },
         ],
-        jsdw: [{ required: true, message: "请输入建设单位", trigger: "blur" }],
+        // jsdw: [{ required: true, message: "请输入建设单位", trigger: "blur" }],
         // xmlx: [{ required: true, message: "请输入项目类型", trigger: "blur" }],
         ydlx: [{ required: true, message: "请输入用地类型", trigger: "blur" }],
         ydmjbegin: [
@@ -198,7 +195,7 @@ export default {
       value: [],
       cascaderOptions: [], //用地性质数据存储数组
       sjyBSM: "",
-      ydlxBSM: "",
+      ydlxBSM: "0701",
       checkList: [
         {
           key: "是否与控规用地性质一致",
@@ -217,22 +214,23 @@ export default {
       fzbs: "YDYHFLDM",
     }).then((res) => {
       //顶级树只有一个
-      let childArr = res.data;
-      childArr.forEach((item) => {
-        let child = item.children;
-        if (item.children.length < 1) {
-          item.children = undefined;
-        } else {
-          for (var i = 0; i < child.length; i++) {
-            if (child[i].children.length < 1) {
-              //判断children的数组长度
-              child[i].children = undefined;
-            }
-          }
-        }
-      });
+      // let childArr = res.data;
+      // childArr.forEach((item) => {
+      //   let child = item.children;
+      //   if (item.children.length < 1) {
+      //     item.children = null;
+      //   } else {
+      //     for (var i = 0; i < child.length; i++) {
+      //       if (child[i].children.length < 1) {
+      //         //判断children的数组长度
+      //         child[i].children = null;
+      //       }
+      //     }
+      //   }
+      // });
 
-      this.cascaderOptions = childArr; //为Cascader的options值
+      // this.cascaderOptions = childArr; //为Cascader的options值
+      this.cascaderOptions = res.data; //为Cascader的options值
     });
     // 获取选址数据源
     GetSjyList().then((res) => {
@@ -242,6 +240,19 @@ export default {
     });
   },
   methods: {
+    getCurrentDateTime() {
+      const now = new Date();
+      const year = now.getFullYear();
+      const month = this.padNumber(now.getMonth() + 1); // 月份是从0开始的
+      const day = this.padNumber(now.getDate());
+      const hours = this.padNumber(now.getHours());
+      const minutes = this.padNumber(now.getMinutes());
+      const seconds = this.padNumber(now.getSeconds());
+      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    },
+    padNumber(num) {
+      return num < 10 ? "0" + num : num;
+    },
     changeCheckBox(val) {
       console.log(val, "杰卡斯到货时间啊肯定会刷卡机很大");
       if (val.value == 1) {
@@ -298,12 +309,10 @@ export default {
       // }
     },
     handleChange2(value) {
-      // console.log(value);
       // const obj = this.$refs['Cascader'].getCheckedNodes()
       this.sjyBSM = value;
     },
     submitData() {
-      console.log(this.ruleForm, "this.ruleForm");
       //更新范围
       var _temp = this.$refs.range.getRange();
       // this.ruleForm.xzfw = _temp.xzfw;
@@ -326,7 +335,6 @@ export default {
             useLandType: this.ruleForm.useLandType, //是否与控规用地性质一致
             multipleDistance: this.ruleForm.multipleDistance, //多地块最大距离
           };
-          // console.log(obj, "objobj");
           AddFzxz(obj).then((res) => {
             const loading = this.$loading({
               lock: true,
@@ -354,10 +362,10 @@ export default {
     },
     reset() {
       (this.ruleForm = {
-        xmmc: "",
-        jsdw: "",
+        xmmc: "规划选址项目_" + this.getCurrentDateTime(),
+        jsdw: "建设单位",
         // xmlx: "",
-        ydlx: "",
+        ydlx: ["07", "0701"],
         ydmjbegin: "", //用地面积开始
         ydmjend: "", //用地面积结束
         sjy: this.options[0].sjymc, //数据源

src/views/viewer.vue

@@ -136,6 +136,7 @@ export default {
             // 耕地保护
             this.$refs.gdbh_ref.init_zbph(this.params);
             this.$refs.gdbh_ref.init_info(this.params);
+            this.$refs.gdbh_ref.init_zbph_hz(this.params);
 
 
             // this.$refs.stxf_ref.setData({ id: this.params.id });
@@ -250,6 +251,7 @@ export default {
                             let adcode = obj.adcode
                             that.params.id = adcode
                             that.params.name = pri_name
+                            store.setCockpitRegion(obj)
 
                             that.setDatas()
                             // 管控指标
@@ -268,6 +270,7 @@ export default {
 
                         that.params.id = '4602'
                         that.setDatas()
+                        store.setCockpitRegion({id: '4602'})
 
                     }
                 }