分页

src/layout/components/Sidebar/index.vue

@@ -13,16 +13,16 @@
         mode="vertical"
         @select="handleSelect"
       >
-        <sidebar-item v-for="route in routes" :key="route.path" :item="route" :base-path="route.path" />
+        <sidebar-item v-for="(route,index) in routes" :key="index" :item="route" :base-path="route.path" />
         <el-submenu index="100">
           <template slot="title">
             <svg-icon icon-class="data" />
             <span slot="title" @mouseover="getGlobalInterface">数据中心</span>
           </template>
           <el-menu-item index="/data/upload-file">jar包管理</el-menu-item>
-          <el-submenu v-for="(myMenu,index) in menu" :key="myMenu.menuName" :index="'100-' + index">
+          <el-submenu v-for="(myMenu,index) in menu" :key="index" :index="'100-' + index">
             <template slot="title">{{ myMenu.menuName }}</template>
-            <el-menu-item v-for="(subMenu,index2) in myMenu.subMenus" :key="subMenu.path" :index="getIndex(index,index2)" @click="handleClick(subMenu)">{{ subMenu.subMenuName }}</el-menu-item>
+            <el-menu-item v-for="(subMenu,index2) in myMenu.subMenus" :key="index2" :index="getIndex(index,index2)" @click="handleClick(subMenu)">{{ subMenu.subMenuName }}</el-menu-item>
           </el-submenu>
         </el-submenu>
       </el-menu>

src/views/projectManage/projectList/projectListIndex.vue

@@ -87,7 +87,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <el-pagination background style="margin-top:30px;" align="center" :current-page="curIndex" :page-size="pageSize" layout="prev, pager, next" :total="total" @current-change="handleCurrentChange" />
+          <el-pagination background style="margin-top:30px;" align="center" :current-page="curIndex" :page-size="pageSize" layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
         </div>
       </div>
     </div>
@@ -111,7 +111,7 @@ export default {
       },
       queryListData: {},
       curIndex: 1,
-      pageSize: 20,
+      pageSize: 10,
       total: 0,
       pauseJumpData: {},
       dialogVisible: false,
@@ -169,8 +169,10 @@ export default {
       queryCode.bizId = localStorage.getItem('key')
       queryCode.pageSize = this.pageSize
       queryCode.curIndex = this.curIndex
+      this.emptyJudge(queryCode)
       projectInit(queryCode).then(res => {
         res.code === 200 ? this.list = res.data : this.errorFun(res.msg)
+        this.total = res.total
       })
     },
     // 业务线数据获取
@@ -214,6 +216,7 @@ export default {
       queryCode.bizId = localStorage.getItem('key')
       queryCode.pageSize = this.pageSize
       queryCode.curIndex = this.curIndex
+      this.emptyJudge(queryCode)
       projectInit(queryCode).then(res => {
         res.code === 200 ? this.list = res.data : this.errorFun(res.msg)
       })
@@ -230,6 +233,14 @@ export default {
         this.$router.push({ path: '/Platform/presentation/Acceptance', query: { projectId: scope }}) // 服务端
       }
     },
+    // 接口不接受空值处理
+    emptyJudge(obj) {
+      for (const key in obj) {
+        if (obj[key] === '') {
+          delete obj[key]
+        }
+      }
+    },
     // 任务创建
     changeaddTaskData(scope) {
       this.$router.push({ name: '任务创建', query: { id: scope.id }})

src/views/projectManage/taskList/taskListIndex.vue

@@ -90,7 +90,7 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-pagination background style="margin-top:30px;" align="center" :current-page="curIndex" :page-size="pageSize" layout="prev, pager, next" :total="total" @current-change="handleCurrentChange" />
+              <el-pagination background style="margin-top:30px;" align="center" :current-page="curIndex" :page-size="pageSize" layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
             </div>
           </el-tab-pane>
           <el-tab-pane label="看板" name="second">
@@ -192,7 +192,7 @@
                       <div class="set-reverse">
                         <span>ID :&nbsp;{{ item.id }}</span>
                         <div class="center">
-                          <span>{{ item.group }}</span>
+                          <span>{{ item.groupName }}</span>
                         </div>
                       </div>
                     </div>
@@ -301,7 +301,7 @@ export default {
       queryCode: {},
       loadingOnlineProcess: false,
       curIndex: 1,
-      pageSize: 20,
+      pageSize: 10,
       total: 0,
       totalKanBan: 0,
       pauseTarget: '',
@@ -364,21 +364,20 @@ export default {
       queryCode.bizId = localStorage.getItem('key')
       queryCode.pageSize = this.pageSize
       queryCode.curIndex = this.curIndex
-      for (const key in queryCode) { // 接口不接受空值的处理
-        if (queryCode[key] === '') {
-          delete queryCode[key]
-        }
-      }
+      this.emptyJudge(queryCode)
       taskListGet(queryCode).then(res => {
         res.code === 200 ? this.tableData = res.data : this.errorFun(res.msg)
+        this.total = res.total
       })
     },
-    dataQueryInSearch(queryCode) {
-      queryCode.bizId = localStorage.getItem('key')
-      queryCode.pageSize = this.pageSize
-      queryCode.curIndex = this.curIndex
-      taskListGet(queryCode).then(res => {
+    dataQueryInSearch() {
+      this.form.bizId = parseInt(localStorage.getItem('key'))
+      this.form.pageSize = this.pageSize
+      this.form.curIndex = this.curIndex
+      this.emptyJudge(this.form)
+      taskListGet(this.form).then(res => {
         res.code === 200 ? this.tableData = res.data : this.errorFun(res.msg)
+        this.total = res.total
       })
     },
     createdCode() {
@@ -717,11 +716,7 @@ export default {
     },
     // 看板查询
     kanBanQuery(e) {
-      for (const key in e) {
-        if (e[key] === '') {
-          delete e[key]
-        }
-      }
+      this.emptyJudge(e)
       e.bizId = this.bizJson
       this.loadingOnlineProcess = true
       listMap(e).then((res) => {
@@ -729,6 +724,14 @@ export default {
         this.loadingOnlineProcess = false
       })
     },
+    // 接口不接受空值处理
+    emptyJudge(obj) {
+      for (const key in obj) {
+        if (obj[key] === '') {
+          delete obj[key]
+        }
+      }
+    },
     // 看板跳转
     jumpToReport(id) {
       this.$router.push({ name: '任务查看', query: { id: id }})