From a4a795a986b009779f09e9a825c0099aa0bacbb8 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 18 八月 2025 16:41:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/public/taimian.png | 0
UI-Project/src/assets/favicon.ico | 0
UI-Project/public/d3.png | 0
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 4
UI-Project/public/3.png | 0
UI-Project/public/88.png | 0
UI-Project/src/assets/vuefavicon.ico | 0
UI-Project/public/dpxsa.png | 0
UI-Project/src/views/LoginView.vue | 6
UI-Project/public/11.png | 0
UI-Project/public/2.png | 0
UI-Project/src/views/Returns/upreturns2.vue | 2
UI-Project/public/C1.png | 0
UI-Project/public/xiaoche.png | 0
UI-Project/public/zhongkong.png | 0
UI-Project/public/d1.png | 0
UI-Project/src/assets/print-lock.css | 349 +++++++++++++++++++++++++++++++
UI-Project/public/xmjclzh.png | 0
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 9
UI-Project/public/sz.png | 0
UI-Project/public/shangpianji.png | 0
UI-Project/src/views/RegisterView.vue | 4
UI-Project/public/1.png | 0
UI-Project/public/dipan.png | 0
UI-Project/public/dlpl.png | 0
UI-Project/public/woshihuancun.png | 0
UI-Project/public/lpla.jpg | 0
UI-Project/src/lang/py.js | 1
UI-Project/src/views/Visualization/screenthree.vue | 2
UI-Project/public/screen.png | 0
UI-Project/src/views/Visualization/screentwo.vue | 2
UI-Project/public/zklpl2.png | 0
UI-Project/src/views/Returns/upreturns.vue | 2
UI-Project/public/d2.png | 0
UI-Project/public/lp9.png | 0
UI-Project/public/9.png | 0
UI-Project/public/d1a.png | 0
UI-Project/src/lang/kr.js | 1
UI-Project/public/dlpl2.png | 0
UI-Project/public/northGlass.ico | 0
UI-Project/public/logo.svg | 1
UI-Project/src/views/Caching/cachingbefore.vue | 2
UI-Project/public/main.css | 54 ++++
UI-Project/public/s.png | 0
UI-Project/public/background.jpg | 0
UI-Project/src/views/hollow/hollowsitwo.vue | 6
UI-Project/src/views/Caching/cachingun.vue | 2
UI-Project/src/views/hollow/hollowslicecage.vue | 31 ++
UI-Project/public/lpa.png | 0
UI-Project/public/ypccche.png | 0
UI-Project/public/ganghuaqian.png | 0
UI-Project/public/user.png | 0
UI-Project/public/ypcc.png | 0
UI-Project/src/views/largescreen/largescreen.vue | 2
UI-Project/public/lpa9.png | 0
UI-Project/public/shangpian.png | 0
UI-Project/public/ypcaac.png | 0
UI-Project/src/lang/en.js | 1
UI-Project/src/lang/zh.js | 1
UI-Project/src/views/Slicecage/slicecageTwo.vue | 6
UI-Project/public/dlpla.png | 0
UI-Project/public/dlpl9.png | 0
UI-Project/src/views/Slicecage/slicecage.vue | 6
UI-Project/public/aaa.png | 0
UI-Project/public/lp.png | 0
UI-Project/public/lpl.jpg | 0
UI-Project/public/xmjc.png | 0
UI-Project/src/views/GlassStorage/MaterialRackManagement.vue | 4
UI-Project/public/bigcar01.png | 0
UI-Project/public/cp.png | 0
UI-Project/public/screen2.png | 0
UI-Project/src/views/largescreendisplay/screendisplay.vue | 2
UI-Project/src/views/Visualization/screenone.vue | 2
UI-Project/public/base.css | 119 ++++++++++
UI-Project/public/emi.png | 0
UI-Project/public/img.png | 0
76 files changed, 591 insertions(+), 30 deletions(-)
diff --git a/UI-Project/public/1.png b/UI-Project/public/1.png
new file mode 100644
index 0000000..eea5301
--- /dev/null
+++ b/UI-Project/public/1.png
Binary files differ
diff --git a/UI-Project/public/11.png b/UI-Project/public/11.png
new file mode 100644
index 0000000..46f9af1
--- /dev/null
+++ b/UI-Project/public/11.png
Binary files differ
diff --git a/UI-Project/public/2.png b/UI-Project/public/2.png
new file mode 100644
index 0000000..470e6eb
--- /dev/null
+++ b/UI-Project/public/2.png
Binary files differ
diff --git a/UI-Project/public/3.png b/UI-Project/public/3.png
new file mode 100644
index 0000000..4900b6c
--- /dev/null
+++ b/UI-Project/public/3.png
Binary files differ
diff --git a/UI-Project/public/88.png b/UI-Project/public/88.png
new file mode 100644
index 0000000..365e1ad
--- /dev/null
+++ b/UI-Project/public/88.png
Binary files differ
diff --git a/UI-Project/public/9.png b/UI-Project/public/9.png
new file mode 100644
index 0000000..3e37ece
--- /dev/null
+++ b/UI-Project/public/9.png
Binary files differ
diff --git a/UI-Project/public/C1.png b/UI-Project/public/C1.png
new file mode 100644
index 0000000..388f062
--- /dev/null
+++ b/UI-Project/public/C1.png
Binary files differ
diff --git a/UI-Project/public/aaa.png b/UI-Project/public/aaa.png
new file mode 100644
index 0000000..be775d6
--- /dev/null
+++ b/UI-Project/public/aaa.png
Binary files differ
diff --git a/UI-Project/public/background.jpg b/UI-Project/public/background.jpg
new file mode 100644
index 0000000..4c726c9a
--- /dev/null
+++ b/UI-Project/public/background.jpg
Binary files differ
diff --git a/UI-Project/public/base.css b/UI-Project/public/base.css
new file mode 100644
index 0000000..0656895
--- /dev/null
+++ b/UI-Project/public/base.css
@@ -0,0 +1,119 @@
+/* color palette from <https://github.com/vuejs/theme> */
+:root {
+ --vt-c-white: #ffffff;
+ --vt-c-white-soft: #f8f8f8;
+ --vt-c-white-mute: #f2f2f2;
+
+ --vt-c-black: #181818;
+ --vt-c-black-soft: #222222;
+ --vt-c-black-mute: #282828;
+
+ --vt-c-indigo: #2c3e50;
+
+ --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
+ --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
+ --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
+ --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
+
+ --vt-c-text-light-1: var(--vt-c-indigo);
+ --vt-c-text-light-2: rgba(60, 60, 60, 0.66);
+ --vt-c-text-dark-1: var(--vt-c-white);
+ --vt-c-text-dark-2: rgba(235, 235, 235, 0.64);
+}
+
+/* semantic color variables for this project */
+:root {
+ --color-background: var(--vt-c-white);
+ --color-background-soft: var(--vt-c-white-soft);
+ --color-background-mute: var(--vt-c-white-mute);
+
+ --color-border: var(--vt-c-divider-light-2);
+ --color-border-hover: var(--vt-c-divider-light-1);
+
+ --color-heading: var(--vt-c-text-light-1);
+ --color-text: var(--vt-c-text-light-1);
+
+ --section-gap: 160px;
+}
+
+@media (prefers-color-scheme: dark) {
+ :root {
+ --color-background: var(--vt-c-black);
+ --color-background-soft: var(--vt-c-black-soft);
+ --color-background-mute: var(--vt-c-black-mute);
+
+ --color-border: var(--vt-c-divider-dark-2);
+ --color-border-hover: var(--vt-c-divider-dark-1);
+
+ --color-heading: var(--vt-c-text-dark-1);
+ --color-text: var(--vt-c-text-dark-2);
+ }
+}
+
+*,
+*::before,
+*::after {
+ box-sizing: border-box;
+ margin: 0;
+ font-weight: normal;
+}
+
+body {
+ min-height: 100vh;
+ color: var(--color-text);
+ background: var(--color-background);
+ transition:
+ color 0.5s,
+ background-color 0.5s;
+ line-height: 1.6;
+ font-family:
+ Inter,
+ -apple-system,
+ BlinkMacSystemFont,
+ 'Segoe UI',
+ Roboto,
+ Oxygen,
+ Ubuntu,
+ Cantarell,
+ 'Fira Sans',
+ 'Droid Sans',
+ 'Helvetica Neue',
+ sans-serif;
+ font-size: 15px;
+ text-rendering: optimizeLegibility;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+/*婊氬姩鏉℃暣浣撻儴鍒�*/
+.mytable-scrollbar ::-webkit-scrollbar {
+ width: 10px;
+ height: 10px;
+}
+/*婊氬姩鏉＄殑杞ㄩ亾*/
+.mytable-scrollbar ::-webkit-scrollbar-track {
+ background-color: #FFFFFF;
+}
+/*婊氬姩鏉￠噷闈㈢殑灏忔柟鍧楋紝鑳藉悜涓婂悜涓嬬Щ鍔�*/
+.mytable-scrollbar ::-webkit-scrollbar-thumb {
+ background-color: transparent;
+ border-radius: 5px;
+ border: 0 solid #F1F1F1;
+ /*box-shadow: inset 0 0 6px rgba(0,0,0,.3);*/
+}
+.mytable-scrollbar ::-webkit-scrollbar-thumb:hover {
+ background-color: #ffffff;
+ box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+}
+.mytable-scrollbar ::-webkit-scrollbar-thumb:active {
+ background-color: white;
+}
+/*杈硅锛屽嵆涓や釜婊氬姩鏉＄殑浜ゆ眹澶�*/
+.mytable-scrollbar ::-webkit-scrollbar-corner {
+ background-color: #FFFFFF;
+}
+.vxe-grid{
+ background-color: white;
+}
+
+
+
diff --git a/UI-Project/public/bigcar01.png b/UI-Project/public/bigcar01.png
new file mode 100644
index 0000000..98a0a0e
--- /dev/null
+++ b/UI-Project/public/bigcar01.png
Binary files differ
diff --git a/UI-Project/public/cp.png b/UI-Project/public/cp.png
new file mode 100644
index 0000000..e3272b2
--- /dev/null
+++ b/UI-Project/public/cp.png
Binary files differ
diff --git a/UI-Project/public/d1.png b/UI-Project/public/d1.png
new file mode 100644
index 0000000..c903c4b
--- /dev/null
+++ b/UI-Project/public/d1.png
Binary files differ
diff --git a/UI-Project/public/d1a.png b/UI-Project/public/d1a.png
new file mode 100644
index 0000000..b031d4b
--- /dev/null
+++ b/UI-Project/public/d1a.png
Binary files differ
diff --git a/UI-Project/public/d2.png b/UI-Project/public/d2.png
new file mode 100644
index 0000000..de73a96
--- /dev/null
+++ b/UI-Project/public/d2.png
Binary files differ
diff --git a/UI-Project/public/d3.png b/UI-Project/public/d3.png
new file mode 100644
index 0000000..1651775
--- /dev/null
+++ b/UI-Project/public/d3.png
Binary files differ
diff --git a/UI-Project/public/dipan.png b/UI-Project/public/dipan.png
new file mode 100644
index 0000000..923b811
--- /dev/null
+++ b/UI-Project/public/dipan.png
Binary files differ
diff --git a/UI-Project/public/dlpl.png b/UI-Project/public/dlpl.png
new file mode 100644
index 0000000..818a0a2
--- /dev/null
+++ b/UI-Project/public/dlpl.png
Binary files differ
diff --git a/UI-Project/public/dlpl2.png b/UI-Project/public/dlpl2.png
new file mode 100644
index 0000000..f3fc60c
--- /dev/null
+++ b/UI-Project/public/dlpl2.png
Binary files differ
diff --git a/UI-Project/public/dlpl9.png b/UI-Project/public/dlpl9.png
new file mode 100644
index 0000000..fc78fde
--- /dev/null
+++ b/UI-Project/public/dlpl9.png
Binary files differ
diff --git a/UI-Project/public/dlpla.png b/UI-Project/public/dlpla.png
new file mode 100644
index 0000000..9aa315e
--- /dev/null
+++ b/UI-Project/public/dlpla.png
Binary files differ
diff --git a/UI-Project/public/dpxsa.png b/UI-Project/public/dpxsa.png
new file mode 100644
index 0000000..c444062
--- /dev/null
+++ b/UI-Project/public/dpxsa.png
Binary files differ
diff --git a/UI-Project/public/emi.png b/UI-Project/public/emi.png
new file mode 100644
index 0000000..815024a
--- /dev/null
+++ b/UI-Project/public/emi.png
Binary files differ
diff --git a/UI-Project/public/ganghuaqian.png b/UI-Project/public/ganghuaqian.png
new file mode 100644
index 0000000..818b191
--- /dev/null
+++ b/UI-Project/public/ganghuaqian.png
Binary files differ
diff --git a/UI-Project/public/img.png b/UI-Project/public/img.png
new file mode 100644
index 0000000..3b0ee2b
--- /dev/null
+++ b/UI-Project/public/img.png
Binary files differ
diff --git a/UI-Project/public/logo.svg b/UI-Project/public/logo.svg
new file mode 100644
index 0000000..7565660
--- /dev/null
+++ b/UI-Project/public/logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 261.76 226.69"><path d="M161.096.001l-30.225 52.351L100.647.001H-.005l130.877 226.688L261.749.001z" fill="#41b883"/><path d="M161.096.001l-30.225 52.351L100.647.001H52.346l78.526 136.01L209.398.001z" fill="#34495e"/></svg>
diff --git a/UI-Project/public/lp.png b/UI-Project/public/lp.png
new file mode 100644
index 0000000..fac27df
--- /dev/null
+++ b/UI-Project/public/lp.png
Binary files differ
diff --git a/UI-Project/public/lp9.png b/UI-Project/public/lp9.png
new file mode 100644
index 0000000..a976458
--- /dev/null
+++ b/UI-Project/public/lp9.png
Binary files differ
diff --git a/UI-Project/public/lpa.png b/UI-Project/public/lpa.png
new file mode 100644
index 0000000..fac27df
--- /dev/null
+++ b/UI-Project/public/lpa.png
Binary files differ
diff --git a/UI-Project/public/lpa9.png b/UI-Project/public/lpa9.png
new file mode 100644
index 0000000..f7f2204
--- /dev/null
+++ b/UI-Project/public/lpa9.png
Binary files differ
diff --git a/UI-Project/public/lpl.jpg b/UI-Project/public/lpl.jpg
new file mode 100644
index 0000000..d66b84d
--- /dev/null
+++ b/UI-Project/public/lpl.jpg
Binary files differ
diff --git a/UI-Project/public/lpla.jpg b/UI-Project/public/lpla.jpg
new file mode 100644
index 0000000..d66b84d
--- /dev/null
+++ b/UI-Project/public/lpla.jpg
Binary files differ
diff --git a/UI-Project/public/main.css b/UI-Project/public/main.css
new file mode 100644
index 0000000..e9c78e5
--- /dev/null
+++ b/UI-Project/public/main.css
@@ -0,0 +1,54 @@
+@import './base.css';
+
+#app {
+ margin: 0 auto;
+ padding: 0;
+ /* background-color: #D5EAFF; */
+ font-weight: normal;
+ height: 100%;
+ width: 100%;
+ /* min-width: 1536px; */
+ /* min-height: 730px; */
+ /* background-image: url("../../src/assets/background.jpg"); */
+}
+
+a,
+.green {
+ text-decoration: none;
+ color: hsla(160, 100%, 37%, 1);
+ transition: 0.4s;
+}
+
+@media (hover: hover) {
+ a:hover {
+ background-color: hsla(160, 100%, 37%, 0.2);
+ }
+}
+
+@media (min-width: 1024px) {
+ body {
+ display: flex;
+ place-items: center;
+ }
+
+ #app {
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+
+ }
+}
+*{
+ margin: 0;
+ padding: 0;
+
+}
+.mainDiv{
+ height: 100vh;
+ width: 100vw;
+}
+html,body{
+ height: 100%;
+ width: 100%;
+ margin: 0;
+ padding: 0;
+}
\ No newline at end of file
diff --git a/UI-Project/public/northGlass.ico b/UI-Project/public/northGlass.ico
new file mode 100644
index 0000000..470e6eb
--- /dev/null
+++ b/UI-Project/public/northGlass.ico
Binary files differ
diff --git a/UI-Project/public/s.png b/UI-Project/public/s.png
new file mode 100644
index 0000000..2caf181
--- /dev/null
+++ b/UI-Project/public/s.png
Binary files differ
diff --git a/UI-Project/public/screen.png b/UI-Project/public/screen.png
new file mode 100644
index 0000000..28ece70
--- /dev/null
+++ b/UI-Project/public/screen.png
Binary files differ
diff --git a/UI-Project/public/screen2.png b/UI-Project/public/screen2.png
new file mode 100644
index 0000000..1e9dd42
--- /dev/null
+++ b/UI-Project/public/screen2.png
Binary files differ
diff --git a/UI-Project/public/shangpian.png b/UI-Project/public/shangpian.png
new file mode 100644
index 0000000..71152cc
--- /dev/null
+++ b/UI-Project/public/shangpian.png
Binary files differ
diff --git a/UI-Project/public/shangpianji.png b/UI-Project/public/shangpianji.png
new file mode 100644
index 0000000..fb645ca
--- /dev/null
+++ b/UI-Project/public/shangpianji.png
Binary files differ
diff --git a/UI-Project/public/sz.png b/UI-Project/public/sz.png
new file mode 100644
index 0000000..fc3e92b
--- /dev/null
+++ b/UI-Project/public/sz.png
Binary files differ
diff --git a/UI-Project/public/taimian.png b/UI-Project/public/taimian.png
new file mode 100644
index 0000000..81e0723
--- /dev/null
+++ b/UI-Project/public/taimian.png
Binary files differ
diff --git a/UI-Project/public/user.png b/UI-Project/public/user.png
new file mode 100644
index 0000000..7c774be
--- /dev/null
+++ b/UI-Project/public/user.png
Binary files differ
diff --git a/UI-Project/public/woshihuancun.png b/UI-Project/public/woshihuancun.png
new file mode 100644
index 0000000..25fb5fb
--- /dev/null
+++ b/UI-Project/public/woshihuancun.png
Binary files differ
diff --git a/UI-Project/public/xiaoche.png b/UI-Project/public/xiaoche.png
new file mode 100644
index 0000000..f1fdf46
--- /dev/null
+++ b/UI-Project/public/xiaoche.png
Binary files differ
diff --git a/UI-Project/public/xmjc.png b/UI-Project/public/xmjc.png
new file mode 100644
index 0000000..dee5f48
--- /dev/null
+++ b/UI-Project/public/xmjc.png
Binary files differ
diff --git a/UI-Project/public/xmjclzh.png b/UI-Project/public/xmjclzh.png
new file mode 100644
index 0000000..5935f14
--- /dev/null
+++ b/UI-Project/public/xmjclzh.png
Binary files differ
diff --git a/UI-Project/public/ypcaac.png b/UI-Project/public/ypcaac.png
new file mode 100644
index 0000000..fdca249
--- /dev/null
+++ b/UI-Project/public/ypcaac.png
Binary files differ
diff --git a/UI-Project/public/ypcc.png b/UI-Project/public/ypcc.png
new file mode 100644
index 0000000..fcfbb34
--- /dev/null
+++ b/UI-Project/public/ypcc.png
Binary files differ
diff --git a/UI-Project/public/ypccche.png b/UI-Project/public/ypccche.png
new file mode 100644
index 0000000..96f75d0
--- /dev/null
+++ b/UI-Project/public/ypccche.png
Binary files differ
diff --git a/UI-Project/public/zhongkong.png b/UI-Project/public/zhongkong.png
new file mode 100644
index 0000000..359c5a0
--- /dev/null
+++ b/UI-Project/public/zhongkong.png
Binary files differ
diff --git a/UI-Project/public/zklpl2.png b/UI-Project/public/zklpl2.png
new file mode 100644
index 0000000..60b7d4d
--- /dev/null
+++ b/UI-Project/public/zklpl2.png
Binary files differ
diff --git a/UI-Project/src/assets/favicon.ico b/UI-Project/src/assets/favicon.ico
new file mode 100644
index 0000000..1d83994
--- /dev/null
+++ b/UI-Project/src/assets/favicon.ico
Binary files differ
diff --git a/UI-Project/src/assets/print-lock.css b/UI-Project/src/assets/print-lock.css
new file mode 100644
index 0000000..aede018
--- /dev/null
+++ b/UI-Project/src/assets/print-lock.css
@@ -0,0 +1,349 @@
+@media print {
+ body {
+ margin: 0px;
+ padding: 0px;
+ }
+}
+
+@page {
+ margin: 0;
+}
+
+.hiprint-printPaper * {
+ box-sizing: border-box;
+ -moz-box-sizing: border-box; /* Firefox */
+ -webkit-box-sizing: border-box; /* Safari */
+}
+
+.hiprint-printPaper *:focus {
+ outline: -webkit-focus-ring-color auto 0px;
+}
+
+.hiprint-printPaper {
+ position: relative;
+ padding: 0 0 0 0;
+ page-break-after: always;
+ -webkit-user-select: none; /* Chrome/Safari/Opera */
+ -moz-user-select: none; /* Firefox */
+ user-select: none;
+ overflow-x: hidden;
+ overflow: hidden;
+}
+
+.hiprint-printPaper .hiprint-printPaper-content {
+ position: relative;
+}
+
+/* 鐏嫄娴忚鍣ㄦ墦鍗� 绗竴椤佃繃鍚� 閲嶅彔闂 */
+@-moz-document url-prefix() {
+ .hiprint-printPaper .hiprint-printPaper-content {
+ position: relative;
+ margin-top: 20px;
+ top: -20px
+ }
+}
+
+.hiprint-printPaper.design {
+ overflow: visible;
+}
+
+
+.hiprint-printTemplate .hiprint-printPanel {
+ page-break-after: always;
+}
+
+.hiprint-printPaper, hiprint-printPanel {
+ box-sizing: border-box;
+ border: 0px;
+}
+
+.hiprint-printPanel .hiprint-printPaper:last-child {
+ page-break-after: avoid;
+}
+
+.hiprint-printTemplate .hiprint-printPanel:last-child {
+ page-break-after: avoid;
+}
+
+.hiprint-printPaper .hideheaderLinetarget {
+ border-top: 0px dashed rgb(201, 190, 190) !important;
+}
+
+.hiprint-printPaper .hidefooterLinetarget {
+ border-top: 0px dashed rgb(201, 190, 190) !important;
+}
+
+.hiprint-printPaper.design {
+ border: 1px dashed rgba(170, 170, 170, 0.7);
+}
+
+.design .hiprint-printElement-table-content, .design .hiprint-printElement-longText-content {
+ overflow: hidden;
+ box-sizing: border-box;
+}
+
+.design .resize-panel {
+ box-sizing: border-box;
+ border: 1px dotted;
+}
+
+.hiprint-printElement-text {
+ background-color: transparent;
+ background-repeat: repeat;
+ padding: 0 0 0 0;
+ border: 0.75pt none rgb(0, 0, 0);
+ direction: ltr;
+ font-family: 'SimSun';
+ font-size: 9pt;
+ font-style: normal;
+ font-weight: normal;
+ padding-bottom: 0pt;
+ padding-left: 0pt;
+ padding-right: 0pt;
+ padding-top: 0pt;
+ text-align: left;
+ text-decoration: none;
+ line-height: 9.75pt;
+ box-sizing: border-box;
+ word-wrap: break-word;
+ word-break: break-all;
+}
+
+.design .hiprint-printElement-text-content {
+ border: 1px dashed rgb(206, 188, 188);
+ box-sizing: border-box;
+}
+
+.hiprint-printElement-longText {
+ background-color: transparent;
+ background-repeat: repeat;
+ border: 0.75pt none rgb(0, 0, 0);
+ direction: ltr;
+ font-family: 'SimSun';
+ font-size: 9pt;
+ font-style: normal;
+ font-weight: normal;
+ padding-bottom: 0pt;
+ padding-left: 0pt;
+ padding-right: 0pt;
+ padding-top: 0pt;
+ text-align: left;
+ text-decoration: none;
+ line-height: 9.75pt;
+ box-sizing: border-box;
+ word-wrap: break-word;
+ word-break: break-all;
+ /*white-space: pre-wrap*/
+}
+
+
+.hiprint-printElement-table {
+ background-color: transparent;
+ background-repeat: repeat;
+ color: rgb(0, 0, 0);
+ border-color: rgb(0, 0, 0);
+ border-style: none;
+ direction: ltr;
+ font-family: 'SimSun';
+ font-size: 9pt;
+ font-style: normal;
+ font-weight: normal;
+ padding-bottom: 0pt;
+ padding-left: 0pt;
+ padding-right: 0pt;
+ padding-top: 0pt;
+ text-align: left;
+ text-decoration: none;
+ padding: 0 0 0 0;
+ box-sizing: border-box;
+ line-height: 9.75pt;
+}
+
+.hiprint-printElement-table thead {
+ background: #e8e8e8;
+ font-weight: 700;
+}
+
+table.hiprint-printElement-tableTarget {
+ width: 100%;
+}
+
+.hiprint-printElement-tableTarget, .hiprint-printElement-tableTarget tr, .hiprint-printElement-tableTarget td {
+ border-color: rgb(0, 0, 0);
+ /*border-style: none;*/
+ /*border: 1px solid rgb(0, 0, 0);*/
+ font-weight: normal;
+ direction: ltr;
+ padding-bottom: 0pt;
+ padding-left: 4pt;
+ padding-right: 4pt;
+ padding-top: 0pt;
+ text-decoration: none;
+ vertical-align: middle;
+ box-sizing: border-box;
+ word-wrap: break-word;
+ word-break: break-all;
+ /*line-height: 9.75pt;
+ font-size: 9pt;*/
+}
+
+.hiprint-printElement-tableTarget-border-all {
+ border: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-none {
+ border: 0px solid;
+}
+.hiprint-printElement-tableTarget-border-lr {
+ border-left: 1px solid;
+ border-right: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-left {
+ border-left: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-right {
+ border-right: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-tb {
+ border-top: 1px solid;
+ border-bottom: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-top {
+ border-top: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-bottom {
+ border-bottom: 1px solid;
+}
+
+.hiprint-printElement-tableTarget-border-td-none td {
+ border: 0px solid;
+}
+.hiprint-printElement-tableTarget-border-td-all td:not(:nth-last-child(-n+2)) {
+ border-right: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-td-all td:last-child {
+ border-left: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-td-all td:last-child:first-child {
+ border-left: none;
+}
+
+/*.hiprint-printElement-tableTarget tr,*/
+.hiprint-printElement-tableTarget td {
+ height: 18pt;
+}
+
+.hiprint-printPaper .hiprint-paperNumber {
+ font-size: 9pt;
+}
+
+.design .hiprint-printElement-table-handle {
+ position: absolute;
+ height: 21pt;
+ width: 21pt;
+ background: red;
+ z-index: 1;
+}
+
+.hiprint-printPaper .hiprint-paperNumber-disabled {
+ float: right !important;
+ right: 0 !important;
+ color: gainsboro !important;
+}
+
+.hiprint-printElement-vline, .hiprint-printElement-hline {
+ border: 0px none rgb(0, 0, 0);
+
+}
+
+.hiprint-printElement-vline {
+ border-left: 0.75pt solid #000;
+ border-right: 0px none rgb(0, 0, 0) !important;
+ border-bottom: 0px none rgb(0, 0, 0) !important;
+ border-top: 0px none rgb(0, 0, 0) !important;
+}
+
+.hiprint-printElement-hline {
+ border-top: 0.75pt solid #000;
+ border-right: 0px none rgb(0, 0, 0) !important;
+ border-bottom: 0px none rgb(0, 0, 0) !important;
+ border-left: 0px none rgb(0, 0, 0) !important;
+}
+
+.hiprint-printElement-oval, .hiprint-printElement-rect {
+ border: 0.75pt solid #000;
+}
+
+.hiprint-text-content-middle {
+}
+
+.hiprint-text-content-middle > div {
+ display: grid;
+ align-items: center;
+}
+
+.hiprint-text-content-bottom {
+}
+
+.hiprint-text-content-bottom > div {
+ display: grid;
+ align-items: flex-end;
+}
+
+.hiprint-text-content-wrap {
+}
+
+.hiprint-text-content-wrap .hiprint-text-content-wrap-nowrap {
+ white-space: nowrap;
+}
+
+.hiprint-text-content-wrap .hiprint-text-content-wrap-clip {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: clip;
+}
+
+.hiprint-text-content-wrap .hiprint-text-content-wrap-ellipsis {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+/*hi-grid-row */
+.hi-grid-row {
+ position: relative;
+ height: auto;
+ margin-right: 0;
+ margin-left: 0;
+ zoom: 1;
+ display: block;
+ box-sizing: border-box;
+}
+
+.hi-grid-row::after, .hi-grid-row::before {
+ display: table;
+ content: '';
+ box-sizing: border-box;
+}
+
+.hi-grid-col {
+ display: block;
+ box-sizing: border-box;
+ position: relative;
+ float: left;
+ flex: 0 0 auto;
+}
+
+.table-grid-row {
+ margin-left: -0pt;
+ margin-right: -0pt;
+}
+
+.tableGridColumnsGutterRow {
+ padding-left: 0pt;
+ padding-right: 0pt;
+}
+
+.hiprint-gridColumnsFooter {
+ text-align: left;
+ clear: both;
+}
diff --git a/UI-Project/src/assets/vuefavicon.ico b/UI-Project/src/assets/vuefavicon.ico
new file mode 100644
index 0000000..df36fcf
--- /dev/null
+++ b/UI-Project/src/assets/vuefavicon.ico
Binary files differ
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index e9318cc..f0eb1b8 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -135,6 +135,7 @@
takeon: 'The arrangement is complete',
},
searchOrder: {
+ hollowPriority:'Hollow priority',
furnaces:'Number of full furnaces',
furnfullTemp: 'Total amount of glass',
startCell: 'Target layer number',
diff --git a/UI-Project/src/lang/kr.js b/UI-Project/src/lang/kr.js
index 3cbdb3a..635a82c 100644
--- a/UI-Project/src/lang/kr.js
+++ b/UI-Project/src/lang/kr.js
@@ -134,6 +134,7 @@
takeon:'欷�牍勱皜 鞕勲霅橃棃鞀惦媹雼�',
},
searchOrder:{
+ hollowPriority:'欷戧车 鞖办劆 靾滌渼',
furnaces:'臧�霌� 彀瀳電� 鞖╆磻搿滌潣 靾�',
furnfullTemp:'鞙犽Μ鞚� 齑濍焿',
startCell:'雽�靸� 霠堨澊鞏� 氩堩樃',
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index 608fb95..2416d17 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -134,6 +134,7 @@
takeaway: '袙蟹褟褌褜 胁褉褍褔薪褍褞',
},
searchOrder: {
+ hollowPriority:'涓┖浼樺厛绾�',
furnaces:'婊＄倝鐐夋暟',
furnfullTemp:'鐜荤拑鎬婚噺',
startCell:'鐩爣灞傚彿',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 104646c..0197007 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -134,6 +134,7 @@
takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
+ hollowPriority:'涓┖浼樺厛绾�',
furnaces:'婊＄倝鐐夋暟',
furnfullTemp:'鐜荤拑鎬婚噺',
startCell:'鐩爣灞傚彿',
diff --git a/UI-Project/src/views/Caching/cachingbefore.vue b/UI-Project/src/views/Caching/cachingbefore.vue
index 278efc3..4cbd384 100644
--- a/UI-Project/src/views/Caching/cachingbefore.vue
+++ b/UI-Project/src/views/Caching/cachingbefore.vue
@@ -423,7 +423,7 @@
</div>
</el-card>
<div class="awatch">
- <img src="../../assets/woshihuancun.png" alt="" style="width: 50%;height: 100%;margin-left: 25%;position: relative;margin-top: 5px;">
+ <img src="/woshihuancun.png" alt="" style="width: 50%;height: 100%;margin-left: 25%;position: relative;margin-top: 5px;">
<div style="position: relative; width: 500px;height: 95px;margin-top: -146px;margin-left: 615px;">
<div
v-for="(rect, index) in adjustedRects"
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index c003ce2..128830a 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -405,7 +405,7 @@
</div>
</el-card>
<div class="awatch">
- <img src="../../assets/woshihuancun.png" alt="" style="width: 50%;height: 100%;margin-left: 25%;margin-top: 5px;position: relative;">
+ <img src="/woshihuancun.png" alt="" style="width: 50%;height: 100%;margin-left: 25%;margin-top: 5px;position: relative;">
<div style="position: relative; width: 500px;height: 95px;margin-top: -227px;margin-left: 615px;">
<div
v-for="(rect, index) in adjustedRects"
diff --git a/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue b/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
index 41981a4..7f804c7 100644
--- a/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
+++ b/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
@@ -657,7 +657,7 @@
}
.img-ypcc {
margin-left: 80px;
- background-image: url("../../assets/ypcc.png");
+ background-image: url("/ypcc.png");
background-repeat: no-repeat;
background-attachment: local;
min-height: 600px;
@@ -669,7 +669,7 @@
margin-top: 0px;
}
.img-car1 {
- background-image: url("../../assets/ypccche.png");
+ background-image: url("/ypccche.png");
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index bd8ec94..286bfbc 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -955,7 +955,7 @@
.img-dlpl{
margin-left: 330px;
margin-top: 10px;
- background-image:url('../../assets/ypcc.png');
+ background-image:url('/ypcc.png');
background-repeat: no-repeat;
background-attachment: local;
min-height: 450px;
@@ -968,7 +968,7 @@
}
.img-car1{
display: flex;
- background-image:url('../../assets/C1.png');
+ background-image:url('/C1.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
diff --git a/UI-Project/src/views/LoginView.vue b/UI-Project/src/views/LoginView.vue
index 9d6cc47..d01c0b3 100644
--- a/UI-Project/src/views/LoginView.vue
+++ b/UI-Project/src/views/LoginView.vue
@@ -103,11 +103,11 @@
<div id="main-login">
<!-- <img
style="width: 100%; height: 99vh"
- src="../../src/assets/background.jpg"
+ src="/background.jpg"
/> -->
<div>
<div style="position: absolute; left: 8vw; top: 6vw; ">
- <img src="../../src/assets/3.png">
+ <img src="/3.png">
</div>
<div style="position: absolute; left: 15vw; top: 22vw; font-size: 55px;color: rgba(29, 33, 41, 1);">
{{ $t('northglassMESsystem') }}
@@ -176,7 +176,7 @@
.mainDiv {
overflow: hidden;
min-width: 718px;
- background-image: url('../../src/assets/background.jpg');
+ background-image: url('/background.jpg');
}
#main-login {
margin: 150px auto 0 auto;
diff --git a/UI-Project/src/views/RegisterView.vue b/UI-Project/src/views/RegisterView.vue
index 31a83f7..74f5830 100644
--- a/UI-Project/src/views/RegisterView.vue
+++ b/UI-Project/src/views/RegisterView.vue
@@ -107,7 +107,7 @@
<div id="main-login">
<div>
<div style="position: absolute; left: 8vw; top: 6vw; ">
- <img src="../../src/assets/3.png">
+ <img src="/3.png">
</div>
<div style="position: absolute; left: 15vw; top: 22vw; font-size: 55px;color: rgba(29, 33, 41, 1);">
{{ $t('northglassMESsystem') }}
@@ -200,7 +200,7 @@
.mainDiv{
overflow: hidden;
min-width: 718px;
- background-image: url("../../src/assets/background.jpg");
+ background-image: url("/background.jpg");
}
#main-login{
margin: 150px auto 0 auto;
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index c2f315c..624cb88 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -483,7 +483,7 @@
<div style="display: flex;margin-left:5%">
<div style="width: 55%;float: left;margin-left: 300px;">
<div style="display: flex;">
- <img src="../../assets/shangpianji.png" alt=""
+ <img src="/shangpianji.png" alt=""
style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 3%;">
<el-table :data="tableDataa" border style="margin-top: 10%;margin-left: 8%;" width="700"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index f1ca805..7cf671e 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -489,7 +489,7 @@
<div style="display: flex;margin-left:5%">
<div style="width: 55%;float: left;margin-left: 300px;">
<div style="display: flex;">
- <img src="../../assets/shangpianji.png" alt=""
+ <img src="/shangpianji.png" alt=""
style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 3%;">
<el-table :data="tableDataa" border style="margin-top: 10%;margin-left: 8%;" width="700"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}" >
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 47e82b4..31a2f51 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1702,7 +1702,7 @@
.img-dlpl{
margin-left: 20px;
margin-top: 0px;
- background-image:url('../../assets/ganghuaqian.png');
+ background-image:url('/ganghuaqian.png');
background-repeat: no-repeat;
background-attachment: local;
min-height: 380px;
@@ -1714,7 +1714,7 @@
}
.img-car1{
display: flex;
- background-image:url('../../assets/xiaoche.png');
+ background-image:url('/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
@@ -1727,7 +1727,7 @@
}
.img-car4{
display: flex;
- background-image:url('../../assets/xiaoche.png');
+ background-image:url('/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
diff --git a/UI-Project/src/views/Slicecage/slicecageTwo.vue b/UI-Project/src/views/Slicecage/slicecageTwo.vue
index 21d3250..6f5b589 100644
--- a/UI-Project/src/views/Slicecage/slicecageTwo.vue
+++ b/UI-Project/src/views/Slicecage/slicecageTwo.vue
@@ -1637,7 +1637,7 @@
.img-dlpl{
margin-left: 70px;
margin-top: 70px;
- background-image:url('../../assets/dlpl2.png');
+ background-image:url('/dlpl2.png');
background-repeat: no-repeat;
background-attachment: local;
min-height: 580px;
@@ -1649,7 +1649,7 @@
}
.img-car1{
display: flex;
- background-image:url('../../assets/xiaoche.png');
+ background-image:url('/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
@@ -1662,7 +1662,7 @@
}
.img-car4{
display: flex;
- background-image:url('../../assets/xiaoche.png');
+ background-image:url('/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
diff --git a/UI-Project/src/views/Visualization/screenone.vue b/UI-Project/src/views/Visualization/screenone.vue
index 4ff7068..138580e 100644
--- a/UI-Project/src/views/Visualization/screenone.vue
+++ b/UI-Project/src/views/Visualization/screenone.vue
@@ -130,7 +130,7 @@
<template>
<!-- 鐖剁骇妗� -->
<div class="container">
- <img src="../../assets/d1.png" style="width: 1500px;height: 750px;" alt="Your Image">
+ <img src="/d1.png" style="width: 1500px;height: 750px;" alt="Your Image">
<div class="moving-rect vertical"></div>
<div class="moving-rect all"></div>
<div class="moving-rect horizontal"></div>
diff --git a/UI-Project/src/views/Visualization/screenthree.vue b/UI-Project/src/views/Visualization/screenthree.vue
index 77a4333..ad71450 100644
--- a/UI-Project/src/views/Visualization/screenthree.vue
+++ b/UI-Project/src/views/Visualization/screenthree.vue
@@ -130,7 +130,7 @@
</script>
<template>
<div id="awatch">
- <img src="../../assets/d3.png" alt="" style="width: 100%;height: 160%;margin-top: 20px;">
+ <img src="/d3.png" alt="" style="width: 100%;height: 160%;margin-top: 20px;">
</div>
</template>
<style scoped>
diff --git a/UI-Project/src/views/Visualization/screentwo.vue b/UI-Project/src/views/Visualization/screentwo.vue
index f78061d..f8ebd4a 100644
--- a/UI-Project/src/views/Visualization/screentwo.vue
+++ b/UI-Project/src/views/Visualization/screentwo.vue
@@ -129,7 +129,7 @@
</script>
<template>
<div id="awatch">
- <img src="../../assets/d2.png" alt="" style="width: 100%;height: 160%;margin-top: 20px;">
+ <img src="/d2.png" alt="" style="width: 100%;height: 160%;margin-top: 20px;">
</div>
</template>
<style scoped>
diff --git a/UI-Project/src/views/hollow/hollowsitwo.vue b/UI-Project/src/views/hollow/hollowsitwo.vue
index b99bdf7..8cdc447 100644
--- a/UI-Project/src/views/hollow/hollowsitwo.vue
+++ b/UI-Project/src/views/hollow/hollowsitwo.vue
@@ -1037,7 +1037,7 @@
.img-zkdlpl{
margin-left: 40px;
margin-top: 8px;
- background-image:url('../../assets/zklpl2.png');
+ background-image:url('/zklpl2.png');
background-repeat: no-repeat;
background-attachment: local;
min-height: 800px;
@@ -1049,7 +1049,7 @@
}
.img-car1{
display: flex;
- background-image:url('../../assets/xiaoche.png');
+ background-image:url('/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
@@ -1062,7 +1062,7 @@
}
.img-car4{
display: flex;
- background-image:url('../../assets/xiaoche.png');
+ background-image:url('/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
diff --git a/UI-Project/src/views/hollow/hollowslicecage.vue b/UI-Project/src/views/hollow/hollowslicecage.vue
index be2a2e7..eb01fe4 100644
--- a/UI-Project/src/views/hollow/hollowslicecage.vue
+++ b/UI-Project/src/views/hollow/hollowslicecage.vue
@@ -30,6 +30,7 @@
const tableDatass = ref([])
const ganghua = ref('')
const diaodu = ref('')
+const hollowPriority = ref('')
const flowCardId = ref('')
const filmsId = ref('')
const adjust = ref([]);
@@ -313,6 +314,24 @@
catch (error) {
}
}
+// 涓┖浼樺厛绾у紑鍏�
+// const handlehollowPriority = async () => {
+// try {
+// const body = {
+// flag: hollowPriority.value,
+// };
+// var url="/hollowGlass/hollowGlassOutRelationInfo/priorityHollowSwitch?flag="+hollowPriority.value;
+// const response = await request.post(url)
+// if (response.code == 200) {
+// ElMessage.success(response.message);
+// hollowPriority.value = response.data
+// }else {
+// ElMessage.error(response.message);
+// }
+// }
+// catch (error) {
+// }
+// }
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/hollowGlassMessage`;
const handleMessage = (data) => {
@@ -392,6 +411,11 @@
}else{
diaodu.value = ''
}
+// if(data.priorityHollowSwitch!=null){
+// hollowPriority.value = data.priorityHollowSwitch[0]
+// }else{
+// hollowPriority.value = ''
+// }
if(data.bigStorageCageInfos!=null){
adjustedRects.value = data.bigStorageCageInfos[0][1].map((rect, index) => ({
id: index + 1,
@@ -658,6 +682,7 @@
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="success" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
<el-button style="margin-top: 7px;margin-left: 10px;" id="searchButton" type="danger" @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button>
<el-switch style="margin-top: 7px;margin-left: 10px;" v-model="diaodu" class="mb-2" :inactive-text="$t('searchOrder.Schedulingswitch')" @change="handlediaodu" />
+ <!-- <el-switch style="margin-top: 7px;margin-left: 10px;" v-model="hollowPriority" class="mb-2" :inactive-text="$t('searchOrder.hollowPriority')" @change="handlehollowPriority" /> -->
<div id="dotClass">
<div>{{ $t('searchOrder.inkageEntity') }}</div>
<i :style="{ marginTop: '2px', backgroundColor: inkageEntity, width: '18px', height: '18px', borderRadius: '50%', display: 'block' }"></i>
@@ -1087,7 +1112,7 @@
.img-zkdlpl{
margin-left: 20px;
margin-top: 0px;
- background-image:url('../../assets/zhongkong.png');
+ background-image:url('/zhongkong.png');
background-repeat: no-repeat;
background-attachment: local;
min-height: 500px;
@@ -1099,7 +1124,7 @@
}
.img-car1{
display: flex;
- background-image:url('../../assets/xiaoche.png');
+ background-image:url('/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
@@ -1112,7 +1137,7 @@
}
.img-car4{
display: flex;
- background-image:url('../../assets/xiaoche.png');
+ background-image:url('/xiaoche.png');
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index 43b4e09..46c97fc 100644
--- a/UI-Project/src/views/largescreen/largescreen.vue
+++ b/UI-Project/src/views/largescreen/largescreen.vue
@@ -12,7 +12,7 @@
</div>
<div style="display: flex;">
<div class="parter" style="margin-top: 10px;margin-left: 150px; height: 240px;width: 1000px;">
- <img src="../../assets/dpxsa.png" style="margin-left: -10px; width: 100%;height: 100%;" alt="Your Image">
+ <img src="/dpxsa.png" style="margin-left: -10px; width: 100%;height: 100%;" alt="Your Image">
<div class="moving-rect lipiana" v-show="woshia"></div>
<div class="moving-rect lipianb" v-show="woshia"></div>
<div class="moving-rect lipianc" v-show="woshic"></div>
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index ecae54e..f1127b4 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -1332,7 +1332,7 @@
/* margin-top: 50px; */
/* float: left; */
position: relative;
- background-image: url('../../assets/screen.png');
+ background-image: url('/screen.png');
width: 795px;
height: 700px;
background-size: contain;
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index 3182e9a..d02c098 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -331,6 +331,15 @@
dispatchHollowSwitch = redisUtil.getCacheObject("dispatchHollowSwitch");
}
jsonObject.append("dispatchHollowSwitch", dispatchHollowSwitch);
+ //璋冨害寮�鍏�
+ boolean priorityHollowSwitch = false;
+ if (redisUtil.getCacheObject("priorityHollowSwitch") == null) {
+ redisUtil.setCacheObject("priorityHollowSwitch", false);
+ } else {
+ priorityHollowSwitch = redisUtil.getCacheObject("priorityHollowSwitch");
+ }
+ jsonObject.append("priorityHollowSwitch", priorityHollowSwitch);
+
//鐞嗙墖绗间娇鐢ㄦ儏鍐�
List<Map<String, Object>> bigStorageCageUsage = hollowBigStorageCageService.selectBigStorageCageUsage();
jsonObject.append("bigStorageCageUsage", bigStorageCageUsage);
--
Gitblit v1.8.0