From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 06 二月 2025 21:11:56 +0800 Subject: [PATCH] Merge branch 'positec' into dms --- src/utils/option.js | 144 ++++++++++++++++++++++------------------------- 1 files changed, 67 insertions(+), 77 deletions(-) diff --git a/src/utils/option.js b/src/utils/option.js index 58196a7..b311e85 100644 --- a/src/utils/option.js +++ b/src/utils/option.js @@ -1,13 +1,7 @@ -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' -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 // 琛ㄥ崟鏍¢獙瑙勫垯 export const formRule = { @@ -17,8 +11,6 @@ formMessage: '鏈�澶欯max涓瓧绗︺��', // 鏂囨湰琛ㄥ崟鏈�澶ф彁绀� numbermsg: '璇疯緭鍏ユ暟瀛楋紒', lettermsg: '璇疯緭鍏ュ瓧姣嶏紒', - letternummsg: '璇疯緭鍏ユ暟瀛楁垨瀛楁瘝锛�', - quotemsg: '涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒', funcname: '璇疯緭鍏ユ暟瀛椼�佸瓧姣嶃�佹眽瀛椾互鍙奯' }, field: { // 瀛楁鍚� @@ -52,30 +44,8 @@ export const sysTemps = [ { title: '鍩虹琛ㄦ牸', - type: 'CommonTable', + type: 'BaseTable', url: nortable, - baseconfig: '', - isSystem: true - }, - { - title: '涓诲瓙琛ㄨ〃鏍�', - type: 'CommonTable', - url: mainsubtable, - baseconfig: '', - isSystem: true, - isSubtable: true - }, - { - title: '鏍戝舰椤甸潰', - type: 'TreePage', - url: treepage, - baseconfig: '', - isSystem: true - }, - { - title: '鏃ュ巻', - type: 'CalendarPage', - url: calendar, baseconfig: '', isSystem: true }, @@ -89,7 +59,7 @@ { title: '澶栭儴椤甸潰', type: 'NewPage', - url: customImg, + url: newpage, baseconfig: '', isSystem: true }, @@ -97,18 +67,17 @@ title: '瑙掕壊鏉冮檺鍒嗛厤', type: 'RolePermission', url: rolemanage, - isSystem: true, - hidden: true + isSystem: true } ] // 鍥捐〃鑹茬郴 -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 = { date: [ - {value: '', text: _dict['model.empty']}, + {value: '', text: '绌�'}, {value: '0', text: '浠婂ぉ'}, {value: 1, text: '鏄ㄥぉ'}, {value: 2, text: '鍓嶅ぉ'}, @@ -131,7 +100,7 @@ {value: -7300, text: '鍚�20骞�'}, ], dateweek: [ - {value: '', text: _dict['model.empty']}, + {value: '', text: '绌�'}, {value: '0', text: '鏈懆'}, {value: 1, text: '涓婂懆'}, {value: 3, text: '鍓嶄笁鍛�'}, @@ -139,7 +108,7 @@ {value: -1, text: '涓嬪懆'} ], datemonth: [ - {value: '', text: _dict['model.empty']}, + {value: '', text: '绌�'}, {value: '0', text: '鏈湀'}, {value: 1, text: '涓婃湀'}, {value: 3, text: '鍓嶄笁鏈�'}, @@ -147,22 +116,28 @@ {value: -1, text: '涓嬫湀'} ], daterange: [ - {value: '', text: _dict['model.empty']}, + {value: '', text: '绌�'}, {value: '[0, 0]', text: '浠婂ぉ'}, {value: '[1, 1]', text: '鏄ㄥぉ'}, {value: '[3, 0]', text: '杩戜笁澶�'}, {value: '[7, 0]', text: '杩戜竷澶�'}, {value: '[30, 0]', text: '杩�30澶�'}, + {value: '[90, 0]', text: '杩�90澶�'}, {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: '鏈懆'}, {value: 'month', text: '鏈湀'}, + {value: 'lastMonth', text: '涓婃湀'}, + {value: 'year', text: '鏈勾'}, + {value: 'lastYear', text: '涓婂勾'}, ], datetime: [ - {value: '', text: _dict['model.empty']}, + {value: '', text: '绌�'}, {value: '0', text: '褰撳墠'}, {value: 1, text: '鏄ㄥぉ'}, {value: 3, text: '鍓嶄笁澶�'}, @@ -187,7 +162,7 @@ // 鍖归厤瑙勫垯 export const matchReg = { - text: [{ + class1: [{ value: 'like', text: 'like' }, { @@ -209,20 +184,7 @@ value: '<=', text: '<=' }], - multiselect: [{ - value: 'like', - text: 'like' - }, { - value: 'not like', - text: 'not like' - }], - select: [{ - value: 'like', - text: 'like' - }, { - value: 'not like', - text: 'not like' - }, { + class2: [{ value: '=', text: '=' }, { @@ -238,7 +200,14 @@ value: '<=', text: '<=' }], - date: [{ + class3: [{ + value: 'like', + text: 'like' + }, { + value: 'not like', + text: 'not like' + }], + class4: [{ value: '>=', text: '>=' }, { @@ -248,13 +217,16 @@ value: '=', text: '=' }], - datemonth: [{ + class5: [{ value: 'between', text: 'between' }], - daterange: [{ + class6: [{ value: 'between', text: 'between' + }, { + value: '=', + text: '=' }] } @@ -391,7 +363,7 @@ }] // 鎸夐挳棰滆壊闆� -export const btnCustomClasses = [{ +export const modalClasses = [{ value: 'primary', text: '钃濊壊' }, { @@ -407,17 +379,26 @@ value: 'green', text: '缁胯壊' }, { - value: 'dgreen', - text: '娣辩豢鑹�' -}, { value: 'purple', text: '绱壊' }, { - value: 'cyan', - text: '闈掕壊' + value: 'border-primary', + text: '鐧藉簳钃濇' }, { - value: 'gray', - text: '鐏拌壊' + value: 'border-yellow', + text: '鐧藉簳榛勬' +}, { + value: 'border-orange', + text: '鐧藉簳姗欐' +}, { + value: 'border-danger', + text: '鐧藉簳绾㈡' +}, { + value: 'border-green', + text: '鐧藉簳缁挎' +}, { + value: 'border-purple', + text: '鐧藉簳绱' }] export const calendarColors = [ @@ -523,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', @@ -948,3 +929,12 @@ } export const queryTableSql = 'select top 999999 TbName,Remark from (select TbName,Remark from sDataDictb where appkey= @appkey@ and Deleted=0 union select a.TbName,Remark from (select TbName,Remark from sDataDictb where appkey= \'\' and Deleted=0 ) a left join (select TbName from sDataDictb where appkey= @appkey@ and Deleted=0 ) b on a.TbName=b.TbName where b.TbName is null ) t order by TbName' + +export const queryPrintSql = `select ID,Images,PrintTempNO+PrintTempName as PN from sPrintTemplate + where appkey= @appkey@ and Deleted=0 and typechartwo='web_print' + union select ID,Images,a.PrintTempNO+PrintTempName as PN + from (select * from sPrintTemplate where appkey= '' and Deleted=0 and typechartwo='web_print') a + left join (select PrintTempNO from sPrintTemplate where appkey= @appkey@ and Deleted=0 ) b + on a.PrintTempNO=b.PrintTempNO + left join (select Srcid from sPrintTemplate_Log where appkey='' and apicode= @appkey@ and Deleted=0 ) c + on a.ID=c.Srcid where b.PrintTempNO is null and c.Srcid is null` \ No newline at end of file -- Gitblit v1.8.0