From 690dd92493026305c7aa12dfe34251e008317ac4 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 06 六月 2023 14:47:47 +0800
Subject: [PATCH] #平库地图完成

---
 src/main/webapp/views/home/map.html |   53 +++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index 13a6764..49ffc1e 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -217,7 +217,7 @@
 
         /*婊戝姩鍗$墖start*/
         .hoverCard {
-            width: 140px;
+            width: 152px;
             height: 224px;
             border-radius: 20px;
             background: #f5f5f5;
@@ -481,7 +481,7 @@
                         <div style="width: 100%;margin-bottom: 20px;">
                             <div style="display: flex;justify-content: space-between;">
                                 <div><input v-model="searchMatnr" placeholder="鐗╂枡鍙�" type="text" class="search-input"></div>
-                                <div><input v-model="searchOrderNo" placeholder="璁㈠崟鍙�" type="text" class="search-input"></div>
+                                <div style="margin-left: 20px"><input v-model="searchOrderNo" placeholder="璁㈠崟鍙�" type="text" class="search-input"></div>
                             </div>
                             <div style="display: flex;justify-content: space-between;margin-top: 10px;">
                                 <div><input style="width: 110px;" v-model="searchMaktx" placeholder="鐗╂枡鍚嶇О" type="text" class="search-input"></div>
@@ -549,24 +549,28 @@
 
             <div class="hoverCard">
                 <div class="card-details">
-                    <p class="text-title" style="text-align: center;">搴撳尯 {{area}}</p>
+                    <p class="text-title" style="text-align: center;">搴撳尯 {{areaName}}</p>
                     <div class="text-body" style="display: flex;">
                         <div class="floorSelect">
                             <label for="area01">绔嬪簱</label>
                             <input id="area01" type="radio" name="r" v-model="area" value="1" checked="">
-                            <label for="area02">骞冲簱A鍖�</label>
-                            <input id="area02" type="radio" v-model="area" name="r" value="2">
                             <label for="area03">骞冲簱B鍖�</label>
                             <input id="area03" type="radio" v-model="area" name="r" value="3">
+                            <label for="area032">骞冲簱B鍖�2灞�</label>
+                            <input id="area032" type="radio" v-model="area" name="r" value="32">
                             <label for="area04">骞冲簱C鍖�</label>
                             <input id="area04" type="radio" v-model="area" name="r" value="4">
+                            <label for="area042">骞冲簱C鍖�2灞�</label>
+                            <input id="area042" type="radio" v-model="area" name="r" value="42">
                             <label for="area05">骞冲簱D鍖�</label>
                             <input id="area05" type="radio" v-model="area" name="r" value="5">
+                            <label for="area052">骞冲簱D鍖�2灞�</label>
+                            <input id="area052" type="radio" v-model="area" name="r" value="52">
 
                         </div>
                     </div>
                 </div>
-                <button class="card-button">搴撳尯 {{area}}</button>
+                <button class="card-button">搴撳尯 {{areaName}}</button>
             </div>
 
             <div class="hoverCard">
@@ -690,6 +694,7 @@
             pointContainerWidth: 0,
             currentLev: 1,
             area:1,
+            areaName:"绔嬪簱",
             crnList: null,
             crnBox: false,
             crnBoxTop: "0px",
@@ -750,6 +755,29 @@
             area: {
                 deep: true,
                 handler(val) {
+                    if (val == 1){
+                        this.areaName = "绔嬪簱"
+
+                    }else if (val == 3){
+                        this.areaName = "B鍖�"
+                    }
+                    else if (val == 4){
+                        this.areaName = "C鍖�"
+                    }
+                    else if (val == 5){
+                        this.areaName = "D鍖�"
+                    }
+                    else if (val == 32){
+                        this.areaName = "B鍖�2灞�"
+                    }
+                    else if (val == 42){
+                        this.areaName = "C鍖�2灞�"
+                    }
+                    else if (val == 52){
+                        this.areaName = "D鍖�2灞�"
+                    }
+
+
                     this.init()
                     if (this.searchMatnr != ""
                         || this.searchOrderNo != ""
@@ -773,7 +801,6 @@
                     headers: {'token': localStorage.getItem('token')},
                     method: "get",
                     success: (data) => {
-                        console.log(data)
                         that.importDataClick(data)
                     }
                 })
@@ -813,7 +840,7 @@
                 //鑾峰彇鐪熷疄搴撲綅琛屽彿锛岄�氳繃鍧愭爣x
                 let data = this.map
                 let rowData = data[x]
-                console.log(x)
+
 
                 for (var i = 1; i < rowData.length; i++) {
 
@@ -822,10 +849,16 @@
                             let locNo = rowData[i].locNo;
                             return "#" + parseInt(locNo.substr(0, 2));
                         }
-                    }else {
+                    }else if (this.area > 10){
                         if (rowData[i].locNo != undefined) {
                             let locNo = rowData[i].locNo;
-                            return "#" + parseInt(locNo.substr(7, 2));;
+                            return "#" + parseInt(locNo.substr(8, 2));
+                        }
+                    }
+                    else {
+                        if (rowData[i].locNo != undefined) {
+                            let locNo = rowData[i].locNo;
+                            return "#" + parseInt(locNo.substr(7, 2));
                         }
                     }
 

--
Gitblit v1.9.1