فهرست منبع

fix: 日历表调整

chenzhen2 2 سال پیش
والد
کامیت
175d2b3b80

+ 26 - 0
src/views/envmonitor/components/Map/index.vue

@@ -23,6 +23,7 @@ import { useStore } from "@/store";
 import { login } from "@/apis/user";
 import { Form, Field, CellGroup, Button, Toast } from "vant";
 import { setToken } from "@/utils/cookies";
+import { getMapInfo } from "@/apis/envmonitor";
 
 export default defineComponent({
   props: {
@@ -30,6 +31,14 @@ export default defineComponent({
       type: Array,
       default: () => [],
     },
+    projectId: {
+      type: String,
+      default: () => "",
+    },
+    spaceInfo: {
+      type: Object,
+      default: () => {},
+    }
   },
   components: {
     vanForm: Form,
@@ -47,6 +56,22 @@ export default defineComponent({
       changeSpace(item: any) {
         contex.emit("changeSpace", item, 1);
       },
+      /**
+       * 获取地图信息
+       */
+      getMapInfo() {
+        let params: any = {
+          // projectId: props.projectId,
+          // floorId: proxyData.floorItem.id,
+        };
+        getMapInfo(params)
+          .then((res) => {
+            let resData: any = res;
+            if (resData.result === "success") {
+            }
+          })
+          .catch(() => {});
+      },
     });
     onMounted(() => {});
     watch(
@@ -69,6 +94,7 @@ export default defineComponent({
 .map-home {
   width: 100%;
   height: 100%;
+  background: $elBg;
 }
 </style>
   

+ 16 - 24
src/views/envmonitor/components/workOvertime/index.vue

@@ -174,11 +174,18 @@ export default defineComponent({
       setOptionnalTime(timerArr: any) {
         let sliderList: any = document.querySelector("#sliderListId");
         let slidersWrapper: any = document.querySelector("#slidersWrapperId");
-        sliderList.style.width =
-          slidersWrapper.offsetWidth * timerArr.length + "px";
+        let sliderWidth: any = slidersWrapper.getBoundingClientRect().width;
+        sliderList.style.width = sliderWidth * timerArr.length + "px";
         let index: any = proxyData.getNowPerstion(timerArr).nowIndex;
         let len: any = proxyData.getNowPerstion(timerArr).len;
-        let sliderLeft: any = slidersWrapper.offsetWidth * index;
+        let sliderLeft: any = sliderWidth * index;
+        if (
+          sliderLeft >
+          proxyData.screenInfo.screenWidth +
+            proxyData.screenInfo.screenWidth / 2
+        ) {
+          sliderLeft = sliderLeft - sliderWidth;
+        }
         sliderList.style.left = -sliderLeft + "px";
         proxyData.setOptionnalPerstion(index, len);
       },
@@ -422,6 +429,8 @@ export default defineComponent({
         proxyData.startLen = len;
         proxyData.endIndex = proxyData.startIndex + len;
         let slidersWrapper: any = document.querySelector("#slidersWrapperId");
+        let slidersWrapperWidth: any =
+          slidersWrapper.getBoundingClientRect().width;
         let sliderBtnEl: any = document.querySelector("#sliderBtnId");
         let endEnd: any = document.querySelector("#endBoxId");
         let sliderBoxArr: any = document.querySelectorAll(".slider-box");
@@ -437,26 +446,9 @@ export default defineComponent({
             index + i
           ].style.background = `linear-gradient(0deg, rgba(0, 255, 163, 0.2), rgba(0, 255, 163, 0.2)), url(${bg})`;
         }
-        sliderBtnEl.style.width =
-          slidersWrapper.offsetWidth * len +
-          (len * 1) / 2 +
-          endEnd.offsetWidth / 2 -
-          7 +
-          "px";
+        sliderBtnEl.style.width = slidersWrapperWidth * len + "px";
         sliderBtnEl.style.background = `rgba(0,0,0,0.2)`;
-        let left: any = slidersWrapper.offsetWidth * index;
-        if (document.body.clientWidth >= 960) {
-          left = left - (index * 1) / 2;
-        }
-        // alert(left)
-        // alert( slidersWrapper.offsetWidth)
-        // let sliderLeft: any = isNaN(parseInt(sliderList.style.left))
-        //   ? 0
-        //   : parseInt(sliderList.style.left);
-        // sliderLeft = Math.abs(sliderLeft);
-        // if (sliderLeft > proxyData.screenInfo.screenWidth) {
-        //   left = left - 5;
-        // }
+        let left: any = slidersWrapperWidth * index;
         sliderBtnEl.style.left = left + "px";
         // // 已被选择的时间
         proxyData.setCheckTimeStyle();
@@ -1160,7 +1152,7 @@ export default defineComponent({
 
       .start {
         position: absolute;
-        width: 3px;
+        width: 2px;
         top: 0;
         height: 100px;
         left: 0px;
@@ -1181,7 +1173,7 @@ export default defineComponent({
           position: absolute;
           top: 0;
           left: 10px;
-          width: 3px;
+          width: 2px;
           height: 100px;
           background: #04b49c;
         }

+ 13 - 2
src/views/envmonitor/index.vue

@@ -179,12 +179,18 @@
     <!--地图数据列表-->
     <van-popup
       v-model:show="isShowMap"
+      class="map-popup"
       position="bottom"
       style="width: 100%; height: 50%"
       :close-on-click-overlay="true"
       teleport="#app"
     >
-      <com-map :spaceData="spaceData" @changeSpace="changeSpace"></com-map>
+      <com-map
+        :spaceData="spaceData"
+        :spaceId="spaceInfo.spaceId"
+        :projectId="projectId"
+        @changeSpace="changeSpace"
+      ></com-map>
     </van-popup>
   </div>
 </template>
@@ -1502,7 +1508,7 @@ export default defineComponent({
               column: "isMajorSpace", //类型:String  必有字段  备注:无
               asc: false, //类型:Boolean  必有字段  备注:无
             },
-          ]
+          ],
         };
         queryWorkSpace(params).then((res) => {
           let resData: any = res;
@@ -1946,4 +1952,9 @@ export default defineComponent({
   }
 }
 </style>
+<style lang="scss">
+.map-popup {
+  background: $elBg;
+}
+</style>