From 6302914c8e172caded459676482016a9e6cffb8b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 29 四月 2024 11:10:01 +0800
Subject: [PATCH] 点位完善

---
 src/views/system/result/detail/index1.vue |   56 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/views/system/result/detail/index1.vue b/src/views/system/result/detail/index1.vue
index 3e3341f..72c3c32 100644
--- a/src/views/system/result/detail/index1.vue
+++ b/src/views/system/result/detail/index1.vue
@@ -26,8 +26,8 @@
       </el-card>
     </div>
 
-    <div style="margin-top: 35px">
-      <el-table :data="tableData" style="width: 100%" v-loading="loading">
+    <div style="margin-top: 35px;margin-bottom: 35px">
+      <el-table :data="tableData" style="width: 100%" v-loading="tableLoading">
         <el-table-column label="鑰冩牳鏃堕棿" prop="createTime" align="center">
         </el-table-column>
         <el-table-column label="鑰冩牳瀵硅薄" prop="deptId" align="center">
@@ -53,33 +53,24 @@
         </el-table-column>
         <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
-            <el-button size="small" type="text"  v-show="scope.row.publish != 1">纭鍙戝竷</el-button>
-            <el-button size="small" type="text"  v-show="scope.row.publish == 1">鍙栨秷鍙戝竷</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-view"
-              @click="handleDetail(scope.row.id)"
-            >璇︾粏</el-button>
+            <el-button size="small" type="text" v-show="scope.row.publish != 1">纭鍙戝竷</el-button>
+            <el-button size="small" type="text" v-show="scope.row.publish == 1">鍙栨秷鍙戝竷</el-button>
+            <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row.id)">璇︾粏</el-button>
           </template>
         </el-table-column>
       </el-table>
-    </div>
 
-    <div style="text-align: right; margin-top: 10px">
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-page="queryParams.pageNum" :page-sizes="[10, 20, 50]" :page-size="queryParams.pageSize"
-        layout="total, sizes, prev, pager, next, jumper" :total="tableData.length">
-      </el-pagination>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+
     </div>
 
   </div>
 </template>
 
 <script>
-import { listScore, getScore, delScore, addScore, updateScore, publishScore } from "@/api/platform/check-score";
+import { listScore, getScore, delScore, addScore, updateScore, publishScore, detailScore } from "@/api/platform/check-score";
 import { areaSelect } from '@/api/system/dept';
-import { mapState } from 'vuex';
 import * as echarts from 'echarts';
 let lineChart = null;
 let observer = null;
@@ -92,14 +83,17 @@
       areaList: [],
       date: '',
       dateRange: '',
+      // 鎬绘潯鏁�
+      total: 0,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         deptId: null,
-        examinTag:0
+        examineTag: 0
       },
       tableData: [],
       loading: false,
+      tableLoading: false,
       searchForm: {
         time: null,
       }
@@ -117,6 +111,7 @@
     this.date = year + '-' + month;
     this.queryParams.date = this.date;
     this.areaSelect();
+    this.getList(this.$route.query.index);
   },
   computed: {
 
@@ -135,17 +130,26 @@
     /** 瀵艰埅鍒囨崲 */
     handleSelect(key) {
       this.activeIndex = key;
-      this.queryParams.examinTag = key;
+      this.queryParams.examineTag = key;
+      this.getChart(this.queryParams.deptId);
       this.getList(this.queryParams.deptId);
     },
     /** 鏌ヨ鑰冩牳妯℃澘鍒楄〃 */
-    getList(deptId) {
+    getChart(deptId) {
       this.loading = true;
       lineChart.showLoading();
       listScore(this.queryParams).then(response => {
-        this.tableData = response.data[deptId];
-        this.loading = false;
         this.initChart(response.data[deptId]);
+        this.loading = false;
+      });
+    },
+    /** 鏌ヨ鑰冩牳妯℃澘鍒楄〃 */
+    getList() {
+      this.tableLoading = true;
+      detailScore(this.queryParams).then(response => {
+        this.tableData = response.rows;
+        this.total = response.total;
+        this.tableLoading = false;
       });
     },
     handleSizeChange(val) {
@@ -187,7 +191,7 @@
           data: dataList.map((item) => item[0]),
         },
         yAxis: {
-          min: 90,
+          min: 'dataMin'
         },
         series: [
           {
@@ -278,14 +282,14 @@
 
     dateChange() {
       this.queryParams.date = this.date;
-      console.log(this.queryParams);
+      this.getChart(this.queryParams.deptId);
       this.getList(this.queryParams.deptId);
     }
 
   },
   mounted() {
     lineChart = echarts.init(this.$refs.chartContent);
-    this.getList(this.$route.query.index);
+    this.getChart(this.$route.query.index);
     this.observe();
   },
   beforeDestroy() {

--
Gitblit v1.8.0