From 70b36819bbc789e0f6cb9abc25f81a96ef9f046d Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期四, 30 十二月 2021 15:15:55 +0800
Subject: [PATCH] YCQ
---
/dev/null | 44 -----
src/main/java/com/zy/common/web/RouterController.java | 2
src/main/webapp/views/console.html | 220 +++++++++++++++++----------
src/main/webapp/views/index.html | 94 +++++------
src/main/webapp/static/css/console.css | 54 +++++-
src/main/webapp/views/login.html | 4
src/main/webapp/views/index1.html | 54 ++++++
7 files changed, 280 insertions(+), 192 deletions(-)
diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java
index 0b83bb3..bee531a 100644
--- a/src/main/java/com/zy/common/web/RouterController.java
+++ b/src/main/java/com/zy/common/web/RouterController.java
@@ -19,7 +19,7 @@
@RequestMapping("/")
public void index(HttpServletResponse response) {
try{
- response.sendRedirect(contextPath+"/views/index.html");
+ response.sendRedirect(contextPath+"/views/index1.html");
} catch (Exception ex){
ex.printStackTrace();
}
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index 6ffac4c..06cb7ce 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -87,6 +87,37 @@
border-radius: 15px;
margin-left: 1%;
}
+ /*鎵爜琛ㄥ崟*/
+ .tablebox {
+ display: inline-block;
+ width: 290px;
+ height: 162px;
+ margin-left: 1.5%;
+ color: white;
+ font-size: 14px;
+ list-style: none;
+ line-height: 27px;
+ text-indent: 10px;
+ }
+ .table-head {
+ width: 100%;
+ height: 27px;
+ background:linear-gradient(to right, rgb(94, 193, 184),rgb(12,71,63));
+ }
+ .right {
+ float: right;
+ text-indent: 10px;
+ padding-right: 10px;
+ }
+ .table-body li {
+ background-color: #5D7677;
+ }
+ .table-body li:nth-child(even) {
+ background-color: #4A6565;
+ }
+
+
+
/* 鎺у埗琛ㄥご */
.body-head {
height: 35px;
@@ -219,7 +250,7 @@
/* 绔欑偣 */
.site {
color: #333;
- height: 20px;
+ height: 18px;
border: 1px solid rgb(108,167,168);
cursor: pointer;
width: 50px;
@@ -227,6 +258,7 @@
background-color: rgb(120,255,129);
font-size: 13px;
}
+ /*绌虹珯鐐�*/
/* ------------------ 杈撻�佺嚎鎬绘垚 ------------------ */
.site-row {
position: absolute;
@@ -234,8 +266,8 @@
}
/* 杈撻�佺嚎绗竴鍒� */
.site-row-1 {
- top: 210px;
- left: 166px;
+ top: 205px;
+ left: 172px;
}
.site-row-1 .site {
width: 70px;
@@ -243,27 +275,27 @@
/* 杈撻�佺嚎绗簩鍒� */
.site-row-2 {
- top: 210px;
- left: 238px;
+ top: 205px;
+ left: 243px;
}
.site-row-2 .site {
width: 70px;
}
.site-row-3 {
- top: 253px;
- left: 310px;
+ top: 246px;
+ left: 314px;
}
.site-row-3 .site {
width: 70px;
}
.site-row-4 {
- top: 210px;
- left: 311px;
+ top: 205px;
+ left: 314px;
}
.site-row-5 {
top: 71px;
- left: 455px;
+ left: 456px;
}
.site-row-5 .site {
width: 70px;
@@ -408,7 +440,7 @@
display: inline-block;
float: right;
margin-top: 15px;
- margin-right: 80px;
+ margin-right: 50px;
}
#crnWindow-head {
width: 291px;
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index c115b0c..701bfba 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -6,7 +6,7 @@
<!--<link rel="stylesheet" type="text/css" href="../static/css/common.css">-->
<link rel="stylesheet" href="../static/css/console.css">
<!-- <link rel="stylesheet" type="text/css" href="../static/css/normalize.css">-->
-
+ <link rel="stylesheet" href="../static/css/animate.min.css">
<script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -22,59 +22,59 @@
</div>
<!--绗�1鍒楋紙瀹藉害 70px锛� -->
<div class="site-row site-row-1">
- <div id="site-173" class="site" style="height: 20px;line-height: 20px;margin-bottom: 85px">173</div>
+ <div id="site-173" class="site" style="height: 18px;line-height: 18px;margin-bottom: 85px">173</div>
</div>
<!--绗�2鍒楋紙瀹藉害 70px锛�-->
<div class="site-row site-row-2">
- <div id="site-175" class="site" style="height: 20px;line-height: 20px;">175</div>
- <div id="site-174" class="site" style="height: 21px;line-height: 21px;">174</div>
- <div id="site-172" class="site" style="height: 20px;line-height: 20px;margin-bottom: 245px">172</div>
- <div id="site-182" class="site" style="height: 20px;line-height: 20px;">182</div>
+ <div id="site-175" class="site" style="height: 18px;line-height: 18px;">175</div>
+ <div id="site-174" class="site" style="height: 19px;line-height: 19px;">174</div>
+ <div id="site-172" class="site" style="height: 18px;line-height: 18px;margin-bottom: 248px">172</div>
+ <div id="site-182" class="site" style="height: 18px;line-height: 18px;">182</div>
</div>
<!-- 绗�3鍒楋紙瀹藉害 70px锛� -->
<div class="site-row site-row-3">
- <div id="site-171" class="site" style="height: 20px;line-height: 20px;margin-bottom: 245px; ">171</div>
- <div id="site-181" class="site" style="height: 20px;line-height: 20px;margin-bottom: 44px; ">181</div>
+ <div id="site-171" class="site" style="height: 18px;line-height: 18px;margin-bottom: 248px; ">171</div>
+ <div id="site-181" class="site" style="height: 18px;line-height: 18px;margin-bottom: 44px; ">181</div>
</div>
<!-- 绗�4鍒楋紙瀹藉害 70px 140px锛� -->
<div class="site-row site-row-4">
- <div id="site-176" class="site" style="height: 20px;line-height: 20px;width:140px;margin-bottom: 21px">176</div>
- <div id="site-170" class="site" style="height: 20px;line-height: 20px;width:70px;margin-bottom: 245px;position: relative;float: right">170</div>
- <div id="site-180" class="site" style="height: 20px;line-height: 20px;width:70px;position: relative;clear:right;float: right">180</div>
+ <div id="site-176" class="site" style="height: 18px;line-height: 18px;width:140px;margin-bottom: 21px">176</div>
+ <div id="site-170" class="site" style="height: 18px;line-height: 18px;width:70px;margin-bottom: 248px;position: relative;float: right">170</div>
+ <div id="site-180" class="site" style="height: 18px;line-height: 18px;width:70px;position: relative;clear:right;float: right">180</div>
</div>
<!--<!– 绗�5鍒楋紙瀹藉害 70px锛� –>-->
<div class="site-row site-row-5">
- <div id="site-163" class="site" style="height: 31px;line-height: 31px">163</div>
- <div id="site-162" class="site" style="height: 31px;line-height: 31px">162</div>
+ <div id="site-163" class="site" style="height: 28.5px;line-height: 28.5px">163</div>
+ <div id="site-162" class="site" style="height: 28.5px;line-height: 28.5px">162</div>
<div id="site-161" class="site" style="height: 71px;line-height: 71px">161</div>
- <div id="site-160" class="site" style="height: 31px;line-height: 31px">160</div>
- <div id="site-159" class="site" style="height: 31px;line-height: 31px">159</div>
- <div id="site-158" class="site" style="height: 70px;line-height: 70px">158</div>
- <div id="site-157" class="site" style="height: 31px;line-height: 31px">157</div>
- <div id="site-156" class="site" style="height: 31px;line-height: 31px">156</div>
- <div id="site-155" class="site" style="height: 70px;line-height: 70px">155</div>
- <div id="site-154" class="site" style="height: 31px;line-height: 31px">154</div>
- <div id="site-153" class="site" style="height: 31px;line-height: 31px">153</div>
- <div id="site-152" class="site" style="height: 70px;line-height: 70px">152</div>
- <div id="site-151" class="site" style="height: 31px;line-height: 31px">151</div>
- <div id="site-150" class="site" style="height: 31px;line-height: 31px">150</div>
+ <div id="site-160" class="site" style="height: 28.5px;line-height: 28.5px">160</div>
+ <div id="site-159" class="site" style="height: 28.5px;line-height: 28.5px">159</div>
+ <div id="site-158" class="site" style="height: 71px;line-height: 71px">158</div>
+ <div id="site-157" class="site" style="height: 28.5px;line-height: 28.5px">157</div>
+ <div id="site-156" class="site" style="height: 28.5px;line-height: 28.5px">156</div>
+ <div id="site-155" class="site" style="height: 71px;line-height: 71px">155</div>
+ <div id="site-154" class="site" style="height: 28.5px;line-height: 28.5px">154</div>
+ <div id="site-153" class="site" style="height: 28.5px;line-height: 28.5px">153</div>
+ <div id="site-152" class="site" style="height: 71px;line-height: 71px">152</div>
+ <div id="site-151" class="site" style="height: 28.5px;line-height: 28.5px">151</div>
+ <div id="site-150" class="site" style="height: 28.5px;line-height: 28.5px">150</div>
</div>
<!--<!– 绗�6鍒楋紙瀹藉害 70px锛� –>-->
<div class="site-row site-row-6">
- <div id="site-120" class="site" style="height: 31px;line-height: 31px">120</div>
- <div id="site-121" class="site" style="height: 31px;line-height: 31px">121</div>
+ <div id="site-120" class="site" style="height: 28.5px;line-height: 28.5px">120</div>
+ <div id="site-121" class="site" style="height: 28.5px;line-height: 28.5px">121</div>
<div id="site-122" class="site" style="height: 71px;line-height: 71px">122</div>
- <div id="site-123" class="site" style="height: 31px;line-height: 31px">123</div>
- <div id="site-124" class="site" style="height: 31px;line-height: 31px">124</div>
- <div id="site-125" class="site" style="height: 70px;line-height: 70px">125</div>
- <div id="site-126" class="site" style="height: 31px;line-height: 31px">126</div>
- <div id="site-127" class="site" style="height: 31px;line-height: 31px">127</div>
- <div id="site-128" class="site" style="height: 70px;line-height: 70px">128</div>
- <div id="site-129" class="site" style="height: 31px;line-height: 31px">129</div>
- <div id="site-130" class="site" style="height: 31px;line-height: 31px">130</div>
- <div id="site-131" class="site" style="height: 70px;line-height: 71px">131</div>
- <div id="site-132" class="site" style="height: 31px;line-height: 31px">132</div>
- <div id="site-133" class="site" style="height: 31px;line-height: 31px">133</div>
+ <div id="site-123" class="site" style="height: 28.5px;line-height: 28.5px">123</div>
+ <div id="site-124" class="site" style="height: 28.5px;line-height: 28.5px">124</div>
+ <div id="site-125" class="site" style="height: 71px;line-height: 71px">125</div>
+ <div id="site-126" class="site" style="height: 28.5px;line-height: 28.5px">126</div>
+ <div id="site-127" class="site" style="height: 28.5px;line-height: 28.5px">127</div>
+ <div id="site-128" class="site" style="height: 71px;line-height: 71px">128</div>
+ <div id="site-129" class="site" style="height: 28.5px;line-height: 28.5px">129</div>
+ <div id="site-130" class="site" style="height: 28.5px;line-height: 28.5px">130</div>
+ <div id="site-131" class="site" style="height: 71px;line-height: 71px">131</div>
+ <div id="site-132" class="site" style="height: 28.5px;line-height: 28.5px">132</div>
+ <div id="site-133" class="site" style="height: 28.5px;line-height: 28.5px">133</div>
</div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
@@ -83,8 +83,7 @@
<div class="lane">
<!-- 璐ф灦 -->
<div class="stock-group">
- <div class="site" style="background-color: rgb(108,167,168) "></div>
- <button class="item">2</button>
+ <button class="item" style="margin-left: 82px">2</button>
<button class="item">4</button>
<button class="item">6</button>
<button class="item">8</button>
@@ -206,8 +205,7 @@
<span class="row-no">3#</span>
</div>
<div class="stock-group">
- <div class="site" style="background-color: rgb(108,167,168)"></div>
- <button class="item">2</button>
+ <button class="item" style="margin-left: 82px">2</button>
<button class="item">4</button>
<button class="item">6</button>
<button class="item">8</button>
@@ -417,8 +415,7 @@
<span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
- <div class="site" style="background-color: rgb(108,167,168)"></div>
- <button class="item">2</button>
+ <button class="item" style="margin-left: 82px">2</button>
<button class="item">4</button>
<button class="item">6</button>
<button class="item">8</button>
@@ -540,8 +537,7 @@
<span class="row-no">11#</span>
</div>
<div class="stock-group">
- <div class="site" style="background-color:rgb(108,167,168)"></div>
- <button class="item">2</button>
+ <button class="item" style="margin-left: 82px">2</button>
<button class="item">4</button>
<button class="item">6</button>
<button class="item">8</button>
@@ -584,8 +580,7 @@
<span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
- <div class="site" style="background-color:rgb(108,167,168)"></div>
- <button class="item">2</button>
+ <button class="item" style="margin-left: 82px">2</button>
<button class="item">4</button>
<button class="item">6</button>
<button class="item">8</button>
@@ -707,8 +702,7 @@
<span class="row-no">15#</span>
</div>
<div class="stock-group">
- <div class="site" style="background-color:rgb(108,167,168)"></div>
- <button class="item">2</button>
+ <button class="item" style="margin-left: 82px">2</button>
<button class="item">4</button>
<button class="item">6</button>
<button class="item">8</button>
@@ -751,8 +745,7 @@
<span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
- <div class="site" style="background-color:rgb(108,167,168)"></div>
- <button class="item">2</button>
+ <button class="item" style="margin-left: 82px">2</button>
<button class="item">4</button>
<button class="item">6</button>
<button class="item">8</button>
@@ -874,8 +867,7 @@
<span class="row-no">19#</span>
</div>
<div class="stock-group">
- <div class="site" style="background-color:rgb(108,167,168)"></div>
- <button class="item">2</button>
+ <button class="item" style="margin-left: 82px">2</button>
<button class="item">4</button>
<button class="item">6</button>
<button class="item">8</button>
@@ -968,10 +960,46 @@
</div>
<div class="bar-code">
<div class="body-head" id="code">鏉＄爜鎵弿鍣�</div>
+ <div class="tablebox">
+ <div class="table-head">
+ <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+ </div>
+ <div class="table-body">
+ <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ </div>
+ </div>
+ <div class="tablebox">
+ <div class="table-head">
+ <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+ </div>
+ <div class="table-body">
+ <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ </div>
+ </div>
+ <div class="tablebox">
+ <div class="table-head">
+ <li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+ </div>
+ <div class="table-body">
+ <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ </div>
+ </div>
</div>
</div>
<!-- 鍫嗗灈鏈哄脊绐� -->
- <div id="crnWindow" style="display: none;">
+ <div id="crnWindow" style="display: none;" class="animate__animated animate__fadeIn">
<div id="crnWindow-head">
<div class='detailed'></div>
<button></button>
@@ -983,7 +1011,7 @@
<span>鍫嗗灈鏈哄彿锛�</span>
</div>
<div class="form-item-input">
- <input type="text" name="crnNo">
+ <input type="text" name="crnNo" value="">
</div>
</div>
<!-- 宸ヤ綔鍙� -->
@@ -992,7 +1020,7 @@
<span>宸ヤ綔鍙凤細</span>
</div>
<div class="form-item-input">
- <input type="text" name="workNo">
+ <input type="text" name="workNo" value="">
</div>
</div>
<!-- 绔欐簮 -->
@@ -1001,7 +1029,7 @@
<span>绔欐簮锛�</span>
</div>
<div class="form-item-input">
- <input type="text" name="sourceStaNo">
+ <input type="text" name="sourceStaNo" value="">
</div>
</div>
<!-- 鐩爣绔� -->
@@ -1010,7 +1038,7 @@
<span>鐩爣绔欙細</span>
</div>
<div class="form-item-input">
- <input type="text" name="staNo">
+ <input type="text" name="staNo" value="">
</div>
</div>
<!-- 宸ヤ綔鐘舵�� -->
@@ -1019,7 +1047,7 @@
<span>宸ヤ綔鐘舵�侊細</span>
</div>
<div class="form-item-input">
- <input type="text" name="wrkSts">
+ <input type="text" name="wrkSts" value="">
</div>
</div>
<!-- 鍑哄叆绫诲瀷 -->
@@ -1028,7 +1056,7 @@
<span>鍑哄叆绫诲瀷锛�</span>
</div>
<div class="form-item-input">
- <input type="text" name="ioType">
+ <input type="text" name="ioType" value="">
</div>
</div>
<!-- 婧愬簱浣� -->
@@ -1037,7 +1065,7 @@
<span>婧愬簱浣嶏細</span>
</div>
<div class="form-item-input">
- <input type="text" name="sourceLocNo">
+ <input type="text" name="sourceLocNo" value="">
</div>
</div>
<!-- 鐩爣搴撲綅 -->
@@ -1046,7 +1074,7 @@
<span>鐩爣搴撲綅锛�</span>
</div>
<div class="form-item-input">
- <input type="text" name="locNo">
+ <input type="text" name="locNo" value="">
</div>
</div>
<!-- 鍫嗗灈鏈虹姸鎬� -->
@@ -1055,7 +1083,7 @@
<span>鍫嗗灈鏈虹姸鎬侊細</span>
</div>
<div class="form-item-input">
- <input type="text" name="crnStatus">
+ <input type="text" name="crnStatus" value="">
</div>
</div>
<!-- 寮傚父 -->
@@ -1064,13 +1092,13 @@
<span>寮傚父锛�</span>
</div>
<div class="form-item-input">
- <input type="text" name="error">
+ <input type="text" name="error" value="">
</div>
</div>
</form>
</div>
<!-- 杈撻�佽澶囧脊绐� -->
- <div id="siteWindow" style="display: none;">
+ <div id="siteWindow" style="display: none;" class="animate__animated animate__fadeIn">
<!-- 琛ㄥご -->
<div id="siteWindow-head">
<div class='detailed'></div>
@@ -1083,7 +1111,7 @@
<span>璁惧鍙凤細</span>
</div>
<div class="form-item-input">
- <input type="text" name="siteId">
+ <input type="text" name="siteId" value="">
</div>
</div>
<!-- 宸ヤ綔鍙� -->
@@ -1092,7 +1120,7 @@
<span>宸ヤ綔鍙凤細</span>
</div>
<div class="form-item-input">
- <input type="text" name="workNo">
+ <input type="text" name="workNo" value="">
</div>
</div>
<!-- 宸ヤ綔鐘舵�� -->
@@ -1101,7 +1129,7 @@
<span>宸ヤ綔鐘舵�侊細</span>
</div>
<div class="form-item-input">
- <input type="text" name="wrkSts">
+ <input type="text" name="wrkSts" value="">
</div>
</div>
<!-- 鑷姩 -->
@@ -1146,7 +1174,7 @@
<span>鍑哄叆绫诲瀷锛�</span>
</div>
<div class="form-item-input">
- <input type="text" name="ioType">
+ <input type="text" name="ioType" value="">
</div>
</div>
<!-- 婧愮珯 -->
@@ -1155,7 +1183,7 @@
<span>婧愮珯锛�</span>
</div>
<div class="form-item-input">
- <input type="text" name="sourceStaNo">
+ <input type="text" name="sourceStaNo" value="">
</div>
</div>
<!-- 鐩爣绔� -->
@@ -1164,7 +1192,7 @@
<span>鐩爣绔欙細</span>
</div>
<div class="form-item-input">
- <input type="text" name="staNo">
+ <input type="text" name="staNo" value="">
</div>
</div>
<!-- 婧愬簱浣� -->
@@ -1173,7 +1201,7 @@
<span>婧愬簱浣嶏細</span>
</div>
<div class="form-item-input">
- <input type="text" name="sourceLocNo">
+ <input type="text" name="sourceLocNo" value="">
</div>
</div>
<!-- 鐩爣搴撲綅 -->
@@ -1182,7 +1210,7 @@
<span>鐩爣搴撲綅锛�</span>
</div>
<div class="form-item-input">
- <input type="text" name="locNo">
+ <input type="text" name="locNo" value="">
</div>
</div>
@@ -1201,16 +1229,41 @@
$("#siteWindow").attr("style","display:block;");//鏄剧ずdiv
$(".detailed").empty();
$('.detailed').append(id+'绔欑偣璇︾粏淇℃伅');
- $.post(baseUrl+"/console/site/detail", {siteId: id}, function (res) {
- for (var val in res.data) {
- var find = $("#siteWindow").find(":input[name='" + val + "']");
- if (find[0].type==='text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
- }
+
+
+
+
+ var res = {
+ code: 500,
+ msg: '鏈嶅姟鍣ㄥ紓甯�',
+ data: {
+ siteId:id,
+ workNo:100,
+ wrkSts:'杩愯涓�',
+ autoing:'Y',
+ loading:'',
+ canining:'',
+ canouting:'',
+ ioType:'鍑哄簱',
+ sourceStaNo:'绔欑偣2',
+ staNo:'绔欑偣1',
+ sourceLocNo:2,
+ locNo:2,
}
- })
+ }
+ http.post(baseUrl+"/console/site/detail", {siteId: id}, function (res) {
+
+ })
+ // res.data
+ for (var val in data) {
+ var find = $("#siteWindow").find(":input[name='" + val + "']");
+ if (find[0].type==='text') {
+ find.val(data[val]);
+ } else if (find[0].type === 'checkbox') {
+ find.attr("checked", data[val] === 'Y');
+ }
+ }
+
});
// 鍫嗗灈鏈轰俊鎭�
$('.machine').on('click',function(){
@@ -1234,6 +1287,9 @@
$('#siteWindow').attr('style','display:none')
$('#crnWindow').attr('style','display:none')
})
+
+
+
var crn1Position = 0;
var crn2Position = 0;
var crn3Position = 0;
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index c28facf..fbce4db 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -1,54 +1,44 @@
<!DOCTYPE html>
-<html lang="">
-<head>
- <meta charset="utf-8">
- <title>鑷姩浠撳簱WCS绯荤粺</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="icon" type="image/x-icon" href="../static/image/wcs_logo.png" />
- <link rel="stylesheet" type="text/css" href="../static/css/normalize.css">
- <link rel="stylesheet" type="text/css" href="../static/css/common.css">
- <link rel="stylesheet" type="text/css" href="../static/css/index-0.css">
- <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
- <script type="text/javascript" src="../static/js/common.js"></script>
- <style>
-
- </style>
-</head>
-<body>
- <!-- 瀵艰埅鏍� -->
- <ul class="nav">
- <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
- <li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">杈撻�佽澶�</a></li>
- <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">鍫嗗灈鏈�</a></li>
- <li class="right"><a id="about" class="nav-unselect" onclick="logout()" href="#">娉ㄩ攢</a></li>
- </ul>
-
- <!-- 涓讳綋鍐呭 -->
- <iframe id="content" src="console-0.html"></iframe>
-
- <footer class="footer">
- Copyright 漏 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</a> 淇濈暀鎵�鏈夋潈鍒�
- </footer>
-</body>
-<script>
- // 瀵艰埅鏍�
- function nav(id) {
- $('.nav-select').attr("class", "nav-unselect");
- $('#'+id).attr("class", "nav-select");
- $('#content').attr("src", id+".html");
- }
-
- // 娉ㄩ攢
- function logout() {
- localStorage.removeItem("token");
- window.location.href = baseUrl + "/login";
- }
-
- // 绯荤粺杩愯鐘舵��
- var systemRunning = true;
-</script>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>鑷姩浠撳簱WCS绯荤粺</title>
+ <link rel="stylesheet" href="../static/css/index.css">
+ <script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
+ </head>
+ <body>
+ <!-- 瀵艰埅鏍� -->
+ <div class="nav">
+ <li class="right">娉ㄩ攢<a id="about" class="nav-unselect" onclick="logout()" href="#"></a></li>
+ </div>
+ <div class="sidebar">
+ <ul>
+ <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
+ <li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">杈撻�佽澶�</a></li>
+ <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">鍫嗗灈鏈�</a></li>
+ </ul>
+ </div>
+ <!-- 涓讳綋鍐呭 -->
+ <iframe id="content" src="console.html"></iframe>
+ <footer class="footer">
+ Copyright 漏 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</a> 淇濈暀鎵�鏈夋潈鍒�
+ </footer>
+ </body>
+ <script>
+ // 瀵艰埅鏍�
+ function nav(id) {
+ $('.nav-select').attr("class", "nav-unselect");
+ $('#'+id).attr("class", "nav-select");
+ $('#content').attr("src", id+".html");
+ }
+
+ 娉ㄩ攢
+ function logout() {
+ localStorage.removeItem("token");
+ window.location.href = baseUrl + "/login";
+ }
+
+ // 绯荤粺杩愯鐘舵��
+ var systemRunning = true;
+ </script>
</html>
-
-
diff --git a/src/main/webapp/views/index0.html b/src/main/webapp/views/index0.html
deleted file mode 100644
index fbce4db..0000000
--- a/src/main/webapp/views/index0.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <meta charset="utf-8">
- <title>鑷姩浠撳簱WCS绯荤粺</title>
- <link rel="stylesheet" href="../static/css/index.css">
- <script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
- </head>
- <body>
- <!-- 瀵艰埅鏍� -->
- <div class="nav">
- <li class="right">娉ㄩ攢<a id="about" class="nav-unselect" onclick="logout()" href="#"></a></li>
- </div>
- <div class="sidebar">
- <ul>
- <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
- <li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">杈撻�佽澶�</a></li>
- <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">鍫嗗灈鏈�</a></li>
- </ul>
- </div>
- <!-- 涓讳綋鍐呭 -->
- <iframe id="content" src="console.html"></iframe>
- <footer class="footer">
- Copyright 漏 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</a> 淇濈暀鎵�鏈夋潈鍒�
- </footer>
- </body>
- <script>
- // 瀵艰埅鏍�
- function nav(id) {
- $('.nav-select').attr("class", "nav-unselect");
- $('#'+id).attr("class", "nav-select");
- $('#content').attr("src", id+".html");
- }
-
- 娉ㄩ攢
- function logout() {
- localStorage.removeItem("token");
- window.location.href = baseUrl + "/login";
- }
-
- // 绯荤粺杩愯鐘舵��
- var systemRunning = true;
- </script>
-</html>
diff --git a/src/main/webapp/views/index1.html b/src/main/webapp/views/index1.html
new file mode 100644
index 0000000..23edd3f
--- /dev/null
+++ b/src/main/webapp/views/index1.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html lang="">
+<head>
+ <meta charset="utf-8">
+ <title>鑷姩浠撳簱WCS绯荤粺</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="icon" type="image/x-icon" href="../static/images/wcs_logo.png" />
+ <link rel="stylesheet" type="text/css" href="../static/css/normalize.css">
+ <link rel="stylesheet" type="text/css" href="../static/css/common.css">
+ <link rel="stylesheet" type="text/css" href="../static/css/index-0.css">
+ <script type="text/javascript" src="../static/js/jquery/jquery-3.3.1.min.js"></script>
+ <script type="text/javascript" src="../static/js/common.js"></script>
+ <style>
+
+ </style>
+</head>
+<body>
+ <!-- 瀵艰埅鏍� -->
+ <ul class="nav">
+ <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
+ <li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">杈撻�佽澶�</a></li>
+ <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">鍫嗗灈鏈�</a></li>
+ <li class="right"><a id="about" class="nav-unselect" onclick="logout()" href="#">娉ㄩ攢</a></li>
+ </ul>
+
+ <!-- 涓讳綋鍐呭 -->
+ <iframe id="content" src="console-0.html"></iframe>
+
+ <footer class="footer">
+ Copyright 漏 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</a> 淇濈暀鎵�鏈夋潈鍒�
+ </footer>
+</body>
+<script>
+ // 瀵艰埅鏍�
+ function nav(id) {
+ $('.nav-select').attr("class", "nav-unselect");
+ $('#'+id).attr("class", "nav-select");
+ $('#content').attr("src", id+".html");
+ }
+
+ // 娉ㄩ攢
+ function logout() {
+ localStorage.removeItem("token");
+ window.location.href = baseUrl + "/login";
+ }
+
+ // 绯荤粺杩愯鐘舵��
+ var systemRunning = true;
+</script>
+</html>
+
+
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index f099ad4..57329ed 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title>绯荤粺鐧诲綍</title>
<link rel="stylesheet" href="../static/layui/css/layui.css" media="all">
- <link rel="icon" type="image/x-icon" href="../static/image/wcs_logo.png" />
+ <link rel="icon" type="image/x-icon" href="../static/images/wcs_logo.png" />
<link rel="stylesheet" href="../static/css/animate.min.css">
<script type="text/javascript" src="../static/layui/layui.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
@@ -17,7 +17,7 @@
height: 100%;
/*background-image: linear-gradient(to right, #ff9569 0%, #e92758 100%);*/
/*background-image: linear-gradient(-90deg, #a2e7f3 0%, #98baee 100%);*/
- background-image: url("../static/image/login.png");
+ background-image: url("../static/images/login.png");
/*background: -webkit-linear-gradient(red, blue); !* Safari 5.1 - 6.0 *!;*/
/*background-image: url("../static/image/login_bg.jpg");*/
/*background-repeat: no-repeat;*/
--
Gitblit v1.9.1