From 29a714f5b11be86d28a738c55a380338eb46bf3c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 16 四月 2025 15:39:13 +0800
Subject: [PATCH] 调整磨边一二线色块位置，大屏订单详情状态修改
---
hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml | 2 +-
UI-Project/src/views/largescreendisplay/screendisplay.vue | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index a257c4b..c462d41 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -974,7 +974,7 @@
<!-- 鐢熶骇缁熻 -->
<div style="height: 100px;width: 25%;float: right;">
<div id="ss" style="width: 100%; display: flex; justify-content: center;">
- <div ref="chartRef" style="width: 600px; height: 400px;"></div>
+ <div ref="chartRef" style="width: 600px; height: 400px;" @dblclick="handlehistorical10()"></div>
</div>
<div style="width: 100%;height: 245px;display: flex;">
<div ref="chartOne" style="width: 100%;"></div>
@@ -1017,13 +1017,13 @@
</div>
<!-- 纾ㄨ竟涓�绾垮崐閫忔槑鑹插潡 -->
<div
- style="width: 80px;height: 40px;top: 410px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+ style="width: 80px;height: 40px;top: 369px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
<div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutOne : 0 }}鐗�</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOutOne : 0 }}m虏</div>
</div>
<!-- 纾ㄨ竟浜岀嚎鍗婇�忔槑鑹插潡 -->
<div
- style="width: 80px;height: 40px;top: 369px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
+ style="width: 80px;height: 40px;top: 410px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
<div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutTwo : 0 }}鐗�</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOutTwo : 0 }}m虏</div>
</div>
@@ -1043,9 +1043,9 @@
style="width: 53px;height: 22px;top: 282px;left: 282px;position: absolute;background-color: #911005;"></div>
<!-- 鍒囧壊鍙拌壊鍧� -->
<div v-if="engineeringOne.length > 1" class="slicing"
- style="width: 45px;height: 20px;top: 500px;left: 496px;position: absolute;background-color: #911005;"></div>
- <div v-if="engineeringTwo.length > 1" class="slicing"
style="width: 45px;height: 20px;top: 550px;left: 496px;position: absolute;background-color: #911005;"></div>
+ <div v-if="engineeringTwo.length > 1" class="slicing"
+ style="width: 45px;height: 20px;top: 500px;left: 496px;position: absolute;background-color: #911005;"></div>
<!-- 鍘熺墖浠撳偍鑹插潡 -->
<div class="raw" style="width: 27px;height: 30px;top: 497px;left: 296px;position: absolute;">
<div v-for="(item, index) in rawGlassStorageDetailList.slice(0, 7)" :key="index"
@@ -1074,11 +1074,11 @@
<!-- 纾ㄨ竟鑹插潡 -->
<div class="container"
style="position: relative;width: 15px;height: 15px;top: 500px;left: 638px;position: absolute;">
- <div v-for="(box, index) in boxes" :key="index" class="box" :style="box.style"></div>
+ <div v-for="(box, index) in boxes2" :key="index" class="box" :style="box.style"></div>
</div>
<div class="container"
style="position: relative;width: 15px;height: 15px;top: 548px;left: 690px;position: absolute;">
- <div v-for="(box, index) in boxes2" :key="index" class="box" :style="box.style"></div>
+ <div v-for="(box, index) in boxes" :key="index" class="box" :style="box.style"></div>
</div>
<!-- 閽㈠寲杩愬姩鑹插潡 -->
<div class="container"
@@ -1143,7 +1143,7 @@
<div style="height: 100px;width: 25%;float: right;">
<div id="ss" style="width: 100%; display: flex; justify-content: center;">
- <div ref="chartRef2" style="width: 600px; height: 400px;"></div>
+ <div ref="chartRef2" style="width: 600px; height: 400px;" @dblclick="handlehistorical10()"></div>
</div>
<div style="width: 100%;height: 245px;display: flex;">
<div ref="chartThree" style="width: 100%;"></div>
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml
index d959a4c..521aeff 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/OrderMapper.xml
@@ -28,6 +28,6 @@
GROUP BY c.order_id
) as d
on a.order_id = d.order_id
- where a.warehousing != 2
+ where a.warehousing != 2 and a.warehousing > 0
</select>
</mapper>
--
Gitblit v1.8.0