From 46d5aca49be78fccb2c2e64dc2332236085f67e2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 30 十一月 2023 08:30:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld
---
src/main/webapp/views/index.html | 15 ++
src/main/webapp/views/deviceWatch/deviceWatch.html | 314 ++++++++++++++++++++++++++-------------------------
2 files changed, 174 insertions(+), 155 deletions(-)
diff --git a/src/main/webapp/views/deviceWatch/deviceWatch.html b/src/main/webapp/views/deviceWatch/deviceWatch.html
index 399ef71..0d41594 100644
--- a/src/main/webapp/views/deviceWatch/deviceWatch.html
+++ b/src/main/webapp/views/deviceWatch/deviceWatch.html
@@ -24,6 +24,17 @@
color: #303133;
}
+ .deviceContainer {
+ display: flex;
+ justify-content: space-around;
+ flex-wrap: wrap;
+ }
+
+ .deviceBox {
+ width: 600px;
+ margin-top: 10px;
+ }
+
.devpBox {
margin-top: 20px;
}
@@ -42,12 +53,13 @@
}
.deviceItem {
- width: 300px;
+ width: 200px;
height: 40px;
}
.devpDeviceBox {
width: 230px;
+ margin-top: 10px;
}
.devpDeviceItem {
@@ -62,168 +74,164 @@
<div slot="header" class="clearfix">
<span>鍫嗗灈鏈�</span>
</div>
- <el-carousel :interval="4000" type="card" :height="crnListHeight">
- <el-carousel-item v-for="(item,index) in crnList" :key="index">
- <div ref="crnCarousel" class="deviceBox">
- <div class="deviceHeader">{{item.crnNo}}鍙峰爢鍨涙満</div>
- <div class="deviceBody">
- <div class="deviceItem">
- <span>鍫嗗灈鏈猴細</span>
- <span>{{ item.crnNo }}</span>
- </div>
- <div class="deviceItem">
- <span>宸ヤ綔鍙凤細</span>
- <span>{{ item.workNo }}</span>
- </div>
- <div class="deviceItem">
- <span>妯″紡锛�</span>
- <span><el-tag :type="item.statusType == '鑷姩' ? 'success':'danger'">{{ item.statusType }}</el-tag></span>
- </div>
- <div class="deviceItem">
- <span>浠诲姟鐘舵�侊細</span>
- <span><el-tag :type="item.wrkStatus == 0 ? '':'success'">{{ item.wrkStatus$ }}</el-tag></span>
- </div>
- <div class="deviceItem">
- <span>璁惧鐘舵�侊細</span>
- <span><el-tag :type="item.deviceStatus == '鑷姩' ? 'success':'danger'">{{ item.deviceStatus }}</el-tag></span>
- </div>
- <div class="deviceItem">
- <span>鏈夌墿锛�</span>
- <span><el-tag :type="item.loading == '鏃犵墿' ? '':'success'">{{ item.loading }}</el-tag></span>
- </div>
- <div class="deviceItem">
- <span>鍒楋細</span>
- <span>{{ item.bay }}</span>
- </div>
- <div class="deviceItem">
- <span>灞傦細</span>
- <span>{{ item.lev }}</span>
- </div>
- <div class="deviceItem">
- <span>鏁呴殰浠ｇ爜锛�</span>
- <span>{{ item.warnCode }}</span>
- </div>
- <div class="deviceItem">
- <span>鏁呴殰鎻忚堪锛�</span>
- <span>{{ item.error }}</span>
- </div>
- <div class="deviceItem">
- <span>婧愮珯锛�</span>
- <span>{{ item.sourceStaNo }}</span>
- </div>
- <div class="deviceItem">
- <span>鐩爣绔欙細</span>
- <span>{{ item.staNo }}</span>
- </div>
- <div class="deviceItem">
- <span>婧愬簱浣嶏細</span>
- <span>{{ item.sourceLocNo }}</span>
- </div>
- <div class="deviceItem">
- <span>鐩爣搴撲綅锛�</span>
- <span>{{ item.locNo }}</span>
- </div>
- <div class="deviceItem">
- <span>璐у弶瀹氫綅锛�</span>
- <span>{{ item.forkOffset }}</span>
- </div>
- <div class="deviceItem">
- <span>杞借揣鍙板畾浣嶏細</span>
- <span>{{ item.liftPos }}</span>
- </div>
- <div class="deviceItem">
- <span>璧拌鍦ㄥ畾浣嶏細</span>
- <span>{{ item.walkPos }}</span>
- </div>
- <div class="deviceItem">
- <span>璧拌閫熷害(m/min)锛�</span>
- <span>{{ item.xspeed }}</span>
- </div>
- <div class="deviceItem">
- <span>鍗囬檷閫熷害(m/min)锛�</span>
- <span>{{ item.yspeed }}</span>
- </div>
- <div class="deviceItem">
- <span>鍙夌墮閫熷害(m/min)锛�</span>
- <span>{{ item.zspeed }}</span>
- </div>
- <div class="deviceItem">
- <span>璧拌璺濈(Km)锛�</span>
- <span>{{ item.xdistance }}</span>
- </div>
- <div class="deviceItem">
- <span>鍗囬檷璺濈(Km)锛�</span>
- <span>{{ item.ydistance }}</span>
- </div>
- <div class="deviceItem">
- <span>璧拌鏃堕暱(H)锛�</span>
- <span>{{ item.xduration }}</span>
- </div>
- <div class="deviceItem">
- <span>鍗囬檷鏃堕暱(H)锛�</span>
- <span>{{ item.yduration }}</span>
- </div>
+ <div class="deviceContainer">
+ <div v-for="(item,index) in crnList" :key="index" class="deviceBox">
+ <div class="deviceHeader">{{item.crnNo}}鍙峰爢鍨涙満</div>
+ <div class="deviceBody">
+ <div class="deviceItem">
+ <span>鍫嗗灈鏈猴細</span>
+ <span>{{ item.crnNo }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>宸ヤ綔鍙凤細</span>
+ <span>{{ item.workNo }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>妯″紡锛�</span>
+ <span><el-tag :type="item.statusType == '鑷姩' ? 'success':'danger'">{{ item.statusType }}</el-tag></span>
+ </div>
+ <div class="deviceItem">
+ <span>浠诲姟鐘舵�侊細</span>
+ <span><el-tag :type="item.wrkStatus == 0 ? '':'success'">{{ item.wrkStatus$ }}</el-tag></span>
+ </div>
+ <div class="deviceItem">
+ <span>璁惧鐘舵�侊細</span>
+ <span><el-tag :type="item.deviceStatus == '鑷姩' ? 'success':'danger'">{{ item.deviceStatus }}</el-tag></span>
+ </div>
+ <div class="deviceItem">
+ <span>鏈夌墿锛�</span>
+ <span><el-tag :type="item.loading == '鏃犵墿' ? '':'success'">{{ item.loading }}</el-tag></span>
+ </div>
+ <div class="deviceItem">
+ <span>鍒楋細</span>
+ <span>{{ item.bay }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>灞傦細</span>
+ <span>{{ item.lev }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>鏁呴殰浠ｇ爜锛�</span>
+ <span>{{ item.warnCode }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>鏁呴殰鎻忚堪锛�</span>
+ <span>{{ item.error }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>婧愮珯锛�</span>
+ <span>{{ item.sourceStaNo }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>鐩爣绔欙細</span>
+ <span>{{ item.staNo }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>婧愬簱浣嶏細</span>
+ <span>{{ item.sourceLocNo }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>鐩爣搴撲綅锛�</span>
+ <span>{{ item.locNo }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>璐у弶瀹氫綅锛�</span>
+ <span>{{ item.forkOffset }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>杞借揣鍙板畾浣嶏細</span>
+ <span>{{ item.liftPos }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>璧拌鍦ㄥ畾浣嶏細</span>
+ <span>{{ item.walkPos }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>璧拌閫熷害(m/min)锛�</span>
+ <span>{{ item.xspeed }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>鍗囬檷閫熷害(m/min)锛�</span>
+ <span>{{ item.yspeed }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>鍙夌墮閫熷害(m/min)锛�</span>
+ <span>{{ item.zspeed }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>璧拌璺濈(Km)锛�</span>
+ <span>{{ item.xdistance }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>鍗囬檷璺濈(Km)锛�</span>
+ <span>{{ item.ydistance }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>璧拌鏃堕暱(H)锛�</span>
+ <span>{{ item.xduration }}</span>
+ </div>
+ <div class="deviceItem">
+ <span>鍗囬檷鏃堕暱(H)锛�</span>
+ <span>{{ item.yduration }}</span>
</div>
</div>
- </el-carousel-item>
- </el-carousel>
+ </div>
+ </div>
</el-card>
<el-card class="box-card devpBox">
<div slot="header" class="clearfix">
<span>杈撻�佺嚎</span>
</div>
- <el-carousel :interval="4000" type="card" :height="devpListHeight">
- <el-carousel-item v-for="(val,index) in devpList" :key="index" w>
- <div style="display: flex;justify-content: space-around;width: 100%;">
- <div v-for="(item,idx) in val" :key="idx" class="devpDeviceBox">
- <div class="deviceHeader">{{item.devNo}}鍙风珯鐐�</div>
- <div class="deviceBody">
- <div class="devpDeviceItem">
- <span>绔欑偣锛�</span>
- <span>{{ item.devNo }}</span>
- </div>
- <div class="devpDeviceItem">
- <span>宸ヤ綔鍙凤細</span>
- <span>{{ item.workNo }}</span>
- </div>
- <div class="devpDeviceItem">
- <span>鑷姩锛�</span>
- <span>{{ item.autoing }}</span>
- </div>
- <div class="devpDeviceItem">
- <span>鏈夌墿锛�</span>
- <span>{{ item.loading }}</span>
- </div>
- <div class="devpDeviceItem">
- <span>鍙叆锛�</span>
- <span>{{ item.inEnable }}</span>
- </div>
- <div class="devpDeviceItem">
- <span>鍙嚭锛�</span>
- <span>{{ item.outEnable }}</span>
- </div>
- <div class="devpDeviceItem">
- <span>鍏ュ簱鏍囪锛�</span>
- <span>{{ item.pakMk }}</span>
- </div>
- <div class="devpDeviceItem">
- <span>绌烘澘淇″彿锛�</span>
- <span>{{ item.emptyMk }}</span>
- </div>
- <div class="devpDeviceItem">
- <span>鐩爣绔欙細</span>
- <span>{{ item.staNo }}</span>
- </div>
- <div class="devpDeviceItem">
- <span>楂樹綆搴撲綅锛�</span>
- <span>{{ item.locType1 }}</span>
- </div>
+ <div v-for="(val,index) in devpList" :key="index" w>
+ <div style="display: flex;justify-content: space-around;width: 100%;margin-top: 20px;">
+ <div v-for="(item,idx) in val" :key="idx" class="devpDeviceBox">
+ <div class="deviceHeader">{{item.devNo}}鍙风珯鐐�</div>
+ <div class="deviceBody">
+ <div class="devpDeviceItem">
+ <span>绔欑偣锛�</span>
+ <span>{{ item.devNo }}</span>
+ </div>
+ <div class="devpDeviceItem">
+ <span>宸ヤ綔鍙凤細</span>
+ <span>{{ item.workNo }}</span>
+ </div>
+ <div class="devpDeviceItem">
+ <span>鑷姩锛�</span>
+ <span>{{ item.autoing }}</span>
+ </div>
+ <div class="devpDeviceItem">
+ <span>鏈夌墿锛�</span>
+ <span>{{ item.loading }}</span>
+ </div>
+ <div class="devpDeviceItem">
+ <span>鍙叆锛�</span>
+ <span>{{ item.inEnable }}</span>
+ </div>
+ <div class="devpDeviceItem">
+ <span>鍙嚭锛�</span>
+ <span>{{ item.outEnable }}</span>
+ </div>
+ <div class="devpDeviceItem">
+ <span>鍏ュ簱鏍囪锛�</span>
+ <span>{{ item.pakMk }}</span>
+ </div>
+ <div class="devpDeviceItem">
+ <span>绌烘澘淇″彿锛�</span>
+ <span>{{ item.emptyMk }}</span>
+ </div>
+ <div class="devpDeviceItem">
+ <span>鐩爣绔欙細</span>
+ <span>{{ item.staNo }}</span>
+ </div>
+ <div class="devpDeviceItem">
+ <span>楂樹綆搴撲綅锛�</span>
+ <span>{{ item.locType1 }}</span>
</div>
</div>
</div>
- </el-carousel-item>
- </el-carousel>
+ </div>
+ </div>
</el-card>
</div>
<script>
@@ -285,7 +293,7 @@
let list = []
let tmp = []
res.data.forEach((item,index) => {
- if (index % 3 == 0) {
+ if (index % 5 == 0) {
if (tmp.length != 0) {
list.push(tmp)
}
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index e3f64de..0c3212b 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -25,7 +25,7 @@
<!-- 澶撮儴 -->
<div class="layui-header">
<div class="layui-logo">
- <img src="../static/wms/image/logo.png" style="display: inline-block; width: 60%;height: auto">
+ <img class="loginLogo" src="../static/wms/image/logo.png" style="display: inline-block; width: 60%;height: auto">
<!-- <span style="margin-top: 0; letter-spacing: 10px">涓壃绔嬪簱</span>-->
<!-- <img src="../static/wms/image/logo.svg"/>-->
<!-- <cite>涓壃 - Zoneyung</cite>-->
@@ -77,7 +77,7 @@
<div class="layui-body"></div>
<!-- 搴曢儴 -->
<div class="layui-footer layui-text">
- copyright 漏 2023 娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙� all rights reserved.
+ <span class="copyright-text">copyright 漏 2023 娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙� all rights reserved.</span>
<span class="pull-right">Version 1.0.0</span>
</div>
@@ -150,6 +150,17 @@
});
$.ajax({
+ url: baseUrl+"/loginInformation",
+ data: {},
+ method: 'GET',
+ success: function (res) {
+ var data = res.data
+ $(".copyright-text").text(data.loginCopyrightText);
+ $(".loginLogo").attr("src", data.loginLogo);
+ }
+ });
+
+ $.ajax({
url: baseUrl + "/license/getLicenseDays",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
--
Gitblit v1.9.1