From ae7f00b753b89ba2d157a53c716662080a3cc171 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 29 七月 2023 12:05:39 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/option.js | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/utils/option.js b/src/utils/option.js
index 2d60bbf..f001d84 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -1,7 +1,6 @@
import nortable from '@/assets/img/normaltable.jpg'
// import mainsubtable from '@/assets/img/mainsubtable.jpg'
-import treepage from '@/assets/img/treepage.jpg'
-import calendar from '@/assets/img/calendar.jpg'
+// import treepage from '@/assets/img/treepage.jpg'
import customImg from '@/assets/img/custom.jpg'
import newpage from '@/assets/img/newpage.jpg'
import rolemanage from '@/assets/img/rolemanage.jpg'
@@ -74,20 +73,13 @@
baseconfig: '',
isSystem: true
},
- {
- title: '鏍戝舰椤甸潰',
- type: 'TreePage',
- url: treepage,
- baseconfig: '',
- isSystem: true
- },
- {
- title: '鏃ュ巻',
- type: 'CalendarPage',
- url: calendar,
- baseconfig: '',
- isSystem: true
- },
+ // {
+ // title: '鏍戝舰椤甸潰',
+ // type: 'TreePage',
+ // url: treepage,
+ // baseconfig: '',
+ // isSystem: true
+ // },
{
title: '澶栭儴椤甸潰',
type: 'NewPage',
@@ -157,6 +149,8 @@
{value: '[7, -7]', text: '鍓嶅悗涓冨ぉ'},
{value: '[30, -30]', text: '鍓嶅悗30澶�'},
{value: '[90, -90]', text: '鍓嶅悗90澶�'},
+ {value: '[180, -180]', label: '鍓嶅悗180澶�'},
+ {value: '[365, -365]', label: '鍓嶅悗365澶�'},
{value: '[-1, -1]', text: '鏄庡ぉ'},
{value: '[-2, -2]', text: '鍚庡ぉ'},
{value: 'week', text: '鏈懆'},
--
Gitblit v1.8.0