wenbobowen %!s(int64=4) %!d(string=hai) anos
pai
achega
6a023a53d9

+ 2 - 2
src/components/input/normalArea.vue

@@ -132,10 +132,10 @@ export default {
   .changeSizeBtn {
     position: absolute;
     top: 3px;
-    right: 4px;
+    right: 0px;
     z-index: 1000;
     height: 34px;
-    width: 34px;
+    width: 24px;
     text-align: center;
     line-height: 34px;
     border-radius: 3px;

+ 2 - 2
src/components/input/textArea.vue

@@ -178,10 +178,10 @@ export default {
   .changeSizeBtn {
     position: absolute;
     top: 3px;
-    right: 4px;
+    right: 0px;
     z-index: 1000;
     height: 34px;
-    width: 34px;
+    width: 24px;
     text-align: center;
     line-height: 34px;
     border-radius: 3px;

+ 3 - 3
src/components/newLayout/Aside.vue

@@ -210,7 +210,7 @@ section {
     }
   }
   .all-pages-list {
-    margin-top: 3px;
+    margin-top: 5px;
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -224,7 +224,7 @@ section {
     .page-item {
       width: 100%;
       white-space: nowrap;
-      padding: 5px 0 2px 27px;
+      padding: 5px 0 0px 27px;
       margin-bottom: 10px;
       cursor: pointer;
       svg {
@@ -236,7 +236,7 @@ section {
     }
     .cut-off {
       border-top: 1px solid #eeeeee;
-      margin: 10px 25px 20px 25px;
+      margin: 0px 25px 5px 25px;
     }
     .page-item:hover {
       background-color: rgba(64, 158, 255, 0.1);

+ 23 - 9
src/views/projectManage/requirement/list/index.vue

@@ -416,7 +416,9 @@ export default {
       demandDirection: [], // 需求方向option
       searchForm: {
         viewType: '0',
-        containStatus: [] // 包含
+        containStatus: [], // 包含
+        pageSize: 15,
+        curIndex: 1
       }, // 查询字段
       pageSize: 15,
       curIndex: 1,
@@ -509,9 +511,8 @@ export default {
       }
       this.searchForm.bizId = this.bizId
       this.loading = true
-
-      this.searchForm.pageSize = this.pageSize
-      this.searchForm.curIndex = this.curIndex
+      // this.searchForm.pageSize = this.pageSize
+      // this.searchForm.curIndex = this.curIndex
     },
     getTableData() { // 查询
       // if (this.bizId === -1) return
@@ -547,6 +548,7 @@ export default {
     },
     async get_chartListDetial(code) {
       if (code) {
+        this.searchForm.curIndex = 1
         this.searchForm.code = code
       }
       const dataList = await getChartListData(this.searchForm)
@@ -624,13 +626,25 @@ export default {
     },
     // 分页pageSize选择
     handleSizeChange(pageSize) {
-      this.pageSize = pageSize
-      this.getTableData()
+      // this.pageSize = pageSize
+      this.searchForm.pageSize = pageSize
+      // this.getTableData()
+      if (this.nowTab === 'charts') {
+        this.get_chartListDetial()
+      } else {
+        this.getTableData()
+      }
     },
     // 当前页选择
     handleCurrentChange(curIndex) {
-      this.curIndex = curIndex
-      this.getTableData()
+      // this.curIndex = curIndex
+      this.searchForm.curIndex = curIndex
+      // this.getTableData()
+      if (this.nowTab === 'charts') {
+        this.get_chartListDetial()
+      } else {
+        this.getTableData()
+      }
     },
     showSelect() {
       this.DetailedScreening = !this.DetailedScreening
@@ -697,7 +711,7 @@ export default {
         // this.getClient(filter.appId)
         Object.assign(this.searchForm, filter)
         // this.requirementName = filter.name
-        this.curIndex = 1
+        this.searchForm.curIndex = 1
         this.getTableData()
       }
     },

+ 1 - 0
src/views/projectManage/taskList/taskIndex.vue

@@ -507,6 +507,7 @@ export default {
     },
     async get_chartListDetial(code) {
       if (code) {
+        this.form_task.curIndex = 1
         this.form_task.code = code
       }
       const dataList = await getChartListData(this.form_task)

+ 1 - 1
src/views/workbench/components/searchSection.vue

@@ -16,7 +16,7 @@
     <div v-if="workbench === '个人' || workbench === '团队' || workbench === '个人忙碌' || workbench === '团队忙碌'" class="member-list">
       <div class="teamMember">类型:</div>
       <el-checkbox-group v-model="checkList" @change="getCheckList">
-        <el-checkbox :label="0" style="font-weight: 400;">排期</el-checkbox>
+        <el-checkbox :label="0" style="font-weight: 400;margin-right: 20px">排期</el-checkbox>
         <el-checkbox :label="1" style="font-weight: 400;">日程</el-checkbox>
       </el-checkbox-group>
     </div>