From cdcd42c6e24b6ede604fab2e9437bbd34930fc23 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期四, 15 八月 2024 17:48:49 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/home/data-rank/index.vue | 2 ++ src/views/home/data-check/index.vue | 26 ++++++++++++++++++++------ src/api/platform/home.js | 5 +++-- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/api/platform/home.js b/src/api/platform/home.js index 3f6b747..55c25fa 100644 --- a/src/api/platform/home.js +++ b/src/api/platform/home.js @@ -51,9 +51,10 @@ } // 鏍哥畻鎶ヨ〃 -export function calculate() { +export function calculate(category) { return request({ url: '/home/calculate', - method: 'get' + method: 'get', + params: { category } }) } \ No newline at end of file diff --git a/src/views/home/data-check/index.vue b/src/views/home/data-check/index.vue index fdd1808..205d4d7 100644 --- a/src/views/home/data-check/index.vue +++ b/src/views/home/data-check/index.vue @@ -5,15 +5,23 @@ <div class="card-content"> <div class="title-container"> <h1>鑰冩牳鎶ヨ〃</h1> - <div class="more-button" @click="$router.push({ path: '/contract/report' })"> + <el-select v-model="category" placeholder="璇烽�夋嫨" @change="calculate(category)" style="width: 150px;"> + <el-option label="瑙嗛" value="1" /> + <el-option label="杞﹁締" value="2" /> + <el-option label="浜鸿劯" value="3" /> + </el-select> + <div class="more-button" @click="$router.push({ path: '/check/result' })"> <span>鏇村</span> <i class="el-icon-arrow-right"></i> </div> </div> <el-table :data="tableData" style="width: 100%" height="350"> - <el-table-column prop="name" label="瑙勫垯鍚嶇О" align="center" show-overflow-tooltip> + <el-table-column label="鎺掑悕" align="center"> + <template slot-scope="scope"> + <span>{{ scope.row.index }}</span> + </template> </el-table-column> - <el-table-column prop="num" label="鏁伴噺" align="center"> + <el-table-column prop="deptName" label="鍖哄煙" align="center" show-overflow-tooltip> </el-table-column> <el-table-column prop="score" label="鍒嗘暟" align="center"> </el-table-column> @@ -30,13 +38,19 @@ data() { return { + category: "1", tableData: [] } }, mounted() { - calculate().then(res => { - this.tableData = res.data; - }) + calculate(this.category); + }, + methods: { + calculate(category) { + calculate(category).then(res => { + this.tableData = res.data; + }) + } } } </script> diff --git a/src/views/home/data-rank/index.vue b/src/views/home/data-rank/index.vue index fd7a25a..b361f2e 100644 --- a/src/views/home/data-rank/index.vue +++ b/src/views/home/data-rank/index.vue @@ -15,6 +15,8 @@ </el-table-column> <el-table-column prop="num" label="瓒呮湡鏁�" align="center"> </el-table-column> + <el-table-column prop="score" label="鍒嗘暟" align="center"> + </el-table-column> </el-table> </div> </el-card> -- Gitblit v1.8.0