From 5208ae16a508a42be2e4b50ef299389fb556a67e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期日, 28 四月 2024 09:14:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/result/detail/index1.vue | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/views/system/result/detail/index1.vue b/src/views/system/result/detail/index1.vue
index 1eef8d2..3e3341f 100644
--- a/src/views/system/result/detail/index1.vue
+++ b/src/views/system/result/detail/index1.vue
@@ -3,8 +3,8 @@
<div>
<el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
style="margin-bottom: 10px">
- <el-menu-item index="1">鐪佸巺鑰冩牳</el-menu-item>
- <el-menu-item index="2">鍖哄煙鑰冩牳</el-menu-item>
+ <el-menu-item index="0">鐪佸巺鑰冩牳</el-menu-item>
+ <el-menu-item index="1">鍖哄煙鑰冩牳</el-menu-item>
</el-menu>
</div>
@@ -53,10 +53,14 @@
</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>
@@ -64,8 +68,8 @@
<div style="text-align: right; margin-top: 10px">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
- :current-page="queryParams.pageNum" :page-sizes="[5, 10, 20]" :page-size="5"
- layout="total, sizes, prev, pager, next, jumper" :total="4">
+ :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>
</div>
@@ -84,8 +88,7 @@
dicts: ['platform_examine_use', 'platform_examine_category'],
data() {
return {
- activeIndex: '1',
- activeIndex2: '2',
+ activeIndex: '0',
areaList: [],
date: '',
dateRange: '',
@@ -93,6 +96,7 @@
pageNum: 1,
pageSize: 10,
deptId: null,
+ examinTag:0
},
tableData: [],
loading: false,
@@ -130,8 +134,9 @@
},
/** 瀵艰埅鍒囨崲 */
handleSelect(key) {
- this.activeIndex = key; // 鏇存柊褰撳墠婵�娲荤殑鑿滃崟椤�
- this.getList();
+ this.activeIndex = key;
+ this.queryParams.examinTag = key;
+ this.getList(this.queryParams.deptId);
},
/** 鏌ヨ鑰冩牳妯℃澘鍒楄〃 */
getList(deptId) {
@@ -149,9 +154,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);
--
Gitblit v1.8.0