Selaa lähdekoodia

fix: pad的样式优化

chenzhen2 2 vuotta sitten
vanhempi
commit
51d6825ed2

+ 10 - 0
src/router/index.ts

@@ -185,6 +185,16 @@ export const constantRoutes: Array<RouteRecordRaw> = [
     }
   },
   {
+    path: '/map-data-old',
+    component: () => import('@/views/mapData/indexOld.vue'),
+    name: 'mapDataold',
+    meta: {
+      title: '处理地图数据',
+      color: '#F5F5F5',
+      hideHeader: false
+    }
+  },
+  {
     path: '/map-data-new',
     component: () => import('@/views/mapDataNew/index.vue'),
     name: 'mapDataNew',

+ 3 - 0
src/views/envmonitor/components/Air/manualIndex.vue

@@ -1009,6 +1009,9 @@ export default defineComponent({
     font-size: 12px;
     .text {
       padding-top: 5px;
+      font-style: normal;
+      font-weight: 600;
+      font-size: 11px;
     }
     .number {
       span {

+ 3 - 0
src/views/envmonitor/components/Map/MapBox.vue

@@ -279,6 +279,9 @@ export default defineComponent({
             //计算指针距离元素边框的位置
             disX = startX - el.offsetLeft;
             disY = startY - el.offsetTop;
+            console.log( el.offsetLeft)
+            console.log(el.offsetTop)
+            console.log(e.touches[0].pageX)
           },
           { passive: true }
         );

+ 4 - 3
src/views/envmonitor/index.vue

@@ -69,7 +69,7 @@
           </div> -->
         </div>
         <div class="space-info">
-          <div class="space-temp">
+          <div class="space-temp" >
             <img :src="parseImgUrl('ipdImages', 'template-icon.svg')" alt="" />
             <span class="temp-text">温度</span>
             <span class="temp-num" v-if="officeData.temperature"
@@ -83,6 +83,7 @@
             :style="[
               { background: item.bgColor ? item.bgColor : '' },
               { opacity: item.bgColor ? 0.8 : '' },
+              { paddingLeft: index == 0 && item.bgColor ? '15px' : '' },
             ]"
             :class="[
               index == 1 ? 'env-color' : '',
@@ -497,7 +498,7 @@ export default defineComponent({
         img: "jiaquan.svg",
         funcid: "HCHO",
         code: "jiaquan",
-        unit: "mg/",
+        unit: "mg/",
       },
       {
         id: 0,
@@ -2030,7 +2031,7 @@ export default defineComponent({
       padding-top: 6vh;
       .space-temp {
         padding-bottom: 13px;
-        border-bottom: 0.5px solid rgba(255, 255, 255, 0.4);
+        // border-bottom: 0.5px solid rgba(255, 255, 255, 0.4);
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;

+ 44 - 7
src/views/mapData/indexOld.vue

@@ -102,23 +102,60 @@ export default defineComponent({
         result = result.replace(/\"/g, "");
         let nameArr: any = name.split("-");
         let arr: any = result.split(/[(\r\n)\r\n]+/);
-        let p: any = localStorage.getItem("ponit");
-        let objArr: any = JSON.parse(p) || {};
         let pointObj: any = {
           spaceId: nameArr[0].toString(),
+          localName:nameArr[0].toString(),
+          canClick:true,
           pointArr: [],
-          circularPoints: [],
+          devicePoint: [],
+          circlePoint: [],
           logPointArr: [],
         };
+
+        // debugger
         arr.map((item: any, index: any) => {
           if (item) {
             let itemArr: any = item.split(",");
+            let obj: any = {
+              left: itemArr[0],
+              top: itemArr[1],
+            };
+            if (nameArr[1]) {
+              pointObj.circlePoint.push(obj);
+            } else {
+              if (index <= 1) {
+                pointObj.logPointArr.push(obj);
+              } else if (index <= 4) {
+                pointObj.devicePoint.push(obj);
+              } else {
+                pointObj.pointArr.push(obj);
+              }
+            }
           }
         });
-
-        proxyData.allObj.objArr = objArr;
-        localStorage.setItem("ponit", JSON.stringify(proxyData.allObj.objArr));
-        proxyData.initCanvas();
+        let str: any = localStorage.getItem("spaceList");
+        let spaceList: any = str ? JSON.parse(str) : [];
+        let flag: any = false;
+        spaceList.map((item: any) => {
+          if (nameArr[1] && item.spaceId === nameArr[1]) {
+            item.circlePoint = pointObj.circlePoint;
+            flag = true;
+          } else {
+           if( item.spaceId === nameArr[0]){
+            // debugger
+            // pointObj.circlePoint = item.circlePoint;
+            item.logPointArr = pointObj.logPointArr;
+            item.devicePoint = pointObj.devicePoint;
+            item.pointArr = pointObj.pointArr;
+            flag = true;
+           }
+          }
+        });
+        if (!flag) {
+          spaceList.push(pointObj);
+        }
+        localStorage.setItem("spaceList", JSON.stringify(spaceList));
+        console.log(spaceList);
       },
       // 处理坐标
       handleStr(mapstr: any) {

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1115 - 209
src/views/mapDataNew/sichuan.vue