From 8fd70102b46c11a51ad8554ae3bc97e71c339f75 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期日, 28 四月 2024 14:20:06 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui
---
src/views/system/result/detail/index1.vue | 74 ++++++++++++++++++++++++-------------
1 files changed, 48 insertions(+), 26 deletions(-)
diff --git a/src/views/system/result/detail/index1.vue b/src/views/system/result/detail/index1.vue
index f0f402b..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">
@@ -53,29 +53,34 @@
</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, scope.index)">璇︾粏</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;
@@ -88,11 +93,13 @@
areaList: [],
date: '',
dateRange: '',
+ // 鎬绘潯鏁�
+ total: 0,
queryParams: {
pageNum: 1,
pageSize: 10,
deptId: null,
- examinTag:0
+ examineTag:0
},
tableData: [],
loading: false,
@@ -113,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: {
@@ -131,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) {
@@ -150,9 +168,13 @@
handleCurrentChange(val) {
console.log(`褰撳墠椤�: ${val}`);
},
- handleDetail(index, row) {
- console.log(index, row);
- this.$router.push("/examine/detail/detail")
+ handleDetail(id) {
+ this.$router.push({
+ path: '/examine/detail/detail',
+ query: {
+ id: id,
+ }
+ })
},
handleDelete(index, row) {
console.log(index, row);
@@ -179,7 +201,7 @@
data: dataList.map((item) => item[0]),
},
yAxis: {
- min: 90,
+
},
series: [
{
@@ -271,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