From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/utils/option.js |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/utils/option.js b/src/utils/option.js
index 2183750..ca6a857 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -1,5 +1,3 @@
-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 treepage from '@/assets/img/treepage.jpg'
@@ -7,8 +5,6 @@
 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
 
 // 琛ㄥ崟鏍¢獙瑙勫垯
 export const formRule = {
@@ -49,20 +45,20 @@
 
 // 绯荤粺妯℃澘
 export const sysTemps = [
-  {
-    title: '鍩虹琛ㄦ牸',
-    type: 'CommonTable',
-    url: nortable,
-    baseconfig: '',
-    isSystem: true
-  },
   // {
-  //   title: '鍩虹琛ㄦ牸锛堟柊锛�',
-  //   type: 'BaseTable',
+  //   title: '鍩虹琛ㄦ牸',
+  //   type: 'CommonTable',
   //   url: nortable,
   //   baseconfig: '',
   //   isSystem: true
   // },
+  {
+    title: '鍩虹琛ㄦ牸',
+    type: 'BaseTable',
+    url: nortable,
+    baseconfig: '',
+    isSystem: true
+  },
   // {
   //   title: '涓诲瓙琛ㄨ〃鏍�',
   //   type: 'CommonTable',
@@ -113,7 +109,7 @@
 // 鏃ユ湡榛樿鍊奸�夋嫨鑼冨洿
 export const dateOptions = {
   date: [
-    {value: '', text: _dict['model.empty']},
+    {value: '', text: '绌�'},
     {value: '0', text: '浠婂ぉ'},
     {value: 1, text: '鏄ㄥぉ'},
     {value: 2, text: '鍓嶅ぉ'},
@@ -136,7 +132,7 @@
     {value: -7300, text: '鍚�20骞�'},
   ],
   dateweek: [
-    {value: '', text: _dict['model.empty']},
+    {value: '', text: '绌�'},
     {value: '0', text: '鏈懆'},
     {value: 1, text: '涓婂懆'},
     {value: 3, text: '鍓嶄笁鍛�'},
@@ -144,7 +140,7 @@
     {value: -1, text: '涓嬪懆'}
   ],
   datemonth: [
-    {value: '', text: _dict['model.empty']},
+    {value: '', text: '绌�'},
     {value: '0', text: '鏈湀'},
     {value: 1, text: '涓婃湀'},
     {value: 3, text: '鍓嶄笁鏈�'},
@@ -152,7 +148,7 @@
     {value: -1, text: '涓嬫湀'}
   ],
   daterange: [
-    {value: '', text: _dict['model.empty']},
+    {value: '', text: '绌�'},
     {value: '[0, 0]', text: '浠婂ぉ'},
     {value: '[1, 1]', text: '鏄ㄥぉ'},
     {value: '[3, 0]', text: '杩戜笁澶�'},
@@ -167,7 +163,7 @@
     {value: 'month', text: '鏈湀'},
   ],
   datetime: [
-    {value: '', text: _dict['model.empty']},
+    {value: '', text: '绌�'},
     {value: '0', text: '褰撳墠'},
     {value: 1, text: '鏄ㄥぉ'},
     {value: 3, text: '鍓嶄笁澶�'},

--
Gitblit v1.8.0