前端统计查询穿透优化，地图添加全景照片

.gitignore

@@ -4,3 +4,7 @@ logs/error-log.html
 logs/jeecgboot-2023-11-02.1.html
 logs/jeecgboot-2023-11-01.0.html
 logs/jeecgboot-2023-11-01.0.log
+logs/jeecgboot-2023-11-03.1.log
+logs/jeecgboot-2023-11-03.1.html
+logs/jeecgboot-2023-11-03.0.html
+logs/jeecgboot-2023-11-03.0.log

BIZ/jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/service/impl/QcSsgqzysytdqkServiceImpl.java

@@ -180,7 +180,7 @@ public class QcSsgqzysytdqkServiceImpl extends ServiceImpl<QcSsgqzysytdqkMapper,
                 }
             }
         }
-        Map<String, List<QcSsgqzysytdqk>> collectBysjyt = list.stream().collect(Collectors.groupingBy((QcSsgqzysytdqk::getSjyt)));
+        Map<String, List<QcSsgqzysytdqk>> collectBysjyt = list.stream().collect(Collectors.groupingBy((QcSsgqzysytdqk::getPzyt)));
         for (String s : collectBysjyt.keySet()) {
             sjytMap.put(s, (double) collectBysjyt.get(s).size());
         }

UI2/src/components/OneMap/BasicMap.vue

@@ -666,7 +666,7 @@ export default {
 
             }
           } else if (actionId == "showAll") {
-            window.open(this.result.vr, '_blank')
+            window.open('http://localhost:59196/?startscene=scene_'+this.resData.vr, '_blank')
           }
           /*  if (attributes.WJBH == "东区国用(2016)第197号") {
               window.open('https://vr.justeasy.cn/view/16id9258237l1652-1692581652.html', '_blank')

UI2/src/components/OneMap/widgets/QueryTool.vue

@@ -47,8 +47,8 @@
         <template v-else>
           <a-list style='margin-top: 20px;' item-layout='horizontal' :data-source='data' :pagination='pagination'>
             <a-list-item slot='renderItem' slot-scope='item, index'>
-              <a-list-item-meta @click='handleCoord(item)' :description='item.otherInfo'>
-                <span slot='title'>{{ item.name }}</span>
+              <a-list-item-meta @click='handleCoord(item)' :description='item.name'>
+                <span slot='title'>{{ item.otherInfo }}</span>
                 <a-avatar slot='avatar' class='result' :src='require(`../static/result${index+1}.png`)'>
                 </a-avatar>
               </a-list-item-meta>
@@ -220,6 +220,7 @@ export default {
 
     },
     handleCoord(item) {
+
       this.$refs.locateByGeoinfo.locate(item);
     },
     handleAttributes(event, item) {

UI2/src/views/qcsb/QcSsgqzysytdqkList1.vue

@@ -14,6 +14,16 @@
               <a-input placeholder="请输入地块" v-model="queryParam.dk"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :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="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="使用权使用方式">
+              <j-dict-select-tag type='list' v-model='queryParam.syqsyfs' dictCode='syqsyfs' placeholder='请选择使用权使用方式'/>
+            </a-form-item>
+          </a-col>
           <a-col v-has="'Query:xzqh'" :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="行政区划">
               <j-area-linkage type="cascader" v-model="queryParam.xzqh" placeholder="请输入省市区"/>
@@ -29,12 +39,18 @@
               <j-dict-select-tag placeholder="请选择文件类型" v-model="queryParam.wjlx" dictCode="wjlx"/>
             </a-form-item>
           </a-col>
-
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="一级单位">
+              <j-dict-select-tag placeholder="请选择一级单位" v-model="queryParam.sysOrgCode" dictCode="yjdw"/>
+            </a-form-item>
+          </a-col>
             <a-col :xl="6" :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 v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否上报">
                 <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
@@ -45,12 +61,6 @@
                 <j-dict-select-tag placeholder="请选择是否通过审核" v-model="queryParam.shzt" dictCode="shzt"/>
               </a-form-item>
             </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="一级单位">
-                <j-dict-select-tag placeholder="请选择一级单位" v-model="queryParam.sysOrgCode" dictCode="yjdw"/>
-              </a-form-item>
-            </a-col>
           </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">

UI2/src/views/qcsb/QcSsgqzysytdqkList2.vue

@@ -29,24 +29,39 @@
               <j-dict-select-tag placeholder="请选择文件类型" v-model="queryParam.wjlx" dictCode="wjlx"/>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :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="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="使用权使用方式">
+              <j-dict-select-tag type='list' v-model='queryParam.syqsyfs' dictCode='syqsyfs' placeholder='请选择使用权使用方式'/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="一级单位">
+              <j-dict-select-tag placeholder="请选择一级单位" v-model="queryParam.sysOrgCode" dictCode="yjdw"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :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 v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="土地使用权人">
-                <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
+              <a-form-item label="是否通过审核">
+                <j-dict-select-tag placeholder="请选择是否通过审核" v-model="queryParam.shzt" dictCode="shzt"/>
               </a-form-item>
             </a-col>
+
             <a-col :xl="6" :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>
-          <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :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>
           </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">

UI2/src/views/qcsb/QcSsgqzysytdqkList_gly.vue

@@ -50,6 +50,11 @@
               <j-dict-select-tag type='list' v-model='queryParam.syqsyfs' dictCode='syqsyfs' placeholder='请选择使用权使用方式'/>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="一级单位">
+              <j-dict-select-tag placeholder="请选择一级单位" v-model="queryParam.sysOrgCode" dictCode="yjdw"/>
+            </a-form-item>
+          </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="土地使用权人">
@@ -61,6 +66,7 @@
                 <j-dict-select-tag placeholder="请选择是否通过审核" v-model="queryParam.shzt" dictCode="shzt"/>
               </a-form-item>
             </a-col>
+
           </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -80,7 +86,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button v-has="'conts:add'" @click="handleAdd2" type="primary" icon="plus">填报信息</a-button>
+<!--      <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">
@@ -141,9 +147,10 @@
             </template>
             <span slot="action" slot-scope="text, record">
                           <a-space>
-                          <a-button @click="handleEdit(record)">编辑</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-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>

UI2/src/views/qcsb/QcSsgqzysytdqkList_tj.vue

@@ -30,460 +30,8 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :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="6" :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="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="使用权使用方式">
-              <j-dict-select-tag type='list' v-model='queryParam.syqsyfs' dictCode='syqsyfs' placeholder='请选择使用权使用方式'/>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="土地使用权人">
-              <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :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>
-          <!--          <template v-if="toggleSearchStatus">-->
-          <!--           -->
-          <!--          </template>-->
-          <a-col :xl="6" :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>-->
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-       <a-button type="primary" icon="import">导入</a-button>
-     </a-upload>
-     &lt;!&ndash; 高级查询区域 &ndash;&gt;
-     <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-     <a-dropdown v-if="selectedRowKeys.length > 0">
-       <a-menu slot="overlay">
-         <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-       </a-menu>
-       <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-     </a-dropdown>-->
-    </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>
-      <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">
-
-            <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">
-                          <a-space>
-                          <a-button @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>
-          <listTable ref="table" :loading="this.load" :result-data="this.resultData"></listTable>
-        </a-tab-pane>
-      </a-tabs>
-
-    </div>
-    <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 listTable from '@/views/listStatistics/listTab'
-import store from '@/store'
-import JAreaSelect from "@comp/jeecg/JAreaSelect";
-
-export default {
-  name: 'QcSsgqzysytdqkList',
-  props: {
-    param: {
-      default: ""
-    }
-  },
-  mixins: [JeecgListMixin, mixinDevice],
-  components: {
-    QcSsgqzysytdqkModal,
-    listTable,
-    JAreaSelect,
-  },
-  data() {
-    return {
-      dlr: false,
-      description: '省属国企占有使用土地情况调查管理页面',
-      resultData: [],
-      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: 'sysOrgCode_dictText'
-        },
-        {
-          title: '地块',
-          align: "center",
-          dataIndex: 'dk'
-        },
-        {
-          title: '文件类型',
-          align: "center",
-          dataIndex: 'wjlx_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/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"
-      },
-      dictOptions: {},
-      superFieldList: [],
-    }
-  },
-
-  created() {
-
-
-  },
-  mounted() {
-    this.show()
-    this.searchQuery()
-  },
-  computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    },
-  },
-  methods: {
-    searchQuery() {
-
-      this.changes = '1'
-      debugger
-      this.loadData(1);
-      // 点击查询清空列表选中行
-      // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
-      this.selectedRowKeys = []
-      this.selectionRows = []
-    },
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error("请设置url.list属性!")
-        return
-      }
-      this.queryParam = this.param
-
-      //加载数据 若传入参数1则加载第一页的内容
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      this.loading = true;
-      getAction(this.url.list, this.queryParam).then((res) => {
-        if (res.success) {
-          console.log(res)
-          //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
-          this.dataSource = res.result.records || res.result;
-          this.dataSource.forEach((item) => {
-            if (item.gyzccgbl) {
-              item.gyzccgbl = Number(item.gyzccgbl).toFixed(2)
-            }
-          })
-          if (res.result.total) {
-            this.ipagination.total = res.result.total;
-          } else {
-            this.ipagination.total = 0;
-          }
-          //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
-        } else {
-          this.$message.warning(res.message)
-        }
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    callback(key) {
-
-      if (key == 1) {
-        this.emptyData()
-        this.changes = '1'
-      }
-      if (key == 2) {
-        this.changes = '2'
-        this.emptyData()
-        this.updataData()
-      }
-    },
-    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
-    },
-    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();
-          }
-        })
-      })
-    },
-    SelectArea(val) {
-      if (val.length > 4) {
-        this.queryParam.xzqh = val + '*'
-      } else {
-        this.queryParam.xzqh = val.slice(0, 4) + '*'
-      }
-    },
-    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();
-        }
-      })
-
-    },
-    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>
-<template>
-  <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="6" :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="6" :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="6" :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="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="行政区划">
-              <JAreaSelect ref="JArea" @Area="SelectArea"></JAreaSelect>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="证书/合同/文件编号">
-              <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
+            <a-form-item label="文件类型">
+              <j-dict-select-tag placeholder="请选择文件类型" v-model="queryParam.wjlx" dictCode="wjlx"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -503,8 +51,8 @@ export default {
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="土地使用权人">
-              <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
+            <a-form-item label="一级单位">
+              <j-dict-select-tag placeholder="请选择一级单位" v-model="queryParam.sysOrgCode" dictCode="yjdw"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -512,18 +60,10 @@ export default {
               <j-dict-select-tag placeholder="请选择是否通过审核" v-model="queryParam.shzt" dictCode="shzt"/>
             </a-form-item>
           </a-col>
-          <!--          <template v-if="toggleSearchStatus">-->
-          <!--           -->
-          <!--          </template>-->
           <a-col :xl="6" :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>-->
             </span>
           </a-col>
         </a-row>
@@ -533,8 +73,9 @@ export default {
 
     <!-- 操作按钮区域 -->
     <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 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>
@@ -549,13 +90,13 @@ export default {
     </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>
-      <a-tabs :active-key="this.changes" @change="callback">
+<!--    <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>-->
+      <a-tabs  :active-key="this.changes"  @change="callback" >
         <a-tab-pane key="1" tab="列表信息">
           <a-table
             ref="table"
@@ -567,7 +108,7 @@ export default {
             :dataSource="dataSource"
             :pagination="ipagination"
             :loading="loading"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+
             class="j-table-force-nowrap"
             @change="handleTableChange">
 
@@ -593,12 +134,9 @@ export default {
             </template>
             <span slot="action" slot-scope="text, record">
                           <a-space>
-                          <a-button @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>
 
@@ -609,7 +147,6 @@ export default {
         </a-tab-pane>
       </a-tabs>
 
-    </div>
     <qc-ssgqzysytdqk-modal ref="modalForm" @ok="modalFormOk"></qc-ssgqzysytdqk-modal>
   </a-card>
 </template>
@@ -645,8 +182,7 @@ export default {
       description: '省属国企占有使用土地情况调查管理页面',
       resultData: [],
       load: true,
-      changes: '1',
-
+      changes:'1',
       // 表头
       columns: [
         {
@@ -726,8 +262,7 @@ export default {
   },
 
   created() {
-
-
+    this.getSuperFieldList();
   },
   mounted() {
     this.show()
@@ -740,8 +275,7 @@ export default {
   },
   methods: {
     searchQuery() {
-
-      this.changes = '1'
+      this.changes='1'
       this.loadData(1);
       // 点击查询清空列表选中行
       // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
@@ -754,6 +288,7 @@ export default {
         return
       }
       this.queryParam = this.param
+
       //加载数据 若传入参数1则加载第一页的内容
       if (arg === 1) {
         this.ipagination.current = 1;
@@ -786,35 +321,35 @@ export default {
 
       if (key == 1) {
         this.emptyData()
-        this.changes = '1'
+        this.changes='1'
       }
       if (key == 2) {
-        this.changes = '2'
+        this.changes='2'
         this.emptyData()
         this.updataData()
       }
     },
-    emptyData() {
+    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
+      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
     },
-    updataData() {
+    updataData(){
       let _this = this;
       new Promise(function (resolve, reject) {
         getAction(_this.url.listTable, _this.queryParam).then(res => {

UI2/src/views/sydwqcsb/QcSsgqzysytdqkList_glyy.vue

@@ -30,6 +30,11 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="主管单位">
+              <j-dict-select-tag placeholder="请选择主管单位" v-model="queryParam.sysOrgCode" dictCode="zgbm"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="证书类型">
               <j-dict-select-tag placeholder="请选择证书类型" v-model="queryParam.zslx" dictCode="zslx"/>
             </a-form-item>
@@ -80,9 +85,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 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>
@@ -139,10 +144,13 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-                          <a-space>
-                          <a-button  @click="handleEdit(record)">编辑</a-button>
+
+
+            <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-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>
@@ -277,6 +285,14 @@
       },
     },
     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) {

UI2/src/views/sydwqcsb/QcSsgqzysytdqkList_tj.vue

@@ -0,0 +1,447 @@
+<template>
+  <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="6" :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="6" :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="6" :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="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="行政区划">
+              <JAreaSelect ref="JArea" @Area="SelectArea"></JAreaSelect>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :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="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="证书类型">
+              <j-dict-select-tag placeholder="请选择证书类型" v-model="queryParam.zslx" dictCode="zslx"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="取得方式">
+              <j-dict-select-tag type='list'v-model='queryParam.syqsyfs'  dictCode='qdfs' placeholder='请选择取得方式' />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :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="6" :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="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="土地使用权人">
+                <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :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="6" :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>-->
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-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>-->
+      <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+       <a-button type="primary" icon="import">导入</a-button>
+     </a-upload>
+     &lt;!&ndash; 高级查询区域 &ndash;&gt;
+     <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+     <a-dropdown v-if="selectedRowKeys.length > 0">
+       <a-menu slot="overlay">
+         <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+       </a-menu>
+       <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+     </a-dropdown>-->
+    </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>-->
+      <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"
+
+        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>
+
+        <span slot="action" slot-scope="text, record">
+                          <a-space>
+<!--                          <a-button  @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-tab-pane>
+      </a-tabs>
+
+    <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',
+    props: {
+      param: {
+        default: ""
+      }
+    },
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      QcSsgqzysytdqkModal,
+      JAreaSelect,
+      listTabBySz
+    },
+    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' }
+          }
+        ],
+        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:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    mounted() {
+      this.show()
+      this.searchQuery()
+    },
+    computed: {
+
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      updataData(){
+        let _this = this;
+        new Promise(function (resolve, reject) {
+          getAction(_this.url.listTable, _this.queryParam).then(res => {
+            if (res.success) {
+              _this.load = false
+              _this.resultData = res.result
+              resolve();
+            }
+          })
+        })
+      },
+      searchQuery() {
+        this.changes='1'
+        this.loadData(1);
+        // 点击查询清空列表选中行
+        // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
+        this.selectedRowKeys = []
+        this.selectionRows = []
+      },
+      loadData(arg) {
+        if (!this.url.list) {
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        this.queryParam = this.param
+
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        this.loading = true;
+        getAction(this.url.list, this.queryParam).then((res) => {
+          if (res.success) {
+            console.log(res)
+            //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+            this.dataSource = res.result.records || res.result;
+            this.dataSource.forEach((item) => {
+              if (item.gyzccgbl) {
+                item.gyzccgbl = Number(item.gyzccgbl).toFixed(2)
+              }
+            })
+            if (res.result.total) {
+              this.ipagination.total = res.result.total;
+            } else {
+              this.ipagination.total = 0;
+            }
+            //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+          } else {
+            this.$message.warning(res.message)
+          }
+        }).finally(() => {
+          this.loading = false
+        })
+      },
+      callback(key) {
+
+        if (key == 1) {
+          this.emptyData()
+          this.changes='1'
+        }
+        if (key == 2) {
+          this.changes='2'
+          this.emptyData()
+          this.updataData()
+        }
+      },
+      SelectArea(val) {
+        if (val.length > 4) {
+          this.queryParam.xzqh = val + '*'
+        } else {
+          this.queryParam.xzqh = val.slice(0, 4) + '*'
+        }
+      },
+      emptyData(){
+        this.load = true
+        this.$refs.table.data=[]
+        this.$refs.table.areaData=[]
+        this.$refs.table.pieResultData=[]
+        this.$refs.table.pieAreaResultData=[]
+        this.$refs.table.DoughnutResultData=[]
+        this.$refs.table.doughnutByXzResultData=[]
+        this.$refs.table.xzData=[]
+        this.$refs.table.registerData=[]
+        this.$refs.table.barResultData=[]
+        this.$refs.table.nan=[]
+        this.$refs.table.va=[]
+        this.$refs.table.xqData=[]
+        this.$refs.table.sjytData=[]
+        this.$refs.table.sjytValue=[]
+        this.$refs.table.sjytName=[]
+        this.$refs.table.barBysjytResultData=[]
+        this.$refs.table.number=0
+      },
+      searchReset() {
+        this.$refs.JArea.allClear(),
+          this.queryParam = {}
+        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();
+              }
+          })
+
+      },
+      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>

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

@@ -51,6 +51,7 @@ export default {
   methods: {
 
     getPie() {
+      var _this= this;
       // 绘制图表
       /* this.$nextTick(() => {*/
       var option = {
@@ -131,6 +132,10 @@ export default {
 
       // 使用刚指定的配置项和数据显示图表。
       var myChart = echarts.init(this.$refs.dom)
+      myChart.on('click',(params)=>{
+        _this.$emit('visible',{sjyt:params.data.name});
+
+      })
       myChart.setOption(option)
       /*window.addEventListener("resize", myChart.resize);*/
 

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

@@ -40,6 +40,7 @@ export default {
   },
   methods: {
     getPie() {
+      var _this = this
       // 绘制图表
      /* this.$nextTick(() => {*/
         var option = {
@@ -96,7 +97,7 @@ export default {
             {
               name: '实际占用土地面积',
               type: 'bar',
-              barWidth: 16,
+              barWidth: 20,
               symbolSize: 8,
               label: {
                 show: true,
@@ -108,7 +109,7 @@ export default {
               name: '闲置低效土地面积',
               type: 'bar',
               symbolSize: 8,
-              barWidth: 16,
+              barWidth: 20,
               label: {
                 show: true,
                 position:'top',

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

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

UI2/src/views/tj/sjtjModules.vue

@@ -67,18 +67,18 @@
       <a-row v-show="this.type=='szdw'">
         <a-col :sm="24" :md="12" :xl="12">
           <a-card style="margin-bottom: 1rem;width:100%;height: 42rem">
-            <mapData :resultMapData="this.resMapSzData" :titles="this.title2"  ></mapData>
+            <mapData :resultMapData="this.resMapSzData" :titles="this.title2"  @visible="visibleInfoBySz"></mapData>
           </a-card>
         </a-col>
         <a-col :sm="24" :md="12" :xl="6">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <PieData :resultData="this.resData1" :titleText=this.textBysz></PieData>
+            <PieData :resultData="this.resData1" :titleText=this.textBysz @visible="visibleInfoBySz"></PieData>
           </a-card>
         </a-col>
         <a-col :sm="24" :md="12" :xl="6">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
             <DoughnutData :titleText="this.titleBysz2" :result-data="this.DoughnutData"
-                          :pie-color="this.color"></DoughnutData>
+                          :pie-color="this.color" ></DoughnutData>
           </a-card>
         </a-col>
         <a-col :sm="24" :md="12" :xl="12">
@@ -89,24 +89,24 @@
             </a-col>
           </a-card>
         </a-col>
-        <a-col :sm="24" :md="12" :xl="12">
-          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <!--            <NightingaleCharData style="margin-left: 10rem"></NightingaleCharData>-->
-            <a-col :xl="5">
-              <WaterWorld :titleText=this.WaterWorldTitle :bottomTitle=this.WaterWorldTitleByqyzy
-                          :resultData="this.resWordDataZy"></WaterWorld>
-            </a-col>
-            <a-col :xl="5" style="margin-left: 5rem">
-              <WaterWorld :bottomTitle=this.WaterWorldTitleBydycz :resultData="this.resWordDataCz"></WaterWorld>
-            </a-col>
-            <a-col :xl="5" style="margin-left: 5rem">
-              <WaterWorld :bottomTitle=this.WaterWorldTitleByxzdx :resultData="this.resWordDataXz"></WaterWorld>
-            </a-col>
-          </a-card>
-        </a-col>
-        <a-col :sm="24" :md="12" :xl="12">
+<!--        <a-col :sm="24" :md="12" :xl="12">-->
+<!--          <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">-->
+<!--            &lt;!&ndash;            <NightingaleCharData style="margin-left: 10rem"></NightingaleCharData>&ndash;&gt;-->
+<!--            <a-col :xl="5">-->
+<!--              <WaterWorld :titleText=this.WaterWorldTitle :bottomTitle=this.WaterWorldTitleByqyzy-->
+<!--                          :resultData="this.resWordDataZy"></WaterWorld>-->
+<!--            </a-col>-->
+<!--            <a-col :xl="5" style="margin-left: 5rem">-->
+<!--              <WaterWorld :bottomTitle=this.WaterWorldTitleBydycz :resultData="this.resWordDataCz"></WaterWorld>-->
+<!--            </a-col>-->
+<!--            <a-col :xl="5" style="margin-left: 5rem">-->
+<!--              <WaterWorld :bottomTitle=this.WaterWorldTitleByxzdx :resultData="this.resWordDataXz"></WaterWorld>-->
+<!--            </a-col>-->
+<!--          </a-card>-->
+<!--        </a-col>-->
+        <a-col :sm="24" :md="12" :xl="24">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <BarDobuleData :titleText=this.BarTitleBysjzymj2 :result-x-data="resBarSzData"></BarDobuleData>
+            <BarDobuleData style="width: 1600px" :titleText=this.BarTitleBysjzymj2 :result-x-data="resBarSzData"></BarDobuleData>
           </a-card>
         </a-col>
       </a-row>
@@ -157,7 +157,7 @@
                         </a-col>-->
             <a-col :sm="24" :md="12" :xl="24">
               <!--              <a-card style="margin-bottom: 1rem;width:100%;height: 20rem">-->
-              <BarData :titleText=this.BarTitleBysz :result-x-data="this.resYData" :dw="this.dw2"
+              <BarData :titleText=this.BarTitleBysz :result-x-data="this.resYData"   :dw="this.dw2"
                        :seriesName="'地块数量'"></BarData>
               <!--              </a-card>-->
             </a-col>
@@ -180,13 +180,24 @@
       </a-row>
       <j-modal
         :visible="visible"
+        @cancel="handleCancel"
+        @ok="handleOk"
+        cancelText="关闭"
+        :okButtonProps="{ class:{'jee-hidden': false} }"
 
-        okText="保存"
+      >
+        <QcSsgqzysytdqkListBySs  :param="this.param"> </QcSsgqzysytdqkListBySs>
+
+
+      </j-modal>
+      <j-modal
+        :visible="visibleSz"
         @cancel="handleCancel"
+        @ok="handleOk"
         cancelText="关闭"
 
       >
-        <QcSsgqzysytdqkList :param="this.param"> </QcSsgqzysytdqkList>
+        <QcSsgqzysytdqkListBySz :param="this.paramSz"></QcSsgqzysytdqkListBySz>
 
       </j-modal>
     </div>
@@ -205,7 +216,10 @@ import BarDobuleData from "@views/tj/compoent/BarDobuleData";
 import WaterWorld from "@views/tj/compoent/WaterWorld";
 import NightingaleCharData from "@views/tj/compoent/NightingaleCharData";
 import {getAction} from "@api/manage";
-import QcSsgqzysytdqkList from "@views/qcsb/QcSsgqzysytdqkList_tj"
+import QcSsgqzysytdqkListBySs from "@views/qcsb/QcSsgqzysytdqkList_tj"
+
+
+import QcSsgqzysytdqkListBySz from "@views/sydwqcsb/QcSsgqzysytdqkList_tj"
 
 export default {
   name: "sjtj",
@@ -237,8 +251,10 @@ export default {
       cz: "",
       qyzy: "",
       xzdx: "",
+      visibleSz:false,
       sum: "",
       param:"",
+      paramSz:"",
       resData2: [],
       color: ['#4676ff', '#1ad4cb'],
       color1: ['#8c42a1', '#4fa5e7'],
@@ -267,7 +283,6 @@ export default {
     }
   },
   mounted() {
-
     new Promise(resolve => {
       this.getPieData(resolve);
       this.getPieData2(resolve);
@@ -290,13 +305,22 @@ export default {
 
 
   },
-  components: {mapData, DoughnutData, BarData, WaterWorld, NightingaleCharData, BarDobuleData, PieData,QcSsgqzysytdqkList},
+  components: {mapData, DoughnutData, BarData, WaterWorld, NightingaleCharData, BarDobuleData, PieData,QcSsgqzysytdqkListBySz,QcSsgqzysytdqkListBySs},
   methods: {
     handleChange(value) {
       this.type = value;
     },
     handleCancel() {
       this.visible = false
+      this.visibleSz = false
+    },
+    visibleInfoBySz(params){
+      this.paramSz=params
+       this.visibleSz = true
+    },
+    handleOk(){
+      this.visible = false
+      this.visibleSz = false
     },
     visibleInfo(params) {
       this.param=params