From 245895f78be2ed25a615608a092490a4042a906b Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期一, 29 九月 2025 17:43:08 +0800
Subject: [PATCH] test
---
locale/es.json | 4
locale/zh-Hans.json | 5 +
locale/en.json | 4
pages/login/set.vue | 174 +++++++++++++++++++++++++++++++++++++-----
locale/zh-Hant.json | 4
api/index.js | 49 +++++++++---
6 files changed, 201 insertions(+), 39 deletions(-)
diff --git a/api/index.js b/api/index.js
index 30d2fdb..d058214 100644
--- a/api/index.js
+++ b/api/index.js
@@ -1,7 +1,7 @@
import http from '../libs/mobox.api.js';
import {
Base64
-} from '@/js/Base64.js';
+} from '@/js/Base64.js';
import utils from "@/js/utils.js"
import {
login as loginOrg,
@@ -176,29 +176,54 @@
isMobox3Web(server)
if (app.globalData.isMobox3) { //鍒ゆ柇鍦板潃鏄惁鏄疢obox3
const mobox3Ports = utils.session.getValue('mobox3_port');
- const orgsport = mobox3Ports.org || 5101
- const moboxsport = mobox3Ports.mobox || 5102
- const datasport = mobox3Ports.data || 5103
+ const mobox3Servers = utils.session.getValue('mobox3_server');
+
+ const orgsport = mobox3Ports?.org || 5101
+ const moboxsport = mobox3Ports?.mobox || 5102
+ const datasport = mobox3Ports?.data || 5103
+
+ const orgsIp = mobox3Servers?.org || ""
+ const moboxsIp = mobox3Servers?.mobox || ""
+ const datasIp = mobox3Servers?.data || ""
var orgSApi = "http://" + ser[0].split(':')[0] + ":" + orgsport + "/";
- var mobxoSApi = "http://" + ser[0].split(':')[0] + ":" + moboxsport + "/";
+ var moboxSApi = "http://" + ser[0].split(':')[0] + ":" + moboxsport + "/";
var dataSApi = "http://" + ser[0].split(':')[0] + ":" + datasport + "/";
+
if (server.includes("://")) {
orgSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + orgsport + "/";
- mobxoSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + moboxsport + "/";
+ moboxSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + moboxsport + "/";
dataSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + datasport + "/";
+ }
+ if (orgsIp) {
+ orgSApi = "http://" + orgsIp + ":" + orgsport + "/";
+ if (orgsIp.includes("://")) {
+ orgSApi = orgsIp + ":" + orgsport + "/";
+ }
+ }
+ if (moboxsIp) {
+ moboxSApi = "http://" + moboxsIp + ":" + moboxsport + "/";
+ if (moboxsIp.includes("://")) {
+ moboxSApi = moboxsIp + ":" + moboxsport + "/";
+ }
+ }
+ if (datasIp) {
+ dataSApi = "http://" + datasIp + ":" + datasport + "/";
+ if (datasIp.includes("://")) {
+ dataSApi = datasIp + ":" + datasport + "/";
+ }
}
app.globalData.mobox3ApiUrl = {
org: orgSApi,
data: dataSApi,
- mobox: mobxoSApi,
+ mobox: moboxSApi,
}
- loginOrg(id, pwd).then((res)=>{
+ loginOrg(id, pwd).then((res) => {
resolve(res)
- }).catch((rej)=>{
+ }).catch((rej) => {
reject(rej)
})
-
+
} else {
var header = {
'content-type': 'application/x-www-form-urlencoded'
@@ -218,9 +243,9 @@
url,
header,
data,
- }).then((res)=>{
+ }).then((res) => {
resolve(res)
- }).catch((rej)=>{
+ }).catch((rej) => {
reject(rej)
})
}
diff --git a/locale/en.json b/locale/en.json
index c2b8b72..c3d8b82 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -59,10 +59,12 @@
"sys.unrealized": "Unrealized",
"sys.select": "Select",
"sys.please": "please",
+ "sys.port": "Port",
+ "page.address": "address",
"page.server": "Server",
"page.mobox3_app_type": "Mobox3 PDA application types",
- "page.mobox3_port": "Mobox3 service port",
+ "page.mobox3_server": "Mobox3 service",
"page.mobox3_bind_classes_when_logging_in": "Bind classes when logging in to mobox3",
"page.bind_class": "Bind classes",
"page.interface_large_mode": "Large mode interface",
diff --git a/locale/es.json b/locale/es.json
index dbc4467..23e174d 100644
--- a/locale/es.json
+++ b/locale/es.json
@@ -58,10 +58,12 @@
"sys.unrealized": "No logrado",
"sys.select": "Escoger",
"sys.please": "Por favor.",
+ "sys.port": "puerto",
+ "page.address": "direcci贸n",
"page.server": "Servidor",
"page.mobox3_app_type": "Tipo de aplicaci贸n PDA mobox3",
- "page.mobox3_port": "Puerto de servicio mobox3",
+ "page.mobox3_server": "servicio mobox3",
"mobox3_bind_classes_when_logging_in": "Mobox3 se une a los turnos al iniciar sesi贸n",
"page.bind_classes": "Turnos vinculados",
"page.interface_large_mode": "Interfaz de gran modo",
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index e9b9258..784886c 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -58,16 +58,19 @@
"sys.unrealized": "鏈疄鐜�,
"sys.select": "璇烽�鎷�,
"sys.please": "璇�,
+ "sys.port": "绔彛",
+ "page.address": "鍦板潃",
"page.server": "鏈嶅姟鍦板潃",
"page.mobox3_app_type": "mobox3 pda搴旂敤绫诲瀷",
- "page.mobox3_port": "mobox3鏈嶅姟绔彛",
+ "page.mobox3_server": "mobox3鏈嶅姟",
"page.mobox3_bind_classes_when_logging_in": "mobox3 鐧诲綍鏃剁粦瀹氱彮娆�,
"page.bind_classes": "缁戝畾鐝",
"page.interface_large_mode": "澶фā寮忕晫闈�,
"page.classes": "鐝",
"page.input_server": "璇疯緭鍏ユ湇鍔″湴鍧�,
"page.set_server": "璁剧疆鏈嶅姟",
+
"page.tip_app_update": "绯荤粺鏈夋柊鐗堟湰锛屾槸鍚﹂渶瑕佹洿鏂帮紵",
"page.tip_no_web_server": "鏈緭鍏ョ綉绔欏湴鍧�紝璇烽噸鏂伴厤缃緭鍏�,
"page.tip_no_user_account": "鏈緭鍏ョ敤鎴峰悕锛岃閲嶆柊杈撳叆",
diff --git a/locale/zh-Hant.json b/locale/zh-Hant.json
index 67b33c3..1b86d52 100644
--- a/locale/zh-Hant.json
+++ b/locale/zh-Hant.json
@@ -58,10 +58,12 @@
"sys.unrealized": "鏈鐝�,
"sys.select": "閫夋嫨",
"sys.please": "璇�,
+ "sys.port": "绔彛",
+"page.address": "鍦板潃",
"page.server": "鏈嶅嫏鍦板潃",
"page.mobox3_app_type": "mobox3 pda鎳夌敤椤炲瀷",
- "page.mobox3_port": "mobox3鏈嶅嫏鍩�,
+ "page.mobox3_server": "mobox3鏈嶅嫏",
"page.mobox3_bind_classes_when_logging_in": "mobox3鐧诲叆鏅傜秮瀹氱彮娆�,
"page.bind_classes": "缍佸畾鐝",
"page.interface_large_mode": "澶фā寮忎粙闈�,
diff --git a/pages/login/set.vue b/pages/login/set.vue
index e1b8d3d..762e82c 100644
--- a/pages/login/set.vue
+++ b/pages/login/set.vue
@@ -1,6 +1,6 @@
<template>
<view class="uni-page-login-set" :class="form.largeMode?'large-mode':''">
- <uni-forms class="form" label-align="right" label-width="150px" :form="form">
+ <uni-forms class="form" label-align="right" label-width="100rpx" :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')">
@@ -9,19 +9,71 @@
<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-section :title="translateSys('page.mobox3_server')" type="line">
+
+ <uni-row>
+ <uni-col :span="16">
+ <uni-forms-item :label="'OrgSAPI '+ translateSys('sys.port')" label-width="240rpx">
+ <input type="number" class="input-port" v-model="form.orgSPort">
+
+ </uni-forms-item>
+ </uni-col>
+ <uni-col :span="8">
+ <uni-forms-item :label="translateSys('page.address')" label-width="100rpx">
+ <switch class="item" :checked="form.showOrgIp"
+ :style="form.largeMode? '':'transform:scale(0.7)'" @change="switchShowOrgIp" />
+ </uni-forms-item>
+ </uni-col>
+ </uni-row>
+ <uni-forms-item :label="translateSys('page.address')" label-width="240rpx" v-if="form.showOrgIp">
+ <input class="input-wrapper" v-model="form.orgSIp">
</uni-forms-item>
- <uni-forms-item label="MoboxSAPI">
+
+ <uni-row>
+ <uni-col :span="16">
+ <uni-forms-item :label="'MoboxSAPI '+ translateSys('sys.port')" label-width="250rpx">
+ <input type="number" class="input-port" v-model="form.moboxSPort">
+
+ </uni-forms-item>
+ </uni-col>
+ <uni-col :span="8">
+ <uni-forms-item :label="translateSys('page.address')" label-width="100rpx">
+ <switch class="item" :checked="form.showMoboxIp"
+ :style="form.largeMode? '':'transform:scale(0.7)'" @change="switchShowMoboxIp" />
+ </uni-forms-item>
+ </uni-col>
+ </uni-row>
+ <uni-forms-item :label="translateSys('page.address')" label-width="240rpx" v-if="form.showMoboxIp">
+ <input class="input-wrapper" v-model="form.moboxSIp">
+ </uni-forms-item>
+
+ <uni-row>
+ <uni-col :span="16">
+ <uni-forms-item :label="'DataSAPI '+ translateSys('sys.port')" label-width="250rpx">
+ <input type="number" class="input-port" v-model="form.dataSPort">
+
+ </uni-forms-item>
+ </uni-col>
+ <uni-col :span="8">
+ <uni-forms-item :label="translateSys('page.address')" label-width="100rpx">
+ <switch class="item" :checked="form.showDataIp"
+ :style="form.largeMode? '':'transform:scale(0.7)'" @change="switchShowDataIp" />
+ </uni-forms-item>
+ </uni-col>
+ </uni-row>
+ <uni-forms-item :label="translateSys('page.address')" label-width="240rpx" v-if="form.showDataIp">
+ <input class="input-wrapper" v-model="form.dataSIp">
+ </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">
+ </uni-forms-item> -->
+ <!-- <uni-forms-item label="MongodbSvr">
<input type="number" class="input-wrapper" v-model="form.mongodbSPort">
- </uni-forms-item>
+ </uni-forms-item> -->
</uni-section>
<view> {{translateSys('page.interface_large_mode')}}
@@ -40,20 +92,32 @@
<script>
import utils from "@/js/utils.js"
-import {showInfo,
- showError} from "@/js/Page.js"
+ import {
+ showInfo,
+ showError,
+ showToast
+ } from "@/js/Page.js"
export default {
data() {
return {
form: {
server: "",
appType: "",
+ orgSIp: "",
+ moboxSIp: "",
+ dataSIp: "",
orgSPort: "",
moboxSPort: "",
dataSPort: "",
mongodbSPort: "",
+ showOrgIp: false,
+ showDataIp: false,
+ showMoboxIp: false,
+
bindClasses: false,
- largeMode: false
+ largeMode: false,
+
+
},
}
@@ -61,6 +125,47 @@
methods: {
onOk() {
+ let org = ""
+ let mobox = ""
+ let data = ""
+ if (this.form.showOrgIp) {
+
+ if (!this.form.orgSIp.trim()) {
+ showToast("鏈嶅姟OrgSAPI鍦板潃涓嶈兘涓虹┖ ")
+ return
+ }
+
+ org = this.form.orgSIp
+ }
+ if (this.form.showMoboxIp) {
+
+ if (!this.form.moboxSIp.trim()) {
+ showToast("鏈嶅姟MoboxSAPI鍦板潃涓嶈兘涓虹┖ ")
+ return
+ }
+
+ mobox = this.form.moboxSIp
+ }
+ if (this.form.showDataIp) {
+
+ if (!this.form.dataSIp.trim()) {
+ showToast("鏈嶅姟DataSAPI鍦板潃涓嶈兘涓虹┖ ")
+ return
+ }
+
+ data = this.form.dataSIp
+ }
+ utils.session.setValue('mobox3_port', {
+ org: this.form.orgSPort,
+ mobox: this.form.moboxSPort,
+ data: this.form.dataSPort,
+ });
+
+ utils.session.setValue('mobox3_server', {
+ org,
+ mobox,
+ data,
+ });
utils.session.setValue('server', this.form.server);
utils.session.setValue('app_type', this.form.appType);
utils.session.setValue('large_mode', this.form.largeMode);
@@ -68,12 +173,6 @@
utils.session.setValue('bind_classes', {
checked: this.form.bindClasses,
classes: bindInfo?.classes || ""
- });
- utils.session.setValue('mobox3_port', {
- org: this.form.orgSPort,
- mobox: this.form.moboxSPort,
- data: this.form.dataSPort,
- mongodb: this.form.mongodbSPort
});
getApp().globalData.largeMode = this.form.largeMode
@@ -88,6 +187,16 @@
// });
},
+ switchShowOrgIp(e) {
+ this.form.showOrgIp = e.detail.value
+ },
+ switchShowMoboxIp(e) {
+ this.form.showMoboxIp = e.detail.value
+ },
+ switchShowDataIp(e) {
+ this.form.showDataIp = e.detail.value
+ },
+
switchBindClasses(e) {
this.form.bindClasses = e.detail.value
},
@@ -101,8 +210,6 @@
},
},
onLoad() {
-
-
this.form.server = utils.session.getValue('server') || "";
this.form.appType = utils.session.getValue('app_type') || "MES";
this.form.bindClasses = utils.session.getValue('bind_classes')?.checked || false
@@ -113,7 +220,19 @@
this.form.moboxSPort = mobox3Port?.mobox || 5102
this.form.dataSPort = mobox3Port?.data || 5103
this.form.mongodbSPort = mobox3Port?.mongodb || 5201
-
+ const mobox3Server = utils.session.getValue('mobox3_server');
+ this.form.orgSIp = mobox3Server?.org || ""
+ this.form.moboxSIp = mobox3Server?.mobox || ""
+ this.form.dataSIp = mobox3Server?.data || ""
+ if (this.form.orgSIp) {
+ this.form.showOrgIp = true
+ }
+ if (this.form.moboxSIp) {
+ this.form.showMoboxIp = true
+ }
+ if (this.form.dataSIp) {
+ this.form.showDataIp = true
+ }
},
}
@@ -124,18 +243,27 @@
display: flex;
width: 750rpx;
flex-direction: column !important;
+ padding: 10rpx 0;
.form {
padding: 10rpx 20rpx;
+
.input-wrapper {
border: 1px solid #d5d5d5;
- width: calc(100% - 16rpx);
- padding: 12rpx 8rpx;
+ width: calc(100% - 10px);
+ padding: 10rpx 5rpx;
+ }
+
+ .input-port {
+ border: 1px solid #d5d5d5;
+ padding: 10rpx 10rpx;
+ width: 120rpx;
}
.uni-forms-item {
- margin: 20rpx;
+ margin: 10rpx 5rpx;
+ // background-color: pink;
}
}
--
Gitblit v1.9.1