1. 首页统计：添加面积数及样式修改；

2. 地块已审核，地块管理，四个页面添加入库年份字段；
3. 系统图标调大；

src/api/api.js

@@ -92,6 +92,7 @@ const checkRuleByCode = (params) => getAction('/sys/checkRule/checkByCode', para
 //加载我的通告信息
 const getUserNoticeInfo= (params)=>getAction("/sys/sysAnnouncementSend/getMyAnnouncementSend",params);
 const getTransitURL = url => `/sys/common/transitRESTful?url=${encodeURIComponent(url)}`
+const getyear = ()=>getAction("/qcsb.qyxx/qcQyxx/queryYears");
 // 中转HTTP请求
 export const transitRESTful = {
   get: (url, parameter) => getAction(getTransitURL(url), parameter),
@@ -157,7 +158,9 @@ export {
   saveDeptRolePermission,
   queryMyDepartTreeList,
   getUserNoticeInfo,
-  getDictItemsFromCache
+  getDictItemsFromCache,
+  getyear,
+
 }
 
 

src/components/ChartCard.vue

@@ -1,13 +1,28 @@
 <template>
-  <a-card :loading="loading" :body-style="{ padding: '20px 24px 8px' }" :bordered="false">
+  <a-card class="cardContent" :loading="loading" :body-style="{ padding: '15px 24px 8px' }" :bordered="false">
     <div class="chart-card-header">
       <div class="meta">
         <span class="chart-card-title">{{ title }}</span>
+        <div>
+          <img v-if="icon == 'green'" src="@/assets/indexChart/green.png">
+          <img v-else-if="icon == 'blue'" src="@/assets/indexChart/blue.png">
+          <img v-else-if="icon == 'purple'" src="@/assets/indexChart/purple.png">
+          <img v-else src="@/assets/indexChart/red.png">
+        </div>
         <span class="chart-card-action">
           <slot name="action"></slot>
         </span>
       </div>
-      <div class="total"><span>{{ total }}</span></div>
+      <div class="total">
+        <div>{{ number }}</div>
+        <div class="content-title">地块数量</div>
+      </div>
+      <div class="total">
+        <div v-if="area != ''">
+          <div>{{ area }}</div>
+          <div class="content-title">地块面积</div>
+        </div>
+      </div>
     </div>
     <!--<div class="chart-card-content">
       <div class="content-fix">
@@ -30,7 +45,15 @@
         type: String,
         default: ''
       },
-      total: {
+      number: {
+        type: String,
+        default: ''
+      },
+      area: {
+        type: String,
+        default: ''
+      },
+      icon: {
         type: String,
         default: ''
       },
@@ -43,33 +66,43 @@
 </script>
 
 <style lang="less" scoped>
+.cardContent /deep/ .chart-card-header{
+  display: flex;
+  justify-content: space-between;
+  //height: fit-content;
+  width: 95%;
+}
   .chart-card-header {
-    position: relative;
+    //position: relative;
     overflow: hidden;
     width: 100%;
 
     .meta {
-      position: relative;
+      //position: relative;
       overflow: hidden;
-      width: 100%;
+      //width: 100%;
       color: white;
       font-size: 20px;
-      line-height: 50px;
-      font-weight:bold
+      //line-height: 50px;
+      font-weight:bold;
+      max-width: 35%;
     }
   }
-
+  .chart-card-header .meta > div {
+    text-align: left;
+    margin-top: 5px;
+  }
   .chart-card-action {
     cursor: pointer;
     position: absolute;
     top: 0;
-    right: 0;
+    right: 15px;
   }
 
   .chart-card-footer {
     border-top: 1px solid #e8e8e8;
-    padding-top: 9px;
-    margin-top: 8px;
+    padding-top: 5px;
+    margin-top: 5px;
 
     > * {
       position: relative;
@@ -96,17 +129,46 @@
       width: 100%;
     }
   }
-
+  // 数量，面积样式
   .total {
-    overflow: hidden;
+    //overflow: hidden;
     text-overflow: ellipsis;
     word-break: break-all;
     white-space: nowrap;
     color: white;
-    margin-top: 4px;
+    margin-top: 35px;
     margin-bottom: 0;
-    font-size: 30px;
-    line-height: 38px;
-    height: 38px;
+    font-size: 26px;
+    //line-height: 38px;
+    //height: 38px;
+  }
+  // 数量，面积标题样式
+  .content-title {
+    font-size: 20px;
+    margin-top: 20px;
+  }
+  //
+  @media (max-width: 1920px) {
+    .chart-card-header .meta {
+      font-size: 16px;
+    }
+
+    .chart-card-header .meta > div {
+      width: 50%;
+      img {
+        width: 100%;
+      }
+    }
+
+    .content-title,
+    .total {
+      font-size: 18px;
+    }
+    // 数量，面积
+    .content-title {
+      margin-top: 15px;
+    }
+    // 卡片底片边距
+
   }
 </style>

src/components/tools/Logo.vue

@@ -47,7 +47,7 @@
       height: @height !important;
 	    //width: 500px;
 	    width: 100vw;
-      line-height: 55px !important;
+      line-height: 59px !important;
       box-shadow: none !important;
       transition: background 300ms;
 
@@ -59,7 +59,7 @@
       }
       // 重新定义图片大小
       img {
-        height: 40px;
+        height: 60px;
       }
     }
 

src/views/dashboard/IndexChart.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="page-header-index-wide">
     <div>
+      <!--省直单位首页-->
       <div v-has="'sydwsy'" style="display: flex">
         <a-card  style="margin-bottom: 1rem;width:30%;">
           <div>
@@ -19,26 +20,26 @@
         <a-card :hoverable='false' style="margin-bottom: 1rem;width:70%;">
             <a-row :gutter="24" style="margin-top: 2%;margin-left: 5%">
               <a-col v-show="this.show" :sm="24" :md="12" :xl="10" :style="{ marginBottom: '24px'}" class="xfrw">
-                <chart-card   :loading="loading" title="下发任务数(省属企业)" :total='this.xfrws'>
+                <chart-card   :loading="loading" title="下发任务数(省属企业)" :icon="'blue'" :number='this.xfrws'>
                   <a-tooltip title="指标说明" slot="action">
                     <a-icon type="info-circle-o" />
                   </a-tooltip>
                 </chart-card>
               </a-col>
               <a-col v-show="this.show" :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px' }" class="yxdls">
-                <chart-card :loading="loading" title="有效登录数(省属企业)" :total="this.yxdls">
+                <chart-card :loading="loading" title="有效登录数(省属企业)" :icon="'red'" :number="this.yxdls">
                   <a-tooltip title="指标说明" slot="action">
                     <a-icon type="info-circle-o" />
                   </a-tooltip>
                 </chart-card>
               </a-col>
               <a-col  :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px' }" class="sbdks">
-                <chart-card v-if="this.yhjs=='shyh'" :loading="loading" title="上报地块数 | 面积 (省属企业)" :total="this.sbdks+' | '+this.sbdkmj+'㎡'">
+                <chart-card v-if="this.yhjs=='shyh'" :loading="loading" title="上报地块数(省属企业)" :icon="'green'" :number="this.sbdks" :area="this.sbdkmj">
                   <a-tooltip title="指标说明" slot="action">
                     <a-icon type="info-circle-o" />
                   </a-tooltip>
                 </chart-card>
-                <chart-card v-else  :loading="loading" title="上报地块数 | 面积" :total="this.sbdks+' | '+this.sbdkmj+'㎡'">
+                <chart-card v-else  :loading="loading" title="上报地块数" :icon="'green'" :number="this.sbdks" :area="this.sbdkmj">
                   <a-tooltip title="指标说明" slot="action">
                     <a-icon type="info-circle-o" />
                   </a-tooltip>
@@ -46,7 +47,7 @@
               </a-col>
 
               <a-col v-show="!this.show" :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px' }" class="dqsbs">
-                <chart-card :loading="loading" title="审核通过数 | 面积" :total="this.shtgs+' | '+this.shtgmj+'㎡'">
+                <chart-card :loading="loading" title="审核通过数" :icon="'blue'" :number="this.sbdks" :area="this.sbdkmj">
                   <a-tooltip title="指标说明" slot="action">
                     <a-icon type="info-circle-o" />
                   </a-tooltip>
@@ -55,7 +56,7 @@
             </a-row>
           <a-row :gutter="24" style="margin-top: 1%;margin-left: 5%">
               <a-col v-show="!this.show" :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px' }" class="shbtg">
-                <chart-card :loading="loading" title="审核不通过（退回） | 面积" :total="this.cwth+' | '+this.cwthmj+'㎡'">
+                <chart-card :loading="loading" title="审核不通过（退回）" :icon="'red'" :number="this.sbdks" :area="this.sbdkmj">
                   <a-tooltip title="指标说明" slot="action">
                     <a-icon type="info-circle-o" />
                   </a-tooltip>
@@ -63,40 +64,40 @@
                 </chart-card>
               </a-col>
               <a-col  :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px' }" class="wshsl">
-                <chart-card  v-if="this.yhjs=='shyh'" :loading="loading" title="未审核地块数 | 面积 (省属企业)" :total="this.wshsl+' | '+this.wshsmj+'㎡'">
+                <chart-card  v-if="this.yhjs=='shyh'" :loading="loading" title="未审核地块数(省属企业)" :icon="'purple'" :number="this.sbdks" :area="this.sbdkmj">
                   <a-tooltip title="指标说明" slot="action">
                     <a-icon type="info-circle-o" />
                   </a-tooltip>
                 </chart-card>
-                <chart-card v-else :loading="loading" title="未审核地块数 | 面积" :total="this.wshsl+' | '+this.wshsmj+'㎡'">
+                <chart-card v-else :loading="loading" title="未审核地块数" :icon="'purple'" :number="this.sbdks" :area="this.sbdkmj">
                   <a-tooltip title="指标说明" slot="action">
                     <a-icon type="info-circle-o" />
                   </a-tooltip>
                 </chart-card>
               </a-col>
               <a-col v-show="this.show" :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px'}" class="xfrw">
-                <chart-card  :loading="loading" title="下发任务数(省直单位)" :total='this.sydwxfrws'>
+                <chart-card  :loading="loading" title="下发任务数(省直单位)" :icon="'blue'" :number='this.sydwxfrws'>
                   <a-tooltip title="指标说明" slot="action">
                     <a-icon type="info-circle-o" />
                   </a-tooltip>
                 </chart-card>
               </a-col>
               <a-col v-show="this.show" :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px' }" class="yxdls">
-                <chart-card :loading="loading" title="有效登录数(省直单位)" :total="this.sydwyxdls">
+                <chart-card :loading="loading" title="有效登录数(省直单位)" :icon="'red'" :number="this.sydwyxdls">
                   <a-tooltip title="指标说明" slot="action">
                     <a-icon type="info-circle-o" />
                   </a-tooltip>
                 </chart-card>
               </a-col>
               <a-col v-show="this.show" :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px' }" class="sbdks">
-                <chart-card :loading="loading" title="上报地块数(省直单位)" :total="this.sydwsbdks">
+                <chart-card :loading="loading" title="上报地块数(省直单位)" :icon="'green'" :number="this.sydwsbdks">
                   <a-tooltip title="指标说明" slot="action">
                     <a-icon type="info-circle-o" />
                   </a-tooltip>
                 </chart-card>
               </a-col>
               <a-col  v-show="this.show" :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px' }" class="wshsl">
-                <chart-card  :loading="loading" title="未审核地块数(省直单位)" :total="this.sydwwsh">
+                <chart-card  :loading="loading" title="未审核地块数(省直单位)" :icon="'purple'" :number="this.sydwwsh">
                   <a-tooltip  title="指标说明" slot="action">
                     <a-icon type="info-circle-o" />
                   </a-tooltip>
@@ -109,6 +110,7 @@
     </div>
 
     <div>
+      <!--省属企业首页-->
       <div v-has="'ssqysy2'" style="display: flex">
         <a-card   style="margin-bottom: 1rem;width:30%;">
           <div>
@@ -127,26 +129,26 @@
         <a-card   style="margin-bottom: 1rem;width:70%;">
           <a-row :gutter="24" style="margin-top: 2%;margin-left: 5%">
             <a-col v-show="this.show" :sm="24" :md="12" :xl="10" :style="{ marginBottom: '24px'}" class="xfrw">
-              <chart-card   :loading="loading" title="下发任务数(省属企业)" :total='this.xfrws'>
+              <chart-card   :loading="loading" title="下发任务数(省属企业)" :icon="'blue'" :number='this.xfrws'>
                 <a-tooltip title="指标说明" slot="action">
                   <a-icon type="info-circle-o" />
                 </a-tooltip>
               </chart-card>
             </a-col>
             <a-col v-show="this.show" :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px' }" class="yxdls">
-              <chart-card :loading="loading" title="有效登录数(省属企业)" :total="this.yxdls">
+              <chart-card :loading="loading" title="有效登录数(省属企业)" :icon="'red'" :number="this.yxdls">
                 <a-tooltip title="指标说明" slot="action">
                   <a-icon type="info-circle-o" />
                 </a-tooltip>
               </chart-card>
             </a-col>
             <a-col  :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px' }" class="sbdks">
-              <chart-card v-if="this.yhjs=='shyh'" :loading="loading" title="上报地块数 | 面积 (省属企业)" :total="this.sbdks+' | '+this.sbdkmj+'㎡'">
+              <chart-card v-if="this.yhjs=='shyh'" :loading="loading" title="上报地块数(省属企业)" :icon="'green'" :number="this.sbdks" :area="this.sbdkmj">
                 <a-tooltip title="指标说明" slot="action">
                   <a-icon type="info-circle-o" />
                 </a-tooltip>
               </chart-card>
-              <chart-card v-else  :loading="loading" title="上报地块数 | 面积" :total="this.sbdks+' | '+this.sbdkmj+'㎡'">
+              <chart-card v-else  :loading="loading" title="上报地块数" :icon="'green'" :number="this.sbdks" :area="this.sbdkmj">
                 <a-tooltip title="指标说明" slot="action">
                   <a-icon type="info-circle-o" />
                 </a-tooltip>
@@ -154,7 +156,7 @@
             </a-col>
 
             <a-col v-show="!this.show" :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px' }" class="dqsbs">
-              <chart-card :loading="loading" title="审核通过数 | 面积" :total="this.shtgs+' | '+this.shtgmj+'㎡'">
+              <chart-card :loading="loading" title="审核通过数" :icon="'blue'" :number="this.shtgs" :area="this.shtgmj">
                 <a-tooltip title="指标说明" slot="action">
                   <a-icon type="info-circle-o" />
                 </a-tooltip>
@@ -163,7 +165,7 @@
           </a-row>
           <a-row :gutter="24" style="margin-top: 1%;margin-left: 5%">
             <a-col v-show="!this.show" :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px' }" class="shbtg">
-              <chart-card :loading="loading" title="审核不通过（退回） | 面积" :total="this.cwth+' | '+this.cwthmj+'㎡'">
+              <chart-card :loading="loading" title="审核不通过（退回）" :icon="'red'" :number="this.cwth" :area="this.cwthmj">
                 <a-tooltip title="指标说明" slot="action">
                   <a-icon type="info-circle-o" />
                 </a-tooltip>
@@ -171,40 +173,40 @@
               </chart-card>
             </a-col>
             <a-col  :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px' }" class="wshsl">
-              <chart-card  v-if="this.yhjs=='shyh'" :loading="loading" title="未审核地块数 | 面积 (省属企业)" :total="this.wshsl+' | '+this.wshsmj+'㎡'">
+              <chart-card  v-if="this.yhjs=='shyh'" :loading="loading" title="未审核地块数(省属企业)" :icon="'purple'" :number="this.wshsl" :area="this.wshsmj">
                 <a-tooltip title="指标说明" slot="action">
                   <a-icon type="info-circle-o" />
                 </a-tooltip>
               </chart-card>
-              <chart-card v-else :loading="loading" title="未审核地块数 | 面积" :total="this.wshsl+' | '+this.wshsmj+'㎡'">
+              <chart-card v-else :loading="loading" title="未审核地块数" :icon="'red'" :number="this.wshsl" :area="this.wshsmj">
                 <a-tooltip title="指标说明" slot="action">
                   <a-icon type="info-circle-o" />
                 </a-tooltip>
               </chart-card>
             </a-col>
             <a-col v-show="this.show" :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px'}" class="xfrw">
-              <chart-card  :loading="loading" title="下发任务数(省直单位)" :total='this.sydwxfrws'>
+              <chart-card  :loading="loading" title="下发任务数(省直单位)" :icon="'blue'" :number='this.sydwxfrws'>
                 <a-tooltip title="指标说明" slot="action">
                   <a-icon type="info-circle-o" />
                 </a-tooltip>
               </chart-card>
             </a-col>
             <a-col v-show="this.show" :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px' }" class="yxdls">
-              <chart-card :loading="loading" title="有效登录数(省直单位)" :total="this.sydwyxdls">
+              <chart-card :loading="loading" title="有效登录数(省直单位)" :icon="'red'" :number="this.sydwyxdls">
                 <a-tooltip title="指标说明" slot="action">
                   <a-icon type="info-circle-o" />
                 </a-tooltip>
               </chart-card>
             </a-col>
             <a-col v-show="this.show" :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px' }" class="sbdks">
-              <chart-card :loading="loading" title="上报地块数(省直单位)" :total="this.sydwsbdks">
+              <chart-card :loading="loading" title="上报地块数(省直单位)" :icon="'green'" :number="this.sydwsbdks">
                 <a-tooltip title="指标说明" slot="action">
                   <a-icon type="info-circle-o" />
                 </a-tooltip>
               </chart-card>
             </a-col>
             <a-col  v-show="this.show" :sm="24" :md="12" :xl="11" :style="{ marginBottom: '24px' }" class="wshsl">
-              <chart-card  :loading="loading" title="未审核地块数(省直单位)" :total="this.sydwwsh">
+              <chart-card  :loading="loading" title="未审核地块数(省直单位)" :icon="'purple'" :number="this.sydwwsh">
                 <a-tooltip  title="指标说明" slot="action">
                   <a-icon type="info-circle-o" />
                 </a-tooltip>
@@ -215,12 +217,12 @@
       </div>
 
     </div>
-
+    <!--修复中心、审核用户、省级账户、超级管理员首页-->
     <a-card v-has="'ssqysy'">
       <a-row :gutter="24">
         <a-col v-show="this.show" :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px'}" class="xfrw">
           <div  style="cursor:pointer" @click="handleXfrws('A04')">
-            <chart-card  :loading="loading" title="下发任务数(省属企业)" :total='this.xfrws'>
+            <chart-card  :loading="loading" title="下发任务数(省属企业)" :icon="'blue'" :number='this.xfrws'>
               <a-tooltip title="指标说明" slot="action">
                 <a-icon type="info-circle-o" />
               </a-tooltip>
@@ -228,8 +230,8 @@
           </div>
         </a-col>
         <a-col v-show="this.show" :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }" class="yxdls">
-          <div style="cursor:pointer" @click="handleYxdl('list2')">
-            <chart-card :loading="loading" title="有效登录数(省属企业)" :total="this.yxdls">
+          <div style="cursor:pointer" @click="handleYxdl(2)">
+            <chart-card :loading="loading" title="有效登录数(省属企业)" :number="this.yxdls">
               <a-tooltip title="指标说明" slot="action">
                 <a-icon type="info-circle-o" />
               </a-tooltip>
@@ -237,13 +239,13 @@
           </div>
         </a-col>
         <a-col  :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }" class="sbdks">
-          <div  style="cursor:pointer" @click="handleSbdks('qcsb-qcSsgqzysytdqk-list2')">
-            <chart-card v-if="this.yhjs=='shyh'" :loading="loading" title="上报地块数(省属企业)" :total="this.sbdks">
+          <div  style="cursor:pointer" @click="handleSbdks(2)">
+            <chart-card v-if="this.yhjs=='shyh'" :loading="loading" title="上报地块数(省属企业)" :icon="'green'" :number="this.sbdks" :area="this.sbdkmj">
               <a-tooltip title="指标说明" slot="action">
                 <a-icon type="info-circle-o" />
               </a-tooltip>
             </chart-card>
-            <chart-card v-else  :loading="loading" title="上报地块数" :total="this.sbdks">
+            <chart-card v-else  :loading="loading" title="上报地块数" :icon="'red'" :number="this.sbdks" :area="this.sbdkmj">
               <a-tooltip title="指标说明" slot="action">
                 <a-icon type="info-circle-o" />
               </a-tooltip>
@@ -251,14 +253,14 @@
           </div>
         </a-col>
         <a-col v-show="!this.show" :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }" class="dqsbs">
-          <chart-card :loading="loading" title="审核通过数" :total="this.shtgs">
+          <chart-card :loading="loading" title="审核通过数" :icon="'blue'" :number="this.shtgs" :area="this.shtgmj">
             <a-tooltip title="指标说明" slot="action">
               <a-icon type="info-circle-o" />
             </a-tooltip>
           </chart-card>
         </a-col>
         <a-col v-show="!this.show" :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }" class="shbtg">
-          <chart-card :loading="loading" title="审核不通过（退回）" :total="this.cwth">
+          <chart-card :loading="loading" title="审核不通过(退回)" :icon="'red'" :number="this.cwth" :area="this.cwthmj">
             <a-tooltip title="指标说明" slot="action">
               <a-icon type="info-circle-o" />
             </a-tooltip>
@@ -266,13 +268,13 @@
           </chart-card>
         </a-col>
         <a-col  :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }" class="wshsl">
-          <div style="cursor:pointer" @click="handleWsh('qcsb-qcSsgqzysytdqk-list1')">
-            <chart-card v-if="this.yhjs=='shyh'" :loading="loading" title="未审核地块数(省属企业)" :total="this.wshsl">
+          <div style="cursor:pointer" @click="handleWsh(0)">
+            <chart-card v-if="this.yhjs=='shyh'" :loading="loading" title="未审核地块数(省属企业)" :icon="'purple'" :number="this.wshsl" :area="this.wshsmj">
               <a-tooltip title="指标说明" slot="action">
                 <a-icon type="info-circle-o" />
               </a-tooltip>
             </chart-card>
-            <chart-card v-else :loading="loading" title="未审核地块数" :total="this.wshsl">
+            <chart-card v-else :loading="loading" title="未审核地块数" :icon="'purple'" :number="this.wshsl" :area="this.wshsmj">
               <a-tooltip title="指标说明" slot="action">
                 <a-icon type="info-circle-o" />
               </a-tooltip>
@@ -281,7 +283,7 @@
         </a-col>
         <a-col v-show="this.show" :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px'}" class="xfrw">
           <div  style="cursor:pointer" @click="handleXfrws('A03')">
-            <chart-card  :loading="loading"  title="下发任务数(省直单位)" :total='this.sydwxfrws'>
+            <chart-card  :loading="loading"  title="下发任务数(省直单位)" :icon="'blue'" :number='this.sydwxfrws'>
               <a-tooltip title="指标说明" slot="action">
                 <a-icon type="info-circle-o" />
               </a-tooltip>
@@ -289,8 +291,8 @@
           </div>
         </a-col>
         <a-col v-show="this.show" :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }" class="yxdls">
-          <div style="cursor:pointer" @click="handleYxdl('list8')">
-          <chart-card :loading="loading" title="有效登录数(省直单位)" :total="this.sydwyxdls">
+          <div style="cursor:pointer" @click="handleYxdl(3)">
+          <chart-card :loading="loading" title="有效登录数(省直单位)" :icon="'red'" :number="this.sydwyxdls">
             <a-tooltip title="指标说明" slot="action">
               <a-icon type="info-circle-o" />
             </a-tooltip>
@@ -298,8 +300,8 @@
           </div>
         </a-col>
         <a-col v-show="this.show" :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }" class="sbdks">
-          <div  style="cursor:pointer" @click="handleSbdks('qcsb-QcSsgqzysytdqkList-list7')">
-            <chart-card :loading="loading" title="上报地块数(省直单位)" :total="this.sydwsbdks">
+          <div  style="cursor:pointer" @click="handleSbdks(3)">
+            <chart-card :loading="loading" title="上报地块数(省直单位)" :icon="'green'" :number="this.sydwsbdks" :area="sydwsbdkmj">
               <a-tooltip title="指标说明" slot="action">
                 <a-icon type="info-circle-o" />
               </a-tooltip>
@@ -308,8 +310,8 @@
 
         </a-col>
         <a-col v-show="this.show" :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }" class="wshsl">
-          <div style="cursor:pointer" @click="handleWsh('qcsb-QcSsgqzysytdqkList-list6')">
-          <chart-card  :loading="loading" title="未审核地块数(省直单位)" :total="this.sydwwsh">
+          <div style="cursor:pointer" @click="handleWsh(1)">
+          <chart-card  :loading="loading" title="未审核地块数(省直单位)" :icon="'purple'" :number="this.sydwwsh" :area="sydwwshmj">
             <a-tooltip title="指标说明" slot="action">
               <a-icon type="info-circle-o" />
             </a-tooltip>
@@ -470,7 +472,9 @@
        sydwxfrws:'',//下发任务数
        sydwyxdls:'',//有效登录数
        sydwsbdks:'',//上报地块数
+        sydwsbdkmj:'',//上报地块面积
         sydwwsh:'',//未审核数量
+        sydwwshmj:'',//未审核面积
         sydwyhjs:'',//用戶角色
         showDqsbs:true,
         show:false,
@@ -545,8 +549,9 @@
       clearInterval(this.time)
     },
     methods: {
-      handleYxdl(view){
-        this.$router.push({name:'qcsb.qyxx-qcQyxx-'+view})
+      // 有效登录数跳转
+      handleYxdl(index){
+        this.$router.push({path: '/enterpriseInfo/enterAudit', query: {index : index}})
       },
       onClose(){
         this.showCallCenter=false;
@@ -563,9 +568,11 @@
       handleRouter2(){
         this.$router.push({path:'/land/landInfo'})
       },
-      handleSbdks(view){
-        this.$router.push({name:view})
+      // 上报地块数
+      handleSbdks(index){
+        this.$router.push({path:'/land/landAudit', query: {index : index}})
       },
+      // 下发任务数
       handleXfrws(orgCode){
         if (JSON.stringify(this.$store.state.permission.routers[6]).includes('isystem-user')) {
           this.$router.push({name:'isystem-user',query:{orgCode: orgCode}})
@@ -577,8 +584,9 @@
           });
         }
       },
-      handleWsh(view){
-        this.$router.push({name:view})
+      // 未审核
+      handleWsh(index){
+        this.$router.push({path:'/land/landAudit', query: {index : index}})
       },
       handleAdd2(){
         this.$router.push({path:'/land/landInfo'})
@@ -697,7 +705,7 @@
 
       },
       selectsydw(){
-
+        // todo: 上报地块面积，未审核面积
         getAction("/qcsb.qyxx/qcQyxx/sydw").then(res=>{
           if(res.code==200){
             for (let i = 0; i <res.result1.length; i++) {
@@ -706,6 +714,8 @@
               this.sydwsbdks=res.result1[2];//上报地块数
               this.sydwwsh=res.result1[3];//未审核数量
               this.sydwyhjs=res.result1[4];//用戶角色
+              this.sydwsbdkmj=res.result1[5];//上报地块数
+              this.sydwwshmj=res.result1[6];//未审核数量
             }
           }
         })
@@ -728,7 +738,6 @@
             }
           }
         })
-        debugger
 
       },
       selectsydwShzt(){
@@ -807,6 +816,8 @@
   }
   .chart-card-header{
     text-align: center;
+    display: flex;
+    justify-content: space-evenly;
   }
   .extra-wrapper {
     line-height: 55px;

src/views/enterpriseInfo/enterAudit.vue

@@ -49,8 +49,9 @@ export default {
   },
   created() {
     this.menus = this.$store.state.menu.menuList['dwsh'];
-    this.defaultValue = this.menus.length > 0 ? this.menus[0].value : '';
-    console.log("landInfo...", this.menus);
+    let menuIndex = this.$route.params.index != undefined ? (this.menus.length > this.$route.params.index ? this.$route.params.index : 0) : 0;
+    console.log("enterAudit...menuIndex", menuIndex);
+    this.defaultValue = this.menus.length > 0 ? this.menus[menuIndex].value : '';
   },
   methods: {
     changeContent(key) {

src/views/infoSearch/infoSearch.vue

@@ -14,9 +14,9 @@
       <!--省直单位信息管理-->
       <depart-info v-show="'szdwxxgl' == defaultValue"></depart-info>
       <!--省属企业地块管理-->
-      <company-land v-show="'ssqydkgl' == defaultValue"></company-land>
+      <company-land v-show="'ssqydkgl' == defaultValue" :year-list="yearList"></company-land>
       <!--省直单位地块管理-->
-      <depart-land v-show="'szdwdkgl' == defaultValue"></depart-land>
+      <depart-land v-show="'szdwdkgl' == defaultValue" :year-list="yearList"></depart-land>
 
     </a-card>
   </div>
@@ -28,8 +28,7 @@ import companyInfo from '../qcsb/qyxx/QcQyxxList_gly.vue'
 import departInfo from '../sydwqcsb/sydwxx/QcQyxxList_glyy.vue'
 import companyLand from '../qcsb/QcSsgqzysytdqkList_gly.vue'
 import departLand from '../sydwqcsb/QcSsgqzysytdqkList_glyy.vue'
-
-
+import {getyear} from '@/api/api'
 
 export default {
   name: 'landInfo',
@@ -45,18 +44,27 @@ export default {
     return {
       defaultValue: '',
       menus: [],
-
+      yearList: [],
     }
   },
   created() {
     this.menus = this.$store.state.menu.menuList['xxcx'];
     this.defaultValue = this.menus.length > 0 ? this.menus[0].value : '';
-    console.log("landInfo...", this.menus);
+    this.getYear();
   },
   methods: {
     changeContent(key) {
       console.log(key);
     },
+    getYear() {
+      getyear().then((res) => {
+        if (res.success) {
+          this.yearList = res.result;
+          console.table(this.yearList);
+        }
+      })
+    }
+
   }
 
 }

src/views/land/landAudit.vue

@@ -14,9 +14,9 @@
       <!--省直单位地块待审核-->
       <depart-land-audit v-show="'szdwdkdsh' == defaultValue"></depart-land-audit>
       <!--省属企业地块已审核-->
-      <company-land-approved v-show="'ssqydkysh' == defaultValue"></company-land-approved>
+      <company-land-approved v-show="'ssqydkysh' == defaultValue" :year-list="yearList"></company-land-approved>
       <!--省直单位地块已审核-->
-      <depart-land-approved v-show="'szdwdkysh' == defaultValue"></depart-land-approved>
+      <depart-land-approved v-show="'szdwdkysh' == defaultValue" :year-list="yearList" ></depart-land-approved>
 
     </a-card>
   </div>
@@ -28,8 +28,7 @@ import companyLandAudit from '../qcsb/QcSsgqzysytdqkList1.vue'
 import departLandAudit from '../sydwqcsb/QcSsgqzysytdqkList1.vue'
 import companyLandApproved from '../qcsb/QcSsgqzysytdqkList2.vue'
 import departLandApproved from '../sydwqcsb/QcSsgqzysytdqkList2.vue'
-
-
+import {getyear} from '@/api/api'
 
 export default {
   name: 'landAudit',
@@ -39,24 +38,34 @@ export default {
     companyLandApproved,
     departLandApproved,
 
-
   },
   data() {
     return {
       defaultValue: '',
       menus: [],
-
+      yearList: [],
     }
   },
   created() {
     this.menus = this.$store.state.menu.menuList['dksh'];
-    this.defaultValue = this.menus.length > 0 ? this.menus[0].value : '';
-    console.log("landInfo...", this.menus);
+    let menuIndex = this.$route.query.index != undefined ? (this.menus.length > this.$route.query.index ? this.$route.query.index : 0) : 0;
+    console.log("landAudit...menuIndex", menuIndex);
+    this.defaultValue = this.menus.length > 0 ? this.menus[menuIndex].value : '';
+    this.getYear();
   },
   methods: {
     changeContent(key) {
       console.log(key);
     },
+    getYear() {
+      getyear().then((res) => {
+        if (res.success) {
+          this.yearList = res.result;
+          console.table(this.yearList);
+        }
+      })
+    }
+
   }
 
 }

src/views/qcsb/QcSsgqzysytdqkList.vue

@@ -20,7 +20,7 @@
               <a-input placeholder="请输入文件编号" v-model="queryParam.wjbh"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="5" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :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>
@@ -31,7 +31,7 @@
                 <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="24">
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否上报">
                 <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
               </a-form-item>

src/views/qcsb/QcSsgqzysytdqkList1.vue

@@ -48,11 +48,6 @@
               </a-form-item>
             </a-col>
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="一级单位">
-                <j-dict-select-tag placeholder="请选择一级单位" v-model="queryParam.sysOrgCode" dictCode="yjdw"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="土地使用权人">
                 <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
               </a-form-item>
@@ -63,6 +58,11 @@
               </a-form-item>
             </a-col>
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="一级单位">
+                <j-dict-select-tag placeholder="请选择一级单位" v-model="queryParam.sysOrgCode" dictCode="yjdw"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="审核结果">
                 <j-dict-select-tag placeholder="请选择是否通过审核" v-model="queryParam.shzt" dictCode="shzt"/>
               </a-form-item>

src/views/qcsb/QcSsgqzysytdqkList2.vue

@@ -14,11 +14,6 @@
               <a-input placeholder="请输入地块名称" v-model="queryParam.dk"></a-input>
             </a-form-item>
           </a-col>
-          <a-col v-has="'Query:xzqh'" :xl="5" :lg="7" :md="8" :sm="24">
-            <a-form-item label="行政区划">
-              <j-area-linkage type="cascader" v-model="queryParam.xzqh" placeholder="请输入省市区"/>
-            </a-form-item>
-          </a-col>
           <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="文件编号">
               <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
@@ -35,11 +30,9 @@
                 <j-dict-select-tag placeholder="请选择文件类型" v-model="queryParam.wjlx" dictCode="wjlx"/>
               </a-form-item>
             </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="使用方式">
-                <j-multi-select-tag type='list_multi' v-model='queryParam.syqsyfs' dictCode='syqsyfs'
-                                    placeholder='请选择使用权使用方式'/>
-                <!--              <j-dict-select-tag type='list' v-model='queryParam.syqsyfs' dictCode='syqsyfs' placeholder='请选择使用权使用方式'/>-->
+            <a-col v-has="'Query:xzqh'" :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="行政区划">
+                <j-area-linkage type="cascader" v-model="queryParam.xzqh" placeholder="请输入省市区"/>
               </a-form-item>
             </a-col>
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
@@ -58,6 +51,13 @@
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="24">
+              <a-form-item label="使用方式">
+                <j-multi-select-tag type='list_multi' v-model='queryParam.syqsyfs' dictCode='syqsyfs'
+                                    placeholder='请选择使用权使用方式'/>
+                <!--              <j-dict-select-tag type='list' v-model='queryParam.syqsyfs' dictCode='syqsyfs' placeholder='请选择使用权使用方式'/>-->
+              </a-form-item>
+            </a-col>
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="审核结果">
                 <j-dict-select-tag placeholder="请选择是否通过审核" v-model="queryParam.shzt" dictCode="shzt"/>
               </a-form-item>
@@ -67,6 +67,16 @@
                 <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
               </a-form-item>
             </a-col>
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="入库年份">
+                <a-select v-model="queryParam.year" placeholder="请选择入库年份">
+                  <a-select-option :value="undefined">请选择</a-select-option>
+                  <a-select-option v-for="item in yearList" :key="item" :value="item">
+                    {{item}}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
           </template>
           <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -164,11 +174,17 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import QcSsgqzysytdqkModal from './modules/QcSsgqzysytdqkModal1'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-  import { loadCategoryData } from '@/api/api'
+  import { loadCategoryData, getyear } from '@/api/api'
 
   export default {
     name: 'QcSsgqzysytdqkList',
     mixins:[JeecgListMixin, mixinDevice],
+    props: {
+      yearList: {
+        type: Array,
+        required: true
+      }
+    },
     components: {
       QcSsgqzysytdqkModal
     },
@@ -291,7 +307,7 @@
         fieldList.push({type:'string',value:'xgwj',text:'附件材料',dictCode:''})
         fieldList.push({type:'int',value:'sfsb',text:'是否上报',dictCode:'xxsbzt'})
         this.superFieldList = fieldList
-      }
+      },
     }
   }
 </script>

src/views/qcsb/QcSsgqzysytdqkList4.vue

@@ -19,8 +19,8 @@
               <a-input placeholder="请输入文件编号" v-model="queryParam.wjbh"></a-input>
             </a-form-item>
           </a-col>
-<!--          <template v-if="toggleSearchStatus">-->
-          <a-col :xl="5" :lg="7" :md="8" :sm="24">
+          <template v-if="toggleSearchStatus">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="是否上报">
               <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
             </a-form-item>
@@ -30,15 +30,15 @@
               <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
             </a-form-item>
           </a-col>
-<!--          </template>-->
+          </template>
           <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-<!--              <a @click="handleToggleSearch" style="margin-left: 8px">
+              <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>-->
+              </a>
             </span>
           </a-col>
         </a-row>

src/views/qcsb/QcSsgqzysytdqkList_gly.vue

@@ -56,7 +56,7 @@
               </a-form-item>
             </a-col>
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item :label="toggleSearchStatus ? '使用方式' : '使用权使用方式'">
+              <a-form-item :label="'取得方式'">
                 <j-multi-select-tag type='list_multi' v-model='queryParam.syqsyfs' dictCode='syqsyfs'
                                     placeholder='请选择使用权使用方式'/>
                 <!--              <j-dict-select-tag type='list' v-model='queryParam.syqsyfs' dictCode='syqsyfs' placeholder='请选择使用权使用方式'/>-->
@@ -68,13 +68,23 @@
               </a-form-item>
             </a-col>
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="使用权人">
-                <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
+              <a-form-item label="审核结果">
+                <j-dict-select-tag placeholder="请选择是否通过审核" v-model="queryParam.shzt" dictCode="shzt"/>
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="24">
-              <a-form-item label="审核结果">
-                <j-dict-select-tag placeholder="请选择是否通过审核" v-model="queryParam.shzt" dictCode="shzt"/>
+              <a-form-item label="入库年份">
+                <a-select v-model="queryParam.year" placeholder="请选择入库年份">
+                  <a-select-option :value="undefined">请选择</a-select-option>
+                  <a-select-option v-for="item in yearList" :key="item" :value="item">
+                    {{item}}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="土地使用权人">
+                <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
               </a-form-item>
             </a-col>
           </template>
@@ -195,6 +205,12 @@ import JAreaSelect from "@comp/jeecg/JAreaSelect";
 export default {
   name: 'QcSsgqzysytdqkList',
   mixins: [JeecgListMixin, mixinDevice],
+  props: {
+    yearList: {
+      type: Array,
+      required: true
+    }
+  },
   components: {
     QcSsgqzysytdqkModal,
     listTable,

src/views/qcsb/qyxx/QcQyxxList.vue

@@ -4,28 +4,28 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row v-has="'cont:cxl'"  :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="用地单位名称">
-              <a-input placeholder="请输入用地单位名称" v-model="queryParam.qymc"></a-input>
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            <a-form-item label="单位名称">
+              <a-input placeholder="请输入单位名称" v-model="queryParam.qymc"></a-input>
             </a-form-item>
           </a-col>
-         <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+         <!-- <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业类型">
               <j-dict-select-tag placeholder="请输入企业类型" dict-code="qylx" v-model="queryParam.qylx" ></j-dict-select-tag>
               &lt;!&ndash;<a-input placeholder="请输入企业类型" v-model="queryParam.qymc"></a-input>&ndash;&gt;
             </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.sfsjtdzc" dictCode="sfsjtdzc"/>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="是否上报">
               <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="是否涉及省内土地资产">
+              <j-dict-select-tag placeholder="请选择是否涉及省内土地资产" v-model="queryParam.sfsjtdzc" dictCode="sfsjtdzc"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="5" :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>

src/views/sydwqcsb/QcSsgqzysytdqkList2.vue

@@ -61,6 +61,16 @@
                 <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
               </a-form-item>
             </a-col>
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="入库年份">
+                <a-select v-model="queryParam.year" placeholder="请选择入库年份">
+                  <a-select-option :value="undefined">请选择</a-select-option>
+                  <a-select-option v-for="item in yearList" :key="item" :value="item">
+                    {{item}}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
           </template>
           <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -166,6 +176,12 @@ import JAreaSelect from "@comp/jeecg/JAreaSelect";
 export default {
   name: 'QcSsgqzysytdqkList',
   mixins: [JeecgListMixin, mixinDevice],
+  props: {
+    yearList: {
+      type: Array,
+      required: true
+    }
+  },
   components: {
     QcSsgqzysytdqkModal,
     JAreaSelect

src/views/sydwqcsb/QcSsgqzysytdqkList4.vue

@@ -19,8 +19,8 @@
               <a-input placeholder="请输入文件编号" v-model="queryParam.wjbh"></a-input>
             </a-form-item>
           </a-col>
-<!--          <template v-if="toggleSearchStatus">-->
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="4" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否上报">
                 <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
               </a-form-item>
@@ -30,15 +30,15 @@
                 <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
               </a-form-item>
             </a-col>
-<!--          </template>-->
+          </template>
           <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-<!--              <a @click="handleToggleSearch" style="margin-left: 8px">
+              <a @click="handleToggleSearch" style="margin-left: 8px">
                 {{ toggleSearchStatus ? '收起' : '展开' }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>-->
+              </a>
             </span>
           </a-col>
         </a-row>

src/views/sydwqcsb/QcSsgqzysytdqkList_glyy.vue

@@ -62,20 +62,30 @@
               </a-form-item>
             </a-col>
             <a-col :xl="5" :lg="7" :md="8" :sm="24">
-              <a-form-item label="使用权人">
-                <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="使用现状">
                 <j-dict-select-tag type='list' v-model='queryParam.tdsyxz' dictCode='tdsyxz' placeholder='请选择土地使用现状' />
               </a-form-item>
             </a-col>
-            <a-col :xl="4" :lg="7" :md="8" :sm="24">
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
               <a-form-item label="是否上报">
                 <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
               </a-form-item>
             </a-col>
+            <a-col :xl="4" :lg="7" :md="8" :sm="24">
+              <a-form-item label="入库年份">
+                <a-select v-model="queryParam.year" placeholder="请选择入库年份">
+                  <a-select-option :value="undefined">请选择</a-select-option>
+                  <a-select-option v-for="item in yearList" :key="item" :value="item">
+                    {{item}}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="土地使用权人">
+                <a-input placeholder="请输入土地使用权人" v-model="queryParam.tdsyqr"></a-input>
+              </a-form-item>
+            </a-col>
           </template>
           <a-col :xl="3" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -193,6 +203,12 @@
   export default {
     name: 'QcSsgqzysytdqkList',
     mixins:[JeecgListMixin, mixinDevice],
+    props: {
+      yearList: {
+        type: Array,
+        required: true
+      }
+    },
     components: {
       QcSsgqzysytdqkModal,
       JAreaSelect,

src/views/sydwqcsb/sydwxx/QcQyxxList.vue

@@ -4,12 +4,12 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row v-show=this.dl :gutter="24">
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="用地单位名称">
-              <a-input placeholder="请输入用地单位名称" v-model="queryParam.qymc"></a-input>
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
+            <a-form-item label="单位名称">
+              <a-input placeholder="请输入单位名称" v-model="queryParam.qymc"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业类型">
               <j-dict-select-tag placeholder="请输入企业类型" dict-code="qylx" v-model="queryParam.qylx" ></j-dict-select-tag>
               <!--<a-input placeholder="请输入企业类型" v-model="queryParam.qymc"></a-input>-->
@@ -20,7 +20,7 @@
               <j-dict-select-tag placeholder="请选择是否涉及省内土地资产" v-model="queryParam.sfsjtdzc" dictCode="sfsjtdzc"/>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="5" :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>