From 2ffd3fc56f81f08ec3dcfb50076e54542685725b Mon Sep 17 00:00:00 2001 From: jt <jt@activesoft.com.cn> Date: 星期一, 29 一月 2024 09:18:14 +0800 Subject: [PATCH] Mobox3PDA-3037调试错误改进 --- store/index.js | 591 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 549 insertions(+), 42 deletions(-) diff --git a/store/index.js b/store/index.js index 3f8d625..2c6c8d9 100644 --- a/store/index.js +++ b/store/index.js @@ -1,33 +1,60 @@ import Vue from 'vue' import Vuex from 'vuex' +import Base64 from '../components/js-base64/base64.js' Vue.use(Vuex) import app from './modules/app' const store = new Vuex.Store({ modules:{ app, + Base64, }, state: { hasLogin: false, + apkVersionInfo: "", loginProvider: "", areaFunc:'', thisareaFuncID:'', + thisareaFuncSubID:'', thisEditName:'', + thisEditSubName:'', thisDictName:'', _classAttrList:{}, _classGridStyleInfo:{}, + _subClassAttrList:{}, + _subClassGridStyleInfo:{}, _dicValueInfo:{}, DataObjRunCustomEventInfo:'', querySelpsn:'', ProjectGetAnalysisList:'', addclassattr:'', + DelObj:'', username:"sa", userpwd:"0000", - url:"39.100.224.211" //192.168.1.184:5200 36.33.24.94:5200 + url:"115.29.185.26:5000/mobox", //192.168.1.184:5200 36.33.24.94:5200 + OIOrgSAPI: '', //115.29.185.26:5101 + OIMoboxSAPI: '', //115.29.185.26:5102 + OIDataSAPI: '', //115.29.185.26:5103 + OIMongodbSvr: '' //115.29.185.26:5201 }, mutations: { setUrl(state, url) { state.url = url; + }, + setOrgSApi(state, url) { + state.OIOrgSAPI = url; + }, + setMobxoSApi(state, url) { + state.OIMoboxSAPI = url; + }, + setDataSApi(state, url) { + state.OIDataSAPI = url; + }, + setMongodbSvr(state, url) { + state.OIMongodbSvr = url; + }, + setApkVersionInfo(state, ret) { + state.apkVersionInfo = ret; }, login(state, provider) { state.hasLogin = true; @@ -39,8 +66,14 @@ setareaFuncid(state,id){ state.thisareaFuncID=id; }, + setareaFunSubcid(state,id){ + state.thisareaFuncSubID=id; + }, seteditName(state,editName){ state.thisEditName=editName; + }, + seteditSubName(state,editName){ + state.thisEditSubName=editName; }, setDictName(state,dictName){ state.thisDictName=dictName; @@ -56,6 +89,16 @@ data = state._classGridStyleInfo[state.thisareaFuncID]; Vue.set(data,state.thisEditName,ret); Vue.set(state._classGridStyleInfo,state.thisareaFuncID,data); + }, + subClassAttrList(state, ret) { + Vue.set(state._subClassAttrList,state.thisareaFuncSubID,ret); + }, + subClassGridStyleInfo(state, ret) { + var data = {}; + if(state._subClassGridStyleInfo[state.thisareaFuncSubID]) + data = state._subClassGridStyleInfo[state.thisareaFuncSubID]; + Vue.set(data,state.thisEditSubName,ret); + Vue.set(state._subClassGridStyleInfo,state.thisareaFuncSubID,data); }, dicValueInfo(state, ret) { // state._dicValueInfo[state.thisareaFuncID] = ret; @@ -73,16 +116,34 @@ addclassattr(state, ret) { state.addclassattr = ret; }, + DelObj(state, ret) { + state.DelObj = ret; + }, logout(state) { state.hasLogin = false }, }, getters: { + GetApkServionInfo(state) { + return state.apkVersionInfo + }, loginid(state) { return state.loginProvider.loginid }, getUrl(state) { return state.url + }, + getOrgSApi(state, url) { + return state.OIOrgSAPI; + }, + getMobxoSApi(state, url) { + return state.OIMoboxSAPI; + }, + getDataSApi(state, url) { + return state.OIDataSAPI; + }, + getMongodbSvr(state, url) { + return state.OIMongodbSvr; }, getclassAttrList(state){ return state._classAttrList[state.thisareaFuncID]; @@ -90,6 +151,15 @@ getclassGridStyleInfo(state){ if(state._classGridStyleInfo[state.thisareaFuncID]) return state._classGridStyleInfo[state.thisareaFuncID][state.thisEditName]; + else + return ""; + }, + getSubClassAttrList(state){ + return state._subClassAttrList[state.thisareaFuncSubID]; + }, + getSubClassGridStyleInfo(state){ + if(state._subClassGridStyleInfo[state.thisareaFuncSubID]) + return state._subClassGridStyleInfo[state.thisareaFuncSubID][state.thisEditSubName]; else return ""; }, @@ -102,6 +172,56 @@ actions: { //{commit} 瑙f瀯锛� //univerifyInfo 鑷畾涔夊弬鏁�+ GetApkVersionInfo: function({ + commit, + state + }, univerifyInfo) { + return new Promise((resolve, reject) => { + univerifyInfo = univerifyInfo || {}; + univerifyInfo.server = univerifyInfo.server || ''; + if (univerifyInfo.server.length == 0) { + reject({"errMsg":'鏈嶅姟鍣ㄥ湴鍧�笉鑳戒负绌�'}); + } + var openinfo = "http://" + univerifyInfo.server + "/"; //+"/OrgWebS" + //璁剧疆鍏ㄥ眬鍙傛暟锛歶rl-鏈嶅姟鍣ㄥ湴鍧�+ commit("setUrl",openinfo); + var ser = univerifyInfo.server.split('/'); + if(ser[1] == 'mobox3'){ + // reject({"errMsg":"Mobox3鏆傛椂鏈敮鎸佽嚜鍔ㄦ洿鏂帮紒"}); + resolve({code:'00000',data:"",msg:""}); + return; + } + uni.request({ + url: openinfo + "PDA/GetApkVersionInfo", + data: {}, + method: 'POST', + dataType:"json", + header: { + 'content-type': 'application/x-www-form-urlencoded' + }, + success: (res) => { + console.log(res); + if(res.statusCode==404){ + reject({"errMsg":"鍦板潃涓嶅锛岃妫�煡璇ュ湴鍧�細"+ openinfo +",鏂规硶锛欸etApkVersionInfo,鏄惁姝g‘"}); + } else if(res.statusCode==500){ + reject({"errMsg":"鏈壘鍒版洿鏂板寘鎵�湪鐩綍锛�}); + } + const ret = res.data + if (ret.code=='00000') { + commit("setApkVersionInfo",ret); + resolve(ret); + } else { + reject({"errMsg":ret.msg}); + } + }, + fail: (err) => { + console.log(err); + reject(err); + } + }) + }) + }, + login: function({ commit, state @@ -111,7 +231,6 @@ univerifyInfo.server = univerifyInfo.server || ''; univerifyInfo.uname = univerifyInfo.uname || ''; univerifyInfo.pwd = univerifyInfo.pwd || ''; - // console.log(univerifyInfo); if (univerifyInfo.server.length == 0) { reject({"errMsg":'鏈嶅姟鍣ㄥ湴鍧�笉鑳戒负绌�'}); } @@ -121,33 +240,48 @@ if (univerifyInfo.pwd.length < 1) { reject({"errMsg":'瀵嗙爜鏈�煭涓�1涓瓧绗�'}); } - var openinfo = "http://" + univerifyInfo.server + "/"; //+"/OrgWebS" + var openinfo = "http://" + univerifyInfo.server + "/"; //璁剧疆鍏ㄥ眬鍙傛暟锛歶rl-鏈嶅姟鍣ㄥ湴鍧� commit("setUrl",openinfo); + var ser = univerifyInfo.server.split('/'); + var url = openinfo + "PDA/SignIn"; + var header = {'content-type': 'application/x-www-form-urlencoded'}; + commit("setOrgSApi",''); + commit("setMobxoSApi",''); + commit("setDataSApi",''); + commit("setMongodbSvr",''); + if(ser[1] == 'mobox3'){ //鍒ゆ柇鍦板潃鏄惁鏄疢obox3 + var orgSApi = "http://" + ser[0].split(':')[0] + ":5101/"; + var mobxoSApi = "http://" + ser[0].split(':')[0] + ":5102/"; + var dataSApi = "http://" + ser[0].split(':')[0] + ":5103/"; + var mongodbSvr = "http://" + ser[0].split(':')[0] + ":5201/"; + commit("setOrgSApi",orgSApi); + commit("setMobxoSApi",mobxoSApi); + commit("setDataSApi",dataSApi); + commit("setMongodbSvr",mongodbSvr); + url = orgSApi+'api/user/ace/VerifyPassword'; + univerifyInfo = { + app_type: "mobox", + user_login: Base64.encode(univerifyInfo.uname), + user_psw: Base64.encode(univerifyInfo.pwd), + }; + header={}; + } - // if (univerifyInfo.server.split(':').length < 2) - // cgi = "http://" + univerifyInfo.server + ":5010"; ///OrgWebS - - // setTimeout(_=>{ - // resolve("00000000000") - // },3000) - // console.log(openinfo + "PDA/SignIn"); uni.request({ - url: openinfo + "PDA/SignIn", + 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 - if (ret.code=='00000') { + if (ret.code=='00000' || ret.err_code == 0) { commit("login",ret); resolve(ret); } else { - reject({"errMsg":ret.msg}); + reject({"errMsg":ret.msg?ret.msg:ret.err_msg}); } }, fail: (err) => { @@ -163,24 +297,63 @@ state }, univerifyInfo) { return new Promise((resolve, reject) => { - // console.log(state.url); + // console.log(state.loginProvider.loginid.result.session_id); + var url = state.url + "PDA/PDAArea"; + 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={}; + } uni.request({ - url: state.url + "PDA/PDAArea", + url: url, data: univerifyInfo, method: 'POST', dataType:"json", - header: { - 'content-type': 'application/x-www-form-urlencoded' - }, + header: header, success: (res) => { - // console.log(res); + console.log(res); + if(res.statusCode==404){ + reject({"errMsg":"鍦板潃涓嶅锛岃妫�煡璇ュ湴鍧�細"+ openinfo}); + } const ret = res.data - if (ret.code=='00000') { + if (ret.code=='00000' || ret.err_code == 0) { commit("areaFunc",ret); resolve(ret); } else { - reject({"errMsg":ret.msg}); + reject({"errMsg":ret.msg?ret.msg:ret.err_msg}); + } + }, + fail: (err) => { + // console.log(err); + reject(err); + } + }) + }) + }, + // Mobox3鑾峰彇搴旂敤棰嗗煙涓嬬殑鍔熻兘鐐�+ GetFuncTree: function({ + commit, + state + }, univerifyInfo) { + return new Promise((resolve, reject) => { + // console.log(state.loginProvider.loginid.result.session_id); + uni.request({ + url: state.OIMoboxSAPI+'api/app/GetFuncTree?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("areaFunc",ret); + resolve(ret); + } else { + reject({"errMsg":ret.err_msg}); } }, fail: (err) => { @@ -240,7 +413,7 @@ 'content-type': 'application/x-www-form-urlencoded' }, success: (res) => { - // console.log(res); + console.log(res); const ret = res.data if (ret.code=='00000') { // var data ={}; @@ -249,6 +422,74 @@ resolve(ret); } else { reject({"errMsg":ret.msg}); + } + }, + fail: (err) => { + // console.log(err); + reject(err); + } + }) + }) + }, + + subClassAttrList: function({ + commit, + state + }, univerifyInfo) { + return new Promise((resolve, reject) => { + // console.log(state.url); + + uni.request({ + url: state.url + "PDA/PDAAttrList", + data: univerifyInfo, + method: 'POST', + dataType:"json", + header: { + 'content-type': 'application/x-www-form-urlencoded' + }, + success: (res) => { + console.log(res); + const ret = res.data + if (ret.code=='00000') { + commit("subClassAttrList",ret); + resolve(ret); + } else { + reject({"errMsg":ret.msg}); + } + }, + fail: (err) => { + // console.log(err); + reject(err); + } + }) + }) + }, + + subClassGridStyleInfo: function({ + commit, + state + }, univerifyInfo) { + return new Promise((resolve, reject) => { + // console.log(state.url); + + uni.request({ + url: state.url + "PDA/PDAGridStyleGetInfo", + data: univerifyInfo, + method: 'POST', + dataType:"json", + header: { + 'content-type': 'application/x-www-form-urlencoded' + }, + success: (res) => { + console.log(res); + const ret = res.data + if (ret.code=='00000') { + // var data ={}; + // Vue.set(data,univerifyInfo.name,ret); + commit("subClassGridStyleInfo",ret); + resolve(ret); + } else { + reject({"errMsg":ret.err_msg}); } }, fail: (err) => { @@ -308,7 +549,7 @@ '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); @@ -331,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.msg}); + reject({"errMsg":res.msg?res.msg:res.err_msg}); } }, fail: (err) => { @@ -363,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鏆傛椂鏈敮鎸侀�鎷╅」鐩帴鍙o紒"}); + // 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; @@ -410,7 +674,7 @@ commit("addclassattr",ret); resolve(ret); } else { - reject({"errMsg":ret.msg}); + reject({"errMsg":JSON.stringify(ret)}); } }, fail: (err) => { @@ -419,7 +683,250 @@ } }) }) - } + }, + + DelObj: function({ + commit, + state + }, univerifyInfo) { + return new Promise((resolve, reject) => { + // console.log(state.url); + uni.request({ + url: state.url + "PDA/DelObj", + data: univerifyInfo, + method: 'POST', + dataType:"json", + header: { + 'content-type': 'application/x-www-form-urlencoded' + }, + success: (res) => { + console.log(res); + const ret = res.data; + if (ret.code=='00000') { + commit("DelObj",ret); + resolve(ret); + } else { + reject({"errMsg":JSON.stringify(ret)}); + } + }, + fail: (err) => { + console.log(err); + reject(err); + } + }) + }) + }, + + + // 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({ + commit, + state + }, univerifyInfo) { + return new Promise((resolve, reject) => { + // console.log(state.loginProvider.loginid.result.session_id); + uni.request({ + url: state.OIDataSAPI+'api/class/uistyle/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) { + // commit("areaFunc",ret); + resolve(ret); + } else { + reject({"errMsg":ret.err_msg}); + } + }, + fail: (err) => { + // console.log(err); + reject(err); + } + }) + }) + }, + // api/dataobj/RunCustomEvent?sessionid=SESSION_ID + // Mobox3鎵ц鑷畾涔夎剼鏈�+ runCustomEvent: function({ + commit, + state + }, univerifyInfo) { + return new Promise((resolve, reject) => { + // console.log(state.loginProvider.loginid.result.session_id); + uni.request({ + url: state.OIDataSAPI+'api/dataobj/RunCustomEvent?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("areaFunc",ret); + resolve(ret); + } else { + reject({"errMsg":ret.err_msg}); + } + }, + fail: (err) => { + // console.log(err); + reject(err); + } + }) + }) + }, + // api/dataobj/Delete?sessionid=SESSION_ID + // Mobox3鍒犻櫎鏁版嵁瀵硅薄 + dataObjDel: function({ + commit, + state + }, univerifyInfo) { + return new Promise((resolve, reject) => { + // console.log(state.loginProvider.loginid.result.session_id); + uni.request({ + url: state.OIDataSAPI+'api/dataobj/Delete?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("areaFunc",ret); + resolve(ret); + } else { + reject({"errMsg":ret.err_msg}); + } + }, + fail: (err) => { + // console.log(err); + reject(err); + } + }) + }) + }, } }) -- Gitblit v1.9.1