更新

UI2/src/views/sydwqcsb/QcSsgqzysytdqkList_glyy.vue

@@ -146,7 +146,7 @@
       </a-table>
         </a-tab-pane>
         <a-tab-pane key="2" tab="统计图表" force-render>
-          <listTable ref="table" :loading="this.load" :result-data="this.resultData"></listTable>
+          <listTabBySz ref="table" :loading="this.load" :result-data="this.resultData"></listTabBySz>
         </a-tab-pane>
       </a-tabs>
     </div>
@@ -164,7 +164,7 @@
   import { getAction } from '../../api/manage'
   import { loadCategoryData } from '@/api/api'
   import JAreaSelect from "@comp/jeecg/JAreaSelect";
-  import listTab from '@/views/listStatistics/listTabBySz'
+  import listTabBySz from '@/views/listStatistics/listTabBySz'
   import store from '@/store'
   export default {
     name: 'QcSsgqzysytdqkList',
@@ -172,12 +172,15 @@
     components: {
       QcSsgqzysytdqkModal,
       JAreaSelect,
-      listTab
+      listTabBySz
     },
     data () {
       return {
         dlr:false,
+        resultData:[],
         description: '省属国企占有使用土地情况调查管理页面',
+        load: true,
+        changes:'1',
         // 表头
         columns: [
           {
@@ -249,6 +252,7 @@
           importExcelUrl: "qcsb/qcSsgqzysytdqk/importExcel",
             wcsh:"/qcsb/qcSsgqzysytdqk/wcsh",
             hfysh:"/qcsb/qcSsgqzysytdqk/hfysh",
+          listTable: "/qcsb/qcSsgqzysytdqk/sumListBysz"
         },
         dictOptions:{},
         superFieldList:[],
@@ -267,6 +271,30 @@
       },
     },
     methods: {
+      updataData(){
+        let _this = this;
+        new Promise(function (resolve, reject) {
+          getAction(_this.url.listTable, _this.queryParam).then(res => {
+            if (res.success) {
+              _this.load = false
+              _this.resultData = res.result
+              resolve();
+            }
+          })
+        })
+      },
+      callback(key) {
+
+        if (key == 1) {
+          this.emptyData()
+          this.changes='1'
+        }
+        if (key == 2) {
+          this.changes='2'
+          this.emptyData()
+          this.updataData()
+        }
+      },
       SelectArea(val) {
         if (val.length > 4) {
           this.queryParam.xzqh = val + '*'
@@ -274,6 +302,26 @@
           this.queryParam.xzqh = val.slice(0, 4) + '*'
         }
       },
+      emptyData(){
+        this.load = true
+        this.$refs.table.data=[]
+        this.$refs.table.areaData=[]
+        this.$refs.table.pieResultData=[]
+        this.$refs.table.pieAreaResultData=[]
+        this.$refs.table.DoughnutResultData=[]
+        this.$refs.table.doughnutByXzResultData=[]
+        this.$refs.table.xzData=[]
+        this.$refs.table.registerData=[]
+        this.$refs.table.barResultData=[]
+        this.$refs.table.nan=[]
+        this.$refs.table.va=[]
+        this.$refs.table.xqData=[]
+        this.$refs.table.sjytData=[]
+        this.$refs.table.sjytValue=[]
+        this.$refs.table.sjytName=[]
+        this.$refs.table.barBysjytResultData=[]
+        this.$refs.table.number=0
+      },
       searchReset() {
         this.$refs.JArea.allClear(),
           this.queryParam = {}

UI2/src/views/tj/compoent/DoughnutData.vue

@@ -32,6 +32,9 @@ export default {
     getPie() {
       // 绘制图表
       var myChart = echarts.init(this.$refs.main)
+      myChart.on('click',(params)=>{
+        console.log('click', params);
+      })
       // 指定图表的配置项和数据
       var option = {
         //标题

UI2/src/views/tj/compoent/PieData.vue

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

UI2/src/views/tj/compoent/map3Data.vue

@@ -1,5 +1,6 @@
 <template>
   <div style="width:800px;height:600px" ref="chartsDOM"></div>
+
 </template>
 
 <script>
@@ -16,6 +17,7 @@ export default {
       barData:[],
       centerData:{} ,
       myChart:null,
+      visible:false
 
     }
   },
@@ -34,14 +36,12 @@ export default {
     },
   },
   created() {
-
       var arr = shandong.features
       arr.length>0 && arr.forEach((item,index) =>{
         var obj = {}
         this.centerData[item.properties.name] = item.properties.center
       })
 
-
   },
 
   props: {
@@ -75,7 +75,8 @@ export default {
       // 显示 loading 动画
       myChart.showLoading();
       myChart.on("click", (params) => {
-        /*console.log(444444444444,params)*/
+
+        _this.$emit('visible',{xzqh:params.data.xzqhdm});
       })
 
       // 再得到数据的基础上，进行地图绘制

UI2/src/views/tj/sjtjModules.vue

@@ -67,7 +67,7 @@
       <a-row v-show="this.type=='szdw'">
         <a-col :sm="24" :md="12" :xl="12">
           <a-card style="margin-bottom: 1rem;width:100%;height: 42rem">
-            <mapData :resultMapData="this.resMapSzData" :titles="this.title2"></mapData>
+            <mapData :resultMapData="this.resMapSzData" :titles="this.title2"  ></mapData>
           </a-card>
         </a-col>
         <a-col :sm="24" :md="12" :xl="6">
@@ -84,7 +84,8 @@
         <a-col :sm="24" :md="12" :xl="12">
           <a-card style="margin-bottom: 1rem;width:100%;height: 20rem">
             <a-col :sm="24" :md="12" :xl="24">
-            <BarData :titleText=this.BarTitleBysz :result-x-data=this.resXData :dw="this.dw2" style="width:800px ;height:300px;"></BarData>
+              <BarData :titleText=this.BarTitleBysz :result-x-data=this.resXData :dw="this.dw2"
+                       style="width:800px ;height:300px;"></BarData>
             </a-col>
           </a-card>
         </a-col>
@@ -112,12 +113,12 @@
       <a-row v-show="this.type=='ssqy'">
         <a-col :sm="24" :md="12" :xl="12">
           <a-card style="margin-bottom: 1rem;width:100%;height: 43rem">
-            <mapData :resultMapData="this.resMapSsData" :titles="this.title1"></mapData>
+            <mapData :resultMapData="this.resMapSsData" :titles="this.title1" @visible="visibleInfo"></mapData>
           </a-card>
         </a-col>
         <a-col :sm="24" :md="12" :xl="6">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <PieData :resultData="this.resData" :titleText="this.textByss"></PieData>
+            <PieData :resultData="this.resData" :titleText="this.textByss" @visible="visibleInfo" ></PieData>
           </a-card>
         </a-col>
         <a-col :sm="24" :md="12" :xl="6">
@@ -128,7 +129,7 @@
         </a-col>
         <a-col :sm="24" :md="12" :xl="6">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <PieData :resultData="this.resData2" :titleText="this.textBysss"></PieData>
+            <PieData :resultData="this.resData2" :titleText="this.textBysss"  @visible="visibleInfo"></PieData>
           </a-card>
         </a-col>
         <a-col :sm="24" :md="12" :xl="6">
@@ -156,7 +157,8 @@
                         </a-col>-->
             <a-col :sm="24" :md="12" :xl="24">
               <!--              <a-card style="margin-bottom: 1rem;width:100%;height: 20rem">-->
-              <BarData :titleText=this.BarTitleBysz :result-x-data="this.resYData" :dw="this.dw2" :seriesName="'地块数量'"></BarData>
+              <BarData :titleText=this.BarTitleBysz :result-x-data="this.resYData" :dw="this.dw2"
+                       :seriesName="'地块数量'"></BarData>
               <!--              </a-card>-->
             </a-col>
           </a-card>
@@ -169,22 +171,31 @@
 
         <a-col :sm="24" :md="12" :xl="24">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <BarData :titleText=this.BarTitleBysjzymjs :result-x-data="this.resYDatas" :seriesName="'地块面积（亩）'" :dw="this.dw"
+            <BarData :titleText=this.BarTitleBysjzymjs :result-x-data="this.resYDatas" :seriesName="'地块面积（亩）'"
+                     :dw="this.dw"
                      style="width:1600px ;height:300px;"></BarData>
           </a-card>
         </a-col>
 
       </a-row>
-      <!--      <a-row>
-              <a-col :sm="24" :md="12" :xl="24">
+      <j-modal
+        :visible="visible"
 
-              </a-col>
-            </a-row>-->
+        okText="保存"
+        @cancel="handleCancel"
+        cancelText="关闭"
+
+      >
+        <QcSsgqzysytdqkList :param="this.param"> </QcSsgqzysytdqkList>
+
+      </j-modal>
     </div>
   </div>
 
+
 </template>
 
+
 <script>
 import mapData from "@views/tj/compoent/map3Data";
 import PieData from "@views/tj/compoent/PieData"
@@ -194,6 +205,7 @@ import BarDobuleData from "@views/tj/compoent/BarDobuleData";
 import WaterWorld from "@views/tj/compoent/WaterWorld";
 import NightingaleCharData from "@views/tj/compoent/NightingaleCharData";
 import {getAction} from "@api/manage";
+import QcSsgqzysytdqkList from "@views/qcsb/QcSsgqzysytdqkList_tj"
 
 export default {
   name: "sjtj",
@@ -201,6 +213,8 @@ export default {
     return {
       SUMSS: "",
       SUMSSXZDX: "",
+      visible: false,
+
       SUMSZ: "",
       SUMSZXZDX: "",
       type: 'ssqy',
@@ -220,10 +234,11 @@ export default {
       resMapSsData: [],
       resBarSsData: [],
       resBarSzData: [],
-      cz:"",
-      qyzy:"",
-      xzdx:"",
-      sum:"",
+      cz: "",
+      qyzy: "",
+      xzdx: "",
+      sum: "",
+      param:"",
       resData2: [],
       color: ['#4676ff', '#1ad4cb'],
       color1: ['#8c42a1', '#4fa5e7'],
@@ -275,11 +290,21 @@ export default {
 
 
   },
-  components: {mapData, DoughnutData, BarData, WaterWorld, NightingaleCharData, BarDobuleData,PieData},
+  components: {mapData, DoughnutData, BarData, WaterWorld, NightingaleCharData, BarDobuleData, PieData,QcSsgqzysytdqkList},
   methods: {
     handleChange(value) {
       this.type = value;
     },
+    handleCancel() {
+      this.visible = false
+    },
+    visibleInfo(params) {
+      this.param=params
+      this.visible = true
+
+      // this.$router.push({ name:'qcsb-qcSsgqzysytdqk-list', query:{sfsb:3} });
+    },
+
     getAreaData() {
       getAction("/qcsb.qyxx/qcQyxx/sbdkmj").then(res => {
         if (res.code == 200) {
@@ -352,7 +377,6 @@ export default {
       getAction("/qcsb.qyxx/qcQyxx/sjyttjss").then(res => {
         if (res.code == 200) {
           this.resYData = res.result
-          console.log(4444444444,res.result)
         }
       }),
         getAction("/qcsb.qyxx/qcQyxx/yjdwmjhz").then(res => {
@@ -377,6 +401,7 @@ export default {
       getAction("/qcsb.qyxx/qcQyxx/ssdtdktj").then(res => {
         if (res.code == 200) {
           this.resMapSsData = res.result
+          console.log(555555555, this.resMapSsData)
         }
       })
     },
@@ -399,11 +424,11 @@ export default {
     geszqyzytData() {
       getAction("/qcsb.qyxx/qcQyxx/szqyzy").then(res => {
         if (res.code == 200) {
-          this.resWordDataCz=parseFloat(res.result[0].value/res.result[3].value);
-            this.resWordDataZy=parseFloat(res.result[1].value/res.result[3].value);
-            this.resWordDataXz=parseFloat(res.result[2].value/res.result[3].value);
+          this.resWordDataCz = parseFloat(res.result[0].value / res.result[3].value);
+          this.resWordDataZy = parseFloat(res.result[1].value / res.result[3].value);
+          this.resWordDataXz = parseFloat(res.result[2].value / res.result[3].value);
 
-            console.log(2222222222,this.resWordDataCz)
+          console.log(2222222222, this.resWordDataCz)
         }
       })
     },