修改

dsk-operate-ui/src/router/index.js

@@ -70,7 +70,7 @@ export const constantRoutes = [
         path: 'index',
         component: () => import('@/views/index'),
         name: 'Index',
-        meta: { title: '首页', icon: 'index',noCache: true }
+        meta: { title: '首页', icon: 'index',noCache: false }
       }
     ]
   },

dsk-operate-ui/src/views/component/CustomMoneySelect.vue

@@ -51,6 +51,10 @@ export default {
       type: String,
       default: '请选择'
     },
+    'moneyValue': {
+      type: String,
+      default: ''
+    },
     'ref-str': {
       type: String,
       default: `timeselect${String(Math.random(0, 100)).slice(2)}`,
@@ -92,6 +96,9 @@ export default {
     if(this.moneyList&&this.moneyList.length>0){
       this.options = this.moneyList
     }
+    if(this.moneyValue){
+      this.value = this.moneyValue
+    }
   },
   destroyed() {
     const app = document.getElementById('app')

dsk-operate-ui/src/views/component/CustomTimeSelect.vue

@@ -46,6 +46,10 @@ export default {
       type: String,
       default: '请选择',
     },
+    'timeValue': {
+      type: String,
+      default: '',
+    },
     'ref-str': {
       type: String,
       default: `timeselect${String(Math.random(0, 100)).slice(2)}`,
@@ -106,6 +110,9 @@ export default {
     if(this.dateTo){
       this.defaultValue = new Date(this.dateTo)
     }
+    if(this.timeValue){
+      this.value = this.timeValue
+    }
     this.handleAppClick()
     if(this.timeList&&this.timeList.length>0){
       this.options = this.timeList

dsk-operate-ui/src/views/detail/party-a/overview/holderinfo.vue

@@ -33,6 +33,9 @@
       <template slot="stockPercent" slot-scope="scope">
         <span>{{scope.row.stockPercent?parseFloat(Number(scope.row.stockPercent*100).toFixed(4))+'%':'--'}}</span>
       </template>
+      <template slot="shouldCapiConv" slot-scope="scope">
+        <span>{{scope.row.shouldCapiConv === '0.00万元人民币'? '--':scope.row.shouldCapiConv}}</span>
+      </template>
     </tables>
   </div>
 </template>
@@ -56,7 +59,7 @@ export default {
       forData: [
         {label: '发起人/股东', prop: 'stockName', minWidth: '230', slot: true},
         {label: '持股比例', prop: 'stockPercent', slot: true},
-        {label: '认缴出资', prop: 'shouldCapiConv'},
+        {label: '认缴出资', prop: 'shouldCapiConv', slot: true},
         {label: '实缴出资额', prop: 'realCapi'},
         {label: '认缴出资日期', prop: 'conDate'},
         {label: '参股日期', prop: 'realCapiDate', width: '150'}

dsk-operate-ui/src/views/index.vue

@@ -73,6 +73,7 @@
                   <custom-time-select
                     :timeList="timeList"
                     v-model="queryParams.time"
+                    timeValue="近七天"
                     placeholder="中标日期"
                     @handle-search="changeSelect1"/>
                 </el-form-item>
@@ -140,6 +141,7 @@
                   <custom-time-select
                     :timeList="timeList"
                     v-model="queryParams1.time"
+                    timeValue="近七天"
                     placeholder="中标日期"
                     @handle-search="changeSelect2"/>
                 </el-form-item>
@@ -188,7 +190,7 @@
                 <div class="list-content">
                   <p class="list-content-text">
                     <span>中标企业：</span>
-                    <span>{{item.ename || '--'}}</span>
+                    <span><router-link :to="`/enterprise/${encodeStr(item.jskEid)}`" tag="a" class="a-link companyName" v-html="item.ename" ></router-link></span>
                   </p>
                   <p class="list-content-text">
                     <span>中标金额：</span>
@@ -205,7 +207,7 @@
                 </div>
               </div>
             </div>
-            <div class="pagination-box" v-if="totalCount>queryParams2.pageSize && !zxzbIsSkeleton">
+            <div class="pagination-box" v-if="show_page && totalCount>queryParams2.pageSize && !zxzbIsSkeleton">
               <el-pagination background :current-page="queryParams2.pageNum" :page-size="queryParams2.pageSize" :total="totalCount" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
             </div>
           </el-tab-pane>
@@ -213,7 +215,7 @@
             <skeleton v-if="zhaobiaoIsSkeleton" style="padding: 16px"></skeleton>
             <div v-if="!zhaobiaoIsSkeleton" class="list">
               <div class="item" v-for="(item,index) in zbList" :key="index">
-                <p class="list-title"><router-link :to="`/biddetail/${item.id}`" tag="a" class="a-link" v-if="item.id" v-html="item.projectName"></router-link></p>
+                <p class="list-title"><router-link :to="`/radar/Notice/details/${item.id}`" tag="a" class="a-link" v-if="item.id" v-html="item.projectName"></router-link></p>
                 <div class="list-content">
                   <p class="list-content-text">
                     <span>总投资：</span>
@@ -230,7 +232,7 @@
                 </div>
               </div>
             </div>
-            <div class="pagination-box" v-if="zbTableTotal>queryParams2.pageSize && !zhaobiaoIsSkeleton">
+            <div class="pagination-box" v-if="show_page && zbTableTotal>queryParams2.pageSize && !zhaobiaoIsSkeleton">
               <el-pagination background :current-page="queryParams2.pageNum" :page-size="queryParams2.pageSize" :total="zbTableTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
             </div>
           </el-tab-pane>
@@ -241,6 +243,7 @@
               <custom-money-select
                 :moneyList="moneyList"
                 v-model="amount"
+                moneyValue="2亿以上"
                 :placeholder="placeholder"
                 @handle-search="changeSelect3" />
             </el-form-item>
@@ -258,6 +261,7 @@
               <custom-time-select
                 :timeList="timeList"
                 v-model="queryParams2.time"
+                timeValue="近七天"
                 placeholder="中标日期"
                 @handle-search="changeSelect3"/>
             </el-form-item>
@@ -682,6 +686,8 @@ export default {
       dxmzbState:true,
       zhaobiaoIsSkeleton:true,
       placeholder:'中标金额',
+      show_page:true,
+      MaxPage:500,
     };
   },
   created() {
@@ -719,11 +725,11 @@ export default {
           this.jtzbList=res.data;
           if(this.jtzbList.length > 0){
             this.initChart(this.jtzbList)
-            setTimeout(() => {
-              this.$nextTick(() => {
-                this.$refs.tableRef.bodyWrapper.scrollTop = 0
-              });
-            }, 500);
+            // setTimeout(() => {
+            //   this.$nextTick(() => {
+            //     this.$refs.tableRef.bodyWrapper.scrollTop = 0
+            //   });
+            // }, 500);
           }
 
         }
@@ -796,6 +802,10 @@ export default {
           this.projectList=res.data.list;
           this.totalCount=res.data.total;
         }
+        // window.scrollTo({
+        //   top: 600,
+        //   behavior: 'smooth' // 滚动行为：smooth平滑滚动，instant瞬间滚动，默认值auto，等同于instant
+        // })
       })
     },
     getBigBidPage(){
@@ -1325,17 +1335,24 @@ export default {
       }
     },
     handleCurrentChange(val){
-      this.queryParams2.pageNum = val
-      if(this.activeName === 'first'){
-        this.getBigWinningBidsPage()
-      }
-      if(this.activeName === 'second'){
-        this.getBigBidPage()
+      if(this.MaxPage<val){
+        this.show_page = false
+        this.$nextTick(() => {
+          this.queryParams2.pageNum = 1
+          this.$message.warning(`对不起，最多只能访问${this.MaxPage}页`)
+          this.show_page = true
+        })
+      }else {
+        this.queryParams2.pageNum = val
+        if(this.activeName === 'first'){
+          this.getBigWinningBidsPage()
+        }
+        if(this.activeName === 'second'){
+          this.getBigBidPage()
+        }
+        this.jump()
       }
-      window.scrollTo({
-        top: 600,
-        behavior: 'smooth' // 滚动行为：smooth平滑滚动，instant瞬间滚动，默认值auto，等同于instant
-      })
+
     },
     handleSizeChange(val){
       this.queryParams2.pageNum = 1
@@ -1362,6 +1379,56 @@ export default {
 
       });
     },
+    jump() {
+      // 用 class="d_jump" 添加锚点
+      // var jump = document.querySelector('.data_list')
+      // if (!jump) {
+      //   jump = document.querySelector('.bottom-toolbar')
+      // }
+      // if (!jump) {
+      //   var jump = document.querySelector('.bg_corl_chaxun')
+      // }
+      // if (!jump) {
+      //   return false
+      // }
+
+      let total = 500
+      let distance = document.documentElement.scrollTop || document.body.scrollTop
+      // 平滑滚动，时长500ms，每10ms一跳，共50跳
+      let step = total / 50
+      if (total > distance) {
+        smoothDown()
+      } else {
+        let newTotal = distance - total
+        step = newTotal / 50
+        smoothUp()
+      }
+
+      function smoothDown() {
+
+        if (distance < total) {
+          distance += step
+          document.body.scrollTop = distance
+          document.documentElement.scrollTop = distance
+          setTimeout(smoothDown, 10)
+        } else {
+          document.body.scrollTop = total
+          document.documentElement.scrollTop = total
+        }
+      }
+
+      function smoothUp() {
+        if (distance > total) {
+          distance -= step
+          document.body.scrollTop = distance
+          document.documentElement.scrollTop = distance
+          setTimeout(smoothUp, 10)
+        } else {
+          document.body.scrollTop = total
+          document.documentElement.scrollTop = total
+        }
+      }
+    },
   }
 };
 </script>
@@ -1634,12 +1701,12 @@ export default {
           margin: 0 16px;
           .item{
             border-bottom: 1px solid #EFEFEF;
-            padding: 16px 0;
+            padding: 13px 0;
             .list-title{
               font-size: 16px;
               font-weight: 700;
               color: #3D3D3D;
-              line-height: 23px;
+              line-height: 20px;
               cursor: pointer;
               .list-titel-a{
                 text-decoration: none;
@@ -1653,7 +1720,7 @@ export default {
               }
             }
             .list-content {
-              margin-top: 16px;
+              margin-top: 12px;
               display: flex;
               justify-content: start;
               align-items: center;
@@ -1682,9 +1749,13 @@ export default {
 
               }
             }
+
           }
         }
       }
+      .pagination-box{
+        padding: 16px;
+      }
       ::v-deep .selectTag{
         .el-select__tags{
           .el-tag{