细节修改

src/assets/styles/index.scss

@@ -724,3 +724,6 @@ body{
 .fs-pro{
   font-size: 30px !important;
 }
+.is-flex{
+  display: flex;
+}

src/services/one-map.js

@@ -182,3 +182,12 @@ export function getNdjzRightPanelList(){
         url:'/yzt/get_nfjz_area'
     })
 }
+export function GetYxzsdkList(params) {
+    return request({
+        url: '/yxzsdk/list',
+        params: {
+            ...params,
+        },
+        method: "get"
+    })
+}

src/views/deck/pages/Page_cylht.vue

@@ -86,6 +86,23 @@
                      :label="item" :key="item" :value="item"></el-option>
         </el-select>
       </div>
+      <div  v-if="currentLayerInfo.name === '意向招商地块'">
+        <div>
+          <el-select clearable v-model="sort_zjd.ghyt" placeholder="请选择流转用途"  class="select-default" popper-class="select-default select-default-popper">
+            <el-option label="流转用途" value=""></el-option>
+            <el-option v-for="item in lzytArr" :label="item.value" :key="item.value"
+                       :value="item.value"></el-option>
+          </el-select>
+        </div>
+        <div class="is-flex two-column">
+          <div style="width: 75%" class="input-range select-default">
+            <el-input type="number" class="" v-model="sort_zjd.area_min" placeholder="最小流转面积" clearable></el-input>
+            <span class="my-line">-</span>
+            <el-input type="number" v-model="sort_zjd.area_max" placeholder="最大流转面积" clearable></el-input>
+          </div>
+          <div style="width: 20%" class="button-default" @click="getListData">查询</div>
+        </div>
+      </div>
       <div class="cr-b2">
         <my-table    highlight-current-row :table-event-obj="{
           'row-click':handlePickItem
@@ -115,7 +132,7 @@ import {getEntSummary, processUnitSituation} from "@/services/zhcj";
 import {GetZjdAnalyse} from "@/services/zjd";
 import {GetDsxmJsonD} from "@/services/dsxm";
 import {getLayerByName} from "@/utils/data/all-layer-info";
-import {getJydwblcightList, getJydwcccightList, getNdjzRightPanelList} from "@/services/one-map";
+import {getJydwblcightList, getJydwcccightList, getNdjzRightPanelList, GetYxzsdkList} from "@/services/one-map";
 import {GetGczList} from "@/services/znfx";
 // import ZhcjZhgc from "@/views/deck/pages/zhcj_sub/ZhcjZhgc.vue";
 
@@ -145,6 +162,13 @@ export default {
   },
   data() {
     return {
+      lzytArr:[
+        { value: "设施化养殖", label: '设施化养殖' },
+        { value: "现代化种植业", label: '现代化种植业' },
+        { value: "休闲农业", label: '休闲农业' },
+        { value: "花卉产业", label: '花卉产业' },
+        { value: "林下经济", label: '林下经济' },
+      ],
       zjd_select:[],
       sort_zjd:{
         town: 'all',
@@ -205,98 +229,7 @@ export default {
   },
   mounted() {
 
-    let data_sta = {
-      '产业联合体':[
-        { name: '产业联合体', value: 0, icon: require('@/assets/imgs/deck/page_zhcj/icon-jtsl.png') },
-        { name: '基地数量', value: 0, icon: require('@/assets/imgs/deck/page_zhcj/icon-lhzt.png') }
-      ],
-      '农村宅基地':[
-        { name: '宅基地占地面积', value: 0, icon: require('@/assets/imgs/deck/page-zjd/人口数量16.png'),unit:'km²' },
-        { name: '宅基地数量', value: 0, icon: require('@/assets/imgs/deck/page-zjd/宅基地数量16.png'),unit: '个'},
-        { name: '人口数量', value: 0, icon: require('@/assets/imgs/deck/page-zjd/人口数量16.png'), unit: '人'},
-      ],
-    }
-    this.data_sta = data_sta[this.currentLayerInfo.name]
-    if (this.currentLayerInfo.name === '产业联合体'){
-      processUnitSituation().then(res => {
-        this.data_sta.forEach((i,index) => {
-          if (index === 0){
-            i.value =res.data.jtcnt
-          }else {
-            i.value =res.data.jdcnt
-          }
-        })
-        // console.log(res)
-      })
-    }
-    else if (this.currentLayerInfo.name === '龙头企业'){
-      getEntSummary().then((res) => {
-        this.data_lt.forEach((i) => (i.count = res.data[i.key]));
-      });
-    }
-    else if (this.currentLayerInfo.name === '郊野单元保留村'){
-      getJydwblcightList().then(res => {
-        this.tableData = res.data
-        console.log('郊野单元保留村',res.data)
-      })
-    }
-    else if (this.currentLayerInfo.name === '郊野单元撤并村'){
-      getJydwcccightList().then(res => {
-        this.tableData = res.data
-        console.log('郊野单元撤并村',res.data)
-      })
-    }  else if (this.currentLayerInfo.name === '农房建筑'){
-      getNdjzRightPanelList().then(res => {
-        this.tableData = res.data
-        console.log('农房建筑',res.data)
-      })
-    }
-    else if (this.currentLayerInfo.name === '农村宅基地'){
-      GetZjdAnalyse().then(res => {
-        let countZjdmj = 0
-        this.tableData = res.data
-        let options = []
-        // let myD = [...res.data]
-        // myD.sort((pre,cur) => {
-        //   return  pre['村'].localeCompare(cur['村'])
-        // })
-        // for (let i = 0; i < myD.length; i+1) {
-        //   let findI
-        // }
-        res.data.forEach(i => {
-          let target = res.data.filter(j => j['镇'] === i['镇'])
-          // console.log(target)
-          if (target.length > 0 && !options.find(it => it.value === i['镇'])) {
-            options.push({ value: i['镇'], children: [...target.map(iy => iy['村'])] })
-            // if(!target.children.includes(i['村'])) {
-            // 	target.children.push(i['村'])
-            // }
-          } else {
-            // options.push({value: i['镇'], children: []})
-          }
-          countZjdmj += i['宅基地面积']
-          this.data_sta[0].value = (countZjdmj / 1000000).toFixed(2)
-          this.data_sta[1].value += i['个数']
-          this.data_sta[2].value += Math.round(i['人口数量'])
-        })
-
-        this.zjd_select = options
-      })
-    }
-    else if (this.currentLayerInfo.name === '都市项目'){
-      GetDsxmJsonD().then(res => {
-        this.tableData = res.data
-
-      })
-    }
-    else if (this.currentLayerInfo.name === '观测站区域分布'){
-      GetGczList().then(res => {
-        // console.log(res.data)
-        this.tableData = res.data
-
-      })
-    }
-
+   this.getListData()
     this.initMap()
   },
   computed: {
@@ -323,6 +256,7 @@ export default {
     pointSearchShow() {
       return this.$store.state.pointSearchShow
     },
+
     zjsFilterTableData(){
       if (this.currentLayerInfo.name === '农村宅基地'){
         if (this.sort_zjd.town == "all") {
@@ -400,6 +334,16 @@ export default {
            {label:'房屋面积(m²)',prop:'area',type:'mj'},
          ]
       }
+     else if (this.currentLayerInfo.name === '意向招商地块'){
+         return  [
+           {label: '所属乡镇',prop:'ssjz'},
+
+           {label:'所属村',prop:'ssc'},
+           {label:'地块状态',prop:'zt'},
+           {label:'流转用途',prop:'ghyt'},
+           {label:'流转面积（亩）',prop:'tbmj',type:'mj'},
+         ]
+      }
 
       let enArr  =allLayerEnToCnArr.find(i => i.name === this.currentLayerInfo.name)?.enArr.filter(my => {
         let f = this.showTableField.find(name => name.label===(my.cn))
@@ -430,6 +374,112 @@ export default {
     }
   },
   methods: {
+    getListData(){
+      let data_sta = {
+        '产业联合体':[
+          { name: '产业联合体', value: 0, icon: require('@/assets/imgs/deck/page_zhcj/icon-jtsl.png') },
+          { name: '基地数量', value: 0, icon: require('@/assets/imgs/deck/page_zhcj/icon-lhzt.png') }
+        ],
+        '农村宅基地':[
+          { name: '宅基地占地面积', value: 0, icon: require('@/assets/imgs/deck/page-zjd/人口数量16.png'),unit:'km²' },
+          { name: '宅基地数量', value: 0, icon: require('@/assets/imgs/deck/page-zjd/宅基地数量16.png'),unit: '个'},
+          { name: '人口数量', value: 0, icon: require('@/assets/imgs/deck/page-zjd/人口数量16.png'), unit: '人'},
+        ],
+      }
+      this.data_sta = data_sta[this.currentLayerInfo.name]
+      if (this.currentLayerInfo.name === '产业联合体'){
+        processUnitSituation().then(res => {
+          this.data_sta.forEach((i,index) => {
+            if (index === 0){
+              i.value =res.data.jtcnt
+            }else {
+              i.value =res.data.jdcnt
+            }
+          })
+          // console.log(res)
+        })
+      }
+      else if (this.currentLayerInfo.name === '龙头企业'){
+        getEntSummary().then((res) => {
+          this.data_lt.forEach((i) => (i.count = res.data[i.key]));
+        });
+      }
+      else if (this.currentLayerInfo.name === '郊野单元保留村'){
+        getJydwblcightList().then(res => {
+          this.tableData = res.data
+          console.log('郊野单元保留村',res.data)
+        })
+      }
+      else if (this.currentLayerInfo.name === '郊野单元撤并村'){
+        getJydwcccightList().then(res => {
+          this.tableData = res.data
+          console.log('郊野单元撤并村',res.data)
+        })
+      }  else if (this.currentLayerInfo.name === '农房建筑'){
+        getNdjzRightPanelList().then(res => {
+          this.tableData = res.data
+          console.log('农房建筑',res.data)
+        })
+      }
+      else if (this.currentLayerInfo.name === '农村宅基地'){
+        GetZjdAnalyse().then(res => {
+          let countZjdmj = 0
+          this.tableData = res.data
+          let options = []
+          // let myD = [...res.data]
+          // myD.sort((pre,cur) => {
+          //   return  pre['村'].localeCompare(cur['村'])
+          // })
+          // for (let i = 0; i < myD.length; i+1) {
+          //   let findI
+          // }
+          res.data.forEach(i => {
+            let target = res.data.filter(j => j['镇'] === i['镇'])
+            // console.log(target)
+            if (target.length > 0 && !options.find(it => it.value === i['镇'])) {
+              options.push({ value: i['镇'], children: [...target.map(iy => iy['村'])] })
+              // if(!target.children.includes(i['村'])) {
+              // 	target.children.push(i['村'])
+              // }
+            } else {
+              // options.push({value: i['镇'], children: []})
+            }
+            countZjdmj += i['宅基地面积']
+            this.data_sta[0].value = (countZjdmj / 1000000).toFixed(2)
+            this.data_sta[1].value += i['个数']
+            this.data_sta[2].value += Math.round(i['人口数量'])
+          })
+
+          this.zjd_select = options
+        })
+      }
+      else if (this.currentLayerInfo.name === '都市项目'){
+        GetDsxmJsonD().then(res => {
+          this.tableData = res.data
+
+        })
+      }
+      else if (this.currentLayerInfo.name === '观测站区域分布'){
+        GetGczList().then(res => {
+          // console.log(res.data)
+          this.tableData = res.data
+
+        })
+      }
+      else if (this.currentLayerInfo.name === '意向招商地块'){
+        GetYxzsdkList({
+          pageNum: 1,
+          pageSize: 1000,
+          zdtbmj: this.sort_zjd.area_max,
+          zxtbmj: this.sort_zjd.area_min,
+          ghyt: this.sort_zjd.ghyt,
+        }).then(res => {
+          // console.log(res.data)
+          this.tableData = res.data.list
+
+        })
+      }
+    },
     changeAnimalType(item){
       this.data_clb1.currentAnimal=this.data_clb1.currentAnimal===item.name?'':item.name
       layerControlNew("gmhyzc",true,1,this.data_clb1.currentAnimal===""?"1=1":"animal_type = '" + this.data_clb1.currentAnimal + "'")
@@ -596,7 +646,19 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.two-column{
+  .my-line{
+    margin: 0 5px;
+  }
+  margin-top: 10px;
+  justify-content: space-between;
+}
+.input-range{
+  display: flex;
+  color: #fff;
+}
 .deck-pages.nczjd{
+
   .other-b1{
     justify-content: flex-start;
   }
@@ -604,6 +666,7 @@ export default {
 .zjd-sort{
   margin-bottom: 15px;
   justify-content: space-between;
+
  >div{
 
    width: 48%;

src/views/deck/pages/zhcj_sub/ZhcjXczx.vue

@@ -285,6 +285,15 @@ export default {
           setCamera({
             tilt:60
           })
+          setTimeout(() => {
+            if (item.village !== '新建村'){
+              layerQueryGet(this.layer_xczx.url, `name='${item.village}'`, true, true, true, 5000, this.outlinecolor, 3)
+            }else {
+              // layerQueryGet(process.env.VUE_APP_MAP_SERVICE +'/i3s_svc/qxsy_test_3/SceneServer', `name='${item.village}'`, true, true, true, 10000, this.outlinecolor, 3)
+              layerQueryGet('http://10.108.3.5/ags_feature_svc/nfgl/FeatureServer/0', "name='新建村'", true, true, true, 5000,this.outlinecolor,3)
+            }
+            setScale(item.village === '新建村'?15000:50000)
+          },1000)
           layerControl('xczxymlxcsfc', false)
 
           if(item.village !== '新建村'){
@@ -294,21 +303,6 @@ export default {
           }
 
 
-          // getQxsyToken().then(res => {
-          //   console.log(res);
-          //   i = {
-          //     ...i,
-          //     jwt: res.data
-          //   }
-          //   addLayer(i)
-          // })
-          if (item.village !== '新建村'){
-            layerQueryGet(this.layer_xczx.url, `name='${item.village}'`, true, true, true, 5000, this.outlinecolor, 3)
-          }else {
-            // layerQueryGet(process.env.VUE_APP_MAP_SERVICE +'/i3s_svc/qxsy_test_3/SceneServer', `name='${item.village}'`, true, true, true, 10000, this.outlinecolor, 3)
-            layerQueryGet('http://10.108.3.5/ags_feature_svc/nfgl/FeatureServer/0', "name='新建村'", true, true, true, 5000,this.outlinecolor,3)
-          }
-          setScale(15000)
         }
         else {
           changeViewType('2D')

src/views/deck/pages/znfx_sub/ZnfxNyd.vue

@@ -17,12 +17,12 @@
       <span class="box-title2">土地类型统计</span>
       <div class="cl-b2">
         <div class="clb2-btns">
-          <el-select v-model="form_sta1.town" placeholder="请选择镇" class="select-default"
+          <el-select v-model="form_sta1.town" @change="changeLeftTown" placeholder="请选择镇" class="select-default"
             popper-class="select-default-popper">
             <el-option value="">全部镇</el-option>
             <el-option v-for="item, index in townList" :key="index" :value="item">{{ item }}</el-option>
           </el-select>
-          <el-select v-model="form_sta1.village" placeholder="请选择村" class="select-default"
+          <el-select @change="villageChange" v-model="form_sta1.village" placeholder="请选择村" class="select-default"
             popper-class="select-default-popper">
             <el-option value="">全部村</el-option>
             <el-option v-for="item, index in villageList" :key="index" :value="item">{{ item }}</el-option>
@@ -334,7 +334,9 @@ export default {
   methods: {
     changeLandSortType(type) {
       this.landCountType = type
-
+      this.changeSortType({
+        areaType:this.currentLandRange
+      })
       this.getAreaRangeData()
     },
     initMap() {
@@ -351,8 +353,12 @@ export default {
       }
       let newLandRange = Object.keys(mapObj).find(key =>mapObj[key] === item?.areaType)
       this.currentLandRange = this.currentLandRange === newLandRange?'':newLandRange
+
+      this.initSearch()
+      this.getZhuliListByRangeTotal()
     },
     showDetailList(){
+      // 获取弹出框的表格数据
       let val  = this.landTypeRangeObj
       console.log('我的val',val)
       if (val.landCountType === 'dk'){
@@ -405,9 +411,7 @@ export default {
     },
     handleRowClick(row) {
       console.log(row)
-      this.changeSortType({
-        areaType:this.currentLandRange
-      })
+      this.currentLandRange = null
      if(this.subStatisticsRow){
        addMapL(this.subStatisticsRow,this.chartLayerObjInfo[this.subStatisticsRow],false,'vector')
      }
@@ -436,10 +440,13 @@ export default {
 
 
         addMapL(this.subStatisticsRow,this.chartLayerObjInfo[this.subStatisticsRow],true,'vector')
-        this.getLandType2Data()
+
       }
       console.log('点击了， 表格')
       this.getAreaRangeData(this.subStatisticsRow)
+      this.changeSortType({
+        areaType:this.currentLandRange
+      })
       // console.log(this.subStatisticsRow);
       // let i = this.types.filter(item => item.type === this.subStatisticsRow)
       // let where = "1=1"
@@ -458,9 +465,7 @@ export default {
       // console.log(params1);
       // myBridge.bridgeContent.Invoke(params1);
     },
-    getLandType2Data() {
 
-    },
     getLandRangeActive(item){
       let mapObj = {
         '10':'10亩以下',
@@ -472,6 +477,10 @@ export default {
       return mapObj[this.currentLandRange] === item.areaType
     },
     changeLeftTown() {
+      // 镇变化以后，表格的地块类型和土地范围清空
+      this.subStatisticsShow = null
+      this.currentLandRange = null
+      // 镇变化以后，获取村
       GetTownList(2, this.form_sta1.town).then(res => {
         this.villageList = res.data
         this.form_sta1.village = ""
@@ -479,9 +488,22 @@ export default {
 
       this.getLandData()
     },
+    villageChange(){
+      // 村变化以后，表格的地块类型和土地范围清空
+      this.subStatisticsShow = null
+      this.currentLandRange = null
+      this.getLandData()
+
+    },
     getLandData() {
+
+      // 获取土地类型统计的数据
       this.data_tdlxtj.forEach(i => i.isShow = false)
       GetLandStatistics("", this.form_sta1.town, this.form_sta1.village).then(res => {
+        this.handleRowClick({
+          type:this.subStatisticsRow
+        })
+
         // console.log(res.data);
         this.data_tdlxtj.forEach((i) => {
           if (i.type === '零星用地') {
@@ -504,7 +526,7 @@ export default {
           }
         })
       })
-      this.getAreaRangeData(this.subStatisticsRow)
+
     },
     getAreaRangeData(val) {
       let URLa = this.landCountType === 'dk' ? GetAreaRangeStatistics : getNydCountStaByZhuti
@@ -584,6 +606,7 @@ export default {
     // },
     getPageChange() {
       this.showDetailList()
+      // this.getZhuliListByRangeTotal()
     },
     // getZhutiData() {
     //   console.log(111);
@@ -734,30 +757,30 @@ export default {
     }
   },
   watch: {
-    'form_sta1.town': {
-      handler() {
-
-        this.handleRowClick({
-          type:this.subStatisticsRow
-        })
-        this.changeSortType({
-          areaType:this.currentLandRange
-        })
-        this.changeLeftTown()
-      }
-    },
-    'form_sta1.village': {
-      handler() {
-
-        this.handleRowClick({
-          type:this.subStatisticsRow
-        })
-        this.changeSortType({
-          areaType:this.currentLandRange
-        })
-        this.getLandData()
-      }
-    },
+    // 'form_sta1.town': {
+    //   handler() {
+    //
+    //     this.handleRowClick({
+    //       type:this.subStatisticsRow
+    //     })
+    //     this.changeSortType({
+    //       areaType:this.currentLandRange
+    //     })
+    //     this.changeLeftTown()
+    //   }
+    // },
+    // 'form_sta1.village': {
+    //   handler() {
+    //
+    //     this.handleRowClick({
+    //       type:this.subStatisticsRow
+    //     })
+    //     this.changeSortType({
+    //       areaType:this.currentLandRange
+    //     })
+    //     this.getLandData()
+    //   }
+    // },
     // 'form_sta3.town': {
     //   handler() {
     //     this.changeRightTown()
@@ -774,14 +797,13 @@ export default {
     //     this.getZhutiData()
     //   }
     // },
-    landTypeRangeObj:{
-      handler(){
-        this.initSearch()
-        this.getZhuliListByRangeTotal()
-        // this.showDetailList()
-      },
-      deep:true
-    }
+    // landTypeRangeObj:{
+    //   handler(){
+    //
+    //
+    //   },
+    //   deep:true
+    // }
   }
 }
 </script>