From c0e017668d780c40f85230f227ea0160b5d22d4d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 二月 2024 14:13:00 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/actionList/funcMegvii/index.jsx | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/zshare/actionList/funcMegvii/index.jsx b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
index e826bcf..78adb47 100644
--- a/src/tabviews/zshare/actionList/funcMegvii/index.jsx
+++ b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
@@ -149,17 +149,19 @@
getIpList = () => {
let _scriptSql = `select ID,data_code,data_name,Remark,face_ip,face_uname,face_pwd from bd_data where typecharone='face_device' and deleted=0`
- _scriptSql = Utils.formatOptions(_scriptSql)
-
let _sParam = {
func: 'sPC_Get_SelectedList',
- LText: _scriptSql,
obj_name: 'data',
arr_field: 'ID,data_code,data_name,Remark,face_ip,face_uname,face_pwd'
}
+
+ if (window.GLOB.execType === 'x') {
+ _sParam.exec_type = 'x'
+ }
+ _sParam.LText = Utils.formatOptions(_scriptSql, _sParam.exec_type)
_sParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- _sParam.secretkey = Utils.encrypt(_sParam.LText, _sParam.timestamp)
+ _sParam.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : _sParam.LText, _sParam.timestamp)
NApi.getSystemCacheConfig(_sParam).then(res => {
if (res.status) {
--
Gitblit v1.8.0