From 7ed546192a84e33561330062cdb48790fcdb5eef Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 19 九月 2024 08:57:55 +0800
Subject: [PATCH] 1.设备/模具:保养规程 表头增加 HErrWarDays int --预警天数 2.设备/模具:保养计划单增加HErrBeginTime datetime --预警开始时间点,审核时把子表 预警开始时间点, 填入 3.设备启动点检清单/启动点检清单:增加字段HDotCheckType varchar(50) --点检类型(设备,模具,作业指导书,检验指导书) HRelationID int --关联ID(设备内码或模具内码) 4.启动点检单: 新增 子表界面 根据不同的点检类型,点击查看,弹出不同的数据(根据表头日期查询(按照当前月显示)) .工艺参数点检:增加附件上传功能 2.设备工艺参数趋势图:根据流转卡的子表进站出站时间查询工艺参数(增加一个选择框 采集来源:(设备采集,手动输入)) 3.开工:增加设备启动点检,防错验证控制
---
WebTM/views/indexMenu.html | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/WebTM/views/indexMenu.html b/WebTM/views/indexMenu.html
index f792231..4fa5b0e 100644
--- a/WebTM/views/indexMenu.html
+++ b/WebTM/views/indexMenu.html
@@ -4,14 +4,19 @@
<html>
<head>
<meta charset="utf-8">
- <title>LMES绠＄悊绯荤粺</title>
+ <title id="HCusName"></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>
@@ -77,7 +82,7 @@
<i class="layui-icon layui-icon-screen-full"></i>
</a>
</li>
- <li class="layui-nav-item" lay-unselect>
+ <li class="layui-nav-item" lay-unselect style="margin-right:15px;">
<a href="javascript:;">
<cite>
<label name="UserName" id="UserName"></label>
@@ -86,14 +91,13 @@
<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>
- <hr>
<dd layadmin-event="logout" style="text-align: center;"><a>閫�鍑�</a></dd>
</dl>
</li>
- <li class="layui-nav-item layui-hide-xs" lay-unselect>
+ <!--<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>-->
<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>
@@ -105,7 +109,7 @@
<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>
+ <span id="HMenuLabel"></span>
</div>
<ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">
<!-- 閲囪喘绠＄悊 -->
@@ -120,7 +124,6 @@
</dd>
</dl>
</li>-->
-
</ul>
</div>
@@ -179,6 +182,7 @@
var element = layui.element;
var $ = layui.jquery;
+ var HType = "PC"; //鐧诲綍骞冲彴锛歅C绔�佹墜鏈虹
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
// layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -191,23 +195,21 @@
set_sideMenuDisPlay();
//#endregion
-
- //#region
-
- //#endregion
+ //鑿滃崟鏍忓懡鍚�
+ setMenuLabel();
//#region 椤甸潰鍏跺畠鏂规硶
//鏄剧ず渚ц竟鑿滃崟
function set_sideMenuDisPlay() {
//鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔�
- var judgeMorPCflag = judgeMorPC();
- if (!judgeMorPCflag) {//绉诲姩绔�
- var dd = '<dd><a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html">宸ュ簭杩涚珯鎺ユ敹鍗昉DA</a ></dd > <dd><a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html">宸ュ簭鍑虹珯姹囨姤鍗昉DA</a></dd>';
- $("#append").prepend(dd);
- }
- if (!judgeMorPCflag) {//绉诲姩绔�
- window.location.href = 'index_Mobile.html'
- }
+ //var judgeMorPCflag = judgeMorPC();
+ //if (!judgeMorPCflag) {//绉诲姩绔�
+ // var dd = '<dd><a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html">宸ュ簭杩涚珯鎺ユ敹鍗昉DA</a ></dd > <dd><a href="杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html">宸ュ簭鍑虹珯姹囨姤鍗昉DA</a></dd>';
+ // $("#append").prepend(dd);
+ //}
+ //if (!judgeMorPCflag) {//绉诲姩绔�
+ // window.location.href = 'index_Mobile.html'
+ //}
var ajaxLoad = layer.load();
//鑾峰彇鑿滃崟鍒楄〃鏁版嵁
@@ -215,7 +217,7 @@
url: GetWEBURL() + "/Web/MenuList",
type: "GET",
async: false,
- data: { "HMakeName": sessionStorage["HUserName"] },
+ data: { "HMakeName": sessionStorage["HUserName"], "HType": HType },
success: function (data) {
var data = JSON.parse(data.data);
console.log(data);
@@ -302,6 +304,13 @@
//#endregion
});
+ //鑿滃崟鏍忓懡鍚�
+ function setMenuLabel() {
+ console.log(sessionStorage["HMenuLabel"]);
+ $("#HMenuLabel").html(sessionStorage["HMenuLabel"]);
+ $("#HCusName").text(sessionStorage["HCusName"]);
+ };
+
document.getElementById('UserName').innerHTML = sessionStorage["HUserName"];
document.getElementById('Organization').innerHTML = sessionStorage["Organization"];
</script>
--
Gitblit v1.9.1