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 | 127 +++++++++++++++++++-----------------------
1 files changed, 58 insertions(+), 69 deletions(-)
diff --git a/src/utils/option.js b/src/utils/option.js
index fac69e0..b311e85 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -1,7 +1,4 @@
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'
@@ -47,44 +44,15 @@
export const sysTemps = [
{
title: '鍩虹琛ㄦ牸',
- type: 'CommonTable',
+ type: 'BaseTable',
url: nortable,
baseconfig: '',
isSystem: true
},
- // {
- // title: '鍩虹琛ㄦ牸锛堟柊锛�',
- // type: 'BaseTable',
- // url: nortable,
- // baseconfig: '',
- // isSystem: true
- // },
- // {
- // title: '涓诲瓙琛ㄨ〃鏍�',
- // type: 'CommonTable',
- // url: mainsubtable,
- // baseconfig: '',
- // isSystem: true,
- // isSubtable: true
- // },
{
title: '鑷畾涔�',
type: 'CustomPage',
url: customImg,
- baseconfig: '',
- isSystem: true
- },
- {
- title: '鏍戝舰椤甸潰',
- type: 'TreePage',
- url: treepage,
- baseconfig: '',
- isSystem: true
- },
- {
- title: '鏃ュ巻',
- type: 'CalendarPage',
- url: calendar,
baseconfig: '',
isSystem: true
},
@@ -154,13 +122,19 @@
{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: '绌�'},
@@ -188,7 +162,7 @@
// 鍖归厤瑙勫垯
export const matchReg = {
- text: [{
+ class1: [{
value: 'like',
text: 'like'
}, {
@@ -210,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: '='
}, {
@@ -239,7 +200,14 @@
value: '<=',
text: '<='
}],
- date: [{
+ class3: [{
+ value: 'like',
+ text: 'like'
+ }, {
+ value: 'not like',
+ text: 'not like'
+ }],
+ class4: [{
value: '>=',
text: '>='
}, {
@@ -249,13 +217,16 @@
value: '=',
text: '='
}],
- datemonth: [{
+ class5: [{
value: 'between',
text: 'between'
}],
- daterange: [{
+ class6: [{
value: 'between',
text: 'between'
+ }, {
+ value: '=',
+ text: '='
}]
}
@@ -392,7 +363,7 @@
}]
// 鎸夐挳棰滆壊闆�
-export const btnCustomClasses = [{
+export const modalClasses = [{
value: 'primary',
text: '钃濊壊'
}, {
@@ -408,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 = [
@@ -524,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',
@@ -949,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