Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/feedback/questionnaire/list.vue

@@ -14,7 +14,8 @@
                     <el-button type="success" @click="drawer = true">预览</el-button>
                 </div>
                 <div style="margin: 10px 0;">
-                    <el-tag :type="feedbackData.processStatus ? feedbackData.processStatus = 1 ? 'success' : 'info' : 'danger'" >
+                    <el-tag
+                        :type="feedbackData.processStatus ? feedbackData.processStatus = 1 ? 'success' : 'info' : 'danger'">
                         {{ feedbackData.processStatus ? feedbackData.processStatus
                             == 1 ? '进行中' : '已结束' : '未开始' }}</el-tag>
                     反馈时间：{{ feedbackData.timeStart }} ~ {{ feedbackData.timeEnd }}
@@ -32,8 +33,8 @@
                         </div>
                         <!-- <el-button class="m15" type="primary" size="small">导出数据</el-button> -->
                         <div class="lBox m15">
-                            <el-table ref="multipleTable" :data="staffList.data" tooltip-effect="dark" border
-                                style="width: 100%;max-height: 450px;background-color: transparent; text-align: center;"
+                            <el-table ref="multipleTable" :data="staffList.data" height="450" tooltip-effect="dark" border
+                                style="width: 100%;background-color: transparent; text-align: center;"
                                 @selection-change="handleSelectionChange" :header-cell-style="{ 'text-align': 'center' }"
                                 :cell-style="{ 'text-align': 'center' }">
                                 <el-table-column type="selection" width="55">
@@ -239,7 +240,7 @@ export default {
                     }
                 })
                 this.staffList.data = arr
-            } else if(val == 3) {
+            } else if (val == 3) {
                 this.staffList.data.forEach(i => {
                     if (!i.backStatus) {
                         arr.push(i)
@@ -282,6 +283,17 @@ export default {
             })
 
         },
+        handleCurrentChange(val) {
+            console.log(val)
+            this.staff.page = val
+            let id = localStorage.getItem('checkFeedbackId')
+            this.getStaffData(id)
+        },
+        handleSizeChange(val){
+            this.staff.size = val
+            let id = localStorage.getItem('checkFeedbackId')
+            this.getStaffData(id)
+        },
         getStaffData(id) {
             //人员数据
             this.$post('/feedback/getStaffList', { feedbackId: id, size: this.staff.size, page: this.staff.page }).then(res => {