[UPDATE] add fenye in *Screen.vue

src/views/historicTaskScreen.vue

@@ -677,16 +677,32 @@
               </div>
               <div class="task_dialog_box_other" v-if="dialogType==2">
                 <el-table
-                  :data="gridData"
+                  :data="pagedData"
                   :header-cell-style="changeHeaderCellStyle"
                   :cell-style="changeCellStyle"
                   stripe
                   :border="true"
                 >
+                  <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="getTableIndex" />
                   <el-table-column align="center"   property="participantName" label="姓名" max-width="350"></el-table-column>
                   <el-table-column align="center" property="score" label="成绩" max-width="300"></el-table-column>
                 </el-table>
 
+                <el-row type="flex" justify="end" style="margin-top: 10px;">
+                  <el-pagination
+                      :total="gridData2.data.length"
+                      :current-page="gridData2.currentPage"
+                      :page-size="gridData2.pageSize"
+                      :page-sizes="[5,10, 15,20]"
+                      layout="total, prev, pager, next, sizes"
+                      @current-change="onCurrentPageChange"
+                      @size-change="onPageSizeChange">
+                  </el-pagination>
+
+                </el-row>
+
+                <operation-space v-if="showOperationSpace" :flow-instance="currentFlowInstance" @close="onOperationSpaceClose"></operation-space>
+
               </div>
 
               <div class="dialog_footer_box">
@@ -721,6 +737,8 @@ export default {
   },
   data() {
     return {
+      showOperationSpace: false,
+      currentFlowInstance: undefined,
       systemTaskId:'',
       unitTaskValue:'',
       systemFinshedValue:'',
@@ -790,6 +808,12 @@ export default {
       unitSubGradeValue:'',
       systemSubGradeValue:'',
       gridData:[],
+      gridData2:{
+        data: [],
+        currentPage:1,
+        pageSize:10,
+        paged:true,
+      },
       dataSrc:'https://cctvwbndbd.a.bdydns.com/cctvwbnd/cctv1_2/index.m3u8?BR=single',
       completionRate:false,
       systemcompletionRate:false,
@@ -801,8 +825,101 @@ export default {
       currentYear:'',
     }
   },
+  computed:{
+    pagedData() { // 动态计算当前页的数据
+      const start = (this.gridData2.currentPage - 1) * this.gridData2.pageSize
+      const end = start + this.gridData2.pageSize
+      return this.gridData2.data.slice(start, end)
+    }
+  },
   methods:{
-
+    /**
+     * 获取每一行的index信息
+     * @param {Integer} index 表格在本页位置
+     */
+    getTableIndex (index) {
+      let a
+      a=((this.gridData2.currentPage - 1) * this.gridData2.pageSize + (index + 1))
+      return a;
+    },
+    onCurrentPageChange (newCurrentPage) {
+        this.loadTableDataImpl3(newCurrentPage, this.gridData2.pageSize).then(() => {//数据加载成功
+        this.gridData2.currentPage = newCurrentPage;
+        this.oldPage = this.gridData2.currentPage-1
+        if(this.gridData2.data.length <= newCurrentPage*this.gridData2.pageSize   ){
+          this.gridData2.paged=true
+        }else{
+          this.gridData2.paged=false
+        }
+      }).catch(() => {//数据加载失败
+        this.gridData2.currentPage = this.oldPage;
+      });
+    },
+    /**
+     * 表格分页每页显示数量变化
+     * @param {Integer} newPageSize 变化后的每页显示数量
+     */
+    onPageSizeChange (newPageSize) {
+      this.gridData2.pageSize = newPageSize;
+      this.gridData2.currentPage = 1
+      this.loadTableDataImpl3(1, newPageSize).then(() => {
+        this.oldPage = this.gridData2.currentPage;
+        this.oldPageSize = this.gridData2.pageSize;
+      }).catch(e => {
+        this.gridData2.currentPage = this.oldPage;
+        this.gridData2.pageSize = this.oldPageSize;
+      });
+    },
+    /**
+     * 获取表格数据
+     * @param {Integer} pageNum 当前分页
+     * @param {Integer} pageSize 每页数量
+     * @param {Boolean} reload 是否重新获取数据
+     */
+    loadTableDataImpl3 (pageNum, pageSize, reload = false) {
+      // 判断是否需要重新加载数据
+      if (reload || !this.gridData2.data || this.gridData2.data.length === 0) {
+        // 调用后端接口或其他数据来源获取数据
+        // 这里省略具体实现
+        // 模拟一个返回结果的 Promise 对象
+        const mockData = new Promise(resolve => {
+          const data = [];
+          for (let i = 1; i <= pageSize; i++) {
+            data.push({
+              id: pageNum * pageSize + i,
+              name: `任务${pageNum * pageSize + i}`,
+              status: Math.floor(Math.random() * 4)
+            });
+          }
+          resolve(data);
+        });
+        // 返回 Promise 对象，以便分页组件可以在数据加载完成后进行下一步处理。
+        return mockData.then(data => {
+          // 更新任务列表数据
+          this.gridData2.data = data;
+          // 返回新的任务列表数据
+          return this.gridData2.data.slice((pageNum - 1) * pageSize, pageNum * pageSize);
+        });
+      } else {// 直接返回已有的任务列表数据
+        return Promise.resolve(this.gridData2.data.slice((pageNum - 1) * pageSize, pageNum * pageSize));
+      }
+    },
+    refreshFormAllInstance (reloadData = false) {
+      if (reloadData) {
+        this.renwuliebiao.refreshTable(true, 1);
+      } else {
+        this.renwuliebiao.refreshTable();
+      }
+      if (!this.isInit) {
+        // 初始化下拉数据
+      }
+      this.isInit = true;
+    },
+    onOperationSpaceClose () {
+      this.showOperationSpace = false;
+      this.currentFlowInstance = null;
+      this.refreshFormAllInstance()
+    },
     // 获取单位名称
     getName(list, id) {
       var tmp =  list.find(k => k["value"] == id)
@@ -2562,6 +2679,7 @@ export default {
       console.log('item',item);
       const { subjectScore } = item
       this.gridData=subjectScore
+      this.gridData2.data=subjectScore
     },
     // 全屏事件
     showFull(id){

src/views/mainScreen.vue

@@ -10,46 +10,10 @@
       <div class="content_cotainer">
         <div class="center_chart_cotainer_task" id="taskItem">
           <div class="task_detail_cotainer_task" style="width:100%;">
-
-
-<!--            <div v-if="false" class="header_line_style">-->
-<!--              <div class="headerTitle"></div>-->
-<!--            </div>-->
-
-<!--            <div v-if="false" class="task_name_header">「{{ currentTaskName }}」任务态势大屏</div>-->
-<!--             任务屏幕-->
-
-<!--            <div class="task_item_header">-->
-<!--              <el-select-->
-<!--                  v-model="wholeOutTaskId"-->
-<!--                  placeholder="「切换任务」"-->
-<!--                  style="width:270px;"-->
-<!--                  @change="changeTask"-->
-<!--                  filterable-->
-<!--              >-->
-<!--                <el-option-->
-<!--                    v-for="item in taskOPtion"-->
-<!--                    :key="item.value"-->
-<!--                    :label="item.label"-->
-<!--                    :value="item.value"-->
-<!--                >-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </div>-->
-
             <div class="task_item_body" >
                 <el-row class="task_item_body1" >
                   <el-col :span="24"  >
-
-                    <el-table ref="teacher" :data="pagedData" size="mini"
-                              @sort-change="pagedData.onSortChange"
-                              header-cell-class-name="table-header-gray" class="task_item_body_bak" >
-<!--                    <el-table ref="teacher" :data="renwuliebiao.data" size="mini"-->
-<!--                              @sort-change="renwuliebiao.onSortChange"-->
-<!--                              header-cell-class-name="table-header-gray">-->
-
-
-<!--                      <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="renwuliebiao.getTableIndex" />-->
+                    <el-table ref="teacher" :data="pagedData" size="mini" @sort-change="pagedData.onSortChange" stripe:border="true" header-cell-class-name="table-header-gray" class="task_item_body_bak" >
                       <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="getTableIndex" />
                       <el-table-column label="任务实际开始时间" prop="0" />
                       <el-table-column label="任务关联ID" prop="1" />
@@ -65,30 +29,23 @@
                         </template>
                       </el-table-column>
                     </el-table>
-
                     <el-row type="flex" justify="end" style="margin-top: 10px;">
                       <el-pagination
                           :total="renwuliebiao.data.length"
                           :current-page="renwuliebiao.currentPage"
                           :page-size="renwuliebiao.pageSize"
-                          :page-sizes="[5,10, 20, 50, 100]"
+                          :page-sizes="[5,10, 15,20, 50]"
                           layout="total, prev, pager, next, sizes"
                           @current-change="onCurrentPageChange"
                           @size-change="onPageSizeChange">
                       </el-pagination>
-
                     </el-row>
                   </el-col>
                 </el-row>
-
                 <operation-space v-if="showOperationSpace" :flow-instance="currentFlowInstance" @close="onOperationSpaceClose"></operation-space>
-
             </div>
-
           </div>
         </div>
-
-
       </div>
     </div>
   </v-scale-screen>
@@ -108,8 +65,6 @@ import hkv from '../components/hk/hkv.vue'
 import hkCamara from '../components/hk/hkCamara.vue'
 import {Message} from "element-ui";
 
-
-
 export default {
   components:{
     myFlylineChartEnhanced,
@@ -123,9 +78,7 @@ export default {
     return {
       showOperationSpace: false,
       currentFlowInstance: undefined,
-      // formAllInstanceWidget: new TableWidget(this.loadAllTaskData, this.loadAllTaskVerify, true, false),
       isInit: false,
-
       HKCardShow: false,
       HKCamaraShow: false,
       systemFinshedValue:'',
@@ -143,7 +96,6 @@ export default {
       websocketOrder: null, //建立的连接
       websocketBpmn: null, //建立的连接
       updatekey:'1',
-
       renwuliebiao:{
         header: ['1', '2', '3','4', '5', '6','7', '8'],
         waitTime:1500,
@@ -152,7 +104,6 @@ export default {
         oddRowBGC:'#072347',
         evenRowBGC:'#021736',
 
-
         actualStartTime:'',
         bk:'',
         description:'',
@@ -163,12 +114,10 @@ export default {
         taskStage:'',
 
         currentPage:1,
-        pageSize:10,
+        pageSize:15,
 
         paged:true,
       },
-
-
       scrollTableConfig:{
         header: ['课目名称', '指令名称', '特情注入', '指令内容', '模训系统', '时间'],
         waitTime:1500,
@@ -217,8 +166,6 @@ export default {
     pagedData() { // 动态计算当前页的数据
       const start = (this.renwuliebiao.currentPage - 1) * this.renwuliebiao.pageSize
       const end = start + this.renwuliebiao.pageSize
-      // console.log("hhhh1:  ",start+"---"+end )
-      // console.log("hhhh2:  ",this.renwuliebiao.data.slice(start, end) )
       return this.renwuliebiao.data.slice(start, end)
     }
   },
@@ -228,37 +175,16 @@ export default {
      * @param {Integer} newCurrentPage 变化后的显示页面
      */
     onCurrentPageChange (newCurrentPage) {
-
-      console.log("1:  ",newCurrentPage )
-      console.log("2:  ",this.renwuliebiao.pageSize )
-      console.log("3:  ",this.oldPage)
-
-
       this.loadTableDataImpl(newCurrentPage, this.renwuliebiao.pageSize).then(() => {//数据加载成功
-
-
         this.renwuliebiao.currentPage = newCurrentPage;
         this.oldPage = this.renwuliebiao.currentPage-1
-        console.log("4:  ",newCurrentPage)
-        console.log("5:  ",this.renwuliebiao.currentPage)
-        console.log("6:  ",this.oldPage)
-
-
         if(this.renwuliebiao.data.length <= newCurrentPage*this.renwuliebiao.pageSize   ){
           this.renwuliebiao.paged=true
         }else{
           this.renwuliebiao.paged=false
         }
-
-
-
       }).catch(() => {//数据加载失败
         this.renwuliebiao.currentPage = this.oldPage;
-
-
-        console.log("7:  ",this.oldPage)
-        console.log("8:  ",this.renwuliebiao.currentPage)
-
       });
     },
     /**
@@ -266,10 +192,6 @@ export default {
      * @param {Integer} newPageSize 变化后的每页显示数量
      */
     onPageSizeChange (newPageSize) {
-
-      console.log("hhhh2:  ",newPageSize )
-
-      this.renwuliebiao.pageSize = newPageSize;
       this.renwuliebiao.currentPage = 1
       this.loadTableDataImpl(1, newPageSize).then(() => {
         this.oldPage = this.renwuliebiao.currentPage;
@@ -297,23 +219,13 @@ export default {
      */
     loadTableDataImpl (pageNum, pageSize, reload = false) {
       console.log("11:  ",pageNum+"---"+pageSize+"---"+reload)
-
-      // const start = (pageNum - 1) * this.renwuliebiao.pageSize
-      // const end = start + this.renwuliebiao.pageSize
-      // // console.log("hhhh1:  ",start+"---"+end )
-      // // console.log("hhhh2:  ",this.renwuliebiao.data.slice(start, end) )
-      // return this.renwuliebiao.data.slice(start, end)
-
-
-// 判断是否需要重新加载数据
+      // 判断是否需要重新加载数据
       if (reload || !this.renwuliebiao.data || this.renwuliebiao.data.length === 0) {
         // 调用后端接口或其他数据来源获取数据
         // 这里省略具体实现
-
         // 模拟一个返回结果的 Promise 对象
         const mockData = new Promise(resolve => {
           const data = [];
-
           for (let i = 1; i <= pageSize; i++) {
             data.push({
               id: pageNum * pageSize + i,
@@ -321,10 +233,8 @@ export default {
               status: Math.floor(Math.random() * 4)
             });
           }
-
           resolve(data);
         });
-
         // 返回 Promise 对象，以便分页组件可以在数据加载完成后进行下一步处理。
         return mockData.then(data => {
           // 更新任务列表数据
@@ -332,45 +242,10 @@ export default {
           // 返回新的任务列表数据
           return this.renwuliebiao.data.slice((pageNum - 1) * pageSize, pageNum * pageSize);
         });
-      } else {
-        // 直接返回已有的任务列表数据
+      } else {// 直接返回已有的任务列表数据
         return Promise.resolve(this.renwuliebiao.data.slice((pageNum - 1) * pageSize, pageNum * pageSize));
       }
-
-
-      // return new Promise((resolve, reject) => {
-      //   console.log("12:  ",this.loadTableData)
-      //
-      //   if (typeof this.loadTableData !== 'function') {
-      //     reject();
-      //   } else {// 如果pageSize和pageNum没有变化，并且不强制刷新
-      //     console.log("13:  ",pageNum+"---"+pageSize+"---"+reload)
-      //     if (this.paged && !reload && this.oldPage === pageNum && this.oldPageSize === pageSize) {
-      //       resolve();
-      //     } else {
-      //       let params = {};
-      //       if (this.orderInfo.fieldName != null) params.orderParam = [this.orderInfo];
-      //       if (this.paged) {
-      //         params.pageParam = {
-      //           pageNum,
-      //           pageSize
-      //         }
-      //       }
-      //       this.loading = true;
-      //       this.loadTableData(params).then(tableData => {
-      //         this.dataList = tableData.dataList;
-      //         this.totalCount = tableData.totalCount;
-      //         this.loading = false;
-      //         resolve();
-      //       }).catch(e => {
-      //         this.loading = false;
-      //         reject(e);
-      //       });
-      //     }
-      //   }
-      // });
     },
-
     /**
      * 刷新表格数据
      * @param {Boolean} research 是否按照新的查询条件重新查询（调用verify函数）
@@ -382,7 +257,6 @@ export default {
         if (typeof this.searchVerify === 'function' && !this.searchVerify()) return;
         reload = true;
       }
-
       if (Number.isInteger(pageNum) && pageNum !== this.renwuliebiao.currentPage) {
         this.loadTableDataImpl(pageNum, this.renwuliebiaopageSize, reload).then(res => {
           this.oldPage = this.renwuliebiao.currentPage = pageNum;
@@ -394,66 +268,22 @@ export default {
         this.loadTableDataImpl(this.renwuliebiao.currentPage, this.renwuliebiao.pageSize, true).catch(e => {});
       }
     },
-
-
-
-
     /**
      * 获取每一行的index信息
      * @param {Integer} index 表格在本页位置
      */
     getTableIndex (index) {
-
-      // console.log("页码1：  "+index)
-      // console.log(".....1  "+index)
-      // console.log("页码2：  "+this.renwuliebiao.paged ? ((this.renwuliebiao.currentPage - 1) * this.renwuliebiao.pageSize + (index + 1)) : (index + 1))
-      // console.log(".....2  "+this.renwuliebiao.paged)
       let a
-      // let a=this.renwuliebiao.paged ? ((this.renwuliebiao.currentPage - 1) * this.renwuliebiao.pageSize + (index + 1)) : (index + 1);
-      // console.log(".....a  "+a)
-      // return this.renwuliebiao.paged ? ((this.renwuliebiao.currentPage - 1) * this.renwuliebiao.pageSize + (index + 1)) : (index + 1);
-
-
-
-
-
-      console.log("参数：  "+this.renwuliebiao.paged+" "+this.renwuliebiao.pageSize+" "+index)
-      // if(this.renwuliebiao.paged){
-      //   console.log("a1")
-      //   a=((this.renwuliebiao.currentPage - 1) * this.renwuliebiao.pageSize + (index + 1))
-      // }else{
-      //   console.log("a2")
-      //   a=(index + 1)
-      // }
       a=((this.renwuliebiao.currentPage - 1) * this.renwuliebiao.pageSize + (index + 1))
-      console.log(".....a  "+a)
       return a;
-
-
-
-
-
-
-
-
     },
-
-
-
     onTiaozhuan (a) {
-
-
-      console.log("111",a[5])
-      // this.$router.push({name: 'testParams',params: {testParams:'testParams'}});
-      // location.reload()
       this.$router.push({
         path:"/taskScreen",
         query:{
           key1:a[5],
-          key2:a[6],
         }
       });
-      // location.reload()
     },
     refreshFormAllInstance (reloadData = false) {
       if (reloadData) {
@@ -461,28 +291,22 @@ export default {
       } else {
         this.renwuliebiao.refreshTable();
       }
-      if (!this.isInit) {
-        // 初始化下拉数据
+      if (!this.isInit) {// 初始化下拉数据
       }
       this.isInit = true;
     },
-
     onOperationSpaceClose () {
       this.showOperationSpace = false;
       this.currentFlowInstance = null;
       this.refreshFormAllInstance()
     },
-
     HKCardInit(){
       this.HKCardShow = true;
     },
     jumpToHistory() {
       // this.$refs.hk.$destroy();
       //     this.HKshow = false;
-
       this.$router.push("/situationScreen")
-
-
     },
     // 表格样式修改
     changeHeaderCellStyle(row,column, rowIndex, columnIndex){
@@ -499,9 +323,6 @@ export default {
         return 'background: #0A427C ; color:#fff;';
       }
     },
-
-
-
     // 获取全部系统
     async getAllSystems(){
       let params={}
@@ -520,9 +341,6 @@ export default {
         this.$message.error(errorMessage)
       }
     },
-
-
-
     // 获取全部单位
     async getAllUnits (){
       let params={}
@@ -545,7 +363,6 @@ export default {
       }
     },
 
-
     /**
      * 获取所有任务实例
      */
@@ -576,7 +393,6 @@ export default {
       });
     },
 
-
     // 获取任务列表
     async getTaskList() {
       let params = {};
@@ -589,32 +405,9 @@ export default {
         this.renwuList=data
         let tempData=[]
         data.forEach((item)=>{
-          console.log("1:  ", item);
-
-
           tempData.push([item.actualStartTime, item.bk, item.description,item.status,item.taskCode,item.taskId ,item.taskName, item.taskStage])
         })
         this.renwuliebiao.data=tempData
-
-          //
-          // this.instructList=data
-          // let tempData=[]
-          // data.forEach((item)=>{
-          //   tempData.push([item.subjectName, item.name, item.situation, item.content, item.system,item.time])
-          // })
-          // this.scrollTableConfig.data=tempData
-          // console.log("🚀 data >> ", this.scrollTableConfig.data);
-          // this.updatekey=new Date().getTime()
-
-
-
-
-
-
-
-
-
-
         this.taskList = data;
         this.wholeOutTaskId = data[0].taskId;
         this.processInstanceId = this.wholeOutTaskId;
@@ -625,7 +418,6 @@ export default {
           };
         });
 
-
         let param = {taskId: this.processInstanceId};
         const res1 = await request("/dt_screen/rest/v2/task/getDefId/", "post", param, false);
         this.processDefinitionId = res1.data;

src/views/situationScreen.vue

@@ -682,16 +682,31 @@
               </div>
               <div class="task_dialog_box_other" v-if="dialogType==2">
                 <el-table
-                  :data="gridData"
+                  :data="pagedData"
                   :header-cell-style="changeHeaderCellStyle"
                   :cell-style="changeCellStyle"
                   stripe
                   :border="true"
-                  height="400"
+
                 >
+                  <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="getTableIndex" />
                   <el-table-column align="center"   property="participantName" label="姓名" max-width="350"></el-table-column>
                   <el-table-column align="center" property="score" label="成绩" max-width="300"></el-table-column>
                 </el-table>
+                <el-row type="flex" justify="end" style="margin-top: 10px;">
+                  <el-pagination
+                      :total="gridData2.data.length"
+                      :current-page="gridData2.currentPage"
+                      :page-size="gridData2.pageSize"
+                      :page-sizes="[5,10,15, 20]"
+                      layout="total, prev, pager, next, sizes"
+                      @current-change="onCurrentPageChange"
+                      @size-change="onPageSizeChange">
+                  </el-pagination>
+
+                </el-row>
+
+                <operation-space v-if="showOperationSpace" :flow-instance="currentFlowInstance" @close="onOperationSpaceClose"></operation-space>
 
               </div>
 
@@ -722,10 +737,13 @@ export default {
   components:{
     myFlylineChartEnhanced,
     sacleBox,
-    myscrollBoard
+    myscrollBoard,
+
   },
   data() {
     return {
+      showOperationSpace: false,
+      currentFlowInstance: undefined,
       systemTaskId:'',
       unitTaskValue:'',
       systemFinshedValue:'',
@@ -795,6 +813,15 @@ export default {
       unitSubGradeValue:'',
       systemSubGradeValue:'',
       gridData:[],
+
+      gridData2:{
+        data: [],
+
+        currentPage:1,
+        pageSize:10,
+
+        paged:true,
+      },
       dataSrc:'https://cctvwbndbd.a.bdydns.com/cctvwbnd/cctv1_2/index.m3u8?BR=single',
       completionRate:false,
       systemcompletionRate:false,
@@ -806,7 +833,126 @@ export default {
       currentYear:'',
     }
   },
+  computed:{
+    pagedData() { // 动态计算当前页的数据
+      const start = (this.gridData2.currentPage - 1) * this.gridData2.pageSize
+      const end = start + this.gridData2.pageSize
+      // console.log("hhhh1:  ",start+"---"+end )
+      // console.log("hhhh2:  ",this.renwuliebiao.data.slice(start, end) )
+      return this.gridData2.data.slice(start, end)
+    }
+  },
   methods:{
+    /**
+     * 获取每一行的index信息
+     * @param {Integer} index 表格在本页位置
+     */
+    getTableIndex (index) {
+      let a
+      console.log("参数：  "+this.gridData2.paged+" "+this.gridData2.pageSize+" "+index)
+      a=((this.gridData2.currentPage - 1) * this.gridData2.pageSize + (index + 1))
+      console.log(".....a  "+a)
+      return a;
+    },
+    onCurrentPageChange (newCurrentPage) {
+
+      console.log("1:  ",newCurrentPage )
+      console.log("2:  ",this.gridData2.pageSize )
+      console.log("3:  ",this.oldPage)
+
+      this.loadTableDataImpl2(newCurrentPage, this.gridData2.pageSize).then(() => {//数据加载成功
+
+        this.gridData2.currentPage = newCurrentPage;
+        this.oldPage = this.gridData2.currentPage-1
+        console.log("4:  ",newCurrentPage)
+        console.log("5:  ",this.gridData2.currentPage)
+        console.log("6:  ",this.oldPage)
+
+        if(this.gridData2.data.length <= newCurrentPage*this.gridData2.pageSize   ){
+          this.gridData2.paged=true
+        }else{
+          this.gridData2.paged=false
+        }
+
+      }).catch(() => {//数据加载失败
+        this.gridData2.currentPage = this.oldPage;
+        console.log("7:  ",this.oldPage)
+        console.log("8:  ",this.gridData2.currentPage)
+
+      });
+    },
+    /**
+     * 表格分页每页显示数量变化
+     * @param {Integer} newPageSize 变化后的每页显示数量
+     */
+    onPageSizeChange (newPageSize) {
+      console.log("hhhh2:  ",newPageSize )
+      this.gridData2.pageSize = newPageSize;
+      this.gridData2.currentPage = 1
+      this.loadTableDataImpl2(1, newPageSize).then(() => {
+        this.oldPage = this.gridData2.currentPage;
+        this.oldPageSize = this.gridData2.pageSize;
+      }).catch(e => {
+        this.gridData2.currentPage = this.oldPage;
+        this.gridData2.pageSize = this.oldPageSize;
+      });
+    },
+    /**
+     * 获取表格数据
+     * @param {Integer} pageNum 当前分页
+     * @param {Integer} pageSize 每页数量
+     * @param {Boolean} reload 是否重新获取数据
+     */
+    loadTableDataImpl2 (pageNum, pageSize, reload = false) {
+      console.log("11:  ",pageNum+"---"+pageSize+"---"+reload)
+      // 判断是否需要重新加载数据
+      if (reload || !this.gridData2.data || this.gridData2.data.length === 0) {
+        // 调用后端接口或其他数据来源获取数据
+        // 这里省略具体实现
+
+        // 模拟一个返回结果的 Promise 对象
+        const mockData = new Promise(resolve => {
+          const data = [];
+          for (let i = 1; i <= pageSize; i++) {
+            data.push({
+              id: pageNum * pageSize + i,
+              name: `任务${pageNum * pageSize + i}`,
+              status: Math.floor(Math.random() * 4)
+            });
+          }
+
+          resolve(data);
+        });
+        // 返回 Promise 对象，以便分页组件可以在数据加载完成后进行下一步处理。
+        return mockData.then(data => {
+          // 更新任务列表数据
+          this.gridData2.data = data;
+          // 返回新的任务列表数据
+          return this.gridData2.data.slice((pageNum - 1) * pageSize, pageNum * pageSize);
+        });
+      } else {// 直接返回已有的任务列表数据
+        return Promise.resolve(this.gridData2.data.slice((pageNum - 1) * pageSize, pageNum * pageSize));
+      }
+    },
+
+    refreshFormAllInstance (reloadData = false) {
+      if (reloadData) {
+        this.renwuliebiao.refreshTable(true, 1);
+      } else {
+        this.renwuliebiao.refreshTable();
+      }
+      if (!this.isInit) {
+        // 初始化下拉数据
+      }
+      this.isInit = true;
+    },
+
+    onOperationSpaceClose () {
+      this.showOperationSpace = false;
+      this.currentFlowInstance = null;
+      this.refreshFormAllInstance()
+    },
+
     jumpToCurrent() {
       // window.location.href = "/taskScreen"
       // this.$router.push("/taskScreen")
@@ -2604,6 +2750,7 @@ export default {
       console.log('item',item);
       const { subjectScore } = item
       this.gridData=subjectScore
+      this.gridData2.data=subjectScore
     },
     // 全屏事件
     showFull(id){