From 3c5de84ea842c28d738e2b53529f1b524af7ecfb Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期日, 28 四月 2024 14:18:29 +0800
Subject: [PATCH] 考核结果二级页面

---
 src/api/platform/check-score.js           |   10 ++++
 src/views/system/result/detail/index1.vue |   52 ++++++++++++++++---------
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/src/api/platform/check-score.js b/src/api/platform/check-score.js
index f26b1b1..e368106 100644
--- a/src/api/platform/check-score.js
+++ b/src/api/platform/check-score.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 鏌ヨ鑰冩牳绉垎鏄庣粏鍒楄〃
+// 鏌ヨ鑰冩牳绉垎鍗$墖鍒楄〃
 export function listScore(query) {
   return request({
     url: '/check/score/list',
@@ -8,6 +8,14 @@
     params: query
   })
 }
+// 鏌ヨ鑰冩牳绉垎鏄庣粏鍒楄〃
+export function detailScore(query) {
+  return request({
+    url: '/check/score/detail',
+    method: 'get',
+    params: query
+  })
+}
 
 // 鏌ヨ鑰冩牳绉垎鏄庣粏璇︾粏
 export function getScoreIndex(id) {
diff --git a/src/views/system/result/detail/index1.vue b/src/views/system/result/detail/index1.vue
index 3e3341f..f85981a 100644
--- a/src/views/system/result/detail/index1.vue
+++ b/src/views/system/result/detail/index1.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="padding: 0px 10px">
+  <div style="padding: 0px 10px" >
     <div>
       <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
         style="margin-bottom: 10px">
@@ -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">
@@ -64,22 +64,23 @@
           </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,11 +93,13 @@
       areaList: [],
       date: '',
       dateRange: '',
+      // 鎬绘潯鏁�
+      total: 0,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         deptId: null,
-        examinTag:0
+        examineTag:0
       },
       tableData: [],
       loading: false,
@@ -117,6 +120,8 @@
     this.date = year + '-' + month;
     this.queryParams.date = this.date;
     this.areaSelect();
+    this.getChart(this.$route.query.index)
+    this.getList(this.$route.query.index);
   },
   computed: {
 
@@ -135,17 +140,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 +201,7 @@
           data: dataList.map((item) => item[0]),
         },
         yAxis: {
-          min: 90,
+
         },
         series: [
           {
@@ -279,13 +293,13 @@
     dateChange() {
       this.queryParams.date = this.date;
       console.log(this.queryParams);
-      this.getList(this.queryParams.deptId);
+      this.getChart(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