From 121dfa79585eb98d8a418280eabe33eef44f112d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 02 十二月 2024 16:33:04 +0800 Subject: [PATCH] 2024-12-02 --- src/utils/option.js | 81 ++++++++++++++++++++++++++++------------ 1 files changed, 57 insertions(+), 24 deletions(-) diff --git a/src/utils/option.js b/src/utils/option.js index f001d84..858aa90 100644 --- a/src/utils/option.js +++ b/src/utils/option.js @@ -1,6 +1,4 @@ import nortable from '@/assets/img/normaltable.jpg' -// import mainsubtable from '@/assets/img/mainsubtable.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' @@ -44,13 +42,6 @@ // 绯荤粺妯℃澘 export const sysTemps = [ - // { - // title: '鍩虹琛ㄦ牸', - // type: 'CommonTable', - // url: nortable, - // baseconfig: '', - // isSystem: true - // }, { title: '鍩虹琛ㄦ牸', type: 'BaseTable', @@ -58,14 +49,6 @@ baseconfig: '', isSystem: true }, - // { - // title: '涓诲瓙琛ㄨ〃鏍�', - // type: 'CommonTable', - // url: mainsubtable, - // baseconfig: '', - // isSystem: true, - // isSubtable: true - // }, { title: '鑷畾涔�', type: 'CustomPage', @@ -73,13 +56,6 @@ baseconfig: '', isSystem: true }, - // { - // title: '鏍戝舰椤甸潰', - // type: 'TreePage', - // url: treepage, - // baseconfig: '', - // isSystem: true - // }, { title: '澶栭儴椤甸潰', type: 'NewPage', @@ -146,6 +122,7 @@ {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澶�'}, @@ -155,6 +132,7 @@ {value: '[-2, -2]', text: '鍚庡ぉ'}, {value: 'week', text: '鏈懆'}, {value: 'month', text: '鏈湀'}, + {value: 'lastMonth', text: '涓婃湀'}, ], datetime: [ {value: '', text: '绌�'}, @@ -240,6 +218,13 @@ class5: [{ value: 'between', text: 'between' + }], + class6: [{ + value: 'between', + text: 'between' + }, { + value: '=', + text: '=' }] } @@ -370,6 +355,45 @@ }, { value: 'border-dgreen', text: '鐧藉簳娣辩豢妗�' +}, { + value: 'border-purple', + text: '鐧藉簳绱' +}] + +// 鎸夐挳棰滆壊闆� +export const modalClasses = [{ + value: 'primary', + text: '钃濊壊' +}, { + value: 'yellow', + text: '榛勮壊' +}, { + value: 'orange', + text: '姗欒壊' +}, { + value: 'danger', + text: '绾㈣壊' +}, { + value: 'green', + text: '缁胯壊' +}, { + value: 'purple', + text: '绱壊' +}, { + value: 'border-primary', + text: '鐧藉簳钃濇' +}, { + value: 'border-yellow', + text: '鐧藉簳榛勬' +}, { + value: 'border-orange', + text: '鐧藉簳姗欐' +}, { + value: 'border-danger', + text: '鐧藉簳绾㈡' +}, { + value: 'border-green', + text: '鐧藉簳缁挎' }, { value: 'border-purple', text: '鐧藉簳绱' @@ -903,3 +927,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