cuiqian2004
2024-08-16 c54802aead926ec66f2c1263ce1615aee0623728
mobox3 端口配置
1个文件已添加
12个文件已修改
342 ■■■■■ 已修改文件
locale/en.json 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
locale/es.json 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
locale/zh-Hans.json 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
locale/zh-Hant.json 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages.json 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/index.vue 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/index.vue 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/set.vue 112 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/modal/5600.vue 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/modal/5601.vue 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/modal/5602.vue 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
store/index.js 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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?",
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?",
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": "选择人员",
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": "系統有新版本,是否需要更新?",
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" : {
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%",
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) { //判断是否是Mobox3
                            success.result.forEach(async (area, index) => {
                                if (area.client_type == 2) { //判断类型是否是PDA类型
                                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的param是base64字符串
                    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;
                }
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;
pages/login/set.vue
New file
@@ -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, //返回层数,2则上上页
                })
                // 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>
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;
                                                        }
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;
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;
                                                        }
                                                    });
                                                });
store/index.js
@@ -282,15 +282,22 @@
                commit("setDataSApi", '');
                commit("setMongodbSvr", '');
                if (ser[ser.length - 1] == 'mobox3') { //判断地址是否是Mobox3
                    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 = {};
                }