From 27c87cc797f4fc9b0744ed8c44b58dbe4ff3a63c Mon Sep 17 00:00:00 2001 From: ZhangXianQiang <1135831638@qq.com> Date: 星期四, 21 三月 2024 18:01:56 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui --- src/views/system/check-result/index.vue | 83 ++++++++++++++++++++++++++++------------- 1 files changed, 56 insertions(+), 27 deletions(-) diff --git a/src/views/system/check-result/index.vue b/src/views/system/check-result/index.vue index 3392f60..9f63175 100644 --- a/src/views/system/check-result/index.vue +++ b/src/views/system/check-result/index.vue @@ -90,10 +90,13 @@ <el-button style="float: right; padding: 3px 0" type="text" @click="handleDetail(item)">璇︽儏</el-button> </div> <div class="text item">鑰冩牳<span class="time">{{ item.examineName }}</span></div> - <div class="text item">鑰冩牳鑼冨洿<span class="time">{{ item.examineRange }}</span></div> - <div class="text item">鑰冩牳棰戠巼<span class="time">{{ item.frequency }}</span></div> + <div class="text item">鑰冩牳棰戠巼<span class="time">{{ "瀛e害鑰冩牳" }}</span></div> <div class="text item">鑰冩牳鍒嗘暟<span class="time">{{ item.checkScore }}</span></div> - <div class="text item">鑰冩牳鏃堕棿<span class="time">{{ item.checkTime }}</span></div> + <div class="text item">鑰冩牳鏃堕棿 + <span class="time">{{ item.checkTime }}</span> + <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish != 1" v-hasPermi="['result:contract:publish']">纭鍙戝竷</el-button> + <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish == 1" v-hasPermi="['result:contract:publish']">宸插彂甯�</el-button> + </div> </el-card> <!-- <el-table v-loading="loading" :data="checkResultList" @selection-change="handleSelectionChange"> @@ -180,32 +183,30 @@ <el-descriptions-item> <template slot="label"> <i class="el-icon-medal"></i> - 绯荤粺鍒嗘暟 + 缁煎悎鍒嗘暟 </template> <el-tag type="danger" size="small">{{detail.checkScore}}</el-tag> </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - <i class="el-icon-medal"></i> - 浜哄伐鍒嗘暟 - </template> - <el-tag type="danger" size="small">{{detail.manualScore}}</el-tag> - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - <i class="el-icon-medal"></i> - 杞﹁締鐐逛綅鍦ㄧ嚎鐜� - </template> - <el-tag type="danger" size="small">{{detail.carOnlineRate}}</el-tag> - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - <i class="el-icon-medal"></i> - 缁煎悎鍒嗘暟 - </template> - <el-tag type="danger" size="small">{{detail.systemScore}}</el-tag> - </el-descriptions-item> </el-descriptions> + <el-table + :data="tableData" + show-summary + style="width: 100%"> + <el-table-column + prop="name" + label="瑙勫垯鍚�" + width="180"> + </el-table-column> + <el-table-column + prop="content" + label="鎸囨爣" + width="180"> + </el-table-column> + <el-table-column + prop="score" + label="寰楀垎"> + </el-table-column> + </el-table> </el-dialog> <!-- 娣诲姞鎴栦慨鏀硅�冩牳缁撴灉瀵硅瘽妗� --> @@ -221,7 +222,7 @@ </template> <script> -import { listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore } from "@/api/platform/check-result"; +import { listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/check-result"; export default { name: "CheckResult", @@ -229,9 +230,26 @@ return { detailTitle: '', detailOpen: false, - detail: { + detail:{ }, + tableData: [{ + name: '瑙嗛骞冲潎鍦ㄧ嚎鐜�', + content: '97%', + score: '-5' + }, { + name: '涓�鏈轰竴妗�24灏忔椂鏈慨澶�', + content: '5涓�', + score: '-0.5' + }, { + name: '瀛樺偍鏁呴殰', + content: '5灏忔椂', + score: '-0.3' + }, { + name: '鏃堕挓涓嶅悓姝�24灏忔椂鏈慨澶�', + content: '3涓�', + score: '-0.5' + }], manualScoreOpen: false, manualScoreForm: {}, manualScoreTitle: '', @@ -352,6 +370,17 @@ this.detailOpen = true; }, + handlePublish(row) { + let text = row.publish == 1 ? '鍙栨秷鍙戝竷' : '鍙戝竷'; + const ids = row.id || this.ids; + this.$modal.confirm('鏄惁纭' + text + '鑰冩牳缁撴灉缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() { + return publishCheckResult(ids); + }).then(() => { + this.getList(); + this.$modal.msgSuccess(text + "鎴愬姛"); + }).catch(() => {}); + + }, /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { this.queryParams.pageNum = 1; -- Gitblit v1.8.0