yangle
2025-04-14 c0a58576b033a3217f209c0137667a6adc0d4721
优化
9个文件已修改
105 ■■■■■ 已修改文件
WebTM/layuiadmin/MESLanguage.js 39 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig2.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/indexMenu.html 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/user/login.html 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站/RetrospectiveQueryReport.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/MESLanguage.js
@@ -89,12 +89,19 @@
    //下拉框所有值  select option
    var OptionList = [];
    const ddElementsOptionList = document.querySelectorAll("select option");
    // éåŽ†å…ƒç´ å¹¶èŽ·å–å†…å®¹
    ddElementsOptionList.forEach((dd, index) => {
        OptionList.push(dd.innerText.trim());
    });
    //表格列数据
    var tableColData = [];
    const tableColDataList = document.querySelectorAll(".layui-table tr span");
    // éåŽ†å…ƒç´ å¹¶èŽ·å–å†…å®¹
    tableColDataList.forEach((dd, index) => {
        tableColData.push(dd.innerText.trim());
    });
    for (var i = 0; i < data.length; i++) {
        var HTranslationText = "";
@@ -111,7 +118,7 @@
                if (document.querySelectorAll("#" + data[i].HFieldCode)[0].innerHTML == data[i].HFieldName) {
                    document.querySelectorAll("#" + data[i].HFieldCode)[0].innerHTML = document.querySelectorAll("#" + data[i].HFieldCode)[0].innerHTML.replace(data[i].HFieldName.replace('*', ''), HTranslationText.replace('*', ''));
                } else if (document.querySelectorAll("#" + data[i].HFieldCode)[0].innerText == data[i].HFieldName) {
                    document.querySelectorAll("#" + data[i].HFieldCode)[0].innerHTML = document.querySelectorAll("#" + data[i].HFieldCode)[0].innerHTML.replace(data[i].HFieldName.replace('*', ''), HTranslationText.replace('*', ''));
                    document.querySelectorAll("#" + data[i].HFieldCode)[0].innerHTML = document.querySelectorAll("#" + data[i].HFieldCode)[0].innerText.replace(data[i].HFieldName.replace('*', ''), HTranslationText.replace('*', ''));
                } else {
                    document.querySelectorAll("#" + data[i].HFieldCode)[0].innerText = document.querySelectorAll("#" + data[i].HFieldCode)[0].innerText.replace(data[i].HFieldName.replace('*', ''), HTranslationText.replace('*', ''));
                }
@@ -120,10 +127,12 @@
            if (InitiaType != 2) {
                if (data[i].HFieldCode != "select option") {
                    var count = document.querySelectorAll(data[i].HFieldCode).length;
                    for (var j = 0; j < count; j++) {
                        if (document.querySelectorAll(data[i].HFieldCode)[j].innerText.trim() == data[i].HFieldName) {
                            document.querySelectorAll(data[i].HFieldCode)[j].innerHTML = document.querySelectorAll(data[i].HFieldCode)[j].innerHTML.replace(data[i].HFieldName, HTranslationText);
                    if (data[i].HFieldCode != ".layui-table tr span") {
                        var count = document.querySelectorAll(data[i].HFieldCode).length;
                        for (var j = 0; j < count; j++) {
                            if (document.querySelectorAll(data[i].HFieldCode)[j].innerText.trim() == data[i].HFieldName) {
                                document.querySelectorAll(data[i].HFieldCode)[j].innerHTML = document.querySelectorAll(data[i].HFieldCode)[j].innerHTML.replace(data[i].HFieldName, HTranslationText);
                            }
                        }
                    }
                } else {
@@ -152,7 +161,7 @@
                }
            } else {
                if (data[i].HFieldCode != "select option") {
                if (data[i].HFieldCode != "select option" && data[i].HFieldCode != ".layui-table tr span") {
                    var count = document.querySelectorAll(data[i].HFieldCode).length;
                    for (var j = 0; j < count; j++) {
                        if (document.querySelectorAll(data[i].HFieldCode)[j].innerText.trim() == data[i].HFieldName) {
@@ -162,6 +171,20 @@
                }
            }
             //表格列数据
            if (data[i].HFieldCode == ".layui-table tr span") {
                var indicesData = [];
                var currentIndex = -1;
                while ((currentIndex = tableColData.indexOf(data[i].HFieldName, currentIndex + 1)) !== -1) {
                    indicesData.push(currentIndex);
                }
                if (data[i].HFieldCode != "select option") {
                    for (var j = 0; j < indicesData.length; j++) {
                        document.querySelectorAll(data[i].HFieldCode)[indicesData[j]].innerHTML = document.querySelectorAll(data[i].HFieldCode)[indicesData[j]].innerHTML.replace(data[i].HFieldName, HTranslationText);
                    }
                }
            }
            //下拉框的默认值
            if (data[i].HFieldCode == ".layui-unselect input") {
                var uncount = document.querySelectorAll(".layui-unselect input").length;
WebTM/layuiadmin/Scripts/webConfig2.js
@@ -14,5 +14,6 @@
}
//页面翻译调用接口
function GetWEBURlLanguage() {
    return GetWEBURL();
    var WEBURL = "http://localhost:8082/LuBaoAPI/";
    return WEBURL;
}
WebTM/views/indexMenu.html
@@ -35,10 +35,10 @@
                        </a>
                    </li>
                    <!--<li class="layui-nav-item layui-hide-xs" lay-unselect>
                        <a href="http://www.layui.com/admin/" target="_blank" title="前台">
                            <i class="layui-icon layui-icon-website"></i>
                        </a>
                    </li>-->
        <a href="http://www.layui.com/admin/" target="_blank" title="前台">
            <i class="layui-icon layui-icon-website"></i>
        </a>
    </li>-->
                    <li class="layui-nav-item" lay-unselect>
                        <a href="javascript:;" layadmin-event="refresh" title="刷新">
                            <i class="layui-icon layui-icon-refresh-3"></i>
@@ -50,6 +50,9 @@
                    <li class="layui-nav-item" lay-unselect style="color: black;">
                        <span>登录组织:</span>
                        <label id="Organization"></label>
                    </li>
                    <li class="layui-nav-item" lay-unselect style="color: black;">
                        <label id="Hlanguage"></label>
                    </li>
                </ul>
                <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
@@ -337,6 +340,14 @@
        document.getElementById('UserName').innerHTML = sessionStorage["HUserName"];
        document.getElementById('Organization').innerHTML = sessionStorage["Organization"];
        if (sessionStorage["HTranSlate"] == 1) {
            document.getElementById('Hlanguage').innerHTML ="当前语言:中文";
        } else if (sessionStorage["HTranSlate"] == 2) {
            document.getElementById('Hlanguage').innerHTML ="Current Language:Eeglish";
        } else if (sessionStorage["HTranSlate"] == 3) {
            document.getElementById('Hlanguage').innerHTML = "Current Language:Spanish";
        }
        function openChildPage(id) {
            //获取页面
            var num = document.getElementById(id);
WebTM/views/user/login.html
@@ -33,7 +33,7 @@
                            <select id="HTranSlate" style="width: 18%; margin-right: 1%; padding-left: 1px; font-size: 13px;">
                                <option value="1" selected>中文</option>
                                <option value="2">Eeglish</option>
                                <option value="3">Español</option>
                                <option value="3">Spanish</option>
                            </select>
                            <!--<li class="ax-col"></li>-->
                        </ul>
@@ -325,6 +325,10 @@
            //提交
            form.on("submit(LAY-user-login-submit)", function (obj) {
                if ($("#HTranSlate").val() == null) {
                    layer.msg("请选择语言!");
                    return false;
                }
                loging();
            })
@@ -338,6 +342,10 @@
            //密码框回车执行登录
            $('#LAY-user-login-password').on('keydown', function (e) {
                if (e.keyCode == 13) {
                    if ($("#HTranSlate").val() == null) {
                        layer.msg("请选择语言!");
                        return false;
                    }
                    loging();
                    //playSound();
                }
WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemBGA.html
@@ -38,7 +38,7 @@
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAdd" id="btnAdd">新增</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCancel" id="btnCancel">退出</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 49.5%; float: left; background-color: white;height:450px;">
                    <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 49.5%; float: left; background-color: white;height:600px;">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">当前工单</li>
                        </ul>
@@ -175,7 +175,7 @@
                            </div>
                        </div>
                    </div>
                    <div class="layui-tab" style="width: 50%; float: left; background-color: white; margin-left: 0.5%; height: 450px;">
                    <div class="layui-tab" style="width: 50%; float: left; background-color: white; margin-left: 0.5%; height: 600px;">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">采集信息</li>
                        </ul>
WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemStationPlatform.html
@@ -26,7 +26,7 @@
        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">保存</button>
        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">退出</button>
    </div>-->
                    <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 49%; float: left; height: 400px;background-color:white;">
                    <div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 49%; float: left; height: 600px;background-color:white;">
                        <div class="layui-tab-content">
                            <!--基本信息-->
                            <div class="layui-tab-item layui-show">
@@ -206,7 +206,7 @@
                            </div>
                        </div>
                    </div>
                    <div class="layui-tab layui-tab-card" style="width: 49%; float: left;height:300px;">
                    <div class="layui-tab layui-tab-card" style="width: 49%; float: left;height:500px;">
                        <ul class="layui-tab-title">
                            <li class="layui-this">关键件清单</li>
                        </ul>
@@ -557,7 +557,7 @@
                , totalRow: true
                , cellMinWidth: 120
                , data: []
                , height: 185
                , height: 385
                , limit: Number.MAX_VALUE
                , cols: [[
                    { type: 'numbers', title: '序号' }
WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/RetrospectiveQueryReport.html
@@ -229,10 +229,11 @@
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
        //初始化表格
        DisPlay_HideColumn();
        //初始化界面
        set_ClearBill();
        //初始化表格
        DisPlay_HideColumn();
        //#endregion
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html
@@ -274,12 +274,6 @@
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>预览</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>保存列宽</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell" id="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>默认列宽</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Exit" id="btn-Exit">退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>保存方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_FY" id="set_FY"><i class="layui-icon layui-icon-set"></i>翻译</button>-->
                            </div>
@@ -1251,7 +1245,6 @@
                        layer.alert(get_MessageError("[0000-1-002]接口请求失败!", sessionStorage["HTranSlate"]), { icon: 5 });
                    }
                })
            }
            //#endregion
            }           
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBillList.html
@@ -328,7 +328,7 @@
                } else {
                    get_FastQuery();
                }
                initFunction(1, HModName, sessionStorage["HTranSlate"]);
                //initFunction(1, HModName, sessionStorage["HTranSlate"]);
            });
            //日期间隔下拉列表监听
@@ -968,6 +968,7 @@
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
                initFunction(1, HModName, sessionStorage["HTranSlate"]);
            }
            //重置过滤条件
@@ -1499,15 +1500,6 @@
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, "3790", HModName, sessionStorage["HUserName"]);
                    }, error: function () {
                        layer.alert(get_MessageError("[0000-1-002]接口请求失败!", sessionStorage["HTranSlate"]), { icon: 5 });
                    }
                })
            }