fix: 分页查询

front/src/api/work.js

@@ -10,6 +10,15 @@ export default {
     });
   },
 
+  //获取项目类型列表 - 分页版本
+  GetWorkInfoByLoginIdPaginated(param) {
+    return request({
+      url: `/work/GetWorkInfoByLoginIdPaginated`,
+      method: "post",
+      data: param
+    });
+  },
+
   GetDevelopIssueList(param) {
     return request({
       url: `/work/GetDevelopIssueList`,
@@ -26,6 +35,15 @@ export default {
     });
   },
 
+  //获取项目问题列表 - 分页版本
+  GetProjectIssueListPaginated(param) {
+    return request({
+      url: `/work/GetProjectIssueListPaginated`,
+      method: "post",
+      data: param
+    });
+  },
+
   GetProjectTaskList(param) {
     return request({
       url: `/work/GetProjectTaskList`,
@@ -50,6 +68,15 @@ export default {
     });
   },
 
+  //获取运营Story列表 - 分页版本
+  GetOperationStoryListPaginated(param) {
+    return request({
+      url: `/work/GetOperationStoryListPaginated`,
+      method: "post",
+      data: param
+    });
+  },
+
   GetProjectDevelopProcessor(param) {
     return request({
       url: `/work/GetProjectDevelopProcessor`,

front/src/views/workbench/inner/inner.vue

@@ -132,13 +132,35 @@
           </template>
         </el-table-column>
       </el-table>
+      <pagination v-show="work_info_total > 0" :total="work_info_total" :page.sync="work_info_pageNum" :limit.sync="work_info_pageSize"
+        @pagination="get_work_info_list" />
     </el-card>
 
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span>我参与的工作</span>
-        <WorkStoryList :project_id="project_id" />
       </div>
+      <el-table :data="work_story_list" border fit highlight-current-row style="width: 100%; margin-left: 2px;">
+        <el-table-column prop="story_intro" label="Story描述" align="left" width="300">
+        </el-table-column>
+        <el-table-column prop="story_manager_name" label="Story管理员" align="left" width="200">
+        </el-table-column>
+        <el-table-column prop="story_state_desp" label="Story状态" align="left" width="200">
+        </el-table-column>
+        <el-table-column label="计划处理时间" align="left">
+          <template slot-scope="scope">
+            <span>{{ scope.row.create_time }}~{{ scope.row.plan_close_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="Task信息" align="left">
+          <template slot-scope="scope">
+            {{ scope.row.story_tasks }}
+            <el-button class="el-icon-view" @click="showWorkTask(scope.row.story_id)" type="text"></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="work_story_total > 0" :total="work_story_total" :page.sync="work_story_pageNum" :limit.sync="work_story_pageSize"
+        @pagination="get_work_story_list" />
     </el-card>
 
     <!-- 分配责任人对话框 -->
@@ -193,6 +215,13 @@
       </div>
     </el-dialog>
 
+    <el-dialog title="工作任务列表" v-if="update_view == false" :visible.sync="dialogVisibleShowWorkTask"
+      :close-on-click-modal="false" width="95%" style="position: fixed;top:-10%" append-to-body>
+      <div class="custom-dialog">
+        <WorkTaskList :story_id="story_id" />
+      </div>
+    </el-dialog>
+
 
   </div>
 </template>
@@ -203,6 +232,7 @@ import notice from '@/api/notice'
 import ProjectIssueList from './projectissuelist.vue'
 import ProjectTaskList from './projecttasklist.vue'
 import WorkStoryList from './workstorylist.vue'
+import WorkTaskList from './worktasklist.vue'
 import ProjectDetail from '@/views/components/ProjectDetail.vue'
 import project from '@/api/project'
 import develop from '@/api/develop'
@@ -214,12 +244,20 @@ export default {
     ProjectIssueList,
     ProjectTaskList,
     WorkStoryList,
+    WorkTaskList,
     ProjectDetail
   },
 
   data() {
     return {
       work_info_list: [],
+      work_info_total: 0,
+      work_info_pageNum: 1,
+      work_info_pageSize: 10,
+      work_story_list: [],
+      work_story_total: 0,
+      work_story_pageNum: 1,
+      work_story_pageSize: 10,
       dialogVisibleShowProjectIssueList: false,
       dialogVisibleShowProjectTaskList: false,
       dialogVisibleUpdateProcessorType: false,
@@ -227,6 +265,8 @@ export default {
       dialogVisibleAddMember: false,
       dialogVisibleShowLog: false,
       dialogVisibleShowProjectDetail: false,
+      dialogVisibleShowWorkTask: false,
+      story_id: 0,
       project_id: 0,
       update_view: false,
       issue_list: [],
@@ -285,6 +325,7 @@ export default {
   },
   mounted() {
     this.get_work_info_list()
+    this.get_work_story_list()
     this.get_issue_type_list()
     this.handleSelectChange(this.selectedIssueTypeId)
   },
@@ -556,13 +597,35 @@ export default {
     },
     get_work_info_list() {
       var param = {
-        user_id: localStorage.getItem('user_id')
+        user_id: localStorage.getItem('user_id'),
+        currPage: this.work_info_pageNum,
+        pageSize: this.work_info_pageSize
       }
-      work.GetWorkInfoByLoginId(param).then(res => {
-        this.work_info_list = res.data.data
+      work.GetWorkInfoByLoginIdPaginated(param).then(res => {
+        this.work_info_list = res.data.data.list
+        this.work_info_total = res.data.data.total
         console.log(res)
       })
     },
+    get_work_story_list() {
+      var param = {
+        user_id: localStorage.getItem('user_id'),
+        currPage: this.work_story_pageNum,
+        pageSize: this.work_story_pageSize
+      }
+      work.GetOperationStoryListPaginated(param).then(res => {
+        this.work_story_list = res.data.data.list
+        this.work_story_total = res.data.data.total
+        console.log(res)
+      })
+    },
+
+    showWorkTask(storyId) {
+      this.story_id = storyId
+      this.dialogVisibleShowWorkTask = true
+      this.update_sub_component()
+    },
+
     showIssueList(project) {
       this.project_id = project.project_id
       //客户项目