浏览代码

增加地块数量和地块面积展示

sugb 7 月之前
父节点
当前提交
aea00a1505

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

@@ -13,6 +13,7 @@
       <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>
@@ -36,10 +37,22 @@ export default {
     }
   },
   created() {
+    //获取到的信息点位信息排前面需要进行反转
     this.menus = this.$store.state.menu.menuList['xxcxss']
+    //反转,地块信息排前面(1)
+    if (this.menus.length > 0 && this.menus[0].value === 'ssqyxxgl'){
+      this.menus=this.menus.reverse()
+    }
     this.defaultValue = this.menus.length > 0 ? this.menus[0].value : ''
     this.getYear()
   },
+  //挂载时,获取一次图表数据
+  mounted() {
+    this.$nextTick(() => {
+      this.$refs.ssqydkgl.updataData()
+      this.$refs.ssqydkgl.queryDkInfo()
+    })
+  },
   methods: {
     changeContent(key) {
       console.log('菜单切换')

+ 22 - 15
src/views/infoSearch/infoSearchSz.vue

@@ -1,19 +1,18 @@
 <!--信息查询-->
 <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'>
+  <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'>
+    <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>
-
+      <depart-land v-show="'szdwdkgl' === defaultValue" :year-list="yearList" ref="szdwdkgl"></depart-land>
     </a-card>
   </div>
 </template>
@@ -33,25 +32,36 @@ export default {
       defaultValue: '',
       menus: [],
       yearList: []
-
     }
   },
   created() {
+    //获取到的信息点位信息排前面需要进行反转
     this.menus = this.$store.state.menu.menuList['xxcxsz']
+    //反转,地块信息排前面(1)
+    if (this.menus.length > 0 && this.menus[0].value === 'szdwxxgl') {
+      this.menus = this.menus.reverse()
+    }
     this.defaultValue = this.menus.length > 0 ? this.menus[0].value : ''
     this.getYear()
   },
+  //挂载时,获取一次图表数据
+  mounted() {
+    this.$nextTick(() => {
+      this.$refs.szdwdkgl.updataData()
+      this.$refs.szdwdkgl.queryDkInfo()
+    })
+  },
   methods: {
     changeContent(key) {
       console.log('菜单切换')
       let value = key.target.value
       if (value === 'szdwdkgl') {
         this.$refs.szdwdkgl.updataData()
-        this.$refs.szdwdkgl. queryDkInfo()
+        this.$refs.szdwdkgl.queryDkInfo()
       }
     },
     getYear() {
-      getyear().then((res) => {
+      getyear().then(res => {
         if (res.success) {
           this.yearList = res.result
           console.table(this.yearList)
@@ -59,7 +69,6 @@ export default {
       })
     }
   }
-
 }
 </script>
 
@@ -77,7 +86,7 @@ export default {
   overflow-y: auto;
 }
 </style>
-<style lang='less' scoped>
+<style lang="less" scoped>
 .info-submit {
   & ::v-deep > .ant-card-body {
     padding: 14px 24px;
@@ -107,7 +116,5 @@ export default {
   &::v-deep .ant-card:last-child .ant-card-body {
     padding: 10px 24px 0;
   }
-
 }
-
-</style>
+</style>

+ 186 - 135
src/views/qcsb/QcSsgqzysytdqkList_gly.vue

@@ -6,7 +6,7 @@
         <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-input placeholder="请输入单位名称" v-model="queryParam.createBy" />
             </a-form-item>
           </a-col>
           <a-col :xl="5" :lg="7" :md="8" :sm="24">
@@ -21,13 +21,18 @@
           </a-col>
           <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="文件类型">
-              <j-multi-select-tag placeholder="请选择文件类型" v-model="queryParam.wjlx" dictCode="wjlx"/>
+              <j-multi-select-tag placeholder="请选择文件类型" v-model="queryParam.wjlx" dictCode="wjlx" />
             </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 type='list' v-model='queryParam.tdsyxz' dictCode='tdsyxz' placeholder='请选择土地使用现状'/>
+                <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">
@@ -42,34 +47,38 @@
             </a-col>
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="实际用途">
-                <j-category-select v-model="queryParam.sjyt" pcode="A04" placeholder="请选择实际用途"/>
+                <j-category-select v-model="queryParam.sjyt" pcode="A04" placeholder="请选择实际用途" />
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否上报">
-                <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
+                <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt" />
               </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.sfczslsj" dictCode="sfgyz"/>
+                <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="'取得方式'">
-                <j-multi-select-tag type='list_multi' v-model='queryParam.syqsyfs' dictCode='syqsyfs'
-                                    placeholder='请选择使用权使用方式'/>
+                <j-multi-select-tag
+                  type="list_multi"
+                  v-model="queryParam.syqsyfs"
+                  dictCode="syqsyfs"
+                  placeholder="请选择使用权使用方式"
+                />
                 <!--              <j-dict-select-tag type='list' v-model='queryParam.syqsyfs' dictCode='syqsyfs' 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.sysOrgCode" dictCode="yjdw"/>
+                <j-dict-select-tag placeholder="请选择一级单位" v-model="queryParam.sysOrgCode" dictCode="yjdw" />
               </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"/>
+                <j-dict-select-tag placeholder="请选择是否通过审核" v-model="queryParam.shzt" dictCode="shzt" />
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="24">
@@ -77,7 +86,7 @@
                 <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}}
+                    {{ item }}
                   </a-select-option>
                 </a-select>
               </a-form-item>
@@ -90,12 +99,11 @@
           </template>
           <a-col :xl="4" :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">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
               </a>
             </span>
           </a-col>
@@ -108,7 +116,9 @@
     <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-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>
@@ -120,22 +130,41 @@
        </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">
+        <a-row>
+          <a-col :span="6">
+            <div class='cho'>
+              <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-col>
+          <a-col :span="9"></a-col>
+          <a-col :span="9">
+            <a-row>
+              <a-col :span="12">
+                <div class="szdk">
+                  <span><img src="../sydwqcsb/img/dk.png" style="margin-left: 10px;margin-right: 10px"/></span>
+                  <span style="color: rgb(50,150,255);font-size: 16px">地块数量(块)</span>
+                  <span style="margin-left: 30px;color: rgb(50,150,255);font-size: 16px">{{ countDk }}</span>
+                </div>
+                <!--                <a-statistic title="地块数量" v-model="countDk" />-->
+              </a-col>
+              <a-col :span="12">
+                <div class="szarea">
+                  <span><img src="../sydwqcsb/img/area.png" style="margin-left: 10px;margin-right: 10px"/></span>
+                  <span style="color: rgb(30,196,146);font-size: 16px">地块面积(亩)</span>
+                  <span style="margin-left: 10px;color: rgb(30,196,146);font-size: 16px">{{ areaDk }}</span>
+                </div>
+              </a-col>
+            </a-row>
+          </a-col>
+        </a-row>
       </div>
       <a-tabs :active-key="this.changes" @change="callback">
         <a-tab-pane key="2" tab="统计图表" force-render>
@@ -145,54 +174,51 @@
           <a-table
             ref="table"
             size="middle"
-            :scroll="{x:true}"
+            :scroll="{ x: true }"
             bordered
             rowKey="id"
             :columns="columns"
             :dataSource="dataSource"
             :pagination="ipagination"
             :loading="loading"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+            :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
             class="j-table-force-nowrap"
-            @change="handleTableChange">
-
+            @change="handleTableChange"
+          >
             <template slot="htmlSlot" slot-scope="text">
               <div v-html="text"></div>
             </template>
-            <template slot="imgSlot" slot-scope="text,record">
+            <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;"/>
+              <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 v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
                 下载
               </a-button>
             </template>
             <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-popconfirm>
-                        </a-space>
-        </span>
-
+              <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-popconfirm>
+              </a-space>
+            </span>
           </a-table>
         </a-tab-pane>
-
       </a-tabs>
-
     </div>
     <qc-ssgqzysytdqk-modal ref="modalForm" @ok="modalFormOk"></qc-ssgqzysytdqk-modal>
   </a-card>
@@ -200,15 +226,15 @@
 
 <script>
 import '@/assets/less/TableExpand.less'
-import {mixinDevice} from '@/utils/mixin'
-import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import QcSsgqzysytdqkModal from './modules/QcSsgqzysytdqkModal2'
-import {filterMultiDictText, getDictItems} from '@/components/dict/JDictSelectUtil'
-import {getAction} from '../../api/manage'
-import {loadCategoryData} from '@/api/api'
+import { filterMultiDictText, getDictItems } from '@/components/dict/JDictSelectUtil'
+import { getAction } from '../../api/manage'
+import { loadCategoryData } from '@/api/api'
 import listTable from '@/views/listStatistics/listTab'
 import store from '@/store'
-import JAreaSelect from "@comp/jeecg/JAreaSelect";
+import JAreaSelect from '@comp/jeecg/JAreaSelect'
 
 // 省属企业
 export default {
@@ -223,7 +249,7 @@ export default {
   components: {
     QcSsgqzysytdqkModal,
     listTable,
-    JAreaSelect,
+    JAreaSelect
   },
   data() {
     return {
@@ -245,84 +271,83 @@ export default {
           dataIndex: '',
           key: 'rowIndex',
           width: 60,
-          align: "center",
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1;
+          align: 'center',
+          customRender: function(t, r, index) {
+            return parseInt(index) + 1
           }
         },
         {
           title: '用地单位名称',
-          align: "center",
+          align: 'center',
           dataIndex: 'sysOrgCode_dictText'
         },
         {
           title: '地块',
-          align: "center",
+          align: 'center',
           dataIndex: 'dk'
         },
         {
           title: '文件类型',
-          align: "center",
+          align: 'center',
           dataIndex: 'wjlx_dictText'
         },
         {
           title: '证书/合同/文件编号',
-          align: "center",
+          align: 'center',
           dataIndex: 'wjbh'
         },
         {
           title: '土地使用权人',
-          align: "center",
+          align: 'center',
           dataIndex: 'tdsyqr'
         },
         {
           title: '使用权使用方式',
-          align: "center",
+          align: 'center',
           dataIndex: 'syqsyfs'
         },
         {
           title: '实际用途',
-          align: "center",
+          align: 'center',
           dataIndex: 'sjyt',
-          customRender:
-            (text) => (text ? filterMultiDictText(this.dictOptions['sjyt'], text) : '')
+          customRender: text => (text ? filterMultiDictText(this.dictOptions['sjyt'], text) : '')
         },
         {
           title: '是否上报',
-          align: "center",
+          align: 'center',
           dataIndex: 'sfsb_dictText'
         },
         {
           title: '操作',
           dataIndex: 'action',
-          align: "center",
-          fixed: "right",
+          align: 'center',
+          fixed: 'right',
           width: 147,
-          scopedSlots: {customRender: 'action'}
+          scopedSlots: { customRender: 'action' }
         }
       ],
       url: {
-        list: "/qcsb/qcSsgqzysytdqk/listBygly",
-        delete: "/qcsb/qcSsgqzysytdqk/delete",
-        deleteBatch: "/qcsb/qcSsgqzysytdqk/deleteBatch",
-        exportXlsUrl: "/qcsb/qcSsgqzysytdqk/exportXls",
-        importExcelUrl: "qcsb/qcSsgqzysytdqk/importExcel",
-        wcsh: "/qcsb/qcSsgqzysytdqk/wcsh",
-        hfysh: "/qcsb/qcSsgqzysytdqk/hfysh",
-        listTable: "/qcsb/qcSsgqzysytdqk/sumList",
-        listQuery: '/qcsb/qcSsgqzysytdqk/listByglyCount',
+        list: '/qcsb/qcSsgqzysytdqk/listBygly',
+        delete: '/qcsb/qcSsgqzysytdqk/delete',
+        deleteBatch: '/qcsb/qcSsgqzysytdqk/deleteBatch',
+        exportXlsUrl: '/qcsb/qcSsgqzysytdqk/exportXls',
+        importExcelUrl: 'qcsb/qcSsgqzysytdqk/importExcel',
+        wcsh: '/qcsb/qcSsgqzysytdqk/wcsh',
+        hfysh: '/qcsb/qcSsgqzysytdqk/hfysh',
+        listTable: '/qcsb/qcSsgqzysytdqk/sumList',
+        listQuery: '/qcsb/qcSsgqzysytdqk/listByglyCount'
       },
       dictOptions: {},
-      superFieldList: [],
+      superFieldList: []
     }
   },
   created() {
-    this.getSuperFieldList();
+    this.getSuperFieldList()
   },
   watch: {
     'queryParam.sysOrgCode': {
       handler(newVal) {
-        if (newVal != ''){
+        if (newVal != '') {
           getDictItems('yjdw', newVal).then(res => {
             for (const re of res) {
               if (re.value == newVal) {
@@ -330,7 +355,7 @@ export default {
               }
             }
           })
-        }else{
+        } else {
           this.title = ''
         }
       }
@@ -340,15 +365,15 @@ export default {
     this.show()
   },
   computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    },
+    importExcelUrl: function() {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    }
   },
   methods: {
     searchQuery() {
       this.changes = '1'
-      this.loadData(1);
-      this.queryDkInfo();
+      this.loadData(1)
+      this.queryDkInfo()
       // 点击查询清空列表选中行
       // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
       this.selectedRowKeys = []
@@ -386,13 +411,13 @@ export default {
       this.$refs.table.number = 0
     },
     // 查询地块和面积统计
-    queryDkInfo(){
+    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('#############################> 地块统计#############>')
             console.log(res)
             _this.countDk = res.result.countDk
             _this.areaDk = res.result.areaDk
@@ -402,13 +427,13 @@ export default {
       })
     },
     updataData() {
-      let _this = this;
-      new Promise(function (resolve, reject) {
+      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();
+            resolve()
           }
         })
       })
@@ -421,14 +446,13 @@ export default {
       }
     },
     searchReset() {
-      this.$refs.JArea.allClear(),
-        this.queryParam = {}
-      this.changes='1'
-      this.queryDkInfo();
-      this.loadData();
+      this.$refs.JArea.allClear(), (this.queryParam = {})
+      this.changes = '1'
+      this.queryDkInfo()
+      this.loadData()
     },
     show() {
-      getAction("/qcsb.qyxx/qcQyxx/dlr").then(res => {
+      getAction('/qcsb.qyxx/qcQyxx/dlr').then(res => {
         if (res.success) {
           if (res.result == 'gzw') {
             this.dl = true
@@ -437,23 +461,23 @@ export default {
       })
     },
     handleWCSH(id) {
-      getAction(this.url.wcsh, {id: id}).then(res => {
+      getAction(this.url.wcsh, { id: id }).then(res => {
         if (res.success) {
-          this.$message.success('审核完成');
-          this.loadData();
+          this.$message.success('审核完成')
+          this.loadData()
         }
       })
     },
     handleHFYSH(id) {
-      getAction(this.url.hfysh, {id: id}).then(res => {
+      getAction(this.url.hfysh, { id: id }).then(res => {
         if (res.success) {
-          this.$message.success('已经恢复');
-          this.loadData();
+          this.$message.success('已经恢复')
+          this.loadData()
         }
       })
     },
     initDictConfig() {
-      loadCategoryData({code: 'A04'}).then((res) => {
+      loadCategoryData({ code: 'A04' }).then(res => {
         if (res.success) {
           console.log(res.result)
           this.$set(this.dictOptions, 'sjyt', res.result)
@@ -461,38 +485,65 @@ export default {
       })
     },
     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'})
+      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: "",
+        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'})
+      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';
+
+.szdk {
+  background-image: url('../sydwqcsb/img/dk_back.png');
+  display: flex;
+  width: 100%;
+  height: 36px;
+  background-size: contain;
+  background-repeat: no-repeat;
+  align-items: center; /* 垂直居中 */
+}
+
+.szarea {
+  background-image: url('../sydwqcsb/img/area_back.png');
+  display: flex;
+  width: 100%;
+  height: 36px;
+  background-size: contain;
+  background-repeat: no-repeat;
+  align-items: center; /* 垂直居中 */
+  margin-left: 7px;
+}
+.cho {
+  display: flex;
+  width: 100%;
+  height: 36px;
+  align-items: center; /* 垂直居中 */
+}
+</style>

+ 186 - 141
src/views/sydwqcsb/QcSsgqzysytdqkList_glyy.vue

@@ -1,99 +1,106 @@
 <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' />
+    <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='取得方式'>
-                <j-multi-select-tag type='list_multi' v-model='queryParam.syqsyfs' dictCode='qdfs'
-                                    placeholder='请选择使用权使用方式' />
+            <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="请选择使用权使用方式"
+                />
               </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'>
+            <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-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-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">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
               </a>
@@ -105,10 +112,12 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <div class='table-operator'>
+    <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-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>
@@ -120,87 +129,102 @@
        </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">
+        <a-row>
+          <a-col :span="6">
+            <div class='cho'>
+              <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-col>
+          <a-col :span="9"></a-col>
+          <!--省直单位-->
+          <a-col :span="9">
+            <a-row >
+              <a-col :span="12">
+                <div class="szdk">
+                  <span><img src='./img/dk.png' style='margin-left: 10px;margin-right: 10px'/></span>
+                  <span style='color: rgb(50,150,255);font-size: 16px'>地块数量(块)</span>
+                  <span style='margin-left: 30px;color: rgb(50,150,255);font-size: 16px'>{{ countDk }}</span>
+                </div>
+                <!--                <a-statistic title="地块数量" v-model="countDk" />-->
+              </a-col>
+              <a-col :span="12">
+                <div class="szarea">
+                  <span><img src='./img/area.png' style='margin-left: 10px;margin-right: 10px'/></span>
+                  <span style='color: rgb(30,196,146);font-size: 16px'>地块面积(亩)</span>
+                  <span style='margin-left: 10px;color: rgb(30,196,146);font-size: 16px'>{{ areaDk }}</span>
+                </div>
+              </a-col>
+            </a-row>
+          </a-col>
+        </a-row>
       </div>
-      <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-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-tab-pane key="1" tab="列表信息">
           <a-table
-            ref='table'
-            size='middle'
-            :scroll='{x:true}'
+            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;' />
+            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='fileSlot' slot-scope='text'>
-              <span v-if='!text' style='font-size: 12px;font-style: italic;'>无文件</span>
-              <a-button
+            <template slot="imgSlot" slot-scope="text, record">
+              <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+              <img
                 v-else
-                :ghost='true'
-                type='primary'
-                icon='download'
-                size='small'
-                @click='downloadFile(text)'>
+                :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'>
-
-
-            <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-popconfirm>
-                        </a-space>
-        </span>
-
+            <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-popconfirm>
+              </a-space>
+            </span>
           </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'
@@ -281,8 +305,7 @@ export default {
           title: '实际用途',
           align: 'center',
           dataIndex: 'sjyt',
-          customRender:
-            (text) => (text ? filterMultiDictText(this.dictOptions['sjyt'], text) : '')
+          customRender: text => (text ? filterMultiDictText(this.dictOptions['sjyt'], text) : '')
         },
         {
           title: '是否上报',
@@ -307,7 +330,7 @@ export default {
         wcsh: '/qcsb/qcSsgqzysytdqk/wcsh',
         hfysh: '/qcsb/qcSsgqzysytdqk/hfysh',
         listTable: '/qcsb/qcSsgqzysytdqk/sumListBysz',
-        listQuery: '/qcsb/qcSsgqzysytdqk/listByglyyCount',
+        listQuery: '/qcsb/qcSsgqzysytdqk/listByglyyCount'
       },
       dictOptions: {},
       superFieldList: []
@@ -317,7 +340,7 @@ export default {
     this.getSuperFieldList()
   },
   mounted() {
-   this.show()
+    this.show()
   },
   computed: {
     importExcelUrl: function() {
@@ -328,21 +351,19 @@ export default {
     searchQuery() {
       this.changes = '1'
       this.loadData('1')
-      this.queryDkInfo();
+      this.queryDkInfo()
       // 点击查询清空列表选中行
       //https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
       this.selectedRowKeys = []
       this.selectionRows = []
     },
     // 查询地块和面积统计
-    queryDkInfo(){
+    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()
@@ -403,9 +424,9 @@ export default {
     searchReset() {
       this.$refs.JArea.allClear()
       this.queryParam = {}
-      this.changes='1'
+      this.changes = '1'
       this.loadData()
-      this.queryDkInfo();
+      this.queryDkInfo()
     },
     show() {
       getAction('/qcsb.qyxx/qcQyxx/dlr').then(res => {
@@ -415,8 +436,7 @@ export default {
           }
         }
       })
-    }
-    ,
+    },
     handleWCSH(id) {
       getAction(this.url.wcsh, { id: id }).then(res => {
         if (res.success) {
@@ -424,7 +444,6 @@ export default {
           this.loadData()
         }
       })
-
     },
     handleHFYSH(id) {
       getAction(this.url.hfysh, { id: id }).then(res => {
@@ -433,10 +452,9 @@ export default {
           this.loadData()
         }
       })
-
     },
     initDictConfig() {
-      loadCategoryData({ code: 'A04' }).then((res) => {
+      loadCategoryData({ code: 'A04' }).then(res => {
         if (res.success) {
           console.log(res.result)
           this.$set(this.dictOptions, 'sjyt', res.result)
@@ -477,6 +495,33 @@ export default {
   }
 }
 </script>
-<!--<style scoped>-->
-<!--@import '~@assets/less/common.less';-->
-<!--</style>-->
+<style scoped>
+@import '~@assets/less/common.less';
+
+.cho {
+  display: flex;
+  width: 100%;
+  height: 36px;
+  align-items: center; /* 垂直居中 */
+}
+.szdk {
+  background-image: url('./img/dk_back.png');
+  display: flex;
+  width: 100%;
+  height: 36px;
+  //background-size: cover;
+  background-size: contain;
+  background-repeat: no-repeat;
+  align-items: center; /* 垂直居中 */
+}
+.szarea {
+  background-image: url('./img/area_back.png');
+  display: flex;
+  width: 100%;
+  height: 36px;
+  background-size: contain;
+  background-repeat: no-repeat;
+  align-items: center; /* 垂直居中 */
+  margin-left: 7px;
+}
+</style>

二进制
src/views/sydwqcsb/img/area.png


二进制
src/views/sydwqcsb/img/area_back.png


二进制
src/views/sydwqcsb/img/dk.png


二进制
src/views/sydwqcsb/img/dk_back.png