From 68c1d09f219ef5b93d6a64a0d059e4255f112d6c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 16 十二月 2023 10:58:55 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/locDetl/locDetl.js | 3 ++-
src/main/webapp/views/home/map.html | 50 +++++++++++++++++++++++++-------------------------
src/main/webapp/views/report/locDetl.html | 3 ++-
3 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 2cc2fb8..973cc32 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -7,7 +7,7 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 200, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜',hide: true}
,{field: 'specs', align: 'center',title: '閰嶇疆',hide: true}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
@@ -34,6 +34,7 @@
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ ,{field: 'owner$', align: 'center',title: '璐т富', hide: false}
];
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index f81f4a0..1108a13 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -513,12 +513,12 @@
<div style="margin-left: 10px;">
<button @click="resetSearch" class="layui-btn layui-btn-sm">閲嶇疆</button>
</div>
- <div style="margin-left: 10px;">
- <button @click="locToLoc2" class="layui-btn layui-btn-sm">渚ц竟绉诲簱</button>
- </div>
- <div v-if="!locOutStatus" style="margin-left: 10px;">
- <button @click="locOutStatus = true" class="layui-btn layui-btn-sm">鍑哄簱閫夋嫨</button>
- </div>
+<!-- <div style="margin-left: 10px;">-->
+<!-- <button @click="locToLoc2" class="layui-btn layui-btn-sm">渚ц竟绉诲簱</button>-->
+<!-- </div>-->
+<!-- <div v-if="!locOutStatus" style="margin-left: 10px;">-->
+<!-- <button @click="locOutStatus = true" class="layui-btn layui-btn-sm">鍑哄簱閫夋嫨</button>-->
+<!-- </div>-->
<div v-else style="margin-left: 10px;border: 1px red solid;display: flex;">
<div>
<button @click="cancelSelectLoc" class="layui-btn layui-btn-sm">鍙栨秷閫夋嫨</button>
@@ -587,30 +587,30 @@
<div style="flex: 1;margin-top: 10px;">
<div style="font-size: 10px;">鍦ㄥ簱</div><div class="pointBox2 pointBoxRed">F</div>
</div>
+<!-- <div style="flex: 1;margin-top: 10px;">-->
+<!-- <div style="font-size: 10px;">绌烘澘</div><div class="pointBox2 pointBoxEmpty">D</div>-->
+<!-- </div>-->
+<!-- <div style="flex: 1;margin-top: 10px;">-->
+<!-- <div style="font-size: 10px;">鍑哄簱涓�</div><div class="pointBox2 pointBoxOut">P</div>-->
+<!-- </div>-->
+<!-- <div style="flex: 1;margin-top: 10px;">-->
+<!-- <div style="font-size: 10px;">鍑哄簱棰勭害</div><div class="pointBox2 pointBoxOutYy">R</div>-->
+<!-- </div>-->
+<!-- <div style="flex: 1;margin-top: 10px;">-->
+<!-- <div style="font-size: 10px;">鍏ュ簱棰勭害</div><div class="pointBox2 pointBoxInYy">S</div>-->
+<!-- </div>-->
<div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">绌烘澘</div><div class="pointBox2 pointBoxEmpty">D</div>
+ <div style="font-size: 10px;">鎼滅储</div><div class="pointBox2 pointBoxSearch"></div>
</div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">鍑哄簱涓�</div><div class="pointBox2 pointBoxOut">P</div>
- </div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">鍑哄簱棰勭害</div><div class="pointBox2 pointBoxOutYy">R</div>
- </div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">鍏ュ簱棰勭害</div><div class="pointBox2 pointBoxInYy">S</div>
- </div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">鎼滅储缁撴灉</div><div class="pointBox2 pointBoxSearch"></div>
- </div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;">閫夋嫨缁撴灉</div><div class="pointBox2 pointBoxSelected"></div>
- </div>
+<!-- <div style="flex: 1;margin-top: 10px;">-->
+<!-- <div style="font-size: 10px;">閫夋嫨</div><div class="pointBox2 pointBoxSelected"></div>-->
+<!-- </div>-->
<div style="flex: 1;margin-top: 10px;">
<div style="font-size: 10px;text-align: center">鍏朵粬</div><div class="pointBox2 pointBoxDefault"></div>
</div>
- <div style="flex: 1;margin-top: 10px;">
- <div style="font-size: 10px;text-align: center">鍐荤粨</div><div class="pointBox2 pointBoxEnd"></div>
- </div>
+<!-- <div style="flex: 1;margin-top: 10px;">-->
+<!-- <div style="font-size: 10px;text-align: center">鍐荤粨</div><div class="pointBox2 pointBoxEnd"></div>-->
+<!-- </div>-->
</div>
</div>
<button class="card-button">搴撲綅鐘舵��</button>
diff --git a/src/main/webapp/views/report/locDetl.html b/src/main/webapp/views/report/locDetl.html
index 9dbc0a4..2fd9957 100644
--- a/src/main/webapp/views/report/locDetl.html
+++ b/src/main/webapp/views/report/locDetl.html
@@ -67,7 +67,8 @@
{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'},
{field: 'batch', align: 'center',title: '鎵规'},
{field: 'anfme', align: 'center',title: '鏁伴噺'},
- {field: 'orderNo', align: 'center',title: '璁㈠崟鍙�'},
+ {field: 'owner$', align: 'center',title: '璐т富'},
+ // {field: 'orderNo', align: 'center',title: '璁㈠崟鍙�'},
{field: 'createTime$', align: 'center',title: '鍏ュ簱鏃堕棿'},
{field: 'specs', align: 'center',title: '瑙勬牸'}
]],
--
Gitblit v1.9.1