From 15dcf7158d4c5d66d4b196e4e0b2030e1070d448 Mon Sep 17 00:00:00 2001 From: cuiqian2004 <cuiqian2004@163.com> Date: 星期一, 03 三月 2025 16:46:24 +0800 Subject: [PATCH] 5601 form --- store/index.js | 1160 +++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 867 insertions(+), 293 deletions(-) diff --git a/store/index.js b/store/index.js index 157d1fb..ddeeac3 100644 --- a/store/index.js +++ b/store/index.js @@ -1,43 +1,48 @@ import Vue from 'vue' import Vuex from 'vuex' import Base64 from '../components/js-base64/base64.js' +import utils from "@/js/utils.js" Vue.use(Vuex) import app from './modules/app' const store = new Vuex.Store({ - modules:{ + modules: { app, Base64, }, state: { hasLogin: false, + deviceId: '', apkVersionInfo: "", loginProvider: "", - areaFunc:'', - thisareaFuncID:'', - thisareaFuncSubID:'', - thisEditName:'', - thisEditSubName:'', - thisDictName:'', - _classAttrList:{}, - _classGridStyleInfo:{}, - _subClassAttrList:{}, - _subClassGridStyleInfo:{}, - _dicValueInfo:{}, - DataObjRunCustomEventInfo:'', - querySelpsn:'', - ProjectGetAnalysisList:'', - addclassattr:'', - DelObj:'', - username:"sa", - userpwd:"0000", - url:"139.159.144.10:8080/mobox3", //115.29.185.26:5000 + areaFunc: '', + thisareaFuncID: '', + thisareaFuncSubID: '', + thisEditName: '', + thisEditSubName: '', + thisDictName: '', + _classAttrList: {}, + _classGridStyleInfo: {}, + _subClassAttrList: {}, + _subClassGridStyleInfo: {}, + _dicValueInfo: {}, + DataObjRunCustomEventInfo: '', + querySelpsn: '', + ProjectGetAnalysisList: '', + addclassattr: '', + DelObj: '', + username: "sa", + userpwd: "0000", + url: "139.159.144.10:8080/mobox3", //115.29.185.26:5000 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: { + setDeviceId(state, ret) { + state.deviceId = ret; + }, setUrl(state, url) { state.url = url; }, @@ -63,46 +68,46 @@ areaFunc(state, ret) { state.areaFunc = ret; }, - setareaFuncid(state,id){ - state.thisareaFuncID=id; + setareaFuncid(state, id) { + state.thisareaFuncID = id; }, - setareaFunSubcid(state,id){ - state.thisareaFuncSubID=id; + setareaFunSubcid(state, id) { + state.thisareaFuncSubID = id; }, - seteditName(state,editName){ - state.thisEditName=editName; + seteditName(state, editName) { + state.thisEditName = editName; }, - seteditSubName(state,editName){ - state.thisEditSubName=editName; + seteditSubName(state, editName) { + state.thisEditSubName = editName; }, - setDictName(state,dictName){ - state.thisDictName=dictName; + setDictName(state, dictName) { + state.thisDictName = dictName; }, classAttrList(state, ret) { // state._classAttrList[state.thisareaFuncID] = ret; - Vue.set(state._classAttrList,state.thisareaFuncID,ret); + Vue.set(state._classAttrList, state.thisareaFuncID, ret); }, classGridStyleInfo(state, ret) { // state._classGridStyleInfo[state.thisareaFuncID] = ret; var data = {}; - if(state._classGridStyleInfo[state.thisareaFuncID]) + if (state._classGridStyleInfo[state.thisareaFuncID]) data = state._classGridStyleInfo[state.thisareaFuncID]; - Vue.set(data,state.thisEditName,ret); - Vue.set(state._classGridStyleInfo,state.thisareaFuncID,data); + Vue.set(data, state.thisEditName, ret); + Vue.set(state._classGridStyleInfo, state.thisareaFuncID, data); }, subClassAttrList(state, ret) { - Vue.set(state._subClassAttrList,state.thisareaFuncSubID,ret); + Vue.set(state._subClassAttrList, state.thisareaFuncSubID, ret); }, subClassGridStyleInfo(state, ret) { var data = {}; - if(state._subClassGridStyleInfo[state.thisareaFuncSubID]) + if (state._subClassGridStyleInfo[state.thisareaFuncSubID]) data = state._subClassGridStyleInfo[state.thisareaFuncSubID]; - Vue.set(data,state.thisEditSubName,ret); - Vue.set(state._subClassGridStyleInfo,state.thisareaFuncSubID,data); + Vue.set(data, state.thisEditSubName, ret); + Vue.set(state._subClassGridStyleInfo, state.thisareaFuncSubID, data); }, dicValueInfo(state, ret) { // state._dicValueInfo[state.thisareaFuncID] = ret; - Vue.set(state._dicValueInfo,state.thisDictName,ret); + Vue.set(state._dicValueInfo, state.thisDictName, ret); }, DataObjRunCustomEventInfo(state, ret) { state.DataObjRunCustomEventInfo = ret; @@ -124,6 +129,9 @@ }, }, getters: { + getDeviceId(state, ret) { + return state.deviceId + }, GetApkServionInfo(state) { return state.apkVersionInfo }, @@ -145,29 +153,29 @@ getMongodbSvr(state, url) { return state.OIMongodbSvr; }, - getclassAttrList(state){ + getclassAttrList(state) { return state._classAttrList[state.thisareaFuncID]; }, - getclassGridStyleInfo(state){ - if(state._classGridStyleInfo[state.thisareaFuncID]) + getclassGridStyleInfo(state) { + if (state._classGridStyleInfo[state.thisareaFuncID]) return state._classGridStyleInfo[state.thisareaFuncID][state.thisEditName]; - else + else return ""; }, - getSubClassAttrList(state){ + getSubClassAttrList(state) { return state._subClassAttrList[state.thisareaFuncSubID]; }, - getSubClassGridStyleInfo(state){ - if(state._subClassGridStyleInfo[state.thisareaFuncSubID]) + getSubClassGridStyleInfo(state) { + if (state._subClassGridStyleInfo[state.thisareaFuncSubID]) return state._subClassGridStyleInfo[state.thisareaFuncSubID][state.thisEditSubName]; - else + else return ""; }, - getdicValueInfo(state){ + getdicValueInfo(state) { return state._dicValueInfo[state.thisDictName]; } - - + + }, actions: { //{commit} 瑙f瀯锛�@@ -180,11 +188,16 @@ univerifyInfo = univerifyInfo || {}; univerifyInfo.server = univerifyInfo.server || ''; if (univerifyInfo.server.length == 0) { - reject({"errMsg":'鏈嶅姟鍣ㄥ湴鍧�笉鑳戒负绌�'}); + reject({ + "errMsg": '鏈嶅姟鍣ㄥ湴鍧�笉鑳戒负绌�' + }); } var openinfo = "http://" + univerifyInfo.server + "/"; //+"/OrgWebS" + if (univerifyInfo.server.includes("://")) { + openinfo = univerifyInfo.server + "/" + } //璁剧疆鍏ㄥ眬鍙傛暟锛歶rl-鏈嶅姟鍣ㄥ湴鍧�- commit("setUrl",openinfo); + commit("setUrl", openinfo); // var ser = univerifyInfo.server.split('/'); // if(ser[1] == 'mobox3'){ // // reject({"errMsg":"Mobox3鏆傛椂鏈敮鎸佽嚜鍔ㄦ洿鏂帮紒"}); @@ -195,23 +208,30 @@ url: openinfo + "PDA/GetApkVersionInfo", data: {}, method: 'POST', - dataType:"json", + dataType: "json", header: { - 'content-type': 'application/x-www-form-urlencoded' + '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":"鏈壘鍒版洿鏂板寘鎵�湪鐩綍锛�}); + 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); + if (ret.code == '00000') { + commit("setApkVersionInfo", ret); resolve(ret); } else { - reject({"errMsg":ret.msg}); + reject({ + "errMsg": ret.msg + }); } }, fail: (err) => { @@ -221,7 +241,7 @@ }) }) }, - + login: function({ commit, state @@ -232,56 +252,86 @@ univerifyInfo.uname = univerifyInfo.uname || ''; univerifyInfo.pwd = univerifyInfo.pwd || ''; if (univerifyInfo.server.length == 0) { - reject({"errMsg":'鏈嶅姟鍣ㄥ湴鍧�笉鑳戒负绌�'}); + reject({ + "errMsg": '鏈嶅姟鍣ㄥ湴鍧�笉鑳戒负绌�' + }); } if (univerifyInfo.uname.length < 2) { - reject({"errMsg":'璐﹀彿鏈�煭涓�2 涓瓧绗�'}); + reject({ + "errMsg": '璐﹀彿鏈�煭涓�2 涓瓧绗�' + }); } if (univerifyInfo.pwd.length < 1) { - reject({"errMsg":'瀵嗙爜鏈�煭涓�1涓瓧绗�'}); + reject({ + "errMsg": '瀵嗙爜鏈�煭涓�1涓瓧绗�' + }); } var openinfo = "http://" + univerifyInfo.server + "/"; + if (univerifyInfo.server.includes("://")) { + openinfo = univerifyInfo.server + "/" + } //璁剧疆鍏ㄥ眬鍙傛暟锛歶rl-鏈嶅姟鍣ㄥ湴鍧�- commit("setUrl",openinfo); - var ser = univerifyInfo.server.split('/'); + commit("setUrl", openinfo); + var ser = univerifyInfo.server.toLowerCase().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'; + var header = { + 'content-type': 'application/x-www-form-urlencoded' + }; + commit("setOrgSApi", ''); + commit("setMobxoSApi", ''); + commit("setDataSApi", ''); + commit("setMongodbSvr", ''); + if (ser[ser.length - 1] == 'mobox3') { //鍒ゆ柇鍦板潃鏄惁鏄疢obox3 + + const orgsport = univerifyInfo.orgsport || 5101 + const moboxsport = univerifyInfo.moboxsport || 5102 + const datasport = univerifyInfo.datasport || 5103 + const mongodbsport = univerifyInfo.mongodbsport || 5201 + + var orgSApi = "http://" + ser[0].split(':')[0] + ":" + orgsport + "/"; + var mobxoSApi = "http://" + ser[0].split(':')[0] + ":" + moboxsport + "/"; + var dataSApi = "http://" + ser[0].split(':')[0] + ":" + datasport + "/"; + var mongodbSvr = "http://" + ser[0].split(':')[0] + ":" + mongodbsport + "/"; + if (univerifyInfo.server.includes("://")) { + orgSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + orgsport + "/"; + mobxoSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + moboxsport + "/"; + dataSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + datasport + "/"; + mongodbSvr = ser[0] + "//" + ser[2].split(':')[0] + ":" + mongodbsport + + "/"; + } + 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), + client_info: { + type: 3, //瀹㈡埛绔被鍨嬶細0鈥揚C锛�鈥揥EB锛�鈥撳畨鍗擄紝3鈥撳畨鍗揚AD锛�鈥搃Phone锛�5鈥搃Pad锛�6鈥撳叾瀹�+ num: state.deviceId //PDA鐨勮澶囧彿 + } }; - header={}; + header = {}; } - + console.log(univerifyInfo); uni.request({ url: url, data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", header: header, success: (res) => { - console.log(res); + console.log(res); const ret = res.data - if (ret.code=='00000' || ret.err_code == 0) { - commit("login",ret); + if (ret.code == '00000' || ret.err_code == 0) { + commit("login", ret); resolve(ret); } else { - reject({"errMsg":ret.msg?ret.msg:ret.err_msg}); + reject({ + "errMsg": ret.msg ? ret.msg : ret.err_msg + }); } }, fail: (err) => { @@ -291,53 +341,82 @@ }) }) }, - + areaFunc: function({ commit, state }, univerifyInfo) { return new Promise((resolve, reject) => { - // console.log(state.loginProvider.loginid.result.session_id); + // console.log(state.loginProvider.loginid.result.session_id); univerifyInfo.loginInfo = JSON.stringify({ - server: uni.getStorageSync('server'), - uname: uni.getStorageSync('account'), - pwd: uni.getStorageSync('password'), + server: utils.session.getValue('server'), + uname: utils.session.getValue('account'), + pwd: utils.session.getValue('password'), cname: plus.device.model, type: "0" }); 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; + 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", + app_type: univerifyInfo.app_type || "MES", }; - header={}; + header = {}; } - + uni.request({ url: url, data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", header: header, success: (res) => { console.log(res); - if(res.statusCode==404){ - reject({"errMsg":"鍦板潃涓嶅锛岃妫�煡璇ュ湴鍧�細"+ openinfo}); - } + if (res.statusCode == 404) { + reject({ + "errMsg": "鍦板潃涓嶅锛岃妫�煡璇ュ湴鍧�細" + openinfo + }); + } // if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){ // uni.reLaunch({ // url: '../login/index' // }) // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�}); // } - const ret = res.data; - if (ret.code=='00000' || ret.err_code == 0) { - commit("areaFunc",ret); + var ret = res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏哸reaFunc銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } + + + if (ret.code == '00000' || ret.err_code == 0) { + commit("areaFunc", ret); resolve(ret); } else { - reject({"errMsg":ret.msg?ret.msg:ret.err_msg}); + reject({ + "errMsg": ret.msg || ret.err_msg + }); } }, fail: (err) => { @@ -353,20 +432,45 @@ state }, univerifyInfo) { return new Promise((resolve, reject) => { - // console.log(state.loginProvider.loginid.result.session_id); + // console.log(state.loginProvider.loginid.result.session_id); uni.request({ - url: state.OIMoboxSAPI+'api/app/GetFuncTree?sessionid='+state.loginProvider.loginid.result.session_id, + url: state.OIMoboxSAPI + 'api/app/GetFuncTree?sessionid=' + state + .loginProvider.loginid.result.session_id, data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", success: (_res) => { // console.log(_res); - const ret = _res.data + var ret = _res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏咷etFuncTree銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } + + if (ret.err_code == 0) { // commit("areaFunc",ret); resolve(ret); } else { - reject({"errMsg":ret.err_msg}); + reject({ + "errMsg": ret.err_msg + }); } }, fail: (err) => { @@ -376,26 +480,26 @@ }) }) }, - + classAttrList: function({ commit, state }, univerifyInfo) { return new Promise((resolve, reject) => { - // console.log(state.url); + // console.log(state.url); univerifyInfo.loginInfo = JSON.stringify({ - server: uni.getStorageSync('server'), - uname: uni.getStorageSync('account'), - pwd: uni.getStorageSync('password'), + server: utils.session.getValue('server'), + uname: utils.session.getValue('account'), + pwd: utils.session.getValue('password'), cname: plus.device.model, type: "0" }); - + uni.request({ url: state.url + "PDA/PDAAttrList", data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", header: { 'content-type': 'application/x-www-form-urlencoded' }, @@ -407,12 +511,36 @@ // }) // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�}); // } - const ret = res.data - if (ret.code=='00000') { - commit("classAttrList",ret); + var ret = res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏哻lassAttrList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } + + + if (ret.code == '00000') { + commit("classAttrList", ret); resolve(ret); } else { - reject({"errMsg":ret.msg}); + reject({ + "errMsg": ret.msg || ret.err_msg + }); } }, fail: (err) => { @@ -422,45 +550,64 @@ }) }) }, - + classGridStyleInfo: function({ commit, state }, univerifyInfo) { return new Promise((resolve, reject) => { - // console.log(state.url); + // console.log(state.url); univerifyInfo.loginInfo = JSON.stringify({ - server: uni.getStorageSync('server'), - uname: uni.getStorageSync('account'), - pwd: uni.getStorageSync('password'), + server: utils.session.getValue('server'), + uname: utils.session.getValue('account'), + pwd: utils.session.getValue('password'), cname: plus.device.model, type: "0" }); - + uni.request({ url: state.url + "PDA/PDAGridStyleGetInfo", data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", header: { 'content-type': 'application/x-www-form-urlencoded' }, success: (res) => { console.log(res); - // if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){ - // uni.reLaunch({ - // url: '../login/index' - // }) - // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�}); - // } - const ret = res.data - if (ret.code=='00000') { + var ret = res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏哻lassGridStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } + + + if (ret.code == '00000') { // var data ={}; // Vue.set(data,univerifyInfo.name,ret); - commit("classGridStyleInfo",ret); + commit("classGridStyleInfo", ret); resolve(ret); } else { - reject({"errMsg":ret.msg}); + + reject({ + "errMsg": ret.msg || ret.err_msg + }); } }, fail: (err) => { @@ -470,26 +617,26 @@ }) }) }, - + subClassAttrList: function({ commit, state }, univerifyInfo) { return new Promise((resolve, reject) => { - // console.log(state.url); + // console.log(state.url); univerifyInfo.loginInfo = JSON.stringify({ - server: uni.getStorageSync('server'), - uname: uni.getStorageSync('account'), - pwd: uni.getStorageSync('password'), + server: utils.session.getValue('server'), + uname: utils.session.getValue('account'), + pwd: utils.session.getValue('password'), cname: plus.device.model, type: "0" }); - + uni.request({ url: state.url + "PDA/PDAAttrList", data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", header: { 'content-type': 'application/x-www-form-urlencoded' }, @@ -501,12 +648,36 @@ // }) // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�}); // } - const ret = res.data - if (ret.code=='00000') { - commit("subClassAttrList",ret); + var ret = res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏唖ubClassAttrList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } + + + if (ret.code == '00000') { + commit("subClassAttrList", ret); resolve(ret); } else { - reject({"errMsg":ret.msg}); + reject({ + "errMsg": ret.msg || ret.err_msg + }); } }, fail: (err) => { @@ -516,30 +687,31 @@ }) }) }, - + subClassGridStyleInfo: function({ commit, state }, univerifyInfo) { return new Promise((resolve, reject) => { - // console.log(state.url); + // console.log(state.url); univerifyInfo.loginInfo = JSON.stringify({ - server: uni.getStorageSync('server'), - uname: uni.getStorageSync('account'), - pwd: uni.getStorageSync('password'), + server: utils.session.getValue('server'), + uname: utils.session.getValue('account'), + pwd: utils.session.getValue('password'), cname: plus.device.model, type: "0" }); - + uni.request({ url: state.url + "PDA/PDAGridStyleGetInfo", data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", header: { 'content-type': 'application/x-www-form-urlencoded' }, success: (res) => { + console.log(res); // if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){ // uni.reLaunch({ @@ -547,14 +719,38 @@ // }) // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�}); // } - const ret = res.data - if (ret.code=='00000') { + var ret = res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏唖ubClassGridStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } + + + if (ret.code == '00000') { // var data ={}; // Vue.set(data,univerifyInfo.name,ret); - commit("subClassGridStyleInfo",ret); + commit("subClassGridStyleInfo", ret); resolve(ret); } else { - reject({"errMsg":ret.err_msg}); + reject({ + "errMsg": ret.msg || ret.err_msg + }); } }, fail: (err) => { @@ -564,38 +760,62 @@ }) }) }, - + dicValueInfo: function({ commit, state }, univerifyInfo) { return new Promise((resolve, reject) => { - // console.log(state.url); + // console.log(state.url); univerifyInfo.loginInfo = JSON.stringify({ - server: uni.getStorageSync('server'), - uname: uni.getStorageSync('account'), - pwd: uni.getStorageSync('password'), + server: utils.session.getValue('server'), + uname: utils.session.getValue('account'), + pwd: utils.session.getValue('password'), cname: plus.device.model, type: "0" }); - + uni.request({ url: state.url + "PDA/PDADicValueGetInfo", data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", header: { 'content-type': 'application/x-www-form-urlencoded' }, success: (res) => { // console.log(res); - const ret = res.data - if (ret.code=='00000') { + var ret = res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏哾icValueInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } + + + if (ret.code == '00000') { state.thisDictName = univerifyInfo.dic_name - commit("dicValueInfo",ret); + commit("dicValueInfo", ret); resolve(ret); } else { - reject({"errMsg":ret.msg}); + reject({ + "errMsg": ret.msg || ret.err_msg + }); } }, fail: (err) => { @@ -605,17 +825,17 @@ }) }) }, - + DataObjRunCustomEventInfo: function({ commit, state }, univerifyInfo) { return new Promise((resolve, reject) => { - // console.log(state.url); + // console.log(state.url); univerifyInfo.loginInfo = JSON.stringify({ - server: uni.getStorageSync('server'), - uname: uni.getStorageSync('account'), - pwd: uni.getStorageSync('password'), + server: utils.session.getValue('server'), + uname: utils.session.getValue('account'), + pwd: utils.session.getValue('password'), cname: plus.device.model, type: "0" }); @@ -623,18 +843,42 @@ url: state.url + "PDA/PDADataObjRunCustomEvent", data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", header: { 'content-type': 'application/x-www-form-urlencoded' }, success: (res) => { // console.log(res); - const ret = res.data - if (ret.code=='00000') { - commit("DataObjRunCustomEventInfo",ret); + var ret = res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏咲ataObjRunCustomEventInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } + + + if (ret.code == '00000') { + commit("DataObjRunCustomEventInfo", ret); resolve(ret); } else { - reject({"errMsg":ret.msg}); + reject({ + "errMsg": ret.msg || ret.err_msg + }); } }, fail: (err) => { @@ -644,41 +888,64 @@ }) }) }, - + querySelpsn: function({ commit, state }, univerifyInfo) { return new Promise((resolve, reject) => { - // console.log(state.url); + // 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; + 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={}; + query_str: univerifyInfo.jp, + }; + header = {}; } uni.request({ url: url, data: datajson, method: 'POST', - dataType:"json", + dataType: "json", header: header, success: (res) => { // console.log(res); - try{ - res = JSON.parse(res.data); - }catch(e){ - res = res.data; + var ret = res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏唓uerySelpsn銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } } - if (res.code=='00000' || res.err_code == 0) { - commit("querySelpsn",res); - resolve(res); + + + if (ret.code == '00000' || ret.err_code == 0) { + commit("querySelpsn", ret); + resolve(ret); } else { - reject({"errMsg":res.msg?res.msg:res.err_msg}); + reject({ + "errMsg": ret.msg || ret.err_msg + }); } }, fail: (err) => { @@ -688,40 +955,67 @@ }) }) }, - + ProjectGetAnalysisList: function({ commit, state }, 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紒"}); + // 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: url, data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", header: header, success: (res) => { console.log(res); - const ret = res.data; - if (ret.code=='00000') { - commit("ProjectGetAnalysisList",ret); + var ret = res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏哖rojectGetAnalysisList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } + + if (ret.code == '00000') { + commit("ProjectGetAnalysisList", ret); resolve(ret); } else { - reject({"errMsg":ret.msg}); + reject({ + "errMsg": ret.msg || ret.err_msg + }); } }, fail: (err) => { @@ -731,7 +1025,7 @@ }) }) }, - + addclassattr: function({ commit, state @@ -739,9 +1033,9 @@ return new Promise((resolve, reject) => { // console.log(state.url); univerifyInfo.loginInfo = JSON.stringify({ - server: uni.getStorageSync('server'), - uname: uni.getStorageSync('account'), - pwd: uni.getStorageSync('password'), + server: utils.session.getValue('server'), + uname: utils.session.getValue('account'), + pwd: utils.session.getValue('password'), cname: plus.device.model, type: "0" }); @@ -749,7 +1043,7 @@ url: state.url + "PDA/addclassattr", data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", header: { 'content-type': 'application/x-www-form-urlencoded' }, @@ -761,12 +1055,35 @@ // }) // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�}); // } - const ret = res.data; - if (ret.code=='00000') { - commit("addclassattr",ret); + var ret = res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏哸ddclassattr銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } + + if (ret.code == '00000') { + commit("addclassattr", ret); resolve(ret); } else { - reject({"errMsg":JSON.stringify(ret)}); + reject({ + "errMsg": JSON.stringify(ret) + }); } }, fail: (err) => { @@ -776,29 +1093,52 @@ }) }) }, - + DelObj: function({ commit, state }, univerifyInfo) { return new Promise((resolve, reject) => { - // console.log(state.url); + // console.log(state.url); uni.request({ url: state.url + "PDA/DelObj", data: univerifyInfo, method: 'POST', - dataType:"json", + 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); + var ret = res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏咲elObj銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } + + if (ret.code == '00000') { + commit("DelObj", ret); resolve(ret); } else { - reject({"errMsg":JSON.stringify(ret)}); + reject({ + "errMsg": JSON.stringify(ret) + }); } }, fail: (err) => { @@ -808,8 +1148,8 @@ }) }) }, - - + + // api/class/attr/GetList?sessionid=SESSION_ID // Mobox3寰楀埌鏁版嵁绫诲睘鎬� classAttrGetList: function({ @@ -819,18 +1159,42 @@ 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, + url: state.OIDataSAPI + 'api/class/attr/GetList?sessionid=' + state + .loginProvider.loginid.result.session_id, data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", success: (_res) => { // console.log(_res); - const ret = _res.data + var ret = _res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏哻lassAttrGetList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } + if (ret.err_code == 0) { - commit("classAttrList",ret); + commit("classAttrList", ret); resolve(ret); } else { - reject({"errMsg":ret.err_msg}); + reject({ + "errMsg": ret.err_msg + }); } }, fail: (err) => { @@ -849,18 +1213,43 @@ 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, + url: state.OIDataSAPI + 'api/class/attr/GetList?sessionid=' + state + .loginProvider.loginid.result.session_id, data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", success: (_res) => { // console.log(_res); - const ret = _res.data + var ret = _res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏唖ubClassAttrGetList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } + + if (ret.err_code == 0) { - commit("subClassAttrList",ret); + commit("subClassAttrList", ret); resolve(ret); } else { - reject({"errMsg":ret.err_msg}); + reject({ + "errMsg": ret.err_msg + }); } }, fail: (err) => { @@ -879,17 +1268,42 @@ 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, + url: state.OIMoboxSAPI + 'api/dict/item/GetInfo?sessionid=' + state + .loginProvider.loginid.result.session_id, data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", success: (_res) => { // console.log(_res); - const ret = _res.data + var ret = _res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏咲ictItemGetList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } + + if (ret.err_code == 0) { resolve(ret); } else { - reject({"errMsg":ret.err_msg}); + reject({ + "errMsg": ret.err_msg + }); } }, fail: (err) => { @@ -908,17 +1322,42 @@ return new Promise((resolve, reject) => { // console.log(state.url); uni.request({ - url: state.OIMoboxSAPI+'api/dict/GetInfo2?sessionid='+state.loginProvider.loginid.result.session_id, + url: state.OIMoboxSAPI + 'api/dict/GetInfo2?sessionid=' + state + .loginProvider.loginid.result.session_id, data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", success: (_res) => { // console.log(_res); - const ret = _res.data + var ret = _res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏咲ictGetInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } + + if (ret.err_code == 0) { resolve(ret); } else { - reject({"errMsg":ret.err_msg}); + reject({ + "errMsg": ret.err_msg + }); } }, fail: (err) => { @@ -928,7 +1367,7 @@ }) }) }, - + // api/dataobj/Create?sessionid=SESSION_ID // Mobox3鍒涘缓鏁版嵁瀵硅薄 createDataObj: function({ @@ -936,19 +1375,44 @@ state }, univerifyInfo) { return new Promise((resolve, reject) => { - // console.log(state.url); + // console.log(state.url); uni.request({ - url: state.OIDataSAPI+'api/dataobj/Create?sessionid='+state.loginProvider.loginid.result.session_id, + url: state.OIDataSAPI + 'api/dataobj/Create?sessionid=' + state + .loginProvider.loginid.result.session_id, data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", success: (_res) => { // console.log(_res); - const ret = _res.data + var ret = _res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏哻reateDataObj銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } + + if (ret.err_code == 0) { resolve(ret); } else { - reject({"errMsg":ret.err_msg}); + reject({ + "errMsg": ret.err_msg + }); } }, fail: (err) => { @@ -958,7 +1422,7 @@ }) }) }, - + // api/class/uistyle/GetInfo?sessionid=SESSION_ID // Mobox3寰楀埌鏁版嵁绫绘樉绀烘牱寮忎俊鎭� UIStyleGetInfo: function({ @@ -966,24 +1430,47 @@ state }, univerifyInfo) { return new Promise((resolve, reject) => { - // console.log(state.loginProvider.loginid.result.session_id); + // console.log(state.loginProvider.loginid.result.session_id); + // console.log(state.OIDataSAPI) uni.request({ - url: state.OIDataSAPI+'api/class/uistyle/GetInfo?sessionid='+state.loginProvider.loginid.result.session_id, + url: state.OIDataSAPI + 'api/class/uistyle/GetInfo?sessionid=' + state + .loginProvider.loginid.result.session_id, data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", success: (_res) => { console.log(_res); - const ret = _res.data + var ret = _res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏哢IStyleGetInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } if (ret.err_code == 0) { - // commit("areaFunc",ret); resolve(ret); } else { - reject({"errMsg":ret.err_msg}); + reject({ + "errMsg": ret.err_msg || ret.errMsg + }); } }, fail: (err) => { - // console.log(err); + console.log("fail", err); reject(err); } }) @@ -998,18 +1485,40 @@ 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, + url: state.OIDataSAPI + 'api/dataobj/RunCustomEvent?sessionid=' + state + .loginProvider.loginid.result.session_id, data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", success: (_res) => { // console.log(_res); - const ret = _res.data + var ret = _res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏唕unCustomEvent銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } if (ret.err_code == 0) { - // commit("areaFunc",ret); resolve(ret); } else { - reject({"errMsg":ret.err_msg}); + reject({ + "errMsg": ret.err_msg || ret.errMsg + }); } }, fail: (err) => { @@ -1028,18 +1537,39 @@ 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, + url: state.OIDataSAPI + 'api/dataobj/Delete?sessionid=' + state + .loginProvider.loginid.result.session_id, data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", success: (_res) => { // console.log(_res); - const ret = _res.data + var ret = _res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏哾ataObjDel銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�) + } + } if (ret.err_code == 0) { - // commit("areaFunc",ret); resolve(ret); } else { - reject({"errMsg":ret.err_msg}); + reject({ + "errMsg": ret.err_msg || ret.errMsg + }); } }, fail: (err) => { @@ -1058,18 +1588,40 @@ return new Promise((resolve, reject) => { // console.log(state.loginProvider.loginid.result.session_id); uni.request({ - url: state.OIDataSAPI+'api/dataobj/query/Query?sessionid='+state.loginProvider.loginid.result.session_id, + url: state.OIDataSAPI + 'api/dataobj/query/Query?sessionid=' + state + .loginProvider.loginid.result.session_id, data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", success: (_res) => { // console.log(_res); - const ret = _res.data + var ret = _res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏哾ataObjQuery銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } if (ret.err_code == 0) { - // commit("areaFunc",ret); resolve(ret); } else { - reject({"errMsg":ret.err_msg}); + reject({ + "errMsg": ret.err_msg || ret.errMsg + }); } }, fail: (err) => { @@ -1086,20 +1638,42 @@ state }, univerifyInfo) { return new Promise((resolve, reject) => { - // console.log(state.loginProvider.loginid.result.session_id); + // console.log(state.loginProvider.loginid.result.session_id); uni.request({ - url: state.OIMoboxSAPI+'api/app/GetInfo?sessionid='+state.loginProvider.loginid.result.session_id, + url: state.OIMoboxSAPI + 'api/app/GetInfo?sessionid=' + state + .loginProvider.loginid.result.session_id, data: univerifyInfo, method: 'POST', - dataType:"json", + dataType: "json", success: (_res) => { // console.log(_res); - const ret = _res.data + var ret = _res.data + if (typeof ret == 'string') { + try { + try { + try { + ret = JSON.parse(ret.replace(/\\"/g, '"')); + } catch (ex) { + ret = JSON.parse(ret.replace(/\\/g, '\\\\')) + } + } catch (ex) { + ret = JSON.parse(ret.replace(/\\"/g, "'").replace( + /[\r\n]/g, + '<br>').replace(/[\t]/g, ' ')); + } + } catch (ex) { + console.log(ret) + return reject( + '灏哸ppGetInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐� + ) + } + } if (ret.err_code == 0) { - // commit("areaFunc",ret); resolve(ret); } else { - reject({"errMsg":ret.err_msg}); + reject({ + "errMsg": ret.err_msg || ret.errMsg + }); } }, fail: (err) => { @@ -1109,8 +1683,8 @@ }) }) }, - + } }) -export default store +export default store \ No newline at end of file -- Gitblit v1.9.1