From dfb7b774d9934f4f5b3edf1a39bf73be9c90c55d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 13 十一月 2020 15:44:57 +0800
Subject: [PATCH] 移出数据表
---
src/utils/utils-datamanage.js | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index ebfef57..d214736 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -86,7 +86,7 @@
arr_field: arrFields,
default_sql: setting.execute ? 'true' : 'false'
}
-
+
let _dataresource = setting.dataresource
let _customScript = ''
@@ -99,6 +99,13 @@
let regoptions = null
if (setting.queryType === 'statistics' || _customScript) {
let allSearch = Utils.getAllSearchOptions(search)
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+
+ if (sessionStorage.getItem('isEditState') === 'true') {
+ userName = sessionStorage.getItem('CloudUserName') || ''
+ fullName = sessionStorage.getItem('CloudFullName') || ''
+ }
regoptions = allSearch.map(item => {
return {
@@ -107,6 +114,12 @@
}
})
regoptions.push({
+ reg: new RegExp('@userName@', 'ig'),
+ value: userName
+ }, {
+ reg: new RegExp('@fullName@', 'ig'),
+ value: fullName
+ }, {
reg: new RegExp('@orderBy@', 'ig'),
value: orderBy
}, {
@@ -187,7 +200,7 @@
/**
* @description 鑾峰彇绯荤粺瀛樺偍杩囩▼ sPC_Get_TableData 鍚堣鍊肩殑鍙傛暟
*/
- static getStatQueryDataParams (setting, statFields, search, orderBy, pageIndex, pageSize, menuType, dataManager) {
+ static getStatQueryDataParams (setting, statFields, search, orderBy, BID, menuType, dataManager) {
let param = {
func: 'sPC_Get_TableData',
obj_name: 'data',
@@ -207,6 +220,13 @@
let regoptions = null
if (setting.queryType === 'statistics' || _customScript) {
let allSearch = Utils.getAllSearchOptions(search)
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+
+ if (sessionStorage.getItem('isEditState') === 'true') {
+ userName = sessionStorage.getItem('CloudUserName') || ''
+ fullName = sessionStorage.getItem('CloudFullName') || ''
+ }
regoptions = allSearch.map(item => {
return {
@@ -215,6 +235,12 @@
}
})
regoptions.push({
+ reg: new RegExp('@userName@', 'ig'),
+ value: userName
+ }, {
+ reg: new RegExp('@fullName@', 'ig'),
+ value: fullName
+ }, {
reg: new RegExp('@orderBy@', 'ig'),
value: orderBy
}, {
@@ -243,7 +269,7 @@
})
}
- let LText = ` select ${statFields.map(col => `sum(${col.field}) as ${col.field}`).join(',')} from ${_dataresource} ${_search} `
+ let LText = ` select ${statFields.map(col => `isnull(sum(${col.field}),0) as ${col.field}`).join(',')} from ${_dataresource} ${_search} `
if (_customScript) {
LText = `${LText}
@@ -269,6 +295,10 @@
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
+ if (BID) {
+ param.BID = BID
+ }
+
// 鏁版嵁绠＄悊鏉冮檺
if (dataManager) {
param.dataM = 'Y'
--
Gitblit v1.8.0