From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/utils/option.js | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/utils/option.js b/src/utils/option.js
index 2c6f1d5..6e6bb25 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -1,10 +1,11 @@
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
import nortable from '@/assets/img/normaltable.jpg'
-import mainsubtable from '@/assets/img/mainsubtable.jpg'
+// import mainsubtable from '@/assets/img/mainsubtable.jpg'
import treepage from '@/assets/img/treepage.jpg'
import calendar from '@/assets/img/calendar.jpg'
import customImg from '@/assets/img/custom.jpg'
+import newpage from '@/assets/img/newpage.jpg'
import rolemanage from '@/assets/img/rolemanage.jpg'
const _dict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
@@ -17,8 +18,6 @@
formMessage: '鏈�澶欯max涓瓧绗︺��', // 鏂囨湰琛ㄥ崟鏈�澶ф彁绀�
numbermsg: '璇疯緭鍏ユ暟瀛楋紒',
lettermsg: '璇疯緭鍏ュ瓧姣嶏紒',
- letternummsg: '璇疯緭鍏ユ暟瀛楁垨瀛楁瘝锛�',
- quotemsg: '涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒',
funcname: '璇疯緭鍏ユ暟瀛椼�佸瓧姣嶃�佹眽瀛椾互鍙奯'
},
field: { // 瀛楁鍚�
@@ -57,14 +56,14 @@
baseconfig: '',
isSystem: true
},
- {
- title: '涓诲瓙琛ㄨ〃鏍�',
- type: 'CommonTable',
- url: mainsubtable,
- baseconfig: '',
- isSystem: true,
- isSubtable: true
- },
+ // {
+ // title: '涓诲瓙琛ㄨ〃鏍�',
+ // type: 'CommonTable',
+ // url: mainsubtable,
+ // baseconfig: '',
+ // isSystem: true,
+ // isSubtable: true
+ // },
{
title: '鑷畾涔�',
type: 'CustomPage',
@@ -89,7 +88,7 @@
{
title: '澶栭儴椤甸潰',
type: 'NewPage',
- url: customImg,
+ url: newpage,
baseconfig: '',
isSystem: true
},
@@ -102,7 +101,7 @@
]
// 鍥捐〃鑹茬郴
-export const chartColors = ['rgb(91, 143, 249)', 'rgb(90, 216, 166)', 'rgb(93, 112, 146)', 'rgb(246, 189, 22)', 'rgb(232, 100, 82)', 'rgb(109, 200, 236)', 'rgb(148, 95, 185)', 'rgb(246, 189, 22)', 'rgb(205, 221, 253)', 'rgb(248, 208, 203)']
+export const chartColors = ['rgb(91, 143, 249)', 'rgb(90, 216, 166)', 'rgb(93, 112, 146)', 'rgb(246, 189, 22)', 'rgb(232, 100, 82)', 'rgb(109, 200, 236)', 'rgb(148, 95, 185)', 'rgb(205, 221, 253)', 'rgb(248, 208, 203)', 'rgb(145, 213, 255)', 'rgb(211, 173, 247)']
// 鏃ユ湡榛樿鍊奸�夋嫨鑼冨洿
export const dateOptions = {
--
Gitblit v1.8.0