From 8a2ca99a372a7b44b990ab161337dfb333767e38 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期二, 12 九月 2023 11:13:01 +0800
Subject: [PATCH] 5600码盘功能点确定时获取正在码盘里没有显示的字段传到脚本里改进
---
store/index.js | 195 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 170 insertions(+), 25 deletions(-)
diff --git a/store/index.js b/store/index.js
index e2dc6b0..68a61d9 100644
--- a/store/index.js
+++ b/store/index.js
@@ -187,7 +187,9 @@
commit("setUrl",openinfo);
var ser = univerifyInfo.server.split('/');
if(ser[1] == 'mobox3'){
- reject({"errMsg":"Mobox3鏆傛椂鏈敮鎸佽嚜鍔ㄦ洿鏂帮紒"});
+ // reject({"errMsg":"Mobox3鏆傛椂鏈敮鎸佽嚜鍔ㄦ洿鏂帮紒"});
+ resolve({code:'00000',data:"",msg:""});
+ return;
}
uni.request({
url: openinfo + "PDA/GetApkVersionInfo",
@@ -209,7 +211,7 @@
commit("setApkVersionInfo",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg});
}
},
fail: (err) => {
@@ -279,7 +281,7 @@
commit("login",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg?ret.msg:ret.err_msg});
}
},
fail: (err) => {
@@ -322,7 +324,7 @@
commit("areaFunc",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg?ret.msg:ret.err_msg});
}
},
fail: (err) => {
@@ -384,7 +386,7 @@
commit("classAttrList",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg});
}
},
fail: (err) => {
@@ -419,7 +421,7 @@
commit("classGridStyleInfo",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg});
}
},
fail: (err) => {
@@ -452,7 +454,7 @@
commit("subClassAttrList",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg});
}
},
fail: (err) => {
@@ -521,7 +523,7 @@
commit("dicValueInfo",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg});
}
},
fail: (err) => {
@@ -547,13 +549,13 @@
'content-type': 'application/x-www-form-urlencoded'
},
success: (res) => {
- console.log(res);
+ // console.log(res);
const ret = res.data
if (ret.code=='00000') {
commit("DataObjRunCustomEventInfo",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg});
}
},
fail: (err) => {
@@ -570,22 +572,34 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.url);
+ var url = state.url + "selpsn/queryjson";
+ var datajson = univerifyInfo;
+ var header = {'content-type': 'application/x-www-form-urlencoded'};
+ if(state.OIOrgSAPI){ //鍒ゆ柇鏄惁鏄疢obox3
+ url = state.OIOrgSAPI+'api/user/query/query?sessionid='+state.loginProvider.loginid.result.session_id;
+ datajson = {
+ query_str: univerifyInfo.jp,
+ };
+ header={};
+ }
uni.request({
- url: state.url + "selpsn/queryjson",
- data: univerifyInfo,
+ url: url,
+ data: datajson,
method: 'POST',
dataType:"json",
- header: {
- 'content-type': 'application/x-www-form-urlencoded'
- },
+ header: header,
success: (res) => {
// console.log(res);
- const ret = JSON.parse(res.data);
- if (ret.code=='00000') {
- commit("querySelpsn",ret);
- resolve(ret);
+ try{
+ res = JSON.parse(res.data);
+ }catch(e){
+ res = res.data;
+ }
+ if (res.code=='00000' || res.err_code == 0) {
+ commit("querySelpsn",res);
+ resolve(res);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":res.msg?res.msg:res.err_msg});
}
},
fail: (err) => {
@@ -602,14 +616,25 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.url);
+ var url = state.url + "bpm/ProjectGetAnalysisList";
+ var header = {'content-type': 'application/x-www-form-urlencoded'};
+ if(state.OIMoboxSAPI){ //鍒ゆ柇鏄惁鏄疢obox3
+ // url = state.OIMoboxSAPI+'api/app/area/GetList?sessionid='+state.loginProvider.loginid.result.session_id;
+ // univerifyInfo = {
+ // app_type: "MES",
+ // };
+ // header={};
+ reject({"errMsg":"Mobox3鏆傛椂鏈敮鎸侀�鎷╅」鐩帴鍙ｏ紒"});
+ // resolve({code:'00000',data:"",msg:""});
+ return;
+ }
+
uni.request({
- url: state.url + "bpm/ProjectGetAnalysisList",
+ url: url,
data: univerifyInfo,
method: 'POST',
dataType:"json",
- header: {
- 'content-type': 'application/x-www-form-urlencoded'
- },
+ header: header,
success: (res) => {
console.log(res);
const ret = res.data;
@@ -617,7 +642,7 @@
commit("ProjectGetAnalysisList",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg});
}
},
fail: (err) => {
@@ -692,6 +717,126 @@
})
},
+
+ // api/class/attr/GetList?sessionid=SESSION_ID
+ // Mobox3寰楀埌鏁版嵁绫诲睘鎬�+ classAttrGetList: function({
+ commit,
+ state
+ }, univerifyInfo) {
+ return new Promise((resolve, reject) => {
+ // console.log(state.url);
+ uni.request({
+ url: state.OIDataSAPI+'api/class/attr/GetList?sessionid='+state.loginProvider.loginid.result.session_id,
+ data: univerifyInfo,
+ method: 'POST',
+ dataType:"json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ commit("classAttrList",ret);
+ resolve(ret);
+ } else {
+ reject({"errMsg":ret.err_msg});
+ }
+ },
+ fail: (err) => {
+ // console.log(err);
+ reject(err);
+ }
+ })
+ })
+ },
+ // api/class/attr/GetList?sessionid=SESSION_ID
+ // Mobox3寰楀埌鏁版嵁绫诲睘鎬�+ subClassAttrGetList: function({
+ commit,
+ state
+ }, univerifyInfo) {
+ return new Promise((resolve, reject) => {
+ // console.log(state.url);
+ uni.request({
+ url: state.OIDataSAPI+'api/class/attr/GetList?sessionid='+state.loginProvider.loginid.result.session_id,
+ data: univerifyInfo,
+ method: 'POST',
+ dataType:"json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ commit("subClassAttrList",ret);
+ resolve(ret);
+ } else {
+ reject({"errMsg":ret.err_msg});
+ }
+ },
+ fail: (err) => {
+ // console.log(err);
+ reject(err);
+ }
+ })
+ })
+ },
+ // api/dict/item/GetInfo?sessionid=SESSION_ID
+ // Mobox3寰楀埌瀛楀吀椤瑰垪琛�+ DictItemGetList: function({
+ commit,
+ state
+ }, univerifyInfo) {
+ return new Promise((resolve, reject) => {
+ // console.log(state.url);
+ uni.request({
+ url: state.OIMoboxSAPI+'api/dict/item/GetInfo?sessionid='+state.loginProvider.loginid.result.session_id,
+ data: univerifyInfo,
+ method: 'POST',
+ dataType:"json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ resolve(ret);
+ } else {
+ reject({"errMsg":ret.err_msg});
+ }
+ },
+ fail: (err) => {
+ // console.log(err);
+ reject(err);
+ }
+ })
+ })
+ },
+ // api/dataobj/Create?sessionid=SESSION_ID
+ // Mobox3鍒涘缓鏁版嵁瀵硅薄
+ createDataObj: function({
+ commit,
+ state
+ }, univerifyInfo) {
+ return new Promise((resolve, reject) => {
+ // console.log(state.url);
+ uni.request({
+ url: state.OIDataSAPI+'api/dataobj/Create?sessionid='+state.loginProvider.loginid.result.session_id,
+ data: univerifyInfo,
+ method: 'POST',
+ dataType:"json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ resolve(ret);
+ } else {
+ reject({"errMsg":ret.err_msg});
+ }
+ },
+ fail: (err) => {
+ console.log(err);
+ reject(err);
+ }
+ })
+ })
+ },
+
// api/class/uistyle/GetInfo?sessionid=SESSION_ID
// Mobox3寰楀埌鏁版嵁绫绘樉绀烘牱寮忎俊鎭� UIStyleGetInfo: function({
--
Gitblit v1.9.1