调整首页（原统计页面）数据内容和布局，完善查询条件传参

src/views/tj/compoent/BarData.vue

@@ -179,7 +179,7 @@ export default {
       // 使用刚指定的配置项和数据显示图表。
       var myChart = echarts.init(this.$refs.dom)
       myChart.on('click',(params)=>{
-        _this.$emit('visible',{sysOrgCode:params.name,sfsb:"3"});
+        _this.$emit('visible',{sysOrgCode:params.name});
 
       })
 

src/views/tj/compoent/BarDataNum.vue

@@ -177,7 +177,7 @@ export default {
       // 使用刚指定的配置项和数据显示图表。
       var myChart = echarts.init(this.$refs.dom)
       myChart.on('click',(params)=>{
-        _this.$emit('visible',{sysOrgCode:params.name,sfsb:"3"});
+        _this.$emit('visible',{sysOrgCode:params.name});
 
       })
 

src/views/tj/compoent/BarDobuleData.vue

@@ -190,7 +190,7 @@ export default {
       // 使用刚指定的配置项和数据显示图表。
       var myChart = echarts.init(this.$refs.dom)
       myChart.on('click', (params) => {
-        _this.$emit('visible', {xzqh: params.name,sfsb:"3"});
+        _this.$emit('visible', {xzqh: params.name});
       })
       myChart.setOption(option);
       myChart.resize();

src/views/tj/compoent/BarDobuleDataNum.vue

@@ -187,7 +187,7 @@ export default {
       // 使用刚指定的配置项和数据显示图表。
       var myChart = echarts.init(this.$refs.dom)
       myChart.on('click', (params) => {
-        _this.$emit('visible', {xzqh: params.name,sfsb:"3"});
+        _this.$emit('visible', {xzqh: params.name});
       })
       myChart.setOption(option);
       myChart.resize();

src/views/tj/compoent/BarTdsjyt.vue

@@ -178,8 +178,8 @@ export default {
         for (const param of this.sjyt) {
           if (param.title == params.name){
 
-            _this.$emit('visible', {sjyt: param.value,sfsb:"3"});
-            _this.$emit('visibleSz', {pzyt: param.value,sfsb:"3"});
+            _this.$emit('visible', {sjyt: param.value});
+            _this.$emit('visibleSz', {pzyt: param.value});
           }
 
         }

src/views/tj/compoent/DoughnutData.vue

@@ -34,13 +34,13 @@ export default {
       // 绘制图表
       var myChart = echarts.init(this.$refs.main)
       myChart.on('click',(params)=>{
-        _this.$emit('visible', {tdsyxz:params.data.name,sfsb:"3"});
+        _this.$emit('visible', {tdsyxz:params.data.name});
         if(params.data.name == "有证"){
-          _this.$emit('visibleCard', {wjlx:"证书",sfsb:"3"});
-          _this.$emit('visibleZs', {zslx:"不动产权证书,国有土地使用证",sfsb:"3"});
+          _this.$emit('visibleCard', {wjlx:"证书"});
+          _this.$emit('visibleZs', {zslx:"不动产权证书,国有土地使用证"});
         }else if(params.data.name == "无证"){
-          _this.$emit('visibleCard', {wjlx:"合同,文件,无",sfsb:"3"});
-          _this.$emit('visibleZs', {zslx:"无,无权属证明材料,文件合同等权属证明材料",sfsb:"3"});
+          _this.$emit('visibleCard', {wjlx:"合同,文件,无"});
+          _this.$emit('visibleZs', {zslx:"无,无权属证明材料,文件合同等权属证明材料"});
         }
       })
       // 指定图表的配置项和数据

src/views/tj/compoent/PieData.vue

@@ -38,8 +38,8 @@ export default {
       // 绘制图表
       var myChart = echarts.init(this.$refs.main)
       myChart.on('click',(params)=>{
-        _this.$emit('visible',{syqsyfs:params.data.name,sfsb:"3"});
-        console.log(4567,params)
+        _this.$emit('visible',{syqsyfs:params.data.name});
+        // console.log(4567,params)
       })
       // 指定图表的配置项和数据
       var option = {

src/views/tj/compoent/PieQdfsMj.vue

@@ -38,8 +38,8 @@ export default {
       // 绘制图表
       var myChart = echarts.init(this.$refs.main)
       myChart.on('click',(params)=>{
-        _this.$emit('visible',{syqsyfs:params.data.name,sfsb:"3"});
-        console.log(params)
+        _this.$emit('visible',{syqsyfs:params.data.name});
+        // console.log(params)
       })
       // 指定图表的配置项和数据
       var option = {

src/views/tj/compoent/map3Data.vue

@@ -2,8 +2,6 @@
   <div>
     <div style="width:calc(100% - 0px);;height:630px" ref="chartsDOM"></div>
   </div>
-
-
 </template>
 
 <script>
@@ -32,6 +30,7 @@ export default {
       myTool1_show: false,
       rangeMax: 200,
       rangeMin: 0,
+      MapSsKey:"SL",
     }
   },
   mounted() {
@@ -42,6 +41,7 @@ export default {
       deep: true,
       handler(newVal, oldVal) {
         this.tem_data = newVal
+        this.MapSsKey=this.resMapSsKey
         this.$nextTick(function () {
           for (var i = 0; i < newVal.length; i++) {
             this.barData.push(newVal[i]);
@@ -53,24 +53,32 @@ export default {
         // this.rangeMax = Math.max.apply(Math, newVal.map(item => item.value));
         // 获取组件允许最小值
         // this.rangeMin = Math.min.apply(Math, newVal.map(item => item.value));
-
       }
     },
+    resMapSsKey: {
+      deep: true,
+      handler(newVal, oldVal) {
+        this.MapSsKey=this.newVal
+        // this.tem_data = this.resultMapData
+        this.$nextTick(function () {
+          this.getPie()
+        })
+      }
+    },
+
     tem_data: {
       deep: true,
       handler(newVal, oldVal) {
+        this.MapSsKey=this.resMapSsKey
         if (oldVal != "") {
           this.tem_resultMapData = oldVal
           this.getPie()
         }
-
       }
-
     }
   },
   created() {
     this.initMap()
-
   },
 
   props: {
@@ -95,6 +103,9 @@ export default {
     },
     titles: {
       type: Object,
+    },
+    resMapSsKey:{
+      type:String,
     }
   },
   methods: {
@@ -121,7 +132,6 @@ export default {
       this.rangeMax = Math.max.apply(Math, this.tem_data.map(item => item.value));
       // 获取组件允许最小值
       this.rangeMin = Math.min.apply(Math, this.tem_data.map(item => item.value));
-
       // 显示 loading 动画
       myChart.showLoading();
       myChart.on("contextmenu", (params) => {
@@ -141,7 +151,7 @@ export default {
         _this.tem_title = params.data.name
         _this.myTool1_show = true
         if (_this.areaData.features[0].properties.level == 'city') {
-          _this.$emit('visible', {xzqh: params.data.xzqhdm, xzqhmc: params.data.name});
+          _this.$emit('visible', {xzqh: params.data.xzqhdm, xzqhmc: params.data.name, level:'city'});
           _this.areaData = require("@views/tj/GeographicDataJson/" + params.data.name + ".json")
           _this.setCenter(_this.areaData)
           if (this.titles.orgCode == "A04") {
@@ -158,7 +168,7 @@ export default {
             })
           }
         } else if (_this.tem_areaData.features[0].properties.level == 'district') {
-          _this.$emit('visible', {xzqh: params.data.xzqhdm, sfsb: "3"});
+          _this.$emit('visible', {xzqh: params.data.xzqhdm});
           // var areaDataItem = _this.areaData.features.filter(item => item.properties.name == params.data.name)
           // console.log(areaDataItem);
           // _this.areaData = {
@@ -203,7 +213,7 @@ export default {
                   _this.setCenter(_this.areaData)
                   _this.tem_data = _this.tem_resultMapData
                   _this.tem_title = ""
-                  _this.$emit('visible', {xzqh: ""});
+                  _this.$emit('visible', {xzqh: "", level:'city'});
                   _this.myTool1_show = false
                 }
               }
@@ -280,12 +290,9 @@ export default {
         }]
       };
       myChart.clear();
-      console.log("tem_data", this.tem_data);
       myChart.setOption(this.options, true);
       myChart.resize();
       //地图的点击事件
-
-
       var option = {
         xAxis: [],
         yAxis: [],
@@ -298,6 +305,10 @@ export default {
         var coord = myChart.convertToPixel('geo', geoCoord);
         idx += '';
         var inflationData = [dataItem.value];
+        if(_this.resMapSsKey==='MJ')
+        {
+          inflationData = [dataItem.value2];
+        }
         option.xAxis.push({
           id: idx,
           gridId: idx,
@@ -306,7 +317,7 @@ export default {
           name: dataItem.name,
           nameGap: 3,
           nameTextStyle: {
-            color: "#000000",
+            color: "#ed5505",
           },
           splitLine: {
             show: false

src/views/tj/compoent/mapData.vue

@@ -81,7 +81,6 @@ export default {
               return params.name + '</br>' + "地块数量：" + params.value + '块' + '</br>'+"实际占用总面积："+params.data.value2.toFixed(2)+"亩"
             },
           },
-
           series: [
             {
               name: '地块数量',
@@ -103,11 +102,10 @@ export default {
                   areaColor: '#009fe8',
                 }
               },
-              data: this.resMapSsDataArea
+              data: this.resultMapData
             },
 
           ],
-
         };
         myChart.setOption(option);
         myChart.resize();

src/views/tj/sjtjModules.vue

@@ -2,10 +2,10 @@
   <div>
     <!--    省属企业与省直单位切换-->
     <div class="cr-btnlist">
-        <button :class="type === 'ssqy' ? ['cr-btn', 'cr-btn-select'] : 'cr-btn'" @click.stop.prevent="handleSubmitSsqy">
+        <button :class="type === 'ssqy' ? ['cr-btn', 'cr-btn-select'] : 'cr-btn'" @click="handleSubmitSsqy">
           省属企业
         </button>
-        <button :class="type === 'szdw' ? ['cr-btn', 'cr-btn-select'] : 'cr-btn'" @click.stop.prevent="handleSubmitSzdw">
+        <button :class="type === 'szdw' ? ['cr-btn', 'cr-btn-select'] : 'cr-btn'" @click="handleSubmitSzdw">
           省直单位
         </button>
     </div>
@@ -31,8 +31,6 @@
                       }}<span style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">家</span>
                     </div>
                   </div>
-
-                  <!--                  <div style="font-size: 24px; float: right;font-weight:600;">{{ SUMSZ }}<span style="font-size: 16px;margin-left:5px;margin-right: 5px;font-weight:400" >亩</span></div>-->
                 </div>
               </div>
             </a-col>
@@ -56,7 +54,7 @@
               </div>
             </a-col>
             <a-col class="flex-center" :sm="24" :md="12" :xl="6">
-              <div class="tjcxcound3" @click="visibleInfo({ sfsb: 3 })">
+              <div class="tjcxcound3" @click="visibleInfo({  })">
                 <div style="color: white;padding-top: 0.1rem">
                   <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px; font-family:'DingTalk_JinBuTi_Regular'">省属企业上报地块</div>
                   <div style="width: 100%">
@@ -81,7 +79,7 @@
               </div>
             </a-col>
             <a-col class="flex-center" :sm="24" :md="12" :xl="6">
-              <div class="tjcxcound4" @click="visibleInfo({ sfsb: 3, tdsyxz: '闲置低效土地' })">
+              <div class="tjcxcound4" @click="visibleInfo({ tdsyxz: '闲置低效土地' })">
                 <div style="color: white;padding-top: 0.1rem">
                   <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px; font-family:'DingTalk_JinBuTi_Regular'">省属企业闲置低效地块</div>
                   <div style="width: 100%">
@@ -137,7 +135,7 @@
               </div>
             </a-col>
             <a-col class="flex-center" :sm="24" :md="12" :xl="6">
-              <div class="tjcxcound3" @click="visibleInfoBySz({ sfsb: 3 })">
+              <div class="tjcxcound3" @click="visibleInfoBySz({ })">
                 <div style="color: white;padding-top: 0.1rem">
                   <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px; font-family:'DingTalk_JinBuTi_Regular'">省直单位地块</div>
                   <div style="width: 100%">
@@ -158,7 +156,7 @@
               </div>
             </a-col>
             <a-col class="flex-center" :sm="24" :md="12" :xl="6">
-              <div class="tjcxcound4" @click="visibleInfoBySz({ sfsb: 3, tdsyxz: '闲置低效土地' })">
+              <div class="tjcxcound4" @click="visibleInfoBySz({ tdsyxz: '闲置低效土地' })">
                 <div style="color: white;padding-top: 0.1rem">
                   <div style="width: 100%;margin-left: 0rem;margin-top:5px; text-indent: 1rem;letter-spacing: 2px; font-family:'DingTalk_JinBuTi_Regular'">省直单位闲置低效地块</div>
                   <div style="width: 100%">
@@ -182,7 +180,7 @@
         </a-col>
       </a-row>
     </div>
-<!--    图标统计展示-->
+<!--    省直单位、省属企业按不同土地类型进行统计展示-->
     <div>
 <!--      省直单位统计图表-->
       <div v-show="this.type == 'szdw'">
@@ -213,14 +211,27 @@
           </div>
           <!--        第一行地图列-->
           <div style="width: calc(50% - 20px);margin-left: 10px;margin-right: 10px">
-            <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省直单位地块统计</div>
+            <div style="display: flex; width: calc(100% - 0px);height:40px;line-height: 40px; background-color: #02A7F0;">
+            <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">
+              省直单位地块统计
+            </div>
+              <div class="cr-tj-btnlist">
+                <button :class="type === 'ssqy' ? ['cr-tj-btn', 'cr-tj-btn-select'] : 'cr-tj-btn'" @click="resMapSsKey='SL'">
+                  数量
+                </button>
+                <button :class="type === 'szdw' ? ['cr-tj-btn', 'cr-tj-btn-select'] : 'cr-tj-btn'" @click="resMapSsKey='MJ'">
+                  面积
+                </button>
+              </div>
+            </div>
             <div>
               <a-card style="margin-bottom: 1rem;width:100%;height: 39rem">
                 <mapData
                   ref="map2ref"
                   :resultMapData="this.resMapSzData"
                   :titles="this.title2"
-                  @visible="visibleInfoBySz"
+                  :resMapSsKey="this.resMapSsKey"
+                  @visible="visibleInfoBySzMap"
                 ></mapData>
               </a-card>
             </div>
@@ -277,7 +288,6 @@
                   ></BarTdsjyt>
                 </a-col>
               </a-card>
-
             </div>
           </div>
           <div style="width: calc(50% - 0px);">
@@ -301,17 +311,17 @@
         <div style="display: flex;">
           <div style="width: calc(100% - 0px);">
             <div style="display: flex; width: calc(100% - 0px);height:40px;line-height: 40px; background-color: #02A7F0;">
-            <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">
-              省直单位土地面积
-            </div>
-            <div class="cr-tj-btnlist">
-              <button :class="type === 'ssqy' ? ['cr-tj-btn', 'cr-tj-btn-select'] : 'cr-tj-btn'" @click="GDSSZTDKEY='SL'">
-                数量
-              </button>
-              <button :class="type === 'szdw' ? ['cr-tj-btn', 'cr-tj-btn-select'] : 'cr-tj-btn'" @click="GDSSZTDKEY='MJ'">
-                面积
-              </button>
-            </div>
+              <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">
+                省直单位土地面积
+              </div>
+              <div class="cr-tj-btnlist">
+                <button :class="type === 'ssqy' ? ['cr-tj-btn', 'cr-tj-btn-select'] : 'cr-tj-btn'" @click="GDSSZTDKEY='SL'">
+                  数量
+                </button>
+                <button :class="type === 'szdw' ? ['cr-tj-btn', 'cr-tj-btn-select'] : 'cr-tj-btn'" @click="GDSSZTDKEY='MJ'">
+                  面积
+                </button>
+              </div>
             </div>
             <div>
               <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
@@ -325,7 +335,7 @@
                 <BarDobuleDataNum v-if="GDSSZTDKEY==='SL'"
                                    :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省直单位实际占用面积' : '省直单位实际占用面积'"
                                    :result-x-data="this.resBarSzData"
-                                   @visible="visibleInfoXzqh"
+                                   @visible="visibleInfoSzXzqh"
                 >
                 </BarDobuleDataNum>
               </a-card>
@@ -339,7 +349,9 @@
         <!--        左侧第一行第一列-->
         <div style="display: flex;">
           <div style="width: calc(25% - 0px);">
-          <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省属企业土地获取方式【地块数量】</div>
+          <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">
+            省属企业土地获取方式【地块数量】
+          </div>
           <div>
             <a-card style="margin-bottom: 0.5rem;width:100%;height: 18rem">
               <PieData
@@ -368,10 +380,26 @@
         </div>
 <!--        第一行地图列-->
           <div style="width: calc(50% - 20px);margin-left: 10px;margin-right: 10px">
-            <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">省属企业地块统计</div>
+            <div style="display: flex; width: calc(100% - 0px);height:40px;line-height: 40px; background-color: #02A7F0;">
+              <div style="width: calc(100% - 0px);text-indent: 10px; font-size: 16px;  font-family:'DingTalk_JinBuTi_Regular';height:40px;line-height: 40px; background-color: #02A7F0; color: white ">
+                省属企业地块统计
+              </div>
+              <div class="cr-tj-btnlist">
+                <button :class="type === 'ssqy' ? ['cr-tj-btn', 'cr-tj-btn-select'] : 'cr-tj-btn'" @click="resMapSsKey='SL'">
+                  数量
+                </button>
+                <button :class="type === 'szdw' ? ['cr-tj-btn', 'cr-tj-btn-select'] : 'cr-tj-btn'" @click="resMapSsKey='MJ'">
+                  面积
+                </button>
+              </div>
+            </div>
             <div>
               <a-card style="margin-bottom: 1rem;width:100%;height: 39rem">
-                <mapData ref="mapref" :resultMapData="this.resMapSsData" :titles="this.title1" @visible="visibleInfo">
+                <mapData ref="mapref"
+                         :resultMapData="this.resMapSsData"
+                         :titles="this.title1"
+                         :resMapSsKey="this.resMapSsKey"
+                         @visible="visibleInfoMap">
                 </mapData>
               </a-card>
             </div>
@@ -501,14 +529,14 @@
           </div>
           <div>
             <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-              <BarDobuleData  v-if="GDSSSTDKEY==='SL'"
+              <BarDobuleData  v-if="GDSSSTDKEY==='MJ'"
                               :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省属企业实际占用面积' : '省属企业实际占用面积'"
                               :result-x-data="this.resBarSsData"
                               @visible="visibleInfoXzqh"
                               style="width:calc(100% - 0px);height:19rem;"
               >
               </BarDobuleData>
-              <BarDobuleDataNum  v-if="GDSSSTDKEY==='MJ'"
+              <BarDobuleDataNum  v-if="GDSSSTDKEY==='SL'"
                                  :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省属企业实际占用面积' : '省属企业实际占用面积'"
                                  :result-x-data="this.resBarSsData"
                                  @visible="visibleInfoXzqh"
@@ -651,6 +679,7 @@ export default {
       resData: [],
       SSQYSL: '',
       SBDKQYSL: '',
+      resMapSsKey: 'SL',
       resMapSzData: [],
       resMapSsData: [],
       resBarSsData: [],
@@ -830,7 +859,11 @@ export default {
     },
     visibleInfoBySz(params) {
       this.paramSz = params
-      if (params.sfsb != null) {
+        this.visibleSz = true
+    },
+    visibleInfoBySzMap(params) {
+      this.paramSz = params
+      if (params.level != 'city') {
         this.visibleSz = true
       }
     },
@@ -897,7 +930,13 @@ export default {
     },
     visibleInfo(params) {
       this.param = params
-      if (params.sfsb != null) {
+      // if (params.sfsb != null) {
+        this.visible = true
+      // }
+    },
+    visibleInfoMap(params) {
+      this.param = params
+      if (params.level != 'city') {
         this.visible = true
       }
     },