From 16bf6889bf1cb1db60d80e3bc40f33f114a8bc8d Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 31 七月 2024 11:27:01 +0800
Subject: [PATCH] feat：考核结果月度季度
---
src/views/system/check/result/index.vue | 30 +++++++++++++++---------------
src/views/system/check/template/index.vue | 2 +-
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/views/system/check/result/index.vue b/src/views/system/check/result/index.vue
index 1013586..7825ca2 100644
--- a/src/views/system/check/result/index.vue
+++ b/src/views/system/check/result/index.vue
@@ -3,8 +3,10 @@
<div>
<el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
style="margin-bottom: 10px">
- <el-menu-item index="0">鐪佸巺鑰冩牳</el-menu-item>
- <el-menu-item index="1">甯傚眬鑰冩牳</el-menu-item>
+ <el-menu-item index="0">鐪佸巺鏈堝害</el-menu-item>
+ <el-menu-item index="1">甯傚眬鏈堝害</el-menu-item>
+ <el-menu-item index="2">鐪佸巺瀛ｅ害</el-menu-item>
+ <el-menu-item index="3">甯傚眬瀛ｅ害</el-menu-item>
</el-menu>
</div>
@@ -31,7 +33,7 @@
</div>
<div class="score-warp">
<div class="score-item">
- <div style="font-size: 15px; margin-bottom: 15px">{{ formatCreateDate(city[0].createTime) }}</div>
+ <div style="font-size: 15px; margin-bottom: 15px">{{ formatCreateDate(city[0]) }}</div>
</div>
<div v-for="(score, scoreIndex) in city" :key="scoreIndex">
<div class="score-item">
@@ -46,7 +48,7 @@
<el-button v-hasPermi="['check:score:publish']" size="medium" :type="isAnyUnpublished(city) ? 'success' : 'danger'" @click="publish(city)">
{{ isAnyUnpublished(city) ? '鍙戝竷' : '鍙栨秷' }}
</el-button>
- <el-button size="medium" @click="jumpDetail(index)" type="info">璇︽儏</el-button>
+ <el-button size="medium" @click="jumpDetail(index)" type="primary">璇︽儏</el-button>
</div>
</div>
</div>
@@ -266,17 +268,15 @@
// 妫�鏌� city 鐨� score 鏁扮粍涓槸鍚︽湁浠讳綍涓�涓殑 publish 灞炴�т负 'UNPUBLISHED'
return city.some(score => score.publish === 'UNPUBLISHED');
},
- formatCreateDate(dateString) {
- const date = new Date(dateString);
- const year = date.getFullYear();
- const month = date.getMonth() + 1; // getMonth() 杩斿洖鐨勬湀浠芥槸浠� 0 寮�濮嬬殑锛屾墍浠ヨ鍔� 1
- const day = date.getDate();
-
- // 浣跨敤 padStart 鏂规硶纭繚鏈堜唤鍜屾棩鏈熷缁堟槸涓や綅鏁�
- const formattedMonth = month.toString().padStart(2, '0');
- const formattedDay = day.toString().padStart(2, '0');
-
- return `${year}骞�${formattedMonth}鏈�${formattedDay}鍙穈;
+ formatCreateDate(item) {
+ let date = new Date(item.startDate);
+ let year = date.getFullYear();
+ let startMonth = date.getMonth() + 1;
+ date = new Date(item.endDate);
+ let endMonth = date.getMonth() + 1;
+ let str = `${year}骞�${startMonth}鏈坄;
+ if (startMonth !== endMonth) str += `-${endMonth}鏈坄;
+ return str;
},
/** 瀵艰埅鍒囨崲 */
handleSelect(key) {
diff --git a/src/views/system/check/template/index.vue b/src/views/system/check/template/index.vue
index 20f9c98..0b739da 100644
--- a/src/views/system/check/template/index.vue
+++ b/src/views/system/check/template/index.vue
@@ -76,7 +76,7 @@
<span>鑰冩牳绫诲瀷锛�</span>
<dict-tag :options="dict.type.platform_examine_category" :value="item.examineCategory"/>
</div>
- <div class="text item">鑰冩牳棰戠巼锛歿{ item.frequency == 0 ? '鏈堝害鑰冩牳' : '瀛ｅ害鑰冩牳' }}</div>
+ <!-- <div class="text item">鑰冩牳棰戠巼锛歿{ item.frequency == 0 ? '鏈堝害鑰冩牳' : '瀛ｅ害鑰冩牳' }}</div> -->
<div class="text item" style="display: flex">
<span>鑰冩牳瀵硅薄锛�</span>
<el-tooltip effect="dark" :content="translateDeptIdList(item.deptId)" placement="top">
--
Gitblit v1.8.0