Merge branch 'http_test' of https://git.xiaojukeji.com/pu_qa_tool/thoth-frontend into http_test

src/views/dataBigManage/components/drawerModal/index.vue

@@ -210,7 +210,7 @@ export default {
       this.headerTitle = this.drawerData.headerTitle
       this.title = this.headerTitle.search(/质量|效率/) > -1 ? this.drawerData.label || '' : this.drawerData.activeLabel
       if (this.headerTitle && this.title) {
-        console.log(this.drawerData)
+        // console.log(this.drawerData)
         this.pagingInit()
         this.setPageSize()
         this.column = []
@@ -232,7 +232,7 @@ export default {
       const pageSize = window.localStorage.getItem('pageSize') || 10
       // this.paging.pageSize = pageSize
       const paging = _.cloneDeep(this.paging)
-      paging.pageSize = pageSize
+      paging.pageSize = Number.parseInt(pageSize)
       this.paging = _.cloneDeep(paging)
     },
     // 设置标题
@@ -383,7 +383,7 @@ export default {
       const paging = _.cloneDeep(this.paging)
       paging.curIndex = value
       this.paging = _.cloneDeep(paging)
-      console.log(this.title)
+      // console.log(this.title)
       if (this.headerTitle === '效率' && this.title !== '需求人力') {
         this.tableListPagination()
       } else {
@@ -474,7 +474,7 @@ export default {
     },
     // 设置列表数据
     setTableList() {
-      console.log(439)
+      // console.log(439)
       this.tableList = []
       if (this.headerTitle === '质量') {
         if (this.title.search(/新增缺陷|reopen/) > -1) {
@@ -622,7 +622,7 @@ export default {
       const res = await getProjectList({
         idList: this.ids.length ? this.ids : [],
         curIndex: this.paging.curIndex,
-        pageSize: 15
+        pageSize: this.paging.pageSize
       })
       if (res.code === 200) {
         // console.log(res)
@@ -715,7 +715,7 @@ export default {
       delete params.pageTotal
       const res = await getRequirePeopleData(params)
       if (res.code === 200) {
-        console.log(res.data)
+        // console.log(res.data)
         this.tableList = res.data
         // this.tableListOld = res.data.length && res.data.map(e => e)
         // this.tableListPagination()
@@ -803,19 +803,22 @@ export default {
     },
     // 分页
     tableListPagination() {
-      if (this.tableListOld.length && this.paging.curIndex - 1) {
-        this.tableList = this.tableListOld.map(e => e).splice((this.paging.curIndex - 1 || 0) * this.paging.pageSize, this.paging.pageSize)
-      } else {
-        this.tableList = this.tableListOld.map(e => e)
+      if (this.tableListOld.length) {
+        if (this.paging.curIndex - 1) {
+          this.tableList = this.tableListOld.map(e => e).splice((this.paging.curIndex - 1 || 0) * this.paging.pageSize, this.paging.pageSize)
+        } else {
+          this.tableList = this.tableListOld.map(e => e) || []
+        }
       }
     },
     /* E 效率：半浮层数据接口 */
     // 分页数据初始化
     pagingInit() {
+      const pageSize = window.localStorage.getItem('pageSize') || 10
       this.paging = {
         curIndex: 1,
         pageTotal: 0,
-        pageSize: 10
+        pageSize: Number.parseInt(pageSize)
       }
     },
     // 设置表格高度