From f0a1d1428a7a258a5493ad5f6c36161ce377c7b0 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 14:33:11 +0800
Subject: [PATCH] 修改cnas
---
src/components/view/index-index.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/components/view/index-index.vue b/src/components/view/index-index.vue
index 62edac6..7c824e6 100644
--- a/src/components/view/index-index.vue
+++ b/src/components/view/index-index.vue
@@ -314,6 +314,8 @@
</div>
</el-col>
<el-col :xs="24" :sm="24" :md="10" :lg="10" :xl="10">
+ <div class="right-1 card" v-if="getNumberFourTypes">
+ <div class="right-1-item">
<div class="right-1 card">
<div class="right-1-item" @click="openNotice">
<div class="img">
@@ -372,18 +374,18 @@
<el-date-picker
v-model="time.week"
type="week"
- format="yyyy-MM-dd"
+ format="yyyy 绗� WW 鍛�"
placeholder="閫夋嫨鍛�" size="mini" v-if="type=='鍛�'" @change="m=>changeTime(type,m)" style="width: 130px;">
</el-date-picker>
<el-date-picker
v-model="time.month"
type="month"
- placeholder="閫夋嫨鏈�" format="yyyy-MM-dd" size="mini" v-if="type=='鏈�'" @change="m=>changeTime(type,m)" style="width: 130px;">
+ placeholder="閫夋嫨鏈�" size="mini" v-if="type=='鏈�'" @change="m=>changeTime(type,m)" style="width: 130px;">
</el-date-picker>
<el-date-picker
v-model="time.year"
type="year"
- placeholder="閫夋嫨骞�" format="yyyy-MM-dd" size="mini" v-if="type=='骞�'" @change="m=>changeTime(type,m)" style="width: 130px;">
+ placeholder="閫夋嫨骞�" size="mini" v-if="type=='骞�'" @change="m=>changeTime(type,m)" style="width: 130px;">
</el-date-picker>
</div>
<!-- <span style="cursor: pointer;font-size: 12px;
@@ -889,10 +891,10 @@
case '鏈�':
const year = new Date(this.time.month).getFullYear();
const month = new Date(this.time.month).getMonth();
-
+ const day = new Date(year, month + 1, 0).getDate(); //
// 璁剧疆璧峰鏃ユ湡鍜岀粨鏉熸棩鏈�
- this.startTime = new Date(year, month, 1).toISOString().slice(0, 10); // 鏈堝垵
- this.endTime = new Date(year, month + 1, 0).toISOString().slice(0, 10); // 鏈堟湯
+ this.startTime = `${year}-${month + 1}-01`
+ this.endTime = `${year}-${month + 1}-${day}` // 鏈堟湯
break;
case '骞�':
const year0 = new Date(this.time.year).getFullYear();
@@ -907,6 +909,7 @@
// 璁剧疆璧峰鏃ユ湡鍜岀粨鏉熸棩鏈�
this.startTime = new Date(year, month, 1).toISOString().slice(0, 10); // 鏈堝垵
this.endTime = new Date(year, month + 1, 0).toISOString().slice(0, 10); // 鏈堟湯
+ this.time.month = new Date()
}
this.initEchart()
},
--
Gitblit v1.9.3