cuiqian2004
2025-09-29 245895f78be2ed25a615608a092490a4042a906b
test
6个文件已修改
240 ■■■■ 已修改文件
api/index.js 49 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
locale/en.json 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
locale/es.json 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
locale/zh-Hans.json 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
locale/zh-Hant.json 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/set.vue 174 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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) { //判断地址是否是Mobox3
            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)
            })
        }
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",
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",
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": "未输入用户名,请重新输入",
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": "大模式介面",
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;
            }
        }