From c54802aead926ec66f2c1263ce1615aee0623728 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 16 八月 2024 17:26:01 +0800
Subject: [PATCH] mobox3 端口配置
---
locale/es.json | 3
pages/modal/5602.vue | 28 ++++
pages/modal/5601.vue | 61 ++++++++++
pages.json | 7 +
store/index.js | 25 ++-
pages/index/index.vue | 34 +++--
locale/zh-Hans.json | 8 +
manifest.json | 4
locale/en.json | 3
pages/modal/5600.vue | 26 ++++
pages/login/set.vue | 112 ++++++++++++++++++
pages/login/index.vue | 28 +++
locale/zh-Hant.json | 3
13 files changed, 309 insertions(+), 33 deletions(-)
diff --git a/locale/en.json b/locale/en.json
index 5d6067f..4f3df46 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -60,6 +60,9 @@
"sys.select": "Select",
"sys.please": "please",
+ "page.server": "Server",
+ "page.mobox3_app_type": "Mobox3 PDA application types",
+ "page.mobox3_port": "Mobox3 service port",
"page.input_server": "Please enter the server",
"page.set_server": "Set up services",
"page.tip_app_update": "Is there a new version of the system that needs to be updated?",
diff --git a/locale/es.json b/locale/es.json
index a646929..f291d1f 100644
--- a/locale/es.json
+++ b/locale/es.json
@@ -59,6 +59,9 @@
"sys.select": "Escoger",
"sys.please": "Por favor.",
+ "page.server": "Servidor",
+ "page.mobox3_app_type": "Tipo de aplicaci贸n PDA mobox3",
+ "page.mobox3_port": "Puerto de servicio mobox3",
"page.input_server": "Por favor, introduzca el servidor",
"page.set_server": "Establecer servicio",
"page.tip_app_update": "驴El sistema tiene una nueva versi贸n, 驴 necesita actualizarse?",
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 81c03c5..c8b8ea9 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -59,8 +59,11 @@
"sys.unrealized": "鏈疄鐜�,
"sys.select": "璇烽�鎷�,
"sys.please": "璇�,
-
-
+
+ "page.server": "鏈嶅姟鍦板潃",
+ "page.mobox3_app_type": "mobox3 pda搴旂敤绫诲瀷",
+ "page.mobox3_port": "mobox3鏈嶅姟绔彛",
+
"page.input_server": "璇疯緭鍏ユ湇鍔″湴鍧�,
"page.set_server": "璁剧疆鏈嶅姟",
"page.tip_app_update": "绯荤粺鏈夋柊鐗堟湰锛屾槸鍚﹂渶瑕佹洿鏂帮紵",
@@ -71,6 +74,7 @@
"page.tip_get_file_fail_last": "鏂囦欢澶辫触",
"page.update_success": "鏇存柊鎴愬姛",
"page.update_fail": "鏇存柊澶辫触",
+
"page.tip_no_app_param": "璇ュ姛鑳界偣鏈厤缃弬鏁帮紝璇烽噸鏂伴厤缃弬鏁�,
"page.select_user": "閫夋嫨浜哄憳",
diff --git a/locale/zh-Hant.json b/locale/zh-Hant.json
index 33b62e7..0c69f87 100644
--- a/locale/zh-Hant.json
+++ b/locale/zh-Hant.json
@@ -59,6 +59,9 @@
"sys.select": "閫夋嫨",
"sys.please": "璇�,
+ "page.server": "鏈嶅姟鍦板潃",
+ "page.mobox3_app_type": "mobox3 pda鎳夌敤椤炲瀷",
+ "page.mobox3_port": "mobox3鏈嶅嫏鍩�,
"page.input_server": "璜嬭几鍏ユ湇鍕欏湴鍧�,
"page.set_server": "瑷畾鏈嶅嫏",
"page.tip_app_update": "绯荤当鏈夋柊鐗堟湰锛屾槸鍚﹂渶瑕佹洿鏂帮紵",
diff --git a/manifest.json b/manifest.json
index 95244e1..ee054c4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "MoboxPDA",
"appid" : "__UNI__56D451E",
"description" : "",
- "versionName" : "1.1.09",
- "versionCode" : 1109,
+ "versionName" : "1.1.11",
+ "versionCode" : 1111,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index d38795a..d97ebf4 100644
--- a/pages.json
+++ b/pages.json
@@ -180,6 +180,13 @@
}
},
{
+ "path": "pages/login/set",
+ "style": {
+ "navigationBarTitleText": "%page.set_server%",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
"path": "pages/login/language",
"style": {
"navigationBarTitleText": "%sys.language%",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c25eee8..bac1495 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -16,7 +16,7 @@
:style="{'background-color':app.bk_color,'color':app.bk_color}">
<i :class="app.img_font_style" :style="{'color':app.txt_color}"></i>
</a>
- <p :data-key="app.id">{{ app.list_name|| app.name}}</p>
+ <p :data-key="app.id">{{ app.list_name|| app.name}}</p>
</li>
</ul>
@@ -27,6 +27,7 @@
<script>
import Base64 from '../../components/js-base64/base64.js'
+ import utils from "@/js/utils.js"
export default {
modules: {
Base64,
@@ -58,25 +59,28 @@
if (this.$store.state.areaFunc)
this.data = this.$store.state.areaFunc.data;
- else
- this.$store.dispatch('areaFunc', {}).then(success => {
+ else {
+ const appType = utils.session.getValue('app_type') || "MES";
+ this.$store.dispatch('areaFunc', {
+ app_type: appType
+ }).then(success => {
// console.log(success);
if (success.code == '00000' || success.err_code == 0) {
this.data = success.data;
-
if (success.err_code != undefined) { //鍒ゆ柇鏄惁鏄疢obox3
success.result.forEach(async (area, index) => {
if (area.client_type == 2) { //鍒ゆ柇绫诲瀷鏄惁鏄疨DA绫诲瀷
+ area.app_type= appType
await this.GetFuncTree(index, area);
}
});
}
} else {
uni.showModal({
- title:this.translateSys("error"),
+ title: this.translateSys("error"),
content: success.msg,
showCancel: false,
- confirmText:this.translateSys("cancel")
+ confirmText: this.translateSys("cancel")
});
}
}).catch(ex => {
@@ -85,17 +89,19 @@
title: this.translateSys("error"),
content: ex.errMsg,
showCancel: false,
- confirmText:this.translateSys("cancel")
+ confirmText: this.translateSys("cancel")
});
});
+ }
},
methods: {
async GetFuncTree(index, area) { //Mobox3鑾峰彇搴旂敤棰嗗煙鐨勫姛鑳界偣
this.data = [];
var $this = this;
+
var json = {
- app_type: "MES",
+ app_type: area.app_type,
area_id: area.id,
area_client_type: area.client_type,
need_ace: '0',
@@ -105,13 +111,13 @@
if (success.err_code == 0) {
if ((success.result || []).length > 0) {
$this.data.push(success.result[0]);
- console.log("onLoad",$this.data )
+ console.log("onLoad", $this.data)
this.$store.commit("areaFunc", $this.data);
}
} else {
uni.showModal({
- title:this.translateSys("error"),
+ title: this.translateSys("error"),
content: success.msg,
showCancel: false,
confirmText: this.translateSys("cancel")
@@ -130,7 +136,7 @@
appCreate(app) { //鐐瑰嚮鍔熻兘鐐硅烦杞〉闈� console.log(app);
var paramStr = this.$store.state.OIMoboxSAPI ? app.param : app.Param;
- var appName = this.$store.state.OIMoboxSAPI ? (app.list_name || app.name ) : app.Name;
+ var appName = this.$store.state.OIMoboxSAPI ? (app.list_name || app.name) : app.Name;
var defCode = this.$store.state.OIMoboxSAPI ? app.def_code : app.DefCode;
var param = "";
if (paramStr) {
@@ -139,13 +145,13 @@
//mobox3鐨刾aram鏄痓ase64瀛楃涓� if (!paramStr.includes('"')) param = Base64.decode(paramStr);
}
-
+
if (!param) {
uni.showModal({
title: this.translateSys("tip"),
- content:this.translate('tip_no_app_param'),
+ content: this.translate('tip_no_app_param'),
showCancel: false,
- confirmText:this.translateSys("cancel")
+ confirmText: this.translateSys("cancel")
});
return;
}
diff --git a/pages/login/index.vue b/pages/login/index.vue
index ec27e9d..2fef010 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -48,7 +48,7 @@
<!-- 杈撳叆妗嗙ず渚�-->
<uni-popup ref="inputDialog" type="dialog">
<uni-popup-dialog ref="inputClose" mode="input" :title="translateSys('set')" :value="userServer"
- :placeholder="translate('input_server')" @confirm="dialogInputConfirm"></uni-popup-dialog>
+ :placeholder="translate('input_server')" @confirm="dialogInputConfirm"></uni-popup-dialog>
</uni-popup>
<!-- 鐗堟湰鍗囩骇寮圭獥寮� -->
<uni-popup ref="promotion" type="center">
@@ -165,7 +165,7 @@
".", ""); //鏈嶅姟绔増鏈彿
// this.downloadUrl = resp.PdaUrl+"/"+VersionName; //app涓嬭浇閾炬帴
- translateSyshis.downloadUrl = rootUrl+ "/Program/" +
+ translateSyshis.downloadUrl = rootUrl + "/Program/" +
VersionName; //app涓嬭浇閾炬帴this.
var isver = translateSyshis.compare(versionNum, version);
if (isver) {
@@ -212,7 +212,7 @@
const VersionCode = resp.VersionCode; //鐗堟湰缂栫爜
const versionNum = resp.Version; //鏈嶅姟绔増鏈彿
// this.downloadUrl = resp.PdaUrl+"/"+VersionName; //app涓嬭浇閾炬帴
- translateSyshis.downloadUrl = rootUrl+
+ translateSyshis.downloadUrl = rootUrl +
"/Program/" +
VersionName; //app涓嬭浇閾炬帴this.
var isver = translateSyshis.compare(versionNum, version);
@@ -334,7 +334,17 @@
// actionLogin:'login'
// }),
inputDialogToggle() {
- this.$refs.inputDialog.open()
+ // this.$refs.inputDialog.open()
+ const $this = this
+ uni.navigateTo({
+ url: "./set",
+ events: {
+ exitSetEvent(val) {
+ $this.userServer = val;
+ $this.query(); //鐗堟湰鍗囩骇
+ }
+ }
+ })
},
clickSetLanguage() {
uni.navigateTo({
@@ -419,9 +429,14 @@
if (this.userServer.includes("://")) {
rootUrl = this.userServer
}
+ const mobox3Port = utils.session.getValue('mobox3_port');
//妫�煡 "鐧诲綍鐘舵�/閿佸睆鐘舵�" 缁撴潫
var loginInfo = {
- server:rootUrl,
+ server: rootUrl,
+ orgsport: mobox3Port?.org || 5101,
+ moboxsport: mobox3Port?.mobox || 5102,
+ datasport: mobox3Port?.data || 5103,
+ mongodbsport: mobox3Port?.mongodb || 5201,
uname: this.userName,
pwd: this.userPwd,
cname: plus.device.model,
@@ -491,6 +506,9 @@
var url = this.$store.state.url;
var username = this.$store.state.username;
var userpwd = this.$store.state.userpwd;
+
+
+
var ischecked = false;
if (!this.userServer)
this.userServer = url;
diff --git a/pages/login/set.vue b/pages/login/set.vue
new file mode 100644
index 0000000..c63f679
--- /dev/null
+++ b/pages/login/set.vue
@@ -0,0 +1,112 @@
+<template>
+ <view class="uni-page-login-set">
+ <uni-forms class="form" label-align="right" label-width="100px" :form="form">
+ <uni-section :title="translateSys('page.server')" type="line">
+ <input type="text" class="input-wrapper" v-model="form.server" :placeholder="translateSys('page.input_server')">
+ </uni-section>
+ <uni-section :title="translateSys('page.mobox3_app_type')" type="line">
+ <input type="text" class="input-wrapper" v-model="form.appType" :placeholder="translateSys('page.input_server')">
+ </uni-section>
+ <uni-section :title="translateSys('page.mobox3_port')" type="line">
+ <uni-forms-item label="OrgSAPI">
+ <input type="number" class="input-wrapper" v-model="form.orgSPort">
+ </uni-forms-item>
+ <uni-forms-item label="MoboxSAPI">
+ <input type="number" class="input-wrapper" v-model="form.moboxSPort">
+ </uni-forms-item>
+ <uni-forms-item label="DataSAPI">
+ <input type="number" class="input-wrapper" v-model="form.dataSPort">
+ </uni-forms-item>
+ <uni-forms-item label="MongodbSvr">
+ <input type="number" class="input-wrapper" v-model="form.mongodbSPort">
+ </uni-forms-item>
+ </uni-section>
+ </uni-forms>
+ <button id='ok' type="default" @tap="onOk" class="btn_ok">{{translateSys("sys.ok")}}</button>
+
+ </view>
+</template>
+
+<script>
+ import utils from "@/js/utils.js"
+ export default {
+ data() {
+ return {
+ form: {
+ server: "",
+ appType: "",
+ orgSPort: "",
+ moboxSPort: "",
+ dataSPort: "",
+ mongodbSPort: "",
+ }
+ }
+ },
+ methods: {
+ onOk() {
+
+ utils.session.setValue('server', this.form.server);
+ utils.session.setValue('app_type', this.form.appType);
+ utils.session.setValue('mobox3_port', {
+ org: this.form.orgSPort,
+ mobox: this.form.moboxSPort,
+ data: this.form.dataSPort,
+ mongodb: this.form.mongodbSPort
+ });
+ var eventChannel = this.$scope.eventChannel;
+ eventChannel.emit('exitSetEvent', this.form.server);
+
+ uni.navigateBack({
+ delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
+ })
+ // uni.reLaunch({
+ // url: '/pages/login/index'
+
+ // });
+ },
+ translateSys(t) {
+ if (typeof this.$t == "function") return this.$t(`${t}`)
+ else return t;
+ },
+ },
+ onLoad() {
+
+ this.form.server = utils.session.getValue('server') || "";
+ this.form.appType = utils.session.getValue('app_type') || "MES";
+ const mobox3Port = utils.session.getValue('mobox3_port');
+ this.form.orgSPort = mobox3Port?.org || 5101
+ this.form.moboxSPort = mobox3Port?.mobox || 5102
+ this.form.dataSPort = mobox3Port?.data || 5103
+ this.form.mongodbSPort = mobox3Port?.mongodb || 5201
+
+ },
+
+ }
+</script>
+
+<style lang="scss">
+ .uni-page-login-set {
+ display: flex;
+ width: 750rpx;
+ flex-direction: column !important;
+ .form{
+ padding: 20rpx;
+
+ }
+ .input-wrapper {
+ border: 1px solid #d5d5d5;
+ width: calc(100% - 16rpx);
+ padding: 12rpx 8rpx;
+ }
+
+ button.btn_ok {
+ margin-top: 50rpx;
+ width: 100%;
+ padding: 20rpx;
+ line-height: 1.5;
+ background: #27A6E1;
+ border: none;
+ color: #fff;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/modal/5600.vue b/pages/modal/5600.vue
index 7561166..b16d955 100644
--- a/pages/modal/5600.vue
+++ b/pages/modal/5600.vue
@@ -975,6 +975,32 @@
data.forEach(async (ele2, index) => {
if (ele.fieldId == ele2
.attr) {
+ if (ele.name ==
+ 'Select' &&
+ ele2
+ .choice_list) {
+ const
+ dictItemList = [];
+ const
+ choiceList =
+ ele2
+ .choice_list ||
+ [];
+ for (let d in
+ choiceList) {
+ const val =
+ choiceList[
+ d];
+ dictItemList
+ .push({
+ text: val,
+ value: val
+ });
+ }
+ ele.dict =
+ dictItemList;
+ }
+
ele.value = ele2
.value;
}
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index f9e3e05..114018f 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -1069,6 +1069,35 @@
ele2
.attr
) {
+ if (ele.name ==
+ 'Select' &&
+ ele2
+ .choice_list
+ ) {
+ const
+ dictItemList = [];
+ const
+ choiceList =
+ ele2
+ .choice_list ||
+ [];
+ for (let d in
+ choiceList) {
+ const
+ val =
+ choiceList[
+ d
+ ];
+ dictItemList
+ .push({
+ text: val,
+ value: val
+ });
+ }
+ ele.dict =
+ dictItemList;
+ }
+
ele.value =
ele2
.value;
@@ -1092,6 +1121,38 @@
ele2
.attr
) {
+ if (col
+ .name ==
+ 'Select' &&
+ ele2
+ .choice_list
+ ) {
+ const
+ dictItemList = [];
+ const
+ choiceList =
+ ele2
+ .choice_list ||
+ [];
+ for (
+ let d in
+ choiceList
+ ) {
+ const
+ val =
+ choiceList[
+ d
+ ];
+ dictItemList
+ .push({
+ text: val,
+ value: val
+ });
+ }
+ col.dict =
+ dictItemList;
+ }
+
col.value =
ele2
.value;
diff --git a/pages/modal/5602.vue b/pages/modal/5602.vue
index 215603f..aa88e49 100644
--- a/pages/modal/5602.vue
+++ b/pages/modal/5602.vue
@@ -186,7 +186,7 @@
return {
title: this.translateSys("sorting"),
ClsID: "Sorting_Detail",
- ClsID2: "Sorting_Result",
+ ClsID2: "Picking_Result",
param: {},
focusFieldId: "",
focusOldFieldId: "",
@@ -966,8 +966,34 @@
data.forEach(async (ele2, index) => {
if (ele.fieldId == ele2
.attr) {
+ if (ele.name ==
+ 'Select' &&
+ ele2
+ .choice_list) {
+ const
+ dictItemList = [];
+ const
+ choiceList =
+ ele2
+ .choice_list ||
+ [];
+ for (let d in
+ choiceList) {
+ const val =
+ choiceList[
+ d];
+ dictItemList
+ .push({
+ text: val,
+ value: val
+ });
+ }
+ ele.dict =
+ dictItemList;
+ }
ele.value = ele2
.value;
+
}
});
});
diff --git a/store/index.js b/store/index.js
index 73a7dd7..2f25b50 100644
--- a/store/index.js
+++ b/store/index.js
@@ -282,15 +282,22 @@
commit("setDataSApi", '');
commit("setMongodbSvr", '');
if (ser[ser.length - 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/";
+
+ 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] + ":5101/";
- mobxoSApi = ser[0] + "//" + ser[2].split(':')[0] + ":5102/";
- dataSApi =ser[0] + "//" + ser[2].split(':')[0] + ":5103/";
- mongodbSvr = ser[0] + "//" + ser[2].split(':')[0] + ":5201/";
+ 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);
@@ -356,7 +363,7 @@
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 = {};
}
--
Gitblit v1.9.1