任务详情新增分页

src/api/api.js

@@ -23,8 +23,8 @@ export function apiGetModel(url, params) {
 //获取菜单数据
 export function apiGetMenuData() {
     return httpRequest({
-        // url: 'menu/menuList?parentId=10105', // 测试
-        url: 'menu/menuList?parentId=6802', // 生产
+        url: 'menu/menuList?parentId=10105', // 测试
+        // url: 'menu/menuList?parentId=6802', // 生产
         method: 'post'
     })
 }

src/api/permission.js

@@ -10,23 +10,23 @@ router.beforeEach((to, from, next) => {
     // next 是一个函数,代表放行
     document.title = `${to.meta.title} | 全业务域对标考评系统`
 
-    // let token = window.localStorage.getItem('token')
+    let token = window.localStorage.getItem('token')
 
-    // if(to.path==='/login'){
-    //     return next()
-    // }else{
-    //     if(!token){
-    //         ElMessage.error('登录已失效，请重新登录');
-    //         store.commit('clearAxiosArr')
-    //         return next('/login')
-    //     } else if (to.path==='/') {
-    //         store.commit('clearAxiosArr')
-    //         return next('/login')
-    //     } else{
-    //         store.commit('clearAxiosArr')
-    //         next()
-    //     }
-    // }
+    if(to.path==='/login'){
+        return next()
+    }else{
+        if(!token){
+            ElMessage.error('登录已失效，请重新登录');
+            store.commit('clearAxiosArr')
+            return next('/login')
+        } else if (to.path==='/') {
+            store.commit('clearAxiosArr')
+            return next('/login')
+        } else{
+            store.commit('clearAxiosArr')
+            next()
+        }
+    }
     
-    return next()
+    // return next()
 })

src/components/taskCenter/taskCenterEvlFrom.vue

@@ -73,7 +73,7 @@
                 </div>
                 <el-tabs v-model="activeName" class="tasktabs" @tab-click="handleClick">
                     <el-tab-pane label="考评指标项内容" name="first">
-                        <el-table :data="quantifiedList" style="width: 100%">
+                        <el-table :data="quantifiedList.slice((pageLeft.currentPage-1)*pageLeft.pagesize, pageLeft.currentPage*pageLeft.pagesize)" style="width: 100%">
                             <el-table-column type="index" label="序号" width="80" />
                             <el-table-column label="业务类别" prop="stageName" />
                             <el-table-column label="所属板块" prop="sectionName" />
@@ -102,9 +102,16 @@
                                 </template>
                             </el-table-column>
                         </el-table>
+                        <el-pagination
+                            @current-change="handleCurrentChangeLeft"
+                            :current-page="pageLeft.currentPage"
+                            :page-size="pageLeft.pagesize"
+                            layout="total, prev, pager, next, jumper"
+                            :total="pageLeft.total">
+                        </el-pagination>
                     </el-tab-pane>
                     <el-tab-pane label="考评评价指标内容" name="second">
-                        <el-table :data="nonQuantifiedList" style="width: 100%">
+                        <el-table :data="nonQuantifiedList.slice((pageRight.currentPage-1)*pageRight.pagesize, pageRight.currentPage*pageRight.pagesize)" style="width: 100%">
                             <el-table-column type="index" label="序号" width="80" />
                             <el-table-column label="单位名称" prop="organizationShortName" width="300">
                                 <template #default="scope">
@@ -210,6 +217,13 @@
                                 </template>
                             </el-table-column>
                         </el-table>
+                        <el-pagination
+                            @current-change="handleCurrentChangeRight"
+                            :current-page="pageRight.currentPage"
+                            :page-size="pageRight.pagesize"
+                            layout="total, prev, pager, next, jumper"
+                            :total="pageRight.total">
+                        </el-pagination>
                     </el-tab-pane>
                     <!-- $utils.havePurview('taskList:twoLevel:see') -->
                     <el-tab-pane label="查看得分" name="three">
@@ -277,6 +291,16 @@ export default {
                 year: '',
                 recStage: ''
             },
+            pageLeft:{
+                pagesize: 15,
+                currentPage: 1,
+                total: 0
+            },
+            pageRight:{
+                pagesize: 15,
+                currentPage: 1,
+                total: 0
+            },
             addIcon: addIcon,
             saveIcon: saveIcon,
             editIcon: editIcon,
@@ -414,7 +438,9 @@ export default {
                     recStage: '有效'
                 }
                 this.quantifiedList = item.map.quantifiedList
+                this.pageLeft.total = item.map.quantifiedList.length
                 this.nonQuantifiedList = item.map.nonQuantifiedList
+                this.pageRight.total = item.map.nonQuantifiedList.length
             }
         },
         changeOrgZa(val) {
@@ -662,6 +688,12 @@ export default {
                 fileSave(blob, `数据导出.xlsx`)
             })
         },
+        handleCurrentChangeLeft(val) {
+            this.pageLeft.currentPage = val
+        },
+        handleCurrentChangeRight(val) {
+            this.pageRight.currentPage = val
+        },
     }
 }
 </script>
@@ -794,8 +826,9 @@ export default {
                         }
                         
                         .el-table{
+                            margin-bottom: 10px;
                             .el-table__body-wrapper{
-                                height: 40vh !important;
+                                height: 38vh !important;
                             }
                             .el-table__row{
                                 .cell{

src/utils/baseUrl.js

@@ -17,8 +17,8 @@ switch (process.env.NODE_ENV) {
  
     case 'production': 
         // baseUrl.ROOT = "http://123.60.219.66:28800/"
-        // baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
-        baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
+        baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
+        // baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
         break 
 }