From c8dec113736cc78c47cd63377d756d364b42a94e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 四月 2025 16:39:15 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/option.js | 112 ++++++++++++++++++++++++++++---------------------------
1 files changed, 57 insertions(+), 55 deletions(-)
diff --git a/src/utils/option.js b/src/utils/option.js
index 858aa90..8d52262 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -79,41 +79,41 @@
date: [
{value: '', text: '绌�'},
{value: '0', text: '浠婂ぉ'},
- {value: 1, text: '鏄ㄥぉ'},
- {value: 2, text: '鍓嶅ぉ'},
- {value: 3, text: '鍓嶄笁澶�'},
- {value: 7, text: '鍓嶄竷澶�'},
- {value: 30, text: '鍓�30澶�'},
- {value: 90, text: '鍓�90澶�'},
- {value: 7300, text: '鍓�20骞�'},
- {value: -1, text: '鏄庡ぉ'},
- {value: -2, text: '鍚庡ぉ'},
- {value: -3, text: '鍚庝笁澶�'},
- {value: -7, text: '鍚庝竷澶�'},
- {value: -30, text: '鍚�30澶�'},
- {value: -90, text: '鍚�90澶�'},
- {value: -180, text: '鍚庡崐骞�'},
- {value: -365, text: '鍚�1骞�'},
- {value: -1095, text: '鍚�3骞�'},
- {value: -1825, text: '鍚�5骞�'},
- {value: -3650, text: '鍚�10骞�'},
- {value: -7300, text: '鍚�20骞�'},
+ {value: '1', text: '鏄ㄥぉ'},
+ {value: '2', text: '鍓嶅ぉ'},
+ {value: '3', text: '鍓嶄笁澶�'},
+ {value: '7', text: '鍓嶄竷澶�'},
+ {value: '30', text: '鍓�30澶�'},
+ {value: '90', text: '鍓�90澶�'},
+ {value: '7300', text: '鍓�20骞�'},
+ {value: '-1', text: '鏄庡ぉ'},
+ {value: '-2', text: '鍚庡ぉ'},
+ {value: '-3', text: '鍚庝笁澶�'},
+ {value: '-7', text: '鍚庝竷澶�'},
+ {value: '-30', text: '鍚�30澶�'},
+ {value: '-90', text: '鍚�90澶�'},
+ {value: '-180', text: '鍚庡崐骞�'},
+ {value: '-365', text: '鍚�1骞�'},
+ {value: '-1095', text: '鍚�3骞�'},
+ {value: '-1825', text: '鍚�5骞�'},
+ {value: '-3650', text: '鍚�10骞�'},
+ {value: '-7300', text: '鍚�20骞�'},
],
dateweek: [
{value: '', text: '绌�'},
{value: '0', text: '鏈懆'},
- {value: 1, text: '涓婂懆'},
- {value: 3, text: '鍓嶄笁鍛�'},
- {value: 7, text: '鍓嶄竷鍛�'},
- {value: -1, text: '涓嬪懆'}
+ {value: '1', text: '涓婂懆'},
+ {value: '3', text: '鍓嶄笁鍛�'},
+ {value: '7', text: '鍓嶄竷鍛�'},
+ {value: '-1', text: '涓嬪懆'}
],
datemonth: [
{value: '', text: '绌�'},
{value: '0', text: '鏈湀'},
- {value: 1, text: '涓婃湀'},
- {value: 3, text: '鍓嶄笁鏈�'},
- {value: 7, text: '鍓嶄竷鏈�'},
- {value: -1, text: '涓嬫湀'}
+ {value: '1', text: '涓婃湀'},
+ {value: '3', text: '鍓嶄笁鏈�'},
+ {value: '7', text: '鍓嶄竷鏈�'},
+ {value: '-1', text: '涓嬫湀'}
],
daterange: [
{value: '', text: '绌�'},
@@ -133,28 +133,30 @@
{value: 'week', text: '鏈懆'},
{value: 'month', text: '鏈湀'},
{value: 'lastMonth', text: '涓婃湀'},
+ {value: 'year', text: '鏈勾'},
+ {value: 'lastYear', text: '涓婂勾'},
],
datetime: [
{value: '', text: '绌�'},
{value: '0', text: '褰撳墠'},
- {value: 1, text: '鏄ㄥぉ'},
- {value: 3, text: '鍓嶄笁澶�'},
- {value: 7, text: '鍓嶄竷澶�'},
- {value: 30, text: '鍓�30澶�'},
- {value: 90, text: '鍓�90澶�'},
- {value: 7300, text: '鍓�20骞�'},
- {value: -1, text: '鏄庡ぉ'},
- {value: -2, text: '鍚庡ぉ'},
- {value: -3, text: '鍚庝笁澶�'},
- {value: -7, text: '鍚庝竷澶�'},
- {value: -30, text: '鍚�30澶�'},
- {value: -90, text: '鍚�90澶�'},
- {value: -180, text: '鍚庡崐骞�'},
- {value: -365, text: '鍚�1骞�'},
- {value: -1095, text: '鍚�3骞�'},
- {value: -1825, text: '鍚�5骞�'},
- {value: -3650, text: '鍚�10骞�'},
- {value: -7300, text: '鍚�20骞�'},
+ {value: '1', text: '鏄ㄥぉ'},
+ {value: '3', text: '鍓嶄笁澶�'},
+ {value: '7', text: '鍓嶄竷澶�'},
+ {value: '30', text: '鍓�30澶�'},
+ {value: '90', text: '鍓�90澶�'},
+ {value: '7300', text: '鍓�20骞�'},
+ {value: '-1', text: '鏄庡ぉ'},
+ {value: '-2', text: '鍚庡ぉ'},
+ {value: '-3', text: '鍚庝笁澶�'},
+ {value: '-7', text: '鍚庝竷澶�'},
+ {value: '-30', text: '鍚�30澶�'},
+ {value: '-90', text: '鍚�90澶�'},
+ {value: '-180', text: '鍚庡崐骞�'},
+ {value: '-365', text: '鍚�1骞�'},
+ {value: '-1095', text: '鍚�3骞�'},
+ {value: '-1825', text: '鍚�5骞�'},
+ {value: '-3650', text: '鍚�10骞�'},
+ {value: '-7300', text: '鍚�20骞�'},
]
}
@@ -502,16 +504,16 @@
'blue-8': '#0050b3',
'blue-9': '#003a8c',
'blue-10': '#002766',
- 'geekblue-1': '#f0f5ff',
- 'geekblue-2': '#d6e4ff',
- 'geekblue-3': '#adc6ff',
- 'geekblue-4': '#85a5ff',
- 'geekblue-5': '#597ef7',
- 'geekblue-6': '#2f54eb',
- 'geekblue-7': '#1d39c4',
- 'geekblue-8': '#10239e',
- 'geekblue-9': '#061178',
- 'geekblue-10': '#030852',
+ 'geekblue-1': '#f0f6ff',
+ 'geekblue-2': '#dee9ff',
+ 'geekblue-3': '#b5ccff',
+ 'geekblue-4': '#8cadff',
+ 'geekblue-5': '#638aff',
+ 'geekblue-6': '#3860f4',
+ 'geekblue-7': '#2544cf',
+ 'geekblue-8': '#162ca8',
+ 'geekblue-9': '#0a1882',
+ 'geekblue-10': '#060e5c',
'purple-1': '#f9f0ff',
'purple-2': '#efdbff',
'purple-3': '#d3adf7',
--
Gitblit v1.8.0