From d14cfd26c49bae091b84e90142b04ec0067c82bb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 25 五月 2023 16:29:10 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index 8176b69..6cee423 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -31,6 +31,50 @@
             color: #fff;
         }
 
+        /*.pointBox {*/
+        /*    background: #bababa;*/
+        /*    width: 40px;*/
+        /*    height: 40px;*/
+        /*    margin-right: 1px;*/
+        /*    display: flex;*/
+        /*    justify-content: center;*/
+        /*    align-items: center;*/
+        /*    font-size: 14px;*/
+        /*    user-select: none;*/
+        /*    color: #fff;*/
+        /*    transform: perspective(70px) rotateX(30deg) translateZ(-10px);*/
+        /*    box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.3);*/
+        /*}*/
+
+        /*.pointBox {*/
+        /*    width: 100px;*/
+        /*    height: 100px;*/
+        /*    transform-style: preserve-3d;*/
+        /*    transform: rotateX(45deg) rotateY(45deg);*/
+        /*    box-shadow: -5px 5px 5px rgba(0,0,0,0.5);*/
+        /*    background: #e5e5e5;*/
+        /*    position: relative;*/
+        /*}*/
+
+        /*.pointBox:before, .cube:after {*/
+        /*    content: "";*/
+        /*    position: absolute;*/
+        /*    top: 0;*/
+        /*    left: 0;*/
+        /*    right: 0;*/
+        /*    bottom: 0;*/
+        /*    background: inherit;*/
+        /*    box-shadow: inherit;*/
+        /*}*/
+
+        /*!*.pointBox:before {*!*/
+        /*!*    transform: rotateY(90deg);*!*/
+        /*!*}*!*/
+
+        /*!*.pointBox:after {*!*/
+        /*!*    transform: rotateX(90deg);*!*/
+        /*!*}*!*/
+
         .pointBox:hover{
             background: #00ff7f;
         }
@@ -676,9 +720,6 @@
                     headers: {'token': localStorage.getItem('token')},
                     method: "get",
                     success: (data) => {
-                        console.log("========")
-                        console.log(data)
-                        console.log("========")
                         that.importDataClick(data)
                     }
                 })
@@ -690,9 +731,6 @@
                 this.mapData = JSON.stringify(this.map)
             },
             importDataClick(mapData) {
-                console.log("========")
-                console.log(mapData)
-                console.log("========")
                 let tmp = JSON.parse(mapData);
                 let data = []
                 tmp.forEach((item, index) => {
@@ -1114,11 +1152,18 @@
                                 let locNo = item.locNo
                                 let y = parseInt(locNo.substr(2,3))
                                 let x = parseInt(locNo.substr(0,2))
-                                if (x >= 2 && x <= 12) {
-                                    x += 1;
-                                }else if (x == 13) {
-                                    x += 2;
+                                console.log(x)
+                                // if ( (x+2) %5 === 0 ) {
+                                //     x = 5*item.crnNo-2;
+                                // }else
+                                if(x<17){
+                                    if (x % 4 == 0 || (x+1) % 4 == 0){
+                                        x = item.crnNo+x
+                                    }else {
+                                        x = item.crnNo+x-1
+                                    }
                                 }
+                                console.log(x)
 
                                 tmp[x][y].searchStatus = true//鎼滅储鏍囪
                             })

--
Gitblit v1.9.1