From a94b0a4d15b26ecf8fe99f0a1c3e60d60b97766d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 15 八月 2023 14:22:03 +0800
Subject: [PATCH] 2023-08-15
---
src/utils/utils-datamanage.js | 45 +++++++++++++++++----------------------------
1 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 86c4751..5be52b3 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -1,6 +1,5 @@
import md5 from 'md5'
import moment from 'moment'
-import options from '@/store/options.js'
import Utils from './utils.js'
export default class DataUtils {
@@ -58,8 +57,8 @@
param.func = setting.innerFunc
} else {
if (window.GLOB.mkHS) {
- if (setting.sysInterface === 'true' && options.cloudServiceApi) {
- param.rduri = options.cloudServiceApi
+ if (setting.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
+ param.rduri = window.GLOB.cloudServiceApi
param.userid = sessionStorage.getItem('CloudUserID') || ''
param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
} else if (setting.sysInterface !== 'true') {
@@ -124,11 +123,6 @@
let city = sessionStorage.getItem('city') || ''
let district = sessionStorage.getItem('district') || ''
let address = sessionStorage.getItem('address') || ''
-
- if (window.GLOB.mkHS) {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
let _dataresource = setting.dataresource
let _customScript = ''
@@ -261,7 +255,7 @@
}
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ if (window.GLOB.debugger === true) {
_customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈�*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
LText && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧�*/\n` : ''}` + LText.replace(/\n\s{8}/ig, '\n'))
}
@@ -286,6 +280,9 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
+ param.username = userName
+ param.fullname = fullName
+
if (window.GLOB.probation) {
param.s_debug_type = 'Y'
}
@@ -294,8 +291,8 @@
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
// special HS鑷畾涔夊嚱鏁版煡璇�
- if (setting.tableName === 's_custom_script' && options.cloudServiceApi) {
- param.rduri = options.cloudServiceApi
+ if (setting.tableName === 's_custom_script' && window.GLOB.cloudServiceApi) {
+ param.rduri = window.GLOB.cloudServiceApi
param.userid = sessionStorage.getItem('CloudUserID') || ''
param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
}
@@ -315,10 +312,6 @@
arr_field: statFields.map(col => col.field).join(','),
default_sql: setting.execute ? 'true' : 'false'
}
-
- // if (setting.transaction === 'true') {
- // param.func = 'sPC_Get_TableData_try'
- // }
let _dataresource = setting.dataresource
let _customScript = ''
@@ -333,11 +326,6 @@
let city = sessionStorage.getItem('city') || ''
let district = sessionStorage.getItem('district') || ''
let address = sessionStorage.getItem('address') || ''
-
- if (window.GLOB.mkHS) {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
if (setting.customScript) {
_customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100)
@@ -417,7 +405,7 @@
}
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ if (window.GLOB.debugger === true) {
_customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈� 缁熻鏌ヨ*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
LText && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧� 缁熻鏌ヨ*/\n` : ''}` + LText.replace(/\n\s{8}/ig, '\n'))
}
@@ -432,6 +420,9 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
+
+ param.username = userName
+ param.fullname = fullName
if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
@@ -504,11 +495,7 @@
let city = sessionStorage.getItem('city') || ''
let district = sessionStorage.getItem('district') || ''
let address = sessionStorage.getItem('address') || ''
-
- if (window.GLOB.mkHS) {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
+
_customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100)
select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}'
${_customScript}
@@ -569,7 +556,7 @@
_script = _script.replace(/@typename@/ig, `'admin'`)
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ if (window.GLOB.debugger === true) {
_script && console.info(`${item.$name ? `/*${item.$name} 鑷畾涔夎剼鏈紙鍚屾鏌ヨ锛�*/\n` : ''}${_sql ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_script}`)
_sql && console.info(`${item.$name ? `/*${item.$name} 鏁版嵁婧愶紙鍚屾鏌ヨ锛�*/\n` : ''}` + _sql)
}
@@ -584,7 +571,9 @@
func: 'sPC_Get_structured_data',
LText: _LText.join(' union all '),
LText_field: LText_field.join(' union all '),
- BID: BID
+ BID: BID,
+ username: sessionStorage.getItem('User_Name') || '',
+ fullName: sessionStorage.getItem('Full_Name') || ''
}
if (config.MenuName) {
--
Gitblit v1.8.0