From 9e8d1bd0b6fb495920921214775b84d490e032a3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 16:43:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/check/result/detail/detail.vue | 111 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 95 insertions(+), 16 deletions(-)
diff --git a/src/views/system/check/result/detail/detail.vue b/src/views/system/check/result/detail/detail.vue
index 6e2108f..f5b8242 100644
--- a/src/views/system/check/result/detail/detail.vue
+++ b/src/views/system/check/result/detail/detail.vue
@@ -1,5 +1,12 @@
<template>
- <div class="app-container">
+ <div style="padding: 0px 10px">
+ <div >
+ <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
+ >
+ <el-menu-item index="0">鐪佸巺鑰冩牳</el-menu-item>
+ <el-menu-item index="1">鍖哄幙鑰冩牳</el-menu-item>
+ </el-menu>
+ </div>
<el-container>
<el-main>
<h2>鑰冩牳瑙勫垯</h2>
@@ -30,6 +37,7 @@
type="text"
icon="el-icon-edit"
@click="handleRuleUpdate(item)"
+ v-hasPermi="['check:template:edit']"
>淇敼
</el-button>
</div>
@@ -81,6 +89,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
+ v-hasPermi="['check:result:detail:export']"
>瀵煎嚭
</el-button>
</el-col>
@@ -91,15 +100,30 @@
:inline="true"
v-show="showSearch"
>
- <el-form-item label="鑰冩牳鏃ユ湡" prop="name">
+<!-- <el-form-item label="鑰冩牳鏈堝害" prop="name">-->
+<!-- <el-date-picker-->
+<!-- v-model="queryParams.date"-->
+<!-- format="yyyy-MM"-->
+<!-- value-format="yyyy-MM"-->
+<!-- type="month"-->
+<!-- placeholder="閫夋嫨鏃ユ湡"-->
+<!-- @change="dateChange"-->
+<!-- >-->
+<!-- </el-date-picker>-->
+<!-- </el-form-item>-->
+ <el-form-item label="鑰冩牳鏃堕棿">
<el-date-picker
- v-model="date"
+ :clearable="false"
+ v-model="queryParams.quarter"
+ type="monthrange"
format="yyyy-MM"
value-format="yyyy-MM"
- type="month"
- placeholder="閫夋嫨鏃ユ湡"
- @change="dateChange"
- >
+ unlink-panels
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫湀浠�"
+ end-placeholder="缁撴潫鏈堜唤"
+ @change="quarterChange"
+ :picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
<el-form-item>
@@ -141,6 +165,17 @@
<span>{{ translateDeptId(scope.row.dept_id) }}</span>
</template>
</el-table-column>
+ <el-table-column
+ label="鑰冩牳鏍囩"
+ align="center"
+ prop="dept_id"
+ width="120px"
+ fixed
+ >
+ <template slot-scope="scope">
+ {{ scope.row.examine_tag === 0 ? '鐪佸巺鑰冩牳' : '鍖哄幙鑰冩牳' }}
+ </template>
+ </el-table-column>
<template v-for="item in tableData">
<el-table-column
:key="item.ruleName"
@@ -149,7 +184,7 @@
width="180px"
>
<template slot-scope="scope">
- <span>{{ scope.row[item.ruleIndex] }}</span>
+ <span>{{ (scope.row[item.ruleIndex] * 100).toFixed(2) + '%'}}</span>
</template>
</el-table-column>
</template>
@@ -192,8 +227,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
</div>
</el-dialog>
@@ -221,8 +256,8 @@
</div>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
</div>
</el-dialog>
</div>
@@ -244,6 +279,32 @@
dicts: ["platform_audit_state"],
data() {
return {
+ pickerOptions: {
+ shortcuts: [{
+ text: '绗竴瀛ｅ害',
+ onClick(picker) {
+ picker.$emit('pick', [new Date(new Date().getFullYear() + "-01"), new Date(new Date().getFullYear() + "-03")]);
+ }
+ },
+ {
+ text: '绗簩瀛ｅ害',
+ onClick(picker) {
+ picker.$emit('pick', [new Date(new Date().getFullYear() + "-04"), new Date(new Date().getFullYear() + "-06")]);
+ }
+ },
+ {
+ text: '绗笁瀛ｅ害',
+ onClick(picker) {
+ picker.$emit('pick', [new Date(new Date().getFullYear() + "-07"), new Date(new Date().getFullYear() + "-09")])
+ }
+ },
+ {
+ text: '绗洓瀛ｅ害',
+ onClick(picker) {
+ picker.$emit('pick', [new Date(new Date().getFullYear() + "-10"), new Date(new Date().getFullYear() + "-12")])
+ }
+ }]
+ },
id: null,
examineCategory: null,
date: "",
@@ -284,6 +345,9 @@
queryParams: {
id: null,
date: null,
+ quarter: null,
+ examineTag: null,
+ deptId: null
},
// 琛ㄥ崟鏍￠獙
rules: {},
@@ -302,6 +366,12 @@
if (this.$route.query.id) {
this.queryParams.id = this.$route.query.id;
}
+ if(this.$route.query.deptId){
+ this.queryParams.deptId = this.$route.query.deptId;
+ }
+ let examineTag = this.$route.query.examineTag;
+ this.activeIndex = examineTag;
+ this.queryParams.examineTag = examineTag;
// 鑰冩牳绉垎鍒楄〃
this.getList();
this.areaSelect();
@@ -363,8 +433,11 @@
}
},
dateChange() {
- this.queryParams.date = this.date;
- console.log(this.queryParams);
+ this.queryParams.quarter = null;
+ this.getList();
+ },
+ quarterChange() {
+ this.queryParams.date = null;
this.getList();
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -396,6 +469,15 @@
this.indexOpen = true;
this.title = "淇敼鑰冩牳鎸囨爣";
},
+ /** 瀵艰埅鍒囨崲 */
+ handleSelect(key) {
+ this.activeIndex = key;
+ this.queryParams.examineTag = key;
+ // 鑰冩牳绉垎鍒楄〃
+ this.getList();
+
+
+ },
/** 淇敼鎸夐挳鎿嶄綔 */
handleRuleUpdate(row) {
this.reset("ruleForm");
@@ -420,15 +502,12 @@
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
this.download(
- "/check/score/export",
+ "/check/score/detailExport",
{
...this.queryParams,
},
`鑰冩牳鎸囨爣_${new Date().getTime()}.xlsx`
);
- },
- handleSelect(key, keyPath) {
- console.log(key, keyPath);
},
},
};
--
Gitblit v1.8.0