瀏覽代碼

(1)信息查询模块中,省属企业地块管理和省直单位地块管理中,由当前默认显示列表信息界面修改为默认显示统计图表界面
(2) 解决信息查询里面按年份查询的参数缺少问题
(3)“信息查询”导航菜单拆分为省直单位和省属企业,省直单位内包含省直单位信息管理和省直单位地块管理,省属企业包含省属企业信息管理和省属企业地块管理
(5)“信息查询”模块中,添加地块数和地块面积统计面板。

sugb 7 月之前
父節點
當前提交
f29db40826

+ 5 - 4
.env.development

@@ -1,12 +1,13 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://127.0.0.1:8080/jeecg-boot/
-#VUE_APP_API_BASE_URL=http://10.233.1.64:9002/jeecg-boot/
-#VUE_APP_API_BASE_URL=http://10.147.20.133:8080/jeecg-boot/
+#本地
+VUE_APP_API_BASE_URL=http://127.0.0.1:8088/jeecg-boot/
+#测试服务器直连
+#VUE_APP_API_BASE_URL=http://10.233.1.64:8080/jeecg-boot/
 
 
 
+#其它连接
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
-
 # 微应用列表必须VUE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
 VUE_APP_SUB_jeecg-app-1 = '//localhost:8092'

+ 0 - 1
src/api/api.js

@@ -160,7 +160,6 @@ export {
   getUserNoticeInfo,
   getDictItemsFromCache,
   getyear,
-
 }
 
 

+ 1 - 1
src/components/OneMap/BasicMap.vue

@@ -679,7 +679,7 @@ export default {
             if (this.resData.vr == null) {
               this.$message.warn('全景图片不存在!')
             } else {
-              window.open('/vtour/tour.html?startscene=scene_' + this.resData.vr, '_blank')
+              window.open('/images/vtour/tour.html?startscene=scene_' + this.resData.vr, '_blank')
               //window.open('http://localhost:56122/?startscene=scene_'+this.resData.vr, '_blank')
             }
           } else {

文件差異過大導致無法顯示
+ 404 - 401
src/components/OneMap/widgets/SpatialAnalysis.vue


+ 1 - 1
src/components/OneMap/widgets/ToolBar.vue

@@ -237,7 +237,7 @@ export default {
       isPrint: false,
       isAnalysis: false,
       isAjQuery: false,
-      isSplit: false,
+      isSplit: false, //是否开启图层分割
       isIdentify: false,
       enableIdentify: false,
       toolShow: {

+ 4 - 6
src/components/chart/PieData.vue

@@ -8,7 +8,6 @@ export default {
   name: 'index',
   data() {
     return {
-
     }
   },
   props:{
@@ -34,6 +33,7 @@ export default {
   },
   methods: {
     getPie() {
+
       var _this = this
       // 绘制图表
       var myChart = echarts.init(this.$refs.main)
@@ -64,7 +64,6 @@ export default {
         legend: {//图例  标注各种颜色代表的模块
           // orient: 'vertical',//图例的显示方式  默认横向显示
           bottom: 10,//控制图例出现的距离  默认左上角
-
           // itemWidth: 16,//图例颜色块的宽度和高度
           // itemHeight: 12,
           textStyle: {//图例中文字的样式
@@ -104,11 +103,10 @@ export default {
             }
           },
         }
-
       }
-        // 使用刚指定的配置项和数据显示图表。
-        myChart.setOption(option)
-    }
+      // 使用刚指定的配置项和数据显示图表。
+      myChart.setOption(option)
+    },
   }
 }
 </script>

+ 1 - 2
src/config/index.js

@@ -6,9 +6,8 @@ window._CONFIG['domianURL'] = Vue.prototype.API_BASE_URL
 //单点登录地址
 window._CONFIG['casPrefixUrl'] = window._CONFIG.VUE_APP_CAS_BASE_URL?window._CONFIG.VUE_APP_CAS_BASE_URL:process.env.VUE_APP_CAS_BASE_URL
 window._CONFIG['onlinePreviewDomainURL'] =  window._CONFIG.VUE_APP_ONLINE_BASE_URL?window._CONFIG.VUE_APP_ONLINE_BASE_URL:process.env.VUE_APP_ONLINE_BASE_URL
-//window._CONFIG['staticDomainURL'] = Vue.prototype.API_BASE_URL + '/images'
 //window._CONFIG['staticDomainURL'] = Vue.prototype.API_BASE_URL + '/sys/common/static'
 window._CONFIG['staticDomainURL'] ='/images/upload'
+//无效
 window._CONFIG['pdfDomainURL'] = Vue.prototype.API_BASE_URL+ '/sys/common/pdf/pdfPreviewIframe'
-
 window._CONFIG['domianURLs'] = "http://127.0.0.1:9001/jeecg-boot"

+ 1 - 1
src/store/menuChild.js

@@ -7,7 +7,7 @@ const menu =  {
       for (let item of data) {
         let action = item.action.split(':');
         item.value = action[1]
-        if (state.menuList[action[0]] == undefined) {
+        if (state.menuList[action[0]] === undefined) {
           state.menuList[action[0]] = [];
         }
         state.menuList[action[0]].push(item);

+ 1 - 1
src/utils/encryption/signMd5Utils.js

@@ -34,7 +34,7 @@ export default class signMd5Utils {
     let jsonObj = this.mergeObject(urlParams, requestParams);
     //console.log("sign jsonObj: ",jsonObj)
     let requestBody = this.sortAsc(jsonObj);
-    console.log("sign requestBody: ",requestBody)
+    // console.log("sign requestBody: ",requestBody)
     return md5(JSON.stringify(requestBody) + signatureSecret).toUpperCase();
   }
 

+ 111 - 102
src/views/infoSearch/infoSearch.vue

@@ -1,114 +1,123 @@
 <!--信息查询-->
-<template>
-  <div class="content-div">
-    <a-card class="info-submit" :bordered="false">
-        <a-radio-group v-model="defaultValue" button-style="solid" @change="changeContent">
-          <a-radio-button v-for="(item, index) in menus" :key="item.action" :value="item.value" :name="item.va">
-            {{ item.describe }}
-          </a-radio-button>
-        </a-radio-group>
-    </a-card>
-    <a-card :bordered="false">
-      <!--省属企业信息管理-->
-      <company-info v-show="'ssqyxxgl' == defaultValue"></company-info>
-      <!--省直单位信息管理-->
-      <depart-info v-show="'szdwxxgl' == defaultValue"></depart-info>
-      <!--省属企业地块管理-->
-      <company-land v-show="'ssqydkgl' == defaultValue" :year-list="yearList"></company-land>
-      <!--省直单位地块管理-->
-      <depart-land v-show="'szdwdkgl' == defaultValue" :year-list="yearList"></depart-land>
+<!--<template>-->
+<!--  <div class='content-div'>-->
+<!--    <a-card class='info-submit' :bordered='false'>-->
+<!--      <a-radio-group v-model='defaultValue' button-style='solid' @change='changeContent'>-->
+<!--        <a-radio-button v-for='(item, index) in menus' :key='item.action' :value='item.value' :name='item.va'>-->
+<!--          {{ item.describe }}-->
+<!--        </a-radio-button>-->
+<!--      </a-radio-group>-->
+<!--    </a-card>-->
+<!--    <a-card :bordered='false'>-->
+<!--      &lt;!&ndash;省属企业信息管理&ndash;&gt;-->
+<!--      <company-info v-show="'ssqyxxgl' === defaultValue"></company-info>-->
+<!--      &lt;!&ndash;省直单位信息管理&ndash;&gt;-->
+<!--      <depart-info v-show="'szdwxxgl' === defaultValue"></depart-info>-->
+<!--      &lt;!&ndash;省属企业地块管理&ndash;&gt;-->
+<!--      <company-land v-show="'ssqydkgl' === defaultValue" :year-list='yearList' ref='ssqydkgl'></company-land>-->
+<!--      &lt;!&ndash;省直单位地块管理&ndash;&gt;-->
+<!--      <depart-land v-show="'szdwdkgl' === defaultValue" :year-list='yearList' ref='szdwdkgl'></depart-land>-->
 
-    </a-card>
-  </div>
-</template>
+<!--    </a-card>-->
+<!--  </div>-->
+<!--</template>-->
+<!--<script>-->
+<!--import companyInfo from '../qcsb/qyxx/QcQyxxList_gly.vue'-->
+<!--import departInfo from '../sydwqcsb/sydwxx/QcQyxxList_glyy.vue'-->
+<!--import companyLand from '../qcsb/QcSsgqzysytdqkList_gly.vue'-->
+<!--import departLand from '../sydwqcsb/QcSsgqzysytdqkList_glyy.vue'-->
+<!--import { getyear } from '@/api/api'-->
 
+<!--export default {-->
+<!--  name: 'landInfo',-->
+<!--  components: {-->
+<!--    companyInfo,-->
+<!--    departInfo,-->
+<!--    companyLand,-->
+<!--    departLand-->
+<!--  },-->
+<!--  data() {-->
+<!--    return {-->
+<!--      defaultValue: '',-->
+<!--      menus: [],-->
+<!--      yearList: []-->
 
-<script>
-import companyInfo from '../qcsb/qyxx/QcQyxxList_gly.vue'
-import departInfo from '../sydwqcsb/sydwxx/QcQyxxList_glyy.vue'
-import companyLand from '../qcsb/QcSsgqzysytdqkList_gly.vue'
-import departLand from '../sydwqcsb/QcSsgqzysytdqkList_glyy.vue'
-import {getyear} from '@/api/api'
+<!--    }-->
+<!--  },-->
+<!--  created() {-->
+<!--    this.menus = this.$store.state.menu.menuList['xxcx']-->
+<!--    this.defaultValue = this.menus.length > 0 ? this.menus[0].value : ''-->
+<!--    this.getYear()-->
+<!--  },-->
+<!--  methods: {-->
+<!--    changeContent(key) {-->
+<!--      console.log('菜单切换')-->
+<!--      let value = key.target.value-->
+<!--      if (value === 'ssqydkgl') {-->
+<!--        this.$refs.ssqydkgl.updataData()-->
+<!--      }-->
+<!--      if (value === 'szdwdkgl') {-->
+<!--        this.$refs.szdwdkgl.updataData()-->
+<!--      }-->
+<!--    },-->
+<!--    getYear() {-->
+<!--      getyear().then((res) => {-->
+<!--        if (res.success) {-->
+<!--          this.yearList = res.result-->
+<!--          console.table(this.yearList)-->
+<!--        }-->
+<!--      })-->
+<!--    }-->
+<!--  }-->
 
-export default {
-  name: 'landInfo',
-  components: {
-    companyInfo,
-    departInfo,
-    companyLand,
-    departLand,
+<!--}-->
+<!--</script>-->
 
+<!--<style scoped>-->
+<!--.content-div {-->
+<!--  height: 100%;-->
+<!--}-->
 
-  },
-  data() {
-    return {
-      defaultValue: '',
-      menus: [],
-      yearList: [],
-    }
-  },
-  created() {
-    this.menus = this.$store.state.menu.menuList['xxcx'];
-    this.defaultValue = this.menus.length > 0 ? this.menus[0].value : '';
-    this.getYear();
-  },
-  methods: {
-    changeContent(key) {
-      console.log(key);
-    },
-    getYear() {
-      getyear().then((res) => {
-        if (res.success) {
-          this.yearList = res.result;
-          console.table(this.yearList);
-        }
-      })
-    }
+<!--.ant-card:not(:last-child) {-->
+<!--  margin-bottom: 10px;-->
+<!--}-->
 
-  }
+<!--.ant-card:last-child {-->
+<!--  height: calc(100% - 70px);-->
+<!--  overflow-y: auto;-->
+<!--}-->
+<!--</style>-->
+<!--<style lang='less' scoped>-->
+<!--.info-submit {-->
+<!--  & ::v-deep > .ant-card-body {-->
+<!--    padding: 14px 24px;-->
+<!--  }-->
 
-}
-</script>
+<!--  &::v-deep .ant-radio-button-wrapper {-->
+<!--    //border: 1px solid ;-->
+<!--    border-radius: 4px;-->
+<!--    padding-left: 25px;-->
+<!--    padding-right: 25px;-->
+<!--    //border-left: 1px;-->
+<!--    border: 1px solid @primary-color;-->
+<!--    margin-left: 15px;-->
+<!--    color: @primary-color;-->
+<!--  }-->
 
-<style scoped>
-.content-div {
-  height: 100%;
-}
-.ant-card:not(:last-child) {
-  margin-bottom: 10px;
-}
-.ant-card:last-child {
-  height: calc(100% - 70px);
-  overflow-y: auto;
-}
-</style>
-<style lang="less" scoped>
-.info-submit {
-  & ::v-deep > .ant-card-body {
-    padding: 14px 24px;
-  }
-  &::v-deep .ant-radio-button-wrapper {
-    //border: 1px solid ;
-    border-radius: 4px;
-    padding-left: 25px;
-    padding-right: 25px;
-    //border-left: 1px;
-    border: 1px solid @primary-color;
-    margin-left: 15px;
-    color: @primary-color;
-  }
-  & /deep/ .ant-radio-button-wrapper:not(:first-child)::before {
-    width: 0px;
-  }
-  & .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
-    color: #fff;
-  }
-}
-.content-div {
-  &::v-deep .ant-card:last-child .ant-card-body {
-    padding: 10px 24px 0;
-  }
+<!--  & /deep/ .ant-radio-button-wrapper:not(:first-child)::before {-->
+<!--    width: 0px;-->
+<!--  }-->
 
-}
+<!--  & .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {-->
+<!--    color: #fff;-->
+<!--  }-->
+<!--}-->
 
-</style>
+<!--.content-div {-->
+<!--  &::v-deep .ant-card:last-child .ant-card-body {-->
+<!--    padding: 10px 24px 0;-->
+<!--  }-->
+
+<!--}-->
+
+<!--</style>-->

+ 112 - 0
src/views/infoSearch/infoSearchSs.vue

@@ -0,0 +1,112 @@
+<!--信息查询-->
+<template>
+  <div class='content-div'>
+    <a-card class='info-submit' :bordered='false'>
+      <a-radio-group v-model='defaultValue' button-style='solid' @change='changeContent'>
+        <a-radio-button v-for='(item, index) in menus' :key='item.action' :value='item.value' :name='item.va'>
+          {{ item.describe }}
+        </a-radio-button>
+      </a-radio-group>
+    </a-card>
+    <a-card :bordered='false'>
+      <!--省属企业信息管理-->
+      <company-info v-show="'ssqyxxgl' === defaultValue"></company-info>
+      <!--省属企业地块管理-->
+      <company-land v-show="'ssqydkgl' === defaultValue" :year-list='yearList' ref='ssqydkgl'></company-land>
+    </a-card>
+  </div>
+</template>
+<script>
+import companyInfo from '../qcsb/qyxx/QcQyxxList_gly.vue'
+import companyLand from '../qcsb/QcSsgqzysytdqkList_gly.vue'
+import { getyear } from '@/api/api'
+
+export default {
+  name: 'landInfo',
+  components: {
+    companyInfo,
+    companyLand,
+  },
+  data() {
+    return {
+      defaultValue: '',
+      menus: [],
+      yearList: []
+
+    }
+  },
+  created() {
+    this.menus = this.$store.state.menu.menuList['xxcxss']
+    this.defaultValue = this.menus.length > 0 ? this.menus[0].value : ''
+    this.getYear()
+  },
+  methods: {
+    changeContent(key) {
+      console.log('菜单切换')
+      let value = key.target.value
+      if (value === 'ssqydkgl') {
+        this.$refs.ssqydkgl.updataData()
+        this.$refs.ssqydkgl.queryDkInfo()
+      }
+    },
+    getYear() {
+      getyear().then((res) => {
+        if (res.success) {
+          this.yearList = res.result
+          console.table(this.yearList)
+        }
+      })
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+.content-div {
+  height: 100%;
+}
+
+.ant-card:not(:last-child) {
+  margin-bottom: 10px;
+}
+
+.ant-card:last-child {
+  height: calc(100% - 70px);
+  overflow-y: auto;
+}
+</style>
+<style lang='less' scoped>
+.info-submit {
+  & ::v-deep > .ant-card-body {
+    padding: 14px 24px;
+  }
+
+  &::v-deep .ant-radio-button-wrapper {
+    //border: 1px solid ;
+    border-radius: 4px;
+    padding-left: 25px;
+    padding-right: 25px;
+    //border-left: 1px;
+    border: 1px solid @primary-color;
+    margin-left: 15px;
+    color: @primary-color;
+  }
+
+  & /deep/ .ant-radio-button-wrapper:not(:first-child)::before {
+    width: 0px;
+  }
+
+  & .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+    color: #fff;
+  }
+}
+
+.content-div {
+  &::v-deep .ant-card:last-child .ant-card-body {
+    padding: 10px 24px 0;
+  }
+
+}
+
+</style>

+ 113 - 0
src/views/infoSearch/infoSearchSz.vue

@@ -0,0 +1,113 @@
+<!--信息查询-->
+<template>
+  <div class='content-div'>
+    <a-card class='info-submit' :bordered='false'>
+      <a-radio-group v-model='defaultValue' button-style='solid' @change='changeContent'>
+        <a-radio-button v-for='(item, index) in menus' :key='item.action' :value='item.value' :name='item.va'>
+          {{ item.describe }}
+        </a-radio-button>
+      </a-radio-group>
+    </a-card>
+    <a-card :bordered='false'>
+      <!--省直单位信息管理-->
+      <depart-info v-show="'szdwxxgl' === defaultValue"></depart-info>
+      <!--省直单位地块管理-->
+      <depart-land v-show="'szdwdkgl' === defaultValue" :year-list='yearList' ref='szdwdkgl'></depart-land>
+
+    </a-card>
+  </div>
+</template>
+<script>
+import departInfo from '../sydwqcsb/sydwxx/QcQyxxList_glyy.vue'
+import departLand from '../sydwqcsb/QcSsgqzysytdqkList_glyy.vue'
+import { getyear } from '@/api/api'
+
+export default {
+  name: 'landInfo',
+  components: {
+    departInfo,
+    departLand
+  },
+  data() {
+    return {
+      defaultValue: '',
+      menus: [],
+      yearList: []
+
+    }
+  },
+  created() {
+    this.menus = this.$store.state.menu.menuList['xxcxsz']
+    this.defaultValue = this.menus.length > 0 ? this.menus[0].value : ''
+    this.getYear()
+  },
+  methods: {
+    changeContent(key) {
+      console.log('菜单切换')
+      let value = key.target.value
+      if (value === 'szdwdkgl') {
+        this.$refs.szdwdkgl.updataData()
+        this.$refs.szdwdkgl. queryDkInfo()
+      }
+    },
+    getYear() {
+      getyear().then((res) => {
+        if (res.success) {
+          this.yearList = res.result
+          console.table(this.yearList)
+        }
+      })
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+.content-div {
+  height: 100%;
+}
+
+.ant-card:not(:last-child) {
+  margin-bottom: 10px;
+}
+
+.ant-card:last-child {
+  height: calc(100% - 70px);
+  overflow-y: auto;
+}
+</style>
+<style lang='less' scoped>
+.info-submit {
+  & ::v-deep > .ant-card-body {
+    padding: 14px 24px;
+  }
+
+  &::v-deep .ant-radio-button-wrapper {
+    //border: 1px solid ;
+    border-radius: 4px;
+    padding-left: 25px;
+    padding-right: 25px;
+    //border-left: 1px;
+    border: 1px solid @primary-color;
+    margin-left: 15px;
+    color: @primary-color;
+  }
+
+  & /deep/ .ant-radio-button-wrapper:not(:first-child)::before {
+    width: 0px;
+  }
+
+  & .ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+    color: #fff;
+  }
+}
+
+.content-div {
+  &::v-deep .ant-card:last-child .ant-card-body {
+    padding: 10px 24px 0;
+  }
+
+}
+
+</style>

+ 21 - 1
src/views/listStatistics/listTab.vue

@@ -98,7 +98,7 @@
         </a-col>
         <a-col :sm="24" :md="12" :xl="18">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-          <BarData :result-x-data="this.barResultData" :dw="'亩'" :title-text="[title=='' ? '省属企业'  : title ]+'实际用面积'" :seriesName="'地块面积(亩)'"></BarData>
+          <BarData :result-x-data="this.barResultData" :dw="'亩'" :title-text="[title=='' ? '省属企业'  : title ]+'实际使用面积'" :seriesName="'地块面积(亩)'"></BarData>
           </a-card>
         </a-col>
         <a-col :sm="24" :md="12" :xl="6">
@@ -247,6 +247,8 @@ export default {
         this.pieArea = this.resultData[3]
         this.DoughnutData = this.resultData[4]
         this.barBySjyt = this.resultData[5]
+        //清理数据
+        this.clears()
         for (let key in this.pieData) {
           this.pieResultData.push({name: key.toString(), value: parseInt(this.pieData[key])})
           this.data.push({type: key.toString(), number: parseInt(this.pieData[key])})
@@ -293,6 +295,24 @@ export default {
   methods: {
     getData() {
 
+    },
+    clears() {
+      this.data = []
+      this.areaData = []
+      this.pieResultData = []
+      this.pieAreaResultData = []
+      this.DoughnutResultData = []
+      this.doughnutByXzResultData = []
+      this.xzData = []
+      this.registerData = []
+      this.barResultData = []
+      this.nan = []
+      this.va = []
+      this.xqData = []
+      this.sjytData = []
+      this.sjytValue = []
+      this.sjytName = []
+      this.barBysjytResultData = []
     }
 
 

+ 125 - 108
src/views/listStatistics/listTabBySz.vue

@@ -1,135 +1,136 @@
 <template>
   <div>
-    <div v-if="this.loading==true">
-      <a-spin tip="Loading...">
-        <div class="spin-content">
+    <div v-if='this.loading==true'>
+      <a-spin tip='Loading...'>
+        <div class='spin-content'>
         </div>
       </a-spin>
     </div>
-    <div v-if="this.loading==false">
+    <div v-if='this.loading==false'>
       <a-row>
-        <a-col :sm="24" :md="12" :xl="6">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <PieData :result-data="pieResultData" :title-text="'省直单位土地地块数量获取方式占比'"></PieData>
+        <a-col :sm='24' :md='12' :xl='6'>
+          <a-card style='margin-bottom: 1rem;width:100%;height: 21rem'>
+            <PieData :result-data='pieResultData' :title-text="'省直单位土地地块数量获取方式占比'"></PieData>
           </a-card>
 
         </a-col>
-        <a-col :sm="24" :md="12" :xl="6">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
+        <a-col :sm='24' :md='12' :xl='6'>
+          <a-card style='margin-bottom: 1rem;width:100%;height: 21rem'>
             <j-vxe-table
-              :columns="columns"
-              :data-source="data"
+              :columns='columns'
+              :data-source='data'
             >
-              <a slot="name" slot-scope="text">{{ text }}</a>
+              <a slot='name' slot-scope='text'>{{ text }}</a>
 
             </j-vxe-table>
           </a-card>
         </a-col>
-        <a-col :sm="24" :md="12" :xl="6">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <PieData :result-data="pieAreaResultData" :title-text="'省直单位土地地块面积获取方式占比'"></PieData>
+        <a-col :sm='24' :md='12' :xl='6'>
+          <a-card style='margin-bottom: 1rem;width:100%;height: 21rem'>
+            <PieData :result-data='pieAreaResultData' :title-text="'省直单位土地地块面积获取方式占比'"></PieData>
 
           </a-card>
         </a-col>
-        <a-col :sm="24" :md="12" :xl="6">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
+        <a-col :sm='24' :md='12' :xl='6'>
+          <a-card style='margin-bottom: 1rem;width:100%;height: 21rem'>
             <j-vxe-table
-              :columns="areaColumns"
-              :data-source="areaData"
+              :columns='areaColumns'
+              :data-source='areaData'
 
             >
-              <a slot="name" slot-scope="text">{{ text }}</a>
+              <a slot='name' slot-scope='text'>{{ text }}</a>
 
             </j-vxe-table>
           </a-card>
         </a-col>
-        <a-col :sm="24" :md="12" :xl="6">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <DoughnutData :result-data="this.DoughnutResultData" :pie-color="color1" :title-text="'单位权证登记比例情况'"
+        <a-col :sm='24' :md='12' :xl='6'>
+          <a-card style='margin-bottom: 1rem;width:100%;height: 21rem'>
+            <DoughnutData :result-data='this.DoughnutResultData' :pie-color='color1'
+                          :title-text="'单位权证登记比例情况'"
             ></DoughnutData>
           </a-card>
         </a-col>
-        <a-col :sm="24" :md="12" :xl="6">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
+        <a-col :sm='24' :md='12' :xl='6'>
+          <a-card style='margin-bottom: 1rem;width:100%;height: 21rem'>
             <j-vxe-table
-              :columns="registerColumns"
-              :data-source="registerData"
+              :columns='registerColumns'
+              :data-source='registerData'
 
             >
-              <a slot="name" slot-scope="text">{{ text }}</a>
+              <a slot='name' slot-scope='text'>{{ text }}</a>
 
             </j-vxe-table>
           </a-card>
         </a-col>
-
-        <a-col :sm="24" :md="12" :xl="6">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <DoughnutData :result-data="this.doughnutByXzResultData" :pie-color="color1" :title-text="'省直单位土地使用现状占比'"
+        <a-col :sm='24' :md='12' :xl='6'>
+          <a-card style='margin-bottom: 1rem;width:100%;height: 21rem'>
+            <DoughnutData :result-data='this.doughnutByXzResultData' :pie-color='color1'
+                          :title-text="'省直单位土地使用现状占比'"
             ></DoughnutData>
           </a-card>
         </a-col>
-        <a-col :sm="24" :md="12" :xl="6">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
+        <a-col :sm='24' :md='12' :xl='6'>
+          <a-card style='margin-bottom: 1rem;width:100%;height: 21rem'>
             <j-vxe-table
-              :columns="registerColumns"
-              :data-source="xzData"
+              :columns='registerColumns'
+              :data-source='xzData'
 
             >
-              <a slot="name" slot-scope="text">{{ text }}</a>
+              <a slot='name' slot-scope='text'>{{ text }}</a>
             </j-vxe-table>
           </a-card>
         </a-col>
 
-        <a-col :sm="24" :md="12" :xl="18">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <BarData :result-x-data="this.barBysjytResultData" :dw="'亩'" :title-text="'省直单位土地实际用途情况'" :seriesName="'地块数量'"></BarData>
+        <a-col :sm='24' :md='12' :xl='18'>
+          <a-card style='margin-bottom: 1rem;width:100%;height: 21rem'>
+            <BarData :result-x-data='this.barBysjytResultData' :dw="'亩'" :title-text="'省直单位土地实际用途情况'"
+                     :seriesName="'地块数量'"></BarData>
           </a-card>
         </a-col>
-        <a-col :sm="24" :md="12" :xl="6">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
+        <a-col :sm='24' :md='12' :xl='6'>
+          <a-card style='margin-bottom: 1rem;width:100%;height: 21rem'>
             <j-vxe-table
-              :columns="sjytDataColumns"
-              :data-source="sjytData"
-              :height="300"
+              :columns='sjytDataColumns'
+              :data-source='sjytData'
+              :height='300'
             >
-              <a slot="name" slot-scope="text">{{ text }}</a>
+              <a slot='name' slot-scope='text'>{{ text }}</a>
             </j-vxe-table>
           </a-card>
         </a-col>
-        <a-col :sm="24" :md="12" :xl="18">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-          <BarData :result-x-data="this.barResultData" :dw="'亩'" :title-text="'省直单位实际占用面积'" :seriesName="'地块面积(亩)'"></BarData>
+        <a-col :sm='24' :md='12' :xl='18'>
+          <a-card style='margin-bottom: 1rem;width:100%;height: 21rem'>
+            <BarData :result-x-data='this.barResultData' :dw="'亩'" :title-text="'省直单位实际使用面积'"
+                     :seriesName="'地块面积(亩)'"></BarData>
           </a-card>
         </a-col>
-        <a-col :sm="24" :md="12" :xl="6">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-                        <j-vxe-table
-                          :columns="xqDataColumns"
-                          :data-source="xqData"
-                          :height="300"
-                        >
-                          <a slot="name" slot-scope="text">{{ text }}</a>
-                        </j-vxe-table>
+        <a-col :sm='24' :md='12' :xl='6'>
+          <a-card style='margin-bottom: 1rem;width:100%;height: 21rem'>
+            <j-vxe-table
+              :columns='xqDataColumns'
+              :data-source='xqData'
+              :height='300'
+            >
+              <a slot='name' slot-scope='text'>{{ text }}</a>
+            </j-vxe-table>
           </a-card>
         </a-col>
       </a-row>
-
     </div>
   </div>
-
 </template>
 
 <script>
-import BarMultid from "@/components/chart/BarMultid";
-import Bar from "@/components/chart/Bar";
-import BarData from "@views/tj/compoent/BarData";
-import Pie from "@/components/chart/Pie";
-import DoughnutData from "@views/tj/compoent/DoughnutData";
-import PieData from "@views/tj/compoent/PieData";
-import {JVXETypes} from '@/components/jeecg/JVxeTable';
+import BarMultid from '@/components/chart/BarMultid'
+import Bar from '@/components/chart/Bar'
+import BarData from '@views/tj/compoent/BarData'
+import Pie from '@/components/chart/Pie'
+import DoughnutData from '@views/tj/compoent/DoughnutData'
+import PieData from '@views/tj/compoent/PieData'
+import { JVXETypes } from '@/components/jeecg/JVxeTable'
 
 export default {
-  name: "listTab",
+  name: 'listTab',
   data() {
     return {
       pieData: {},
@@ -143,7 +144,7 @@ export default {
         {
           title: '获取方式',
           dataIndex: 'type',
-          key: 'type',
+          key: 'type'
 
         },
         {
@@ -152,14 +153,14 @@ export default {
           key: 'number',
           type: JVXETypes.inputNumber,
           statistics: ['sum']
-        },
+        }
 
       ],
       areaColumns: [
         {
           title: '获取方式',
           dataIndex: 'type',
-          key: 'type',
+          key: 'type'
         },
         {
           title: '地块面积(亩)',
@@ -167,13 +168,13 @@ export default {
           key: 'number',
           type: JVXETypes.inputNumber,
           statistics: ['sum']
-        },
+        }
       ],
-      xqDataColumns:[
+      xqDataColumns: [
         {
           title: '类型',
           dataIndex: 'type',
-          key: 'type',
+          key: 'type'
         },
         {
           title: '面积(亩)',
@@ -181,13 +182,13 @@ export default {
           key: 'number',
           type: JVXETypes.inputNumber,
           statistics: ['sum']
-        },
+        }
       ],
-      sjytDataColumns:[
+      sjytDataColumns: [
         {
           title: '类型',
           dataIndex: 'type',
-          key: 'type',
+          key: 'type'
         },
         {
           title: '数量',
@@ -195,13 +196,13 @@ export default {
           key: 'number',
           type: JVXETypes.inputNumber,
           statistics: ['sum']
-        },
+        }
       ],
       registerColumns: [
         {
           title: '类型',
           dataIndex: 'type',
-          key: 'type',
+          key: 'type'
         },
         {
           title: '数量',
@@ -209,22 +210,22 @@ export default {
           key: 'number',
           type: JVXETypes.inputNumber,
           statistics: ['sum']
-        },
+        }
       ],
       data: [],
       barData: [],
       barResultData: {},
       areaData: [],
-      sjytName:[],
-      sjytValue:[],
-      va:[],
-      nan:[],
+      sjytName: [],
+      sjytValue: [],
+      va: [],
+      nan: [],
       xzData: [],
       xqData: [],
       pieAreaResultData: [],
       doughnutByXzResultData: [],
-      barBysjytResultData:{},
-      sjytData:[]
+      barBysjytResultData: {},
+      sjytData: []
     }
   },
   components: {
@@ -233,56 +234,57 @@ export default {
     Pie,
     BarData,
     BarMultid,
-    DoughnutData,
+    DoughnutData
 
   },
   watch: {
     resultData() {
-      this.$nextTick(function () {
+      this.$nextTick(function() {
         this.pieData = this.resultData[0]
         this.barData = this.resultData[1]
         this.doughnutByXzData = this.resultData[2]
         this.pieArea = this.resultData[3]
         this.DoughnutData = this.resultData[4]
         this.barBySjyt = this.resultData[5]
+        // 重新清理数据
+        this.clears()
         for (let key in this.pieData) {
-          this.pieResultData.push({name: key.toString(), value: parseInt(this.pieData[key])})
-          this.data.push({type: key.toString(), number: parseInt(this.pieData[key])})
+          this.pieResultData.push({ name: key.toString(), value: parseInt(this.pieData[key]) })
+          this.data.push({ type: key.toString(), number: parseInt(this.pieData[key]) })
         }
         for (let key in this.pieArea) {
-          this.pieAreaResultData.push({name: key.toString(), value: this.pieArea[key]*0.0015})
-          this.areaData.push({type: key.toString(), number: this.pieArea[key].toFixed(2)*0.0015})
+          this.pieAreaResultData.push({ name: key.toString(), value: this.pieArea[key]})
+          this.areaData.push({ type: key.toString(), number: this.pieArea[key].toFixed(2)})
         }
 
         for (let key in this.DoughnutData) {
           if (key != '证书') {
             this.number = this.number + this.DoughnutData[key]
           }
-          this.registerData.push({type: key.toString(), number: this.DoughnutData[key]})
+          this.registerData.push({ type: key.toString(), number: this.DoughnutData[key] })
         }
-        this.DoughnutResultData.push({name: '有证', value: this.DoughnutData['证书']},
-          {name: '无证', value: this.number})
+        this.DoughnutResultData.push({ name: '有证', value: this.DoughnutData['证书'] },
+          { name: '无证', value: this.number })
 
         for (let key in this.doughnutByXzData) {
-          this.doughnutByXzResultData.push({name: key.toString(), value: this.doughnutByXzData[key]*0.0015})
-          this.xzData.push({type: key.toString(), number: this.doughnutByXzData[key].toFixed(2)*0.0015})
+          this.doughnutByXzResultData.push({ name: key.toString(), value: this.doughnutByXzData[key]})
+          this.xzData.push({ type: key.toString(), number: this.doughnutByXzData[key].toFixed(2)})
         }
         for (let key in this.barData) {
           this.nan.push(key.toString())
-          this.va.push(parseFloat(this.barData[key].toFixed(2))*0.0015)
-          this.xqData.push({type: key.toString(), number: this.barData[key].toFixed(2)*0.0015})
+          this.va.push(parseFloat(this.barData[key].toFixed(2)))
+          this.xqData.push({ type: key.toString(), number: this.barData[key].toFixed(2)})
         }
-        this.barResultData.name=this.nan;
-        this.barResultData.value=this.va;
+        this.barResultData.name = this.nan
+        this.barResultData.value = this.va
 
         for (let key in this.barBySjyt) {
           this.sjytName.push(key.toString())
           this.sjytValue.push(this.barBySjyt[key])
-          this.sjytData.push({type: key.toString(), number: this.barBySjyt[key]})
+          this.sjytData.push({ type: key.toString(), number: this.barBySjyt[key] })
         }
-        this.barBysjytResultData.name=this.sjytName;
-        this.barBysjytResultData.value=this.sjytValue;
-
+        this.barBysjytResultData.name = this.sjytName
+        this.barBysjytResultData.value = this.sjytValue
       })
     }
   },
@@ -291,10 +293,25 @@ export default {
   },
   methods: {
     getData() {
-
+    },
+    clears() {
+      this.data = []
+      this.areaData = []
+      this.pieResultData = []
+      this.pieAreaResultData = []
+      this.DoughnutResultData = []
+      this.doughnutByXzResultData = []
+      this.xzData = []
+      this.registerData = []
+      this.barResultData = []
+      this.nan = []
+      this.va = []
+      this.xqData = []
+      this.sjytData = []
+      this.sjytValue = []
+      this.sjytName = []
+      this.barBysjytResultData = []
     }
-
-
   },
   props: {
     loading: {

+ 42 - 20
src/views/qcsb/QcSsgqzysytdqkList_gly.vue

@@ -120,6 +120,14 @@
        </a-menu>
        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
      </a-dropdown>-->
+      <a-row>
+        <a-col :span="3">
+          <a-statistic title="地块数量" v-model="countDk" style="margin-right: 50px" />
+        </a-col>
+        <a-col :span="3">
+          <a-statistic title="地块面积(亩)" :precision="2" v-model="areaDk" />
+        </a-col>
+      </a-row>
     </div>
 
     <!-- table区域-begin -->
@@ -130,6 +138,9 @@
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
       <a-tabs :active-key="this.changes" @change="callback">
+        <a-tab-pane key="2" tab="统计图表" force-render>
+          <listTable ref="table" :loading="this.load" :result-data="this.resultData" :title="title"></listTable>
+        </a-tab-pane>
         <a-tab-pane key="1" tab="列表信息">
           <a-table
             ref="table"
@@ -179,9 +190,7 @@
 
           </a-table>
         </a-tab-pane>
-        <a-tab-pane key="2" tab="统计图表" force-render>
-          <listTable ref="table" :loading="this.load" :result-data="this.resultData" :title="title"></listTable>
-        </a-tab-pane>
+
       </a-tabs>
 
     </div>
@@ -201,7 +210,7 @@ import listTable from '@/views/listStatistics/listTab'
 import store from '@/store'
 import JAreaSelect from "@comp/jeecg/JAreaSelect";
 
-
+// 省属企业
 export default {
   name: 'QcSsgqzysytdqkList',
   mixins: [JeecgListMixin, mixinDevice],
@@ -218,11 +227,13 @@ export default {
   },
   data() {
     return {
+      countDk: 0,
+      areaDk: 0,
       dlr: false,
       description: '省属国企占有使用土地情况调查管理页面',
       resultData: [],
       load: true,
-      changes: '1',
+      changes: '2',
       title: '',
       queryParam: {
         sysOrgCode: null
@@ -298,16 +309,15 @@ export default {
         importExcelUrl: "qcsb/qcSsgqzysytdqk/importExcel",
         wcsh: "/qcsb/qcSsgqzysytdqk/wcsh",
         hfysh: "/qcsb/qcSsgqzysytdqk/hfysh",
-        listTable: "/qcsb/qcSsgqzysytdqk/sumList"
+        listTable: "/qcsb/qcSsgqzysytdqk/sumList",
+        listQuery: '/qcsb/qcSsgqzysytdqk/listByglyCount',
       },
       dictOptions: {},
       superFieldList: [],
     }
   },
-
   created() {
     this.getSuperFieldList();
-
   },
   watch: {
     'queryParam.sysOrgCode': {
@@ -319,7 +329,6 @@ export default {
                 this.title = re.text
               }
             }
-
           })
         }else{
           this.title = ''
@@ -339,20 +348,19 @@ export default {
     searchQuery() {
       this.changes = '1'
       this.loadData(1);
+      this.queryDkInfo();
       // 点击查询清空列表选中行
       // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
       this.selectedRowKeys = []
       this.selectionRows = []
     },
     callback(key) {
-
       if (key == 1) {
         this.emptyData()
         this.changes = '1'
       }
       if (key == 2) {
         this.changes = '2'
-        this.emptyData()
         this.updataData()
       }
     },
@@ -377,6 +385,22 @@ export default {
       this.$refs.table.barBysjytResultData = []
       this.$refs.table.number = 0
     },
+    // 查询地块和面积统计
+    queryDkInfo(){
+      console.log('查询地块和面积')
+      let _this = this
+      new Promise(function(resolve, reject) {
+        getAction(_this.url.listQuery, _this.queryParam).then(res => {
+          if (res.success) {
+            console.log("#############################> 地块统计#############>")
+            console.log(res)
+            _this.countDk = res.result.countDk
+            _this.areaDk = res.result.areaDk
+            resolve()
+          }
+        })
+      })
+    },
     updataData() {
       let _this = this;
       new Promise(function (resolve, reject) {
@@ -384,7 +408,6 @@ export default {
           if (res.success) {
             _this.load = false
             _this.resultData = res.result
-            console.log(777777777777, _this.resultData)
             resolve();
           }
         })
@@ -400,7 +423,9 @@ export default {
     searchReset() {
       this.$refs.JArea.allClear(),
         this.queryParam = {}
-      this.loadData(1);
+      this.changes='1'
+      this.queryDkInfo();
+      this.loadData();
     },
     show() {
       getAction("/qcsb.qyxx/qcQyxx/dlr").then(res => {
@@ -410,8 +435,7 @@ export default {
           }
         }
       })
-    }
-    ,
+    },
     handleWCSH(id) {
       getAction(this.url.wcsh, {id: id}).then(res => {
         if (res.success) {
@@ -419,7 +443,6 @@ export default {
           this.loadData();
         }
       })
-
     },
     handleHFYSH(id) {
       getAction(this.url.hfysh, {id: id}).then(res => {
@@ -428,7 +451,6 @@ export default {
           this.loadData();
         }
       })
-
     },
     initDictConfig() {
       loadCategoryData({code: 'A04'}).then((res) => {
@@ -471,6 +493,6 @@ export default {
   }
 }
 </script>
-<style scoped>
-@import '~@assets/less/common.less';
-</style>
+<!--<style scoped>-->
+<!--@import '~@assets/less/common.less';-->
+<!--</style>-->

+ 389 - 349
src/views/sydwqcsb/QcSsgqzysytdqkList_glyy.vue

@@ -1,100 +1,101 @@
 <template>
-  <a-card :bordered="false">
+  <a-card :bordered='false'>
     <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :xl="5" :lg="7" :md="8" :sm="24">
-          <a-form-item label="单位名称">
-            <a-input placeholder="请输入单位名称"  v-model="queryParam.createBy"/>
-          </a-form-item>
+    <div class='table-page-search-wrapper'>
+      <a-form layout='inline' @keyup.enter.native='searchQuery'>
+        <a-row :gutter='24'>
+          <a-col :xl='5' :lg='7' :md='8' :sm='24'>
+            <a-form-item label='单位名称'>
+              <a-input placeholder='请输入单位名称' v-model='queryParam.createBy' />
+            </a-form-item>
           </a-col>
-          <a-col :xl="5" :lg="7" :md="8" :sm="24">
-            <a-form-item label="地块名称">
-              <a-input placeholder="请输入地块名称" v-model="queryParam.dk"></a-input>
+          <a-col :xl='5' :lg='7' :md='8' :sm='24'>
+            <a-form-item label='地块名称'>
+              <a-input placeholder='请输入地块名称' v-model='queryParam.dk'></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="5" :lg="7" :md="8" :sm="24">
-            <a-form-item label="地块编号">
-              <a-input placeholder="请输入地块编号" v-model="queryParam.dkbh"></a-input>
+          <a-col :xl='5' :lg='7' :md='8' :sm='24'>
+            <a-form-item label='地块编号'>
+              <a-input placeholder='请输入地块编号' v-model='queryParam.dkbh'></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="4" :lg="7" :md="8" :sm="24">
-            <a-form-item label="行政区划">
-              <JAreaSelect ref="JArea" @Area="SelectArea"></JAreaSelect>
+          <a-col :xl='4' :lg='7' :md='8' :sm='24'>
+            <a-form-item label='行政区划'>
+              <JAreaSelect ref='JArea' @Area='SelectArea'></JAreaSelect>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="是否存在矢量">
-                <j-dict-select-tag placeholder="请选择是否存在矢量" v-model="queryParam.sfczslsj" dictCode="sfgyz"/>
+          <template v-if='toggleSearchStatus'>
+            <a-col :xl='5' :lg='7' :md='8' :sm='24'>
+              <a-form-item label='是否存在矢量'>
+                <j-dict-select-tag placeholder='请选择是否存在矢量' v-model='queryParam.sfczslsj' dictCode='sfgyz' />
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="文件编号">
-                <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
+            <a-col :xl='5' :lg='7' :md='8' :sm='24'>
+              <a-form-item label='文件编号'>
+                <a-input placeholder='请输入证书/合同/文件编号' v-model='queryParam.wjbh'></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="证书类型">
-                <j-multi-select-tag placeholder="请选择证书类型" v-model="queryParam.zslx" dictCode="zslx"/>
+            <a-col :xl='5' :lg='7' :md='8' :sm='24'>
+              <a-form-item label='证书类型'>
+                <j-multi-select-tag placeholder='请选择证书类型' v-model='queryParam.zslx' dictCode='zslx' />
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="批准用途">
-                <j-category-select v-model="queryParam.pzyt" pcode="A04" placeholder="请选择批准用途"/>
+            <a-col :xl='5' :lg='7' :md='8' :sm='24'>
+              <a-form-item label='批准用途'>
+                <j-category-select v-model='queryParam.pzyt' pcode='A04' placeholder='请选择批准用途' />
               </a-form-item>
             </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="24">
-              <a-form-item label="主管单位">
-                <j-multi-select-tag placeholder="请选择主管单位" v-model="queryParam.sysOrgCode" dictCode="zgbm"/>
+            <a-col :xl='4' :lg='7' :md='8' :sm='24'>
+              <a-form-item label='主管单位'>
+                <j-multi-select-tag placeholder='请选择主管单位' v-model='queryParam.sysOrgCode' dictCode='zgbm' />
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="是否通过审核">
-                <j-dict-select-tag placeholder="请选择是否通过审核" v-model="queryParam.shzt" dictCode="shzt"/>
+            <a-col :xl='5' :lg='7' :md='8' :sm='24'>
+              <a-form-item label='是否通过审核'>
+                <j-dict-select-tag placeholder='请选择是否通过审核' v-model='queryParam.shzt' dictCode='shzt' />
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="取得方式">
+            <a-col :xl='5' :lg='7' :md='8' :sm='24'>
+              <a-form-item label='取得方式'>
                 <j-multi-select-tag type='list_multi' v-model='queryParam.syqsyfs' dictCode='qdfs'
-                                    placeholder='请选择使用权使用方式'/>
+                                    placeholder='请选择使用权使用方式' />
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="使用现状">
-                <j-dict-select-tag type='list' v-model='queryParam.tdsyxz' dictCode='tdsyxz' placeholder='请选择土地使用现状' />
+            <a-col :xl='5' :lg='7' :md='8' :sm='24'>
+              <a-form-item label='使用现状'>
+                <j-dict-select-tag type='list' v-model='queryParam.tdsyxz' dictCode='tdsyxz'
+                                   placeholder='请选择土地使用现状' />
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="是否上报">
-                <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
+            <a-col :xl='5' :lg='7' :md='8' :sm='24'>
+              <a-form-item label='是否上报'>
+                <j-dict-select-tag placeholder='请选择是否上报' v-model='queryParam.sfsb' dictCode='xxsbzt' />
               </a-form-item>
             </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="24">
-              <a-form-item label="入库年份">
-                <a-select v-model="queryParam.year" placeholder="请选择入库年份">
-                  <a-select-option :value="undefined">请选择</a-select-option>
-                  <a-select-option v-for="item in yearList" :key="item" :value="item">
-                    {{item}}
+            <a-col :xl='4' :lg='7' :md='8' :sm='24'>
+              <a-form-item label='入库年份'>
+                <a-select v-model='queryParam.year' placeholder='请选择入库年份'>
+                  <a-select-option :value='undefined'>请选择</a-select-option>
+                  <a-select-option v-for='item in yearList' :key='item' :value='item'>
+                    {{ item }}
                   </a-select-option>
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="土地使用权人">
-                <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
+            <a-col :xl='5' :lg='7' :md='8' :sm='24'>
+              <a-form-item label='土地使用权人'>
+                <a-input placeholder='请输入土地使用权人' v-model='queryParam.tdsyqr'></a-input>
               </a-form-item>
             </a-col>
           </template>
-          <a-col :xl="3" :lg="7" :md="8" :sm="24">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+          <a-col :xl='3' :lg='7' :md='8' :sm='24'>
+            <span style='float: left;overflow: hidden;' class='table-page-search-submitButtons'>
 
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
+              <a-button type='primary' @click='searchQuery' icon='search'>查询</a-button>
+              <a-button type='primary' @click='searchReset' icon='reload' style='margin-left: 8px'>重置</a-button>
+              <a @click='handleToggleSearch' style='margin-left: 8px'>
                 {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
               </a>
             </span>
           </a-col>
@@ -104,10 +105,10 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <div class="table-operator">
-<!--      <a-button v-has="'conts:add'"@click="handleAdd2" type="primary" icon="plus">填报信息</a-button>-->
-    <a-button type="primary" icon="download" @click="handleExportXls('省直单位占有使用土地情况调查')">导出</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('省直单位占有使用土地情况调查')">全部导出</a-button>
+    <div class='table-operator'>
+      <!--      <a-button v-has="'conts:add'"@click="handleAdd2" type="primary" icon="plus">填报信息</a-button>-->
+      <a-button type='primary' icon='download' @click="handleExportXls('省直单位占有使用土地情况调查')">导出</a-button>
+      <a-button type='primary' icon='download' @click="handleExportXls('省直单位占有使用土地情况调查')">全部导出</a-button>
       <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
@@ -119,324 +120,363 @@
        </a-menu>
        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
      </a-dropdown>-->
+      <a-row>
+        <a-col :span="3">
+          <a-statistic title="地块数量" v-model="countDk" style="margin-right: 50px" />
+        </a-col>
+        <a-col :span="3">
+          <a-statistic title="地块面积(亩)" :precision="2" v-model="areaDk" />
+        </a-col>
+      </a-row>
     </div>
-
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      <div class='ant-alert ant-alert-info' style='margin-bottom: 16px;'>
+        <i class='anticon anticon-info-circle ant-alert-icon'></i> 已选择 <a
+        style='font-weight: 600'>{{ selectedRowKeys.length }}</a>项
+        <a style='margin-left: 24px' @click='onClearSelected'>清空</a>
       </div>
-      <a-tabs  :active-key="this.changes"  @change="callback" >
-        <a-tab-pane key="1" tab="列表信息">
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
+      <a-tabs :active-key='this.changes' @change='callback'>
+        <a-tab-pane key='2' tab='统计图表' force-render>
+          <listTabBySz ref='table' :loading='this.load' :result-data='this.resultData'></listTabBySz>
+        </a-tab-pane>
+        <a-tab-pane key='1' tab='列表信息'>
+          <a-table
+            ref='table'
+            size='middle'
+            :scroll='{x:true}'
+            bordered
+            rowKey='id'
+            :columns='columns'
+            :dataSource='dataSource'
+            :pagination='ipagination'
+            :loading='loading'
+            :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
+            class='j-table-force-nowrap'
+            @change='handleTableChange'>
 
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
+            <template slot='htmlSlot' slot-scope='text'>
+              <div v-html='text'></div>
+            </template>
+            <template slot='imgSlot' slot-scope='text,record'>
+              <span v-if='!text' style='font-size: 12px;font-style: italic;'>无图片</span>
+              <img v-else :src='getImgView(text)' :preview='record.id' height='25px' alt=''
+                   style='max-width:80px;font-size: 12px;font-style: italic;' />
+            </template>
+            <template slot='fileSlot' slot-scope='text'>
+              <span v-if='!text' style='font-size: 12px;font-style: italic;'>无文件</span>
+              <a-button
+                v-else
+                :ghost='true'
+                type='primary'
+                icon='download'
+                size='small'
+                @click='downloadFile(text)'>
+                下载
+              </a-button>
+            </template>
 
-        <span slot="action" slot-scope="text, record">
+            <span slot='action' slot-scope='text, record'>
 
 
             <a-space>
-                          <a-button v-if="record.sfsb<3" @click="handleEdit(record)">编辑</a-button>
-                             <a-button v-if="record.sfsb==3" @click="handleEdit(record)">重新审核</a-button>
-                          <a-button @click="handleDetail(record)" type='primary'>查看</a-button>
-<!--                          <a-button v-if="record.sfsb===3" @click="handleWCSH(record.id)">完成审核</a-button>-->
-                             <a-popconfirm title="确定恢复么吗?" @confirm="() => handleHFYSH(record.id)">
-                            <a-button v-if="record.sfsb===4">恢复为已审核</a-button>
+                          <a-button v-if='record.sfsb<3' @click='handleEdit(record)'>编辑</a-button>
+                             <a-button v-if='record.sfsb==3' @click='handleEdit(record)'>重新审核</a-button>
+                          <a-button @click='handleDetail(record)' type='primary'>查看</a-button>
+              <!--                          <a-button v-if="record.sfsb===3" @click="handleWCSH(record.id)">完成审核</a-button>-->
+                             <a-popconfirm title='确定恢复么吗?' @confirm='() => handleHFYSH(record.id)'>
+                            <a-button v-if='record.sfsb===4'>恢复为已审核</a-button>
                              </a-popconfirm>
                         </a-space>
         </span>
 
-      </a-table>
-        </a-tab-pane>
-        <a-tab-pane key="2" tab="统计图表" force-render>
-          <listTabBySz ref="table" :loading="this.load" :result-data="this.resultData"></listTabBySz>
+          </a-table>
         </a-tab-pane>
+
       </a-tabs>
     </div>
-    <qc-ssgqzysytdqk-modal ref="modalForm" @ok="modalFormOk"></qc-ssgqzysytdqk-modal>
+    <qc-ssgqzysytdqk-modal ref='modalForm' @ok='modalFormOk'></qc-ssgqzysytdqk-modal>
   </a-card>
 </template>
 
 <script>
 
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import QcSsgqzysytdqkModal from './modules/QcSsgqzysytdqkModal2'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-  import { getAction } from '../../api/manage'
-  import { loadCategoryData } from '@/api/api'
-  import JAreaSelect from "@comp/jeecg/JAreaSelect";
-  import listTabBySz from '@/views/listStatistics/listTabBySz'
-  import store from '@/store'
-  export default {
-    name: 'QcSsgqzysytdqkList',
-    mixins:[JeecgListMixin, mixinDevice],
-    props: {
-      yearList: {
-        type: Array,
-        required: true
-      }
+import '@/assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import QcSsgqzysytdqkModal from './modules/QcSsgqzysytdqkModal2'
+import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
+import { getAction } from '../../api/manage'
+import { loadCategoryData } from '@/api/api'
+import JAreaSelect from '@comp/jeecg/JAreaSelect'
+import listTabBySz from '@/views/listStatistics/listTabBySz'
+import store from '@/store'
+
+export default {
+  name: 'QcSsgqzysytdqkList',
+  mixins: [JeecgListMixin, mixinDevice],
+  props: {
+    yearList: {
+      type: Array,
+      required: true
+    }
+  },
+  components: {
+    QcSsgqzysytdqkModal,
+    JAreaSelect,
+    listTabBySz
+  },
+  data() {
+    return {
+      countDk: 0,
+      areaDk: 0,
+      dlr: false,
+      resultData: [],
+      description: '省属国企占有使用土地情况调查管理页面',
+      load: true,
+      changes: '2',
+      // 表头
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function(t, r, index) {
+            return parseInt(index) + 1
+          }
+        },
+        {
+          title: '用地单位名称',
+          align: 'center',
+          dataIndex: 'createBy'
+        },
+        {
+          title: '地块',
+          align: 'center',
+          dataIndex: 'dk'
+        },
+        {
+          title: '证书类型',
+          align: 'center',
+          dataIndex: 'zslx_dictText'
+        },
+        {
+          title: '证书/合同/文件编号',
+          align: 'center',
+          dataIndex: 'wjbh'
+        },
+        {
+          title: '土地使用权人',
+          align: 'center',
+          dataIndex: 'tdsyqr'
+        },
+        {
+          title: '使用权使用方式',
+          align: 'center',
+          dataIndex: 'syqsyfs_dictText'
+        },
+        {
+          title: '实际用途',
+          align: 'center',
+          dataIndex: 'sjyt',
+          customRender:
+            (text) => (text ? filterMultiDictText(this.dictOptions['sjyt'], text) : '')
+        },
+        {
+          title: '是否上报',
+          align: 'center',
+          dataIndex: 'sfsb_dictText'
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: 'center',
+          fixed: 'right',
+          width: 147,
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      url: {
+        list: '/qcsb/qcSsgqzysytdqk/listByglyy',
+        delete: '/qcsb/qcSsgqzysytdqk/delete',
+        deleteBatch: '/qcsb/qcSsgqzysytdqk/deleteBatch',
+        exportXlsUrl: '/qcsb/qcSsgqzysytdqk/exportXls3',
+        importExcelUrl: 'qcsb/qcSsgqzysytdqk/importExcel',
+        wcsh: '/qcsb/qcSsgqzysytdqk/wcsh',
+        hfysh: '/qcsb/qcSsgqzysytdqk/hfysh',
+        listTable: '/qcsb/qcSsgqzysytdqk/sumListBysz',
+        listQuery: '/qcsb/qcSsgqzysytdqk/listByglyyCount',
+      },
+      dictOptions: {},
+      superFieldList: []
+    }
+  },
+  created() {
+    this.getSuperFieldList()
+  },
+  mounted() {
+   this.show()
+  },
+  computed: {
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    }
+  },
+  methods: {
+    searchQuery() {
+      this.changes = '1'
+      this.loadData('1')
+      this.queryDkInfo();
+      // 点击查询清空列表选中行
+      //https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
+      this.selectedRowKeys = []
+      this.selectionRows = []
     },
-    components: {
-      QcSsgqzysytdqkModal,
-      JAreaSelect,
-      listTabBySz
+    // 查询地块和面积统计
+    queryDkInfo(){
+      console.log('查询地块和面积')
+      let _this = this
+      new Promise(function(resolve, reject) {
+        getAction(_this.url.listQuery, _this.queryParam).then(res => {
+          if (res.success) {
+            console.log("#############################> 地块统计#############>")
+            console.log(res)
+            _this.countDk = res.result.countDk
+            _this.areaDk = res.result.areaDk
+            resolve()
+          }
+        })
+      })
     },
-    data () {
-      return {
-        dlr:false,
-        resultData:[],
-        description: '省属国企占有使用土地情况调查管理页面',
-        load: true,
-        changes:'1',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-            {
-                title:'用地单位名称',
-                align:"center",
-                dataIndex: 'createBy'
-            },
-          {
-            title:'地块',
-            align:"center",
-            dataIndex: 'dk'
-          },
-          {
-            title:'证书类型',
-            align:"center",
-            dataIndex: 'zslx_dictText'
-          },
-          {
-            title:'证书/合同/文件编号',
-            align:"center",
-            dataIndex: 'wjbh'
-          },
-          {
-            title:'土地使用权人',
-            align:"center",
-            dataIndex: 'tdsyqr'
-          },
-          {
-            title:'使用权使用方式',
-            align:"center",
-            dataIndex: 'syqsyfs_dictText'
-          },
-          {
-            title:'实际用途',
-            align:"center",
-            dataIndex: 'sjyt',
-            customRender:
-              (text) => (text ? filterMultiDictText(this.dictOptions['sjyt'], text) : '')
-          },
-          {
-            title:'是否上报',
-            align:"center",
-            dataIndex: 'sfsb_dictText'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
+    updataData() {
+      console.log('执行钩子1')
+      let _this = this
+      new Promise(function(resolve, reject) {
+        getAction(_this.url.listTable, _this.queryParam).then(res => {
+          if (res.success) {
+            _this.resultData = res.result
+            _this.load = false
+            resolve()
           }
-        ],
-        url: {
-          list: "/qcsb/qcSsgqzysytdqk/listByglyy",
-          delete: "/qcsb/qcSsgqzysytdqk/delete",
-          deleteBatch: "/qcsb/qcSsgqzysytdqk/deleteBatch",
-          exportXlsUrl: "/qcsb/qcSsgqzysytdqk/exportXls3",
-          importExcelUrl: "qcsb/qcSsgqzysytdqk/importExcel",
-            wcsh:"/qcsb/qcSsgqzysytdqk/wcsh",
-            hfysh:"/qcsb/qcSsgqzysytdqk/hfysh",
-          listTable: "/qcsb/qcSsgqzysytdqk/sumListBysz"
-        },
-        dictOptions:{},
-        superFieldList:[],
+        })
+      })
+    },
+    callback(key) {
+      if (key == 1) {
+        this.emptyData()
+        this.changes = '1'
+      }
+      if (key == 2) {
+        this.changes = '2'
+        this.updataData()
       }
     },
-    created() {
-    this.getSuperFieldList();
+    SelectArea(val) {
+      if (val.length > 4) {
+        this.queryParam.xzqh = val + '*'
+      } else {
+        this.queryParam.xzqh = val.slice(0, 4) + '*'
+      }
     },
-    mounted() {
-      this.show()
+    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
     },
-    computed: {
-
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
+    searchReset() {
+      this.$refs.JArea.allClear()
+      this.queryParam = {}
+      this.changes='1'
+      this.loadData()
+      this.queryDkInfo();
     },
-    methods: {
-      searchQuery() {
-        this.changes='1'
-        this.loadData(1);
-        // 点击查询清空列表选中行
-        // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
-        this.selectedRowKeys = []
-        this.selectionRows = []
-      },
-      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()
+    show() {
+      getAction('/qcsb.qyxx/qcQyxx/dlr').then(res => {
+        if (res.success) {
+          if (res.result == 'gzw') {
+            this.dl = true
+          }
         }
-      },
-      SelectArea(val) {
-        if (val.length > 4) {
-          this.queryParam.xzqh = val + '*'
-        } else {
-          this.queryParam.xzqh = val.slice(0, 4) + '*'
+      })
+    }
+    ,
+    handleWCSH(id) {
+      getAction(this.url.wcsh, { id: id }).then(res => {
+        if (res.success) {
+          this.$message.success('审核完成')
+          this.loadData()
         }
-      },
-      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 = {}
-        this.loadData(1);
-      },
-      show(){
-        getAction("/qcsb.qyxx/qcQyxx/dlr").then(res => {
-          if (res.success) {
-            if(res.result=='gzw'){
-              this.dl=true
-            }
-          }
-        })
-      }
-      ,
-        handleWCSH(id){
-            getAction(this.url.wcsh,{id:id}).then(res => {
-                if (res.success) {
-                    this.$message.success('审核完成');
-                    this.loadData();
-                }
-            })
+      })
 
-        },
-      handleHFYSH(id){
-          getAction(this.url.hfysh,{id:id}).then(res => {
-              if (res.success) {
-                  this.$message.success('已经恢复');
-                  this.loadData();
-              }
-          })
+    },
+    handleHFYSH(id) {
+      getAction(this.url.hfysh, { id: id }).then(res => {
+        if (res.success) {
+          this.$message.success('已经恢复')
+          this.loadData()
+        }
+      })
 
-      },
-      initDictConfig(){
-        loadCategoryData({code:'A04'}).then((res) => {
-          if (res.success) {
-            console.log(res.result)
-            this.$set(this.dictOptions, 'sjyt', res.result)
-          }
-        })
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'dk',text:'地块',dictCode:''})
-        fieldList.push({type:'string',value:'wjlx',text:'文件类型',dictCode:'wjlx'})
-        fieldList.push({type:'string',value:'wjbh',text:'证书/合同/文件编号',dictCode:''})
-        fieldList.push({type:'string',value:'tdsyqr',text:'土地使用权人',dictCode:''})
-        fieldList.push({type:'double',value:'sjzytdmj',text:'实际占用土地面积',dictCode:''})
-        fieldList.push({type:'double',value:'qzpzsymj',text:'其中批准使用面积',dictCode:''})
-        fieldList.push({type:'double',value:'sjsyjzmj',text:'实际使用建筑面积',dictCode:''})
-        fieldList.push({type:'double',value:'qzpzsymj2',text:'其中批准使用面积',dictCode:''})
-        fieldList.push({type:'double',value:'sjrjl',text:'容积率',dictCode:''})
-        fieldList.push({type:'string',value:'syqsyfs',text:'使用权使用方式',dictCode:'syqsyfs'})
-        fieldList.push({type:'string',value:'zlwz',text:'坐落位置',dictCode:''})
-        fieldList.push({type:'string',value:'sjyt',text:'实际用途',dictCode:'tdyt'})
-        fieldList.push({type:'date',value:'qsqssj',text:'权属起始时间'})
-        fieldList.push({type:'date',value:'qsdqsj',text:'权属到期时间'})
-        fieldList.push({type:'string',value:'tdsyxz',text:'土地使用现状',dictCode:'tdsyxz'})
-        fieldList.push({type:'list_multi',value:'dbdycfqk',text:'担保、抵押、查封情况',dictTable:"", dictText:'', dictCode:'dbdycfqk'})
-        fieldList.push({type:'string',value:'bz',text:'备注',dictCode:''})
-        fieldList.push({type:'string',value:'xgwj',text:'附件材料',dictCode:''})
-        fieldList.push({type:'int',value:'sfsb',text:'是否上报',dictCode:'xxsbzt'})
-        this.superFieldList = fieldList
-      }
+    },
+    initDictConfig() {
+      loadCategoryData({ code: 'A04' }).then((res) => {
+        if (res.success) {
+          console.log(res.result)
+          this.$set(this.dictOptions, 'sjyt', res.result)
+        }
+      })
+    },
+    // 字段列表
+    getSuperFieldList() {
+      let fieldList = []
+      fieldList.push({ type: 'string', value: 'dk', text: '地块', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'wjlx', text: '文件类型', dictCode: 'wjlx' })
+      fieldList.push({ type: 'string', value: 'wjbh', text: '证书/合同/文件编号', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'tdsyqr', text: '土地使用权人', dictCode: '' })
+      fieldList.push({ type: 'double', value: 'sjzytdmj', text: '实际占用土地面积', dictCode: '' })
+      fieldList.push({ type: 'double', value: 'qzpzsymj', text: '其中批准使用面积', dictCode: '' })
+      fieldList.push({ type: 'double', value: 'sjsyjzmj', text: '实际使用建筑面积', dictCode: '' })
+      fieldList.push({ type: 'double', value: 'qzpzsymj2', text: '其中批准使用面积', dictCode: '' })
+      fieldList.push({ type: 'double', value: 'sjrjl', text: '容积率', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'syqsyfs', text: '使用权使用方式', dictCode: 'syqsyfs' })
+      fieldList.push({ type: 'string', value: 'zlwz', text: '坐落位置', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'sjyt', text: '实际用途', dictCode: 'tdyt' })
+      fieldList.push({ type: 'date', value: 'qsqssj', text: '权属起始时间' })
+      fieldList.push({ type: 'date', value: 'qsdqsj', text: '权属到期时间' })
+      fieldList.push({ type: 'string', value: 'tdsyxz', text: '土地使用现状', dictCode: 'tdsyxz' })
+      fieldList.push({
+        type: 'list_multi',
+        value: 'dbdycfqk',
+        text: '担保、抵押、查封情况',
+        dictTable: '',
+        dictText: '',
+        dictCode: 'dbdycfqk'
+      })
+      fieldList.push({ type: 'string', value: 'bz', text: '备注', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'xgwj', text: '附件材料', dictCode: '' })
+      fieldList.push({ type: 'int', value: 'sfsb', text: '是否上报', dictCode: 'xxsbzt' })
+      this.superFieldList = fieldList
     }
   }
+}
 </script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
+<!--<style scoped>-->
+<!--@import '~@assets/less/common.less';-->
+<!--</style>-->

+ 0 - 1
vue.config.js

@@ -34,7 +34,6 @@ module.exports = {
     if (process.env.NODE_ENV === 'production') {
       config.optimization.minimizer[0].options.terserOptions.compress.drop_console = true
     }
-    ;
   },
 
   chainWebpack: (config) => {

部分文件因文件數量過多而無法顯示