Merge branch 'master' into lhr

# Conflicts:
#	BIZ/jeecg-boot-module-zrzyqc/target/classes/org/jeecg/modules/zrzyqc/qcsb/controller/QcSsgqzysytdqkController.class
#	UI2/src/views/tj/compoent/DoughnutData.vue

BIZ/jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/controller/QcSsgqzysytdqkController.java

@@ -775,6 +775,73 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
         return Result.OK("编辑成功!");
     }
 
+
+    /**
+     * 编辑
+     *
+     * @param qcSsgqzysytdqk
+     * @return
+     */
+    @AutoLog(value = "省属国企占有使用土地情况调查-编辑")
+    @ApiOperation(value = "省属国企占有使用土地情况调查-编辑", notes = "省属国企占有使用土地情况调查-编辑")
+    @RequestMapping(value = "/edit1", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit1(@RequestBody QcSsgqzysytdqk qcSsgqzysytdqk) {
+        //当输入的为亩时
+        if (qcSsgqzysytdqk.getSfsb() == 3) {
+            if (qcSsgqzysytdqk.getSjzytdmjdw().equals("1")) {
+                qcSsgqzysytdqk.setSjzytdmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjzytdmj()));
+                qcSsgqzysytdqk.setSjzytdmjPf(Zh.MzP(qcSsgqzysytdqk.getSjzytdmj()));
+                qcSsgqzysytdqk.setSjzytdmjM(qcSsgqzysytdqk.getSjzytdmj());
+                qcSsgqzysytdqk.setQzpztdmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj()));
+                qcSsgqzysytdqk.setQzpztdmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj()));
+                qcSsgqzysytdqk.setQzpztdmjM(qcSsgqzysytdqk.getQzpzsymj());
+            } else if (qcSsgqzysytdqk.getSjzytdmjdw().equals("2")) {//当输入的为公顷时
+                qcSsgqzysytdqk.setSjzytdmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjzytdmj()));
+                qcSsgqzysytdqk.setSjzytdmjM(Zh.GqZm(qcSsgqzysytdqk.getSjzytdmj()));
+                qcSsgqzysytdqk.setSjzytdmjGq(qcSsgqzysytdqk.getSjzytdmj());
+                qcSsgqzysytdqk.setQzpztdmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj()));
+                qcSsgqzysytdqk.setQzpztdmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj()));
+                qcSsgqzysytdqk.setQzpztdmjGq(qcSsgqzysytdqk.getQzpzsymj());
+            } else if (qcSsgqzysytdqk.getSjzytdmjdw().equals("3")) {//当输入的为平方米时
+                qcSsgqzysytdqk.setSjzytdmjM(Zh.PzM(qcSsgqzysytdqk.getSjzytdmj()));
+                qcSsgqzysytdqk.setSjzytdmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjzytdmj()));
+                qcSsgqzysytdqk.setSjzytdmjPf(qcSsgqzysytdqk.getSjzytdmj());
+                qcSsgqzysytdqk.setQzpztdmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj()));
+                qcSsgqzysytdqk.setQzpztdmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj()));
+                qcSsgqzysytdqk.setQzpztdmjPf(qcSsgqzysytdqk.getQzpzsymj());
+            }
+            if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("1")) {//当输入的为亩时
+                qcSsgqzysytdqk.setSjsyjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjsyjzmj()));
+                qcSsgqzysytdqk.setSjsyjzmjPf(Zh.MzP(qcSsgqzysytdqk.getSjsyjzmj()));
+                qcSsgqzysytdqk.setSjsyjzmjM(qcSsgqzysytdqk.getSjsyjzmj());
+                qcSsgqzysytdqk.setQzpzjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj2()));
+                qcSsgqzysytdqk.setQzpzjzmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj2()));
+                qcSsgqzysytdqk.setQzpzjzmjM(qcSsgqzysytdqk.getQzpzsymj2());
+            } else if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("2")) {//当输入的为公顷时
+                qcSsgqzysytdqk.setSjsyjzmjM(Zh.GqZm(qcSsgqzysytdqk.getSjsyjzmj()));
+                qcSsgqzysytdqk.setSjsyjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjsyjzmj()));
+                qcSsgqzysytdqk.setSjsyjzmjGq(qcSsgqzysytdqk.getSjsyjzmj());
+                qcSsgqzysytdqk.setQzpzjzmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj2()));
+                qcSsgqzysytdqk.setQzpzjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj2()));
+                qcSsgqzysytdqk.setQzpzjzmjGq(qcSsgqzysytdqk.getQzpzsymj2());
+            } else if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("3")) {//当输入的为平方米时
+                qcSsgqzysytdqk.setSjsyjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjsyjzmj()));
+                qcSsgqzysytdqk.setSjsyjzmjM(Zh.PzM(qcSsgqzysytdqk.getSjsyjzmj()));
+                qcSsgqzysytdqk.setSjsyjzmjPf(qcSsgqzysytdqk.getSjsyjzmj());
+                qcSsgqzysytdqk.setQzpzjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj2()));
+                qcSsgqzysytdqk.setQzpzjzmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj2()));
+                qcSsgqzysytdqk.setQzpzjzmjPf(qcSsgqzysytdqk.getQzpzsymj2());
+            }
+            qcSsgqzysytdqk.setSfsb(1);
+            qcSsgqzysytdqkService.saveOrUpdate(qcSsgqzysytdqk);
+
+        }
+
+
+
+        return Result.OK("变更成功!");
+    }
+
     /**
      * 通过id删除
      *

UI2/src/components/tools/UserMenu.vue

@@ -197,8 +197,13 @@
             return that.Logout({}).then(() => {
               // update-begin author:scott date:20211223 for:【JTC-198】退出登录体验不好
               //that.$router.push({ path: '/user/login' });
-              window.location.reload()
+              // window.location.reload()
               // update-end author:scott date:20211223 for:【JTC-198】退出登录体验不好
+              let sevice = 'http://' + window.location.host + '/'
+              console.log("sevice=====" + sevice);
+              // let serviceUrl = encodeURIComponent(sevice)
+
+              window.location.href = sevice
             }).catch(err => {
               that.$message.error({
                 title: '错误',

UI2/src/mixins/JeecgListMixin.js

@@ -234,6 +234,11 @@ export const JeecgListMixin = {
       this.$refs.modalForm.title = "编辑";
       this.$refs.modalForm.disableSubmit = false;
     },
+    handleEdit1: function (record) {
+      this.$refs.modalForm.edit1(record);
+      this.$refs.modalForm.title = "变更";
+      this.$refs.modalForm.disableSubmit = false;
+    },
     handleAdd: function () {
       this.$refs.modalForm.add();
       this.$refs.modalForm.title = "新增";

UI2/src/views/qcsb/QcSsgqzysytdqkList.vue

@@ -118,6 +118,7 @@
                           <a-button v-has="'conts:bj'" v-if="record.sfsb===0" @click="handleEdit(record)">编辑</a-button>
 
                                <a-button @click="handleDetail(record)" type='primary'>查看</a-button>
+                          <a-button v-if="record.sfsb===3" @click="handleEdit1(record)" type='primary'>变更</a-button>
                           <a-popconfirm title="上报后将不可修改，是否确认上报?" @confirm="() => handleSB(record.id)">
                   <a-button v-has="'conts:sb'" v-if="record.sfsb===0" >上报</a-button>
                 </a-popconfirm>

UI2/src/views/qcsb/QcSsgqzysytdqkList1.vue

@@ -24,7 +24,11 @@
               <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.wjlx" dictCode="wjlx"/>
+            </a-form-item>
+          </a-col>
 
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="土地使用权人">
@@ -67,6 +71,7 @@
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" 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>

UI2/src/views/qcsb/QcSsgqzysytdqkList2.vue

@@ -24,6 +24,11 @@
               <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.wjlx" dictCode="wjlx"/>
+            </a-form-item>
+          </a-col>
 
 
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -62,6 +67,7 @@
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
      <a-button v-has="'dc'" type="primary" icon="download" @click="handleExportXls('省属国企占有使用土地情况调查')">导出</a-button>
+      <a-button v-has="'dc'" 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>

UI2/src/views/qcsb/QcSsgqzysytdqkList_gly.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.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.sfsb" dictCode="xxsbzt"/>
             </a-form-item>
@@ -77,6 +82,7 @@
     <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>

UI2/src/views/qcsb/QcSsgqzysytdqkList_tj.vue

@@ -452,4 +452,459 @@ export default {
 </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>
+          </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'
+      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>

UI2/src/views/qcsb/modules/QcSsgqzysytdqkForm.vue

@@ -1010,6 +1010,7 @@ export default {
       url: {
         add: '/qcsb/qcSsgqzysytdqk/add',
         edit: '/qcsb/qcSsgqzysytdqk/edit',
+        edit1: '/qcsb/qcSsgqzysytdqk/edit1',
         queryById: '/qcsb/qcSsgqzysytdqk/queryById'
       },
       disabledDate: '',
@@ -1132,7 +1133,10 @@ export default {
       this.model = Object.assign({}, record)
       this.visible = true
     },
-
+    edit1(record) {
+      this.model = Object.assign({}, record)
+      this.visible = true
+    },
     submitForm() {
       const that = this
       // 触发表单验证
@@ -1168,6 +1172,41 @@ export default {
 
       })
     },
+    submitForm1() {
+      const that = this
+      // 触发表单验证
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          let startTime = moment(this.model.qsqssj);
+          let endTime = moment(this.model.qsdqsj);
+          if (endTime.valueOf() < startTime.valueOf()) {
+            this.$message.error('请检查权属到期时间是否正确！');
+            return
+          }
+          that.confirmLoading = true
+          let httpurl = ''
+          let method = ''
+          if (!this.model.id) {
+            httpurl += this.url.add
+            method = 'post'
+          } else {
+            httpurl += this.url.edit1
+            method = 'put'
+          }
+          httpAction(httpurl, this.model, method).then((res) => {
+            if (res.success) {
+              that.$message.success(res.message)
+              that.$emit('ok')
+            } else {
+              that.$message.warning(res.message)
+            }
+          }).finally(() => {
+            that.confirmLoading = false
+          })
+        }
+
+      })
+    },
     /**
      *点击提示
      */

UI2/src/views/qcsb/modules/QcSsgqzysytdqkModal.vue

@@ -20,6 +20,14 @@
         </a-button>
       </div>
     </template>
+    <template>
+      <div style="position: absolute;left: 10%;top:13px;">
+        <a-button v-if="!disableSubmit"  @click="handleOk1" type="primary" style="margin-bottom: 0;margin-right: 8px">保存</a-button>
+        <a-button @click="handleCancel">
+          关闭
+        </a-button>
+      </div>
+    </template>
     <!--邱东宝 增加modal按钮调整到顶部 end-->
     <apply-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" />
     <qc-ssgqzysytdqk-form ref="realForm" @ok="submitCallback" :disabled="disa" :upload="uploads"></qc-ssgqzysytdqk-form>
@@ -57,6 +65,12 @@
           this.$refs.realForm.edit(record);
         })
       },
+      edit1 (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
       close () {
         this.$emit('close');
         this.visible = false;
@@ -66,6 +80,11 @@
         this.$refs.realForm.submitForm();
           this.disa=false
       },
+      handleOk1 () {
+        this.disa=true
+        this.$refs.realForm.submitForm1();
+        this.disa=false
+      },
       submitCallback(){
         this.$emit('ok');
         this.visible = false;

UI2/src/views/sydwqcsb/QcSsgqzysytdqkList.vue

@@ -122,6 +122,7 @@
                         <a-space>
                           <a-button v-has="'conten:bj'" v-if="record.sfsb===0" @click="handleEdit(record)">编辑</a-button>
                                <a-button @click="handleDetail(record)" type='primary'>查看</a-button>
+                          <a-button v-if="record.sfsb===3" @click="handleEdit1(record)" type='primary'>变更</a-button>
                           <a-popconfirm title="报送后将不可修改，是否确认上报?" @confirm="() => handleSB(record.id)">
                   <a-button v-has="'conten:sb'" v-if="record.sfsb===0" >报送</a-button>
                 </a-popconfirm>

UI2/src/views/sydwqcsb/QcSsgqzysytdqkList1.vue

@@ -25,6 +25,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.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>
@@ -70,6 +75,7 @@
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" 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>

UI2/src/views/sydwqcsb/QcSsgqzysytdqkList2.vue

@@ -25,6 +25,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.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 placeholder="请选择主管单位" v-model="queryParam.sysOrgCode" dictCode="zgbm"/>
             </a-form-item>
@@ -71,6 +76,7 @@
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" 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>

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.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>
@@ -77,6 +82,7 @@
     <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>

UI2/src/views/sydwqcsb/modules/QcSsgqzysytdqkForm.vue

@@ -645,6 +645,7 @@ export default {
       url: {
         add: '/qcsb/qcSsgqzysytdqk/add2',
         edit: '/qcsb/qcSsgqzysytdqk/edit',
+        edit1: '/qcsb/qcSsgqzysytdqk/edit1',
         queryById: '/qcsb/qcSsgqzysytdqk/queryById',
         stag:'qcsb/qcSsgqzysytdqk/addStag'
       },
@@ -813,6 +814,10 @@ export default {
       this.model = Object.assign({}, record)
       this.visible = true
     },
+    edit1(record) {
+      this.model = Object.assign({}, record)
+      this.visible = true
+    },
     //暂存
     stagForm(){
       const that = this
@@ -887,6 +892,53 @@ export default {
 
       })
     },
+    submitForm1() {
+      if (this.postion.lat != '' && this.postion.lng != '') {
+        this.model.lat = this.postion.lat;
+        this.model.lng = this.postion.lng;
+      };
+      /*  if(this.model.lat == '' && this.model.lng == ''){
+          this.$info({
+            title: '说明',
+            content: (<div><p>请点击坐落位置后的定位按钮，选择地块相应位置</p></div>),
+            onOk() {
+            }
+          })
+        }*/
+      const that = this
+      // 触发表单验证
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          let startTime = moment(this.model.qsqssj);
+          let endTime = moment(this.model.qsdqsj);
+          if (endTime.valueOf() < startTime.valueOf()) {
+            this.$message.error('请检查权属到期时间是否正确！');
+            return
+          }
+          that.confirmLoading = true
+          let httpurl = ''
+          let method = ''
+          if (!this.model.id) {
+            httpurl += this.url.add
+            method = 'post'
+          } else {
+            httpurl += this.url.edit1
+            method = 'put'
+          }
+          httpAction(httpurl, this.model, method).then((res) => {
+            if (res.success) {
+              that.$message.success(res.message)
+              that.$emit('ok')
+            } else {
+              that.$message.warning(res.message)
+            }
+          }).finally(() => {
+            that.confirmLoading = false
+          })
+        }
+
+      })
+    },
     popupCallback(value, row) {
       this.model = Object.assign(this.model, row);
     },

UI2/src/views/sydwqcsb/modules/QcSsgqzysytdqkModal.vue

@@ -23,6 +23,16 @@
       </div>
 
     </template>
+    <template>
+      <div style="position: absolute;left: 10%;top:13px;">
+        <a-button v-if="!disableSubmit" @click="handleOk1" type="primary" style="margin-bottom: 0;margin-right: 8px">保存</a-button>
+
+        <a-button @click="handleCancel">关闭</a-button>
+
+
+      </div>
+
+    </template>
     <!--邱东宝 增加modal按钮调整到顶部 end-->
     <apply-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
     <qc-ssgqzysytdqk-form ref="realForm" @ok="submitCallback" :postion="this.model" :toqyxx="this.toDk"
@@ -90,7 +100,16 @@ export default {
         this.$refs.realForm.edit(record);
       })
     },
-
+    edit1(record) {
+      this.stag=false;
+      /*   this.lats=record.lat;
+         this.lngs=record.lng
+         console.log(6666666666666,this.lats,this.lngs)*/
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs.realForm.edit(record);
+      })
+    },
     close() {
       this.$emit('close');
       this.visible = false;
@@ -100,6 +119,11 @@ export default {
       this.$refs.realForm.submitForm();
       this.disa = false
     },
+    handleOk1() {
+      this.disa = true
+      this.$refs.realForm.submitForm1();
+      this.disa = false
+    },
     stagInfo(){
       this.$refs.realForm.stagForm();
     },

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

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