From 7366a5bc2c2db8c487baa8c3b8e18e32e98c9bd5 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期二, 20 八月 2024 15:44:40 +0800
Subject: [PATCH] test

---
 store/index.js | 1065 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 885 insertions(+), 180 deletions(-)

diff --git a/store/index.js b/store/index.js
index d4ed931..2f25b50 100644
--- a/store/index.js
+++ b/store/index.js
@@ -1,37 +1,65 @@
 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:'',
-		username:"sa",
-		userpwd:"0000",
-		url:"115.29.185.26:5000" //192.168.1.184:5200 36.33.24.94:5200
+		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;
+		},
+		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;
@@ -40,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;
@@ -93,44 +121,127 @@
 		addclassattr(state, ret) {
 			state.addclassattr = ret;
 		},
+		DelObj(state, ret) {
+			state.DelObj = ret;
+		},
 		logout(state) {
 			state.hasLogin = false
 		},
 	},
 	getters: {
+		getDeviceId(state, ret) {
+			return state.deviceId
+		},
+		GetApkServionInfo(state) {
+			return state.apkVersionInfo
+		},
 		loginid(state) {
 			return state.loginProvider.loginid
 		},
 		getUrl(state) {
 			return state.url
 		},
-		getclassAttrList(state){
+		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];
 		},
-		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} 瑙ｆ瀯锛� 		//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"
+				if (univerifyInfo.server.includes("://")) {
+					openinfo = univerifyInfo.server + "/"
+				}
+				//璁剧疆鍏ㄥ眬鍙傛暟锛歶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,鏄惁姝ｇ‘"
+							});
+						} 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
@@ -140,43 +251,87 @@
 				univerifyInfo.server = univerifyInfo.server || '';
 				univerifyInfo.uname = univerifyInfo.uname || '';
 				univerifyInfo.pwd = univerifyInfo.pwd || '';
-				// console.log(univerifyInfo);
 				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 + "/"; //+"/OrgWebS"
+				var openinfo = "http://" + univerifyInfo.server + "/";
+				if (univerifyInfo.server.includes("://")) {
+					openinfo = univerifyInfo.server + "/"
+				}
 				//璁剧疆鍏ㄥ眬鍙傛暟锛歶rl-鏈嶅姟鍣ㄥ湴鍧�-				commit("setUrl",openinfo);
-				
-				// if (univerifyInfo.server.split(':').length < 2)
-				// 	cgi = "http://" + univerifyInfo.server + ":5010"; ///OrgWebS
-				
-				// setTimeout(_=>{
-				// 	resolve("00000000000")
-				// },3000)
-				// console.log(openinfo + "PDA/SignIn");
+				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[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 = {};
+				}
+				console.log(univerifyInfo);
 				uni.request({
-					url: openinfo + "PDA/SignIn",
+					url: url,
 					data: univerifyInfo,
 					method: 'POST',
-					dataType:"json",
-					header: {
-					    'content-type': 'application/x-www-form-urlencoded'
-					},
+					dataType: "json",
+					header: header,
 					success: (res) => {
-						// console.log(res); 
+						console.log(res);
 						const ret = res.data
-						if (ret.code=='00000') {
-							commit("login",ret);
+						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) => {
@@ -186,30 +341,60 @@
 				})
 			})
 		},
-		
+
 		areaFunc: function({
 			commit,
 			state
 		}, univerifyInfo) {
 			return new Promise((resolve, reject) => {
-				 // console.log(state.url);
-				 
+				// console.log(state.loginProvider.loginid.result.session_id);
+				univerifyInfo.loginInfo = JSON.stringify({
+					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;
+					univerifyInfo = {
+						app_type: 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'
-					},
+					dataType: "json",
+					header: header,
 					success: (res) => {
-						// console.log(res);
-						const ret = res.data
-						if (ret.code=='00000') {
-							commit("areaFunc",ret);
+						console.log(res);
+						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);
 							resolve(ret);
 						} else {
-							reject({"errMsg":ret.msg});
+							reject({
+								"errMsg": ret.msg || ret.err_msg
+							});
 						}
 					},
 					fail: (err) => {
@@ -219,30 +404,77 @@
 				})
 			})
 		},
-		
+		// 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) => {
+						// console.log(err);
+						reject(err);
+					}
+				})
+			})
+		},
+
 		classAttrList: function({
 			commit,
 			state
 		}, univerifyInfo) {
 			return new Promise((resolve, reject) => {
-				 // console.log(state.url);
-				
+				// console.log(state.url);
+				univerifyInfo.loginInfo = JSON.stringify({
+					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'
 					},
 					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') {
-							commit("classAttrList",ret);
+						if (ret.code == '00000') {
+							commit("classAttrList", ret);
 							resolve(ret);
 						} else {
-							reject({"errMsg":ret.msg});
+							reject({
+								"errMsg": ret.msg || ret.err_msg
+							});
 						}
 					},
 					fail: (err) => {
@@ -252,32 +484,42 @@
 				})
 			})
 		},
-		
+
 		classGridStyleInfo: function({
 			commit,
 			state
 		}, univerifyInfo) {
 			return new Promise((resolve, reject) => {
-				 // console.log(state.url);
-				 
+				// console.log(state.url);
+				univerifyInfo.loginInfo = JSON.stringify({
+					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);
 						const ret = res.data
-						if (ret.code=='00000') {
+						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) => {
@@ -287,30 +529,45 @@
 				})
 			})
 		},
-		
+
 		subClassAttrList: function({
 			commit,
 			state
 		}, univerifyInfo) {
 			return new Promise((resolve, reject) => {
-				 // console.log(state.url);
-				
+				// console.log(state.url);
+				univerifyInfo.loginInfo = JSON.stringify({
+					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'
 					},
 					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') {
-							commit("subClassAttrList",ret);
+						if (ret.code == '00000') {
+							commit("subClassAttrList", ret);
 							resolve(ret);
 						} else {
-							reject({"errMsg":ret.msg});
+							reject({
+								"errMsg": ret.msg || ret.err_msg
+							});
 						}
 					},
 					fail: (err) => {
@@ -320,32 +577,48 @@
 				})
 			})
 		},
-		
+
 		subClassGridStyleInfo: function({
 			commit,
 			state
 		}, univerifyInfo) {
 			return new Promise((resolve, reject) => {
-				 // console.log(state.url);
-				 
+				// console.log(state.url);
+				univerifyInfo.loginInfo = JSON.stringify({
+					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') {
+						if (ret.code == '00000') {
 							// var data ={};
 							// Vue.set(data,univerifyInfo.name,ret);
-							commit("subClassGridStyleInfo",ret);
+							commit("subClassGridStyleInfo", ret);
 							resolve(ret);
 						} else {
-							reject({"errMsg":ret.msg});
+							reject({
+								"errMsg": ret.msg || ret.err_msg
+							});
 						}
 					},
 					fail: (err) => {
@@ -355,31 +628,40 @@
 				})
 			})
 		},
-		
+
 		dicValueInfo: function({
 			commit,
 			state
 		}, univerifyInfo) {
 			return new Promise((resolve, reject) => {
-				 // console.log(state.url);
-				 
+				// console.log(state.url);
+				univerifyInfo.loginInfo = JSON.stringify({
+					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') {
+						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) => {
@@ -389,61 +671,38 @@
 				})
 			})
 		},
-		
+
 		DataObjRunCustomEventInfo: function({
 			commit,
 			state
 		}, univerifyInfo) {
 			return new Promise((resolve, reject) => {
-				 // console.log(state.url);
+				// console.log(state.url);
+				univerifyInfo.loginInfo = JSON.stringify({
+					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/PDADataObjRunCustomEvent",
 					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("DataObjRunCustomEventInfo",ret);
-							resolve(ret);
-						} else {
-							reject({"errMsg":ret.msg});
-						}
-					},
-					fail: (err) => {
-						console.log(err);
-						reject(err);
-					}
-				})
-			})
-		},
-		
-		querySelpsn: function({
-			commit,
-			state
-		}, univerifyInfo) {
-			return new Promise((resolve, reject) => {
-				 // console.log(state.url);
-				uni.request({
-					url: state.url + "selpsn/queryjson",
-					data: univerifyInfo,
-					method: 'POST',
-					dataType:"json",
+					dataType: "json",
 					header: {
 						'content-type': 'application/x-www-form-urlencoded'
 					},
 					success: (res) => {
 						// console.log(res);
-						const ret = JSON.parse(res.data);
-						if (ret.code=='00000') {
-							commit("querySelpsn",ret);
+						const ret = res.data
+						if (ret.code == '00000') {
+							commit("DataObjRunCustomEventInfo", ret);
 							resolve(ret);
 						} else {
-							reject({"errMsg":ret.msg});
+							reject({
+								"errMsg": ret.msg || ret.err_msg
+							});
 						}
 					},
 					fail: (err) => {
@@ -453,29 +712,95 @@
 				})
 			})
 		},
-		
+
+		querySelpsn: function({
+			commit,
+			state
+		}, 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: url,
+					data: datajson,
+					method: 'POST',
+					dataType: "json",
+					header: header,
+					success: (res) => {
+						// console.log(res);
+						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 || ret.err_msg
+							});
+						}
+					},
+					fail: (err) => {
+						console.log(err);
+						reject(err);
+					}
+				})
+			})
+		},
+
 		ProjectGetAnalysisList: function({
 			commit,
 			state
 		}, univerifyInfo) {
 			return new Promise((resolve, reject) => {
-				 // console.log(state.url);
+				// 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'
-					},
+					dataType: "json",
+					header: header,
 					success: (res) => {
 						console.log(res);
 						const ret = res.data;
-						if (ret.code=='00000') {
-							commit("ProjectGetAnalysisList",ret);
+						if (ret.code == '00000') {
+							commit("ProjectGetAnalysisList", ret);
 							resolve(ret);
 						} else {
-							reject({"errMsg":ret.msg});
+							reject({
+								"errMsg": ret.msg || ret.err_msg
+							});
 						}
 					},
 					fail: (err) => {
@@ -485,29 +810,44 @@
 				})
 			})
 		},
-		
+
 		addclassattr: function({
 			commit,
 			state
 		}, univerifyInfo) {
 			return new Promise((resolve, reject) => {
-				 // console.log(state.url);
+				// console.log(state.url);
+				univerifyInfo.loginInfo = JSON.stringify({
+					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 + "workspace/addclassattr",
+					url: state.url + "PDA/addclassattr",
 					data: univerifyInfo,
 					method: 'POST',
-					dataType:"json",
+					dataType: "json",
 					header: {
 						'content-type': 'application/x-www-form-urlencoded'
 					},
 					success: (res) => {
-						console.log(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') {
-							commit("addclassattr",ret);
+						if (ret.code == '00000') {
+							commit("addclassattr", ret);
 							resolve(ret);
 						} else {
-							reject({"errMsg":JSON.stringify(ret)});
+							reject({
+								"errMsg": JSON.stringify(ret)
+							});
 						}
 					},
 					fail: (err) => {
@@ -516,9 +856,374 @@
 					}
 				})
 			})
-		}
-		
+		},
+
+		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/dict/GetInfo2?sessionid=SESSION_ID
+		// Mobox3寰楀埌瀛楀吀淇℃伅
+		DictGetInfo: function({
+			commit,
+			state
+		}, univerifyInfo) {
+			return new Promise((resolve, reject) => {
+				// console.log(state.url);
+				uni.request({
+					url: state.OIMoboxSAPI + 'api/dict/GetInfo2?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);
+					}
+				})
+			})
+		},
+		// api/dataobj/query/Query?sessionid=SESSION_ID
+		// Mobox3鏌ヨ鏁版嵁瀵硅薄
+		dataObjQuery: function({
+			commit,
+			state
+		}, univerifyInfo) {
+			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,
+					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/app/GetInfo?sessionid=SESSION_ID
+		// Mobox3鑾峰彇鍔熻兘鐐逛俊鎭�+		appGetInfo: function({
+			commit,
+			state
+		}, univerifyInfo) {
+			return new Promise((resolve, reject) => {
+				// console.log(state.loginProvider.loginid.result.session_id);
+				uni.request({
+					url: state.OIMoboxSAPI + 'api/app/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);
+					}
+				})
+			})
+		},
+
 	}
 })
 
-export default store
+export default store
\ No newline at end of file

--
Gitblit v1.9.1