| WebTM/Properties/PublishProfiles/JFTM.pubxml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/Properties/PublishProfiles/JFTM.pubxml.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/WebTM.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/layuiadmin/Scripts/webConfig.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/indexMenu_PDA.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/indexMenu_PingBan.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/Properties/PublishProfiles/JFTM.pubxml
@@ -10,7 +10,7 @@ <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration> <LastUsedPlatform>Any CPU</LastUsedPlatform> <PublishProvider>FileSystem</PublishProvider> <PublishUrl>D:\编码\发布\layui</PublishUrl> <PublishUrl>D:\网站发布\智云MESWMS\LAYUI</PublishUrl> <WebPublishMethod>FileSystem</WebPublishMethod> <SiteUrlToLaunchAfterPublish /> </PropertyGroup> WebTM/Properties/PublishProfiles/JFTM.pubxml.user
Diff too large WebTM/WebTM.csproj
@@ -206,6 +206,8 @@ <Content Include="views\home\console_pb.html" /> <Content Include="views\home\console_QiaoYi.html" /> <Content Include="views\home\console_Mobile_QiaoYi.html" /> <Content Include="views\indexMenu_PDA.html" /> <Content Include="views\indexMenu_PingBan.html" /> <Content Include="views\index_KaiBeiNaiTe.html" /> <Content Include="views\index_Mobile_KaiBeiNaiTe.html" /> <Content Include="views\index_Mobile_QiaoYi.html" /> WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,11 +5,11 @@ //var WEBURL = "http://61.164.86.218:8099/ABAPI/"; /*var WEBURL = "http://localhost/API/"; */ //颜晓军本地配置 //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //杨乐本地配置 //var WEBURL = "http://localhost:8082/API/"; //杜贺本地配置 var WEBURL = "http://localhost:8082/API/"; //杜贺本地配置 // var WEBURL = "http://localhost:81/API/"; //王彬本地配置 /*var WEBURL = "http://localhost:8083/API/"; //陈雯静本地配置*/ // var WEBURL = "http://localhost:81/API/" //翁涛涛本地配置 var WEBURL = "http://localhost:8082/API/"; //张瑞广本地配置 //var WEBURL = "http://localhost:8082/API/"; //张瑞广本地配置 //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //余思杰本地配置 //var WEBURL = "http://localhost:8088/ARAPI/"; //余思杰本地配置(安瑞) //var WEBURL = "http://10.1.4.155/API/"; //江丰客户NEW WebTM/views/indexMenu_PDA.html
New file @@ -0,0 +1,273 @@ <!DOCTYPE html> <html> <head> <meta charset="utf-8"> <title>LMES管理系统移动端</title> <meta name="renderer" content="webkit"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0"> <link rel="stylesheet" href="../layuiadmin/layui/css/layui.css" media="all"> <link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all"> <script src="../layuiadmin/zgqCustom/zgqCustom.js"></script> <script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script> <style> .layui-nav-tree .layui-nav-item { width: 88%; } .layui-nav * { font-size: 13px; } .layui-side-menu .layui-nav .layui-nav-item a { padding-left: 25px; } </style> </head> <body class="layui-layout-body"> <div id="LAY_app"> <div class="layui-layout layui-layout-admin"> <div class="layui-header"> <!-- 头部区域 --> <ul class="layui-nav layui-layout-left"> <li class="layui-nav-item layadmin-flexible" lay-unselect> <a href="javascript:;" layadmin-event="flexible" title="侧边伸缩"> <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></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> </a> </li> <li class="layui-nav-item" lay-unselect> <a href="javascript:void(0);"> <i id="MenuDefineID" class="layui-icon layui-icon-app"></i> </a> </li> </ul> <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right"> <li class="layui-nav-item layui-hide-xs" lay-unselect> <a href="javascript:;" layadmin-event="theme"> <i class="layui-icon layui-icon-theme"></i> </a> </li> <li class="layui-nav-item layui-hide-xs" lay-unselect> <a href="javascript:;" layadmin-event="note"> <i class="layui-icon layui-icon-note"></i> </a> </li> <li class="layui-nav-item layui-hide-xs" lay-unselect> <a href="javascript:;" layadmin-event="fullscreen"> <i class="layui-icon layui-icon-screen-full"></i> </a> </li> <li class="layui-nav-item" lay-unselect> <a href="javascript:;"> <cite> <label name="UserName" id="UserName"></label> </cite> </a> </li> <li class="layui-nav-item" lay-unselect> <dd layadmin-event="logout" style="text-align: center;background-color:red"><a>退出</a></dd> </li> </ul> </div> <!-- 侧边菜单 --> <div class="layui-side layui-side-menu"> <div class="layui-side-scroll"> <div class="layui-logo" lay-href="home/console_Mobile_KaiBeiNaiTe.html"> <img src="../layuiadmin/myicon/yidongduan.svg" alt="移动端" style="width:25px;height:25px;margin-right: 5px;" /> <span>LMES管理系统</span> </div> <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu" style="width:260px"> </ul> </div> </div> <!-- 页面标签 --> <div class="layadmin-pagetabs" id="LAY_app_tabs"> <div class="layui-icon layadmin-tabs-control layui-icon-prev" layadmin-event="leftPage"></div> <div class="layui-icon layadmin-tabs-control layui-icon-next" layadmin-event="rightPage"></div> <div class="layui-icon layadmin-tabs-control layui-icon-down"> <ul class="layui-nav layadmin-tabs-select" lay-filter="layadmin-pagetabs-nav"> <li class="layui-nav-item" lay-unselect> <a href="javascript:;"></a> <dl class="layui-nav-child layui-anim-fadein"> <dd layadmin-event="closeThisTabs"><a href="javascript:;">关闭当前标签页</a></dd> <dd layadmin-event="closeOtherTabs"><a href="javascript:;">关闭其它标签页</a></dd> <dd layadmin-event="closeAllTabs"><a href="javascript:;">关闭全部标签页</a></dd> </dl> </li> </ul> </div> <div class="layui-tab" lay-unauto lay-allowClose="true" lay-filter="layadmin-layout-tabs"> <ul class="layui-tab-title" id="LAY_app_tabsheader"> <li lay-id="home/console_Mobile_KaiBeiNaiTe.html" lay-attr="home/console_Mobile_KaiBeiNaiTe.html" class="layui-this"><i class="layui-icon layui-icon-home"></i></li> </ul> </div> </div> <!-- 主体内容 --> <div class="layui-body" id="LAY_app_body"> <div class="layadmin-tabsbody-item layui-show"> <iframe src="home/console_Mobile_KaiBeiNaiTe.html" frameborder="0" class="layadmin-iframe"></iframe> </div> </div> <!-- 辅助元素,一般用于移动设备下遮罩 --> <div class="layadmin-body-shade" layadmin-event="shade"></div> </div> </div> <script src="../layuiadmin/layui/layui.js"></script> <script src="../layuiadmin/Scripts/webConfig.js"></script> <script src="../layuiadmin/zgqCustom/zgqCustom.js"></script> <script src="../layuiadmin/PubCustom.js"></script> <script> layui.config({ base: '../layuiadmin/' }).extend({ index: 'lib/index' }).use(['index', 'form', 'laydate', 'table', 'element'], function () { var $ = layui.$; var element = layui.element; var $ = layui.jquery; var HType = "mobile"; //登录平台:PC端、手机端 //#region 页面初始化 set_ClearBill(); //#endregion //#region 页面其它方法 //#region 页面初始化方法 function set_ClearBill() { //判断是否登录 未登录则跳到登录页 if (sessionStorage.login != "login") { layer.confirm("登录失效,请重新登录!", { icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录'] }, function () { window.location.href = "user/login.html"; }); } //加载侧边菜单栏 set_sideMenuDisPlay(); } //#endregion //#region 显示侧边菜单 function set_sideMenuDisPlay() { ////判断用户是移动端还是PC端 //var judgeMorPCflag = judgeMorPC(); //if (judgeMorPCflag) {//PC端 // window.location.href = 'indexMenu.html' //} var ajaxLoad = layer.load(); //获取菜单列表数据 $.ajax({ url: GetWEBURL() + "/Web/MenuList", type: "GET", async: false, data: { "HMakeName": sessionStorage["HUserName"], "HType": HType }, success: function (data) { var data = JSON.parse(data.data); console.log(data); MenuMain(data); layer.close(ajaxLoad); }, error: function (data) { layer.close(ajaxLoad); layer.alert("发生错误!", { icon: 5 }); } }); } //#endregion //#region 遍历生成主菜单 function MenuMain(data) { var liStr = ''; //遍历生成主菜单 for (var i = 0; i < data.length; i++) { // 判断是否存在子菜单 if (data[i].childMenus != null && data[i].childMenus.length > 0) { liStr += '<li data-name="set" class="layui-nav-item">'; //设置一级菜单图标 if (data[i].HLevel == 1 && data[i].HPicNum != null && data[i].HPicNum != "") { liStr += '<a><i class="' + data[i].HPicNum + '"></i><cite>' + data[i].HName + '</cite><span class="layui-nav-more"></span></a>'; } else { liStr += '<a><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite><span class="layui-nav-more"></span></a>'; } liStr += '<dl class="layui-nav-child">'; // 遍历获取子菜单 for (var k = 0; k < data[i].childMenus.length; k++) { liStr += getChildMenu(data[i].childMenus[k], 0); } liStr += '</dl></li>'; } else { liStr += '<li class="layui-nav-item"><a class="" href="' + data[i].Hurl + '"><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite></a></li>'; } }; $(".layui-nav-tree").html(liStr); element.init(); } //#endregion //#region 递归生成子菜单 function getChildMenu(subMenu, num) { num++; var subStr = ''; if (subMenu.childMenus != null && subMenu.childMenus.length > 0) { subStr += '<dd>'; subStr += '<a>' + subMenu.HName + '</a>'; subStr += '<dl class="layui-nav-child">'; for (var j = 0; j < subMenu.childMenus.length; j++) { subStr += getChildMenu(subMenu.childMenus[j], num); } subStr += '</dl>'; subStr += '</dd>'; } else { subStr += '<dd><a lay-href="' + subMenu.Hurl + '">' + subMenu.HName + '</a></dd>'; } return subStr; } //#endregion //#region 菜单自定义:弹出菜单自定义子页面 Ul = document.getElementById("MenuDefineID"); Ul.addEventListener("click", function (event) { layer.open({ type: 2 , area: ['90%', '90%'] , title: '菜单自定义' , closeBtn: 1 , shade: 0.6 //遮罩透明度 , maxmin: true //允许全屏最小化 , anim: 0 //0-6的动画形式,-1不开启 , content: '系统管理/菜单自定义/Xt_DefineMenuDisplay.html' , resize: false , btn: ["确定"] , end: function () { //刷新页面, location.reload(); } }) }, false); //#endregion //#endregion }); document.getElementById('UserName').innerHTML = sessionStorage["HUserName"]; </script> </body> </html> WebTM/views/indexMenu_PingBan.html
New file @@ -0,0 +1,324 @@ <!DOCTYPE html> <html> <head> <meta charset="utf-8"> <title>LMES管理系统</title> <meta name="renderer" content="webkit"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0"> <link rel="stylesheet" href="../layuiadmin/layui/css/layui.css" media="all"> <link rel="stylesheet" href="../layuiadmin/style/admin.css" media="all"> <script src="../layuiadmin/Scripts/jquery-3.5.1.min.js"></script> <script language="JavaScript"> //屏蔽后退按钮 history.pushState(null, null, document.URL); window.addEventListener('popstate', function () { history.pushState(null, null, document.URL); }); </script> <script> /^http(s*):\/\//.test(location.href) || alert('请先部署到 localhost 下再访问'); </script> </head> <body class="layui-layout-body"> <div id="LAY_app"> <div class="layui-layout layui-layout-admin"> <div class="layui-header"> <!-- 头部区域 --> <ul class="layui-nav"> <li class="layui-nav-item layadmin-flexible" lay-unselect> <a href="javascript:;" layadmin-event="flexible" title="侧边伸缩"> <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i> </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> <li class="layui-nav-item" lay-unselect> <a href="javascript:;" layadmin-event="refresh" title="刷新"> <i class="layui-icon layui-icon-refresh-3"></i> </a> </li> <li class="layui-nav-item layui-hide-xs" lay-unselect> <input type="text" placeholder="搜索..." autocomplete="off" class="layui-input layui-input-search" layadmin-event="serach" lay-action="https://www.baidu.com/s?ie=UTF-8&wd="> </li> <li class="layui-nav-item" lay-unselect style="color: black;"> <span>登录组织:</span> <label id="Organization"></label> </li> </ul> <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right"> <li class="layui-nav-item" lay-unselect> <a href="javascript:void(0);"> <i id="MenuDefineID" class="layui-icon layui-icon-app"></i> </a> </li> <li class="layui-nav-item" lay-unselect> <a href="javascript:void(0);"> <!--<a lay-href="app/message/index.html" layadmin-event="message" lay-text="消息中心">--> <i class="layui-icon layui-icon-notice"></i> <!--如果有新消息,则显示小圆点--> <span class="layui-badge-dot"></span> </a> </li> <li class="layui-nav-item layui-hide-xs" lay-unselect> <a href="javascript:;" layadmin-event="theme"> <i class="layui-icon layui-icon-theme"></i> </a> </li> <li class="layui-nav-item layui-hide-xs" lay-unselect> <a href="javascript:;" layadmin-event="note"> <i class="layui-icon layui-icon-note"></i> </a> </li> <li class="layui-nav-item layui-hide-xs" lay-unselect> <a href="javascript:;" layadmin-event="fullscreen"> <i class="layui-icon layui-icon-screen-full"></i> </a> </li> <li class="layui-nav-item" lay-unselect style="margin-right:15px;"> <a href="javascript:;"> <cite> <label name="UserName" id="UserName"></label> </cite> </a> <dl class="layui-nav-child"> <dd><a lay-href="set/user/info.html">基本资料</a></dd> <dd><a lay-href="set/user/password.html">修改密码</a></dd> <dd layadmin-event="logout" style="text-align: center;"><a>退出</a></dd> </dl> </li> <!--<li class="layui-nav-item layui-hide-xs" lay-unselect> <a href="javascript:;" layadmin-event="about"><i class="layui-icon layui-icon-more-vertical"></i></a> </li>--> <li class="layui-nav-item layui-show-xs-inline-block layui-hide-sm" lay-unselect> <a href="javascript:;" layadmin-event="more"><i class="layui-icon layui-icon-more-vertical"></i></a> </li> </ul> </div> <!-- 侧边菜单 --> <!--<div class="layui-side layui-side-menu" style="display:none;"> <div class="layui-side-scroll"> <div class="layui-logo" lay-href="home/console.html"> <img src="../layuiadmin/myicon/win.svg" alt="PC端" style="width:25px;height:25px;margin-right: 5px;" /> <span>LMES管理系统</span> </div> <ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">--> <!-- 采购管理 --> <!--<li data-name="set" class="layui-nav-item"> <a><i class="layui-icon layui-icon-set"></i><cite>采购管理</cite></a> <dl class="layui-nav-child"> <dd> <a>委外订单</a> <dl class="layui-nav-child"> <dd><a lay-href="采购管理/委外订单/WW_EntrustOrderBillList.html">委外订单维护</a></dd> </dl> </dd> </dl> </li>--> <!--</ul> </div> </div>--> <!-- 页面标签 --> <div class="layadmin-pagetabs" id="LAY_app_tabs" style="position:fixed;left:0px;"> <div class="layui-icon layadmin-tabs-control layui-icon-prev" layadmin-event="leftPage"></div> <div class="layui-icon layadmin-tabs-control layui-icon-next" layadmin-event="rightPage"></div> <div class="layui-icon layadmin-tabs-control layui-icon-down"> <ul class="layui-nav layadmin-tabs-select" lay-filter="layadmin-pagetabs-nav"> <li class="layui-nav-item" lay-unselect> <a href="javascript:;"></a> <dl class="layui-nav-child layui-anim-fadein"> <dd layadmin-event="closeThisTabs"><a href="javascript:;">关闭当前标签页</a></dd> <dd layadmin-event="closeOtherTabs"><a href="javascript:;">关闭其它标签页</a></dd> <dd layadmin-event="closeAllTabs"><a href="javascript:;">关闭全部标签页</a></dd> </dl> </li> </ul> </div> <div class="layui-tab" lay-unauto lay-allowClose="true" lay-filter="layadmin-layout-tabs"> <ul class="layui-tab-title" id="LAY_app_tabsheader"> <li lay-id="home/console.html" lay-attr="home/console.html" class="layui-this"><i class="layui-icon layui-icon-home"></i></li> </ul> </div> </div> <!-- 主体内容 --> <div class="layui-body" id="LAY_app_body" style="position:fixed;left:0px;"> <div class="layadmin-tabsbody-item layui-show"> <iframe src="home/console.html" frameborder="0" class="layadmin-iframe"></iframe> </div> </div> <!-- 辅助元素,一般用于移动设备下遮罩 --> <div class="layadmin-body-shade" layadmin-event="shade"></div> </div> </div> <script src="../layuiadmin/layui/layui.js"></script> <script src="../layuiadmin/Scripts/webConfig.js"></script> <script src="../layuiadmin/zgqCustom/zgqCustom.js"></script> <script src="../layuiadmin/PubCustom.js"></script> <script> // 导航菜单的间隔像素 var menuCell = 5; layui.config({ base: '../layuiadmin/' //静态资源所在路径 }).extend({ index: 'lib/index' //主入口模块 }).use(['index', 'form', 'laydate', 'table', 'element'], function () { var $ = layui.$; var element = layui.element; var $ = layui.jquery; var HType = "PC"; //登录平台:PC端、手机端 //判断是否登录 未登录则跳到登录页 //if (sessionStorage.login != "login") { // layer.confirm("登录失效,请重新登录!", { // icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录'] // }, function () { window.location.href = "user/login.html"; }); //} //#region 页面初始化 //set_sideMenuDisPlay(); //#endregion //#region //#endregion //#region 页面其它方法 //显示侧边菜单 function set_sideMenuDisPlay() { //判断用户是移动端还是PC端 //var judgeMorPCflag = judgeMorPC(); //if (!judgeMorPCflag) {//移动端 // var dd = '<dd><a href="车间管理/工序流转/MES_StationInBill_PDA.html">工序进站接收单PDA</a ></dd > <dd><a href="车间管理/工序流转/MES_StationOutBill_PDA.html">工序出站汇报单PDA</a></dd>'; // $("#append").prepend(dd); //} //if (!judgeMorPCflag) {//移动端 // window.location.href = 'index_Mobile.html' //} var ajaxLoad = layer.load(); //获取菜单列表数据 $.ajax({ url: GetWEBURL() + "/Web/MenuList", type: "GET", async: false, data: { "HMakeName": sessionStorage["HUserName"], "HType": HType }, success: function (data) { var data = JSON.parse(data.data); console.log(data); MenuMain(data); layer.close(ajaxLoad); }, error: function (data) { layer.close(ajaxLoad); layer.alert("发生错误!", { icon: 5 }); } }); } //遍历生成主菜单 function MenuMain(data) { var liStr = ''; //遍历生成主菜单 for (var i = 0; i < data.length; i++) { // 判断是否存在子菜单 if (data[i].childMenus != null && data[i].childMenus.length > 0) { liStr += '<li data-name="set" class="layui-nav-item">'; //设置一级菜单图标 if (data[i].HLevel == 1 && data[i].HPicNum != null && data[i].HPicNum != "") { liStr += '<a><i class="' + data[i].HPicNum + '"></i><cite>' + data[i].HName + '</cite><span class="layui-nav-more"></span></a>'; } else { liStr += '<a><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite><span class="layui-nav-more"></span></a>'; } liStr += '<dl class="layui-nav-child">'; // 遍历获取子菜单 for (var k = 0; k < data[i].childMenus.length; k++) { liStr += getChildMenu(data[i].childMenus[k], 0); } liStr += '</dl></li>'; } else { liStr += '<li class="layui-nav-item"><a class="" href="' + data[i].Hurl + '"><i class="layui-icon layui-icon-set"></i><cite>' + data[i].HName + '</cite></a></li>'; } }; $(".layui-nav-tree").html(liStr); element.init(); } // 递归生成子菜单 function getChildMenu(subMenu, num) { num++; var subStr = ''; if (subMenu.childMenus != null && subMenu.childMenus.length > 0) { subStr += '<dd>'; subStr += '<a>' + subMenu.HName + '</a>'; subStr += '<dl class="layui-nav-child">'; for (var j = 0; j < subMenu.childMenus.length; j++) { subStr += getChildMenu(subMenu.childMenus[j], num); } subStr += '</dl>'; subStr += '</dd>'; } else { subStr += '<dd><a lay-href="' + subMenu.Hurl + '">' + subMenu.HName + '</a></dd>'; } return subStr; } //菜单自定义:弹出菜单自定义子页面 Ul = document.getElementById("MenuDefineID"); Ul.addEventListener("click", function (event) { layer.open({ type: 2 , area: ['90%', '90%'] , title: '菜单自定义' , closeBtn: 1 , shade: 0.6 //遮罩透明度 , maxmin: true //允许全屏最小化 , anim: 0 //0-6的动画形式,-1不开启 , content: '系统管理/菜单自定义/Xt_DefineMenuDisplay.html' , resize: false , btn: ["确定"] , end: function () { //刷新页面, location.reload(); } }) }, false); //#endregion }); document.getElementById('UserName').innerHTML = sessionStorage["HUserName"]; document.getElementById('Organization').innerHTML = sessionStorage["Organization"]; </script> <!--<script> var _hmt = _hmt || []; (function() { var hm = document.createElement("script"); hm.src = "https://hm.baidu.com/hm.js?d214947968792b839fd669a4decaaffc"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(hm, s); })(); </script>--> </body> </html>