浏览代码

fix: 平板bug修改

chenzhen2 2 年之前
父节点
当前提交
9f17098973

+ 12 - 11
src/views/envmonitor/components/Map/SpaceBox.vue

@@ -11,16 +11,17 @@
     <div class="space-box">
     <div class="space-box">
       <template v-if="spaceData && spaceData.length">
       <template v-if="spaceData && spaceData.length">
         <div
         <div
-        class="space-item"
-        :class="activeSpace.spaceId == item.spaceId ? 'space-active-item' : ''"
-        :key="'spaceItem' + index"
-        @click="changeSpace(item, index)"
-        v-for="(item, index) in spaceData"
-      >
-        <span> {{ item.spaceName }}</span>
-      </div>
+          class="space-item"
+          :class="
+            activeSpace.spaceId == item.spaceId ? 'space-active-item' : ''
+          "
+          :key="'spaceItem' + index"
+          @click="changeSpace(item, index)"
+          v-for="(item, index) in spaceData"
+        >
+          <span> {{ item.spaceName }}</span>
+        </div>
       </template>
       </template>
-      
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
@@ -102,7 +103,7 @@ export default defineComponent({
       },
       },
       // 搜索
       // 搜索
       onSearch() {
       onSearch() {
-        proxyData.queryWorkSpace()
+        proxyData.queryWorkSpace();
       },
       },
       // 取消搜索
       // 取消搜索
       onCancel() {},
       onCancel() {},
@@ -111,7 +112,7 @@ export default defineComponent({
     watch(
     watch(
       props,
       props,
       (newProps: any) => {
       (newProps: any) => {
-        proxyData.spaceData = newProps.spaceData;
+        proxyData.spaceData = JSON.parse(JSON.stringify(newProps.spaceData));
         proxyData.activeSpace = newProps.spaceInfo;
         proxyData.activeSpace = newProps.spaceInfo;
       },
       },
       {
       {

+ 20 - 2
src/views/envmonitor/components/Map/index.vue

@@ -1,5 +1,6 @@
 <template>
 <template>
   <div class="map-home map-home-pading">
   <div class="map-home map-home-pading">
+    <!-- <div class="map-title">可调空间</div> -->
     <div class="map-top">
     <div class="map-top">
       <span :class="type == 1 ? 'span-active' : ''" @click="checkMapType(1)"
       <span :class="type == 1 ? 'span-active' : ''" @click="checkMapType(1)"
         >列表</span
         >列表</span
@@ -123,7 +124,7 @@ export default defineComponent({
           .catch(() => {
           .catch(() => {
             proxyData.showMap = false;
             proxyData.showMap = false;
           });
           });
-      }
+      },
     });
     });
     onMounted(() => {
     onMounted(() => {
       proxyData.getMapInfo();
       proxyData.getMapInfo();
@@ -153,14 +154,31 @@ export default defineComponent({
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
   background: $elBg;
   background: $elBg;
-  .map-top {
+  .map-title {
     position: fixed;
     position: fixed;
     padding-top: 5px;
     padding-top: 5px;
+    padding-left: 20px;
     width: 160px;
     width: 160px;
     left: 0px;
     left: 0px;
     top: 30%;
     top: 30%;
     z-index: 333;
     z-index: 333;
     border-radius: 10px;
     border-radius: 10px;
+    font-family: "PingFang SC";
+    font-style: normal;
+    font-weight: 500;
+    font-size: 18px;
+    line-height: 31px;
+    /* identical to box height */
+    color: #646C73;
+  }
+  .map-top {
+    position: fixed;
+    padding-top: 5px;
+    width: 160px;
+    right: 0px;
+    top: 30%;
+    z-index: 333;
+    border-radius: 10px;
     span {
     span {
       width: 80px;
       width: 80px;
       height: 30px;
       height: 30px;

+ 35 - 8
src/views/envmonitor/components/workOvertime/index.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="work-content">
   <div class="work-content">
     <div class="work-space">
     <div class="work-space">
-      <div class="space-title">尚格云 申请延时</div>
+      <div class="space-title">{{ spaceInfo.spaceName }} 申请延时</div>
       <div class="device-tip">延时期间,空间相关设备会开启</div>
       <div class="device-tip">延时期间,空间相关设备会开启</div>
     </div>
     </div>
     <div class="add-time" id="addTimeId">
     <div class="add-time" id="addTimeId">
@@ -99,6 +99,10 @@ export default defineComponent({
       type: String,
       type: String,
       default: () => "",
       default: () => "",
     },
     },
+    spaceInfo: {
+      type: Object,
+      default: () => {},
+    },
   },
   },
   setup(props, context) {
   setup(props, context) {
     const proxyGlobal: any = getCurrentInstance();
     const proxyGlobal: any = getCurrentInstance();
@@ -140,6 +144,14 @@ export default defineComponent({
         let nowIndex: any = getNowTime()[1];
         let nowIndex: any = getNowTime()[1];
         return nowIndex;
         return nowIndex;
       },
       },
+      // 获取每天真实的下标
+      getTomorrowIndex() {
+        let nowIndex: any = 0;
+        if (proxyData.nowData.week === "今天") {
+          nowIndex = getNowTime()[1];
+        }
+        return nowIndex;
+      },
       // 获取当前位置的坐标
       // 获取当前位置的坐标
       getNowPerstion(timerArr: any) {
       getNowPerstion(timerArr: any) {
         let nowIndex: any = proxyData.getNowIndex();
         let nowIndex: any = proxyData.getNowIndex();
@@ -437,7 +449,7 @@ export default defineComponent({
         let sliderBtnEl: any = document.querySelector("#sliderBtnId");
         let sliderBtnEl: any = document.querySelector("#sliderBtnId");
         let endEnd: any = document.querySelector("#endBoxId");
         let endEnd: any = document.querySelector("#endBoxId");
         let sliderBoxArr: any = document.querySelectorAll(".slider-box");
         let sliderBoxArr: any = document.querySelectorAll(".slider-box");
-        let parseIndex = proxyData.getNowIndex();
+        let parseIndex = proxyData.getTomorrowIndex();
         for (let i = 0; i < sliderBoxArr.length; i++) {
         for (let i = 0; i < sliderBoxArr.length; i++) {
           if (i >= parseIndex) {
           if (i >= parseIndex) {
             sliderBoxArr[i].style.background = "transparent";
             sliderBoxArr[i].style.background = "transparent";
@@ -488,6 +500,7 @@ export default defineComponent({
        */
        */
       setServiceTimerStyle() {
       setServiceTimerStyle() {
         let timerArr: any = proxyData.nowTimerArr;
         let timerArr: any = proxyData.nowTimerArr;
+        // debugger
         let sliderBoxArr: any = document.querySelectorAll(".slider-box");
         let sliderBoxArr: any = document.querySelectorAll(".slider-box");
         for (let i = 0; i < timerArr.length; i++) {
         for (let i = 0; i < timerArr.length; i++) {
           if (timerArr[i].isServiceTime) {
           if (timerArr[i].isServiceTime) {
@@ -596,6 +609,8 @@ export default defineComponent({
       //   }
       //   }
       // },
       // },
       setWorkTimeList() {
       setWorkTimeList() {
+        proxyData.isUpdate = false;
+        proxyGlobal.proxy.$loadinngEnd();
         let data: any = proxyData.workkArr;
         let data: any = proxyData.workkArr;
         proxyData.dateArr = [];
         proxyData.dateArr = [];
         let nowDate: any = formatDate("YYYY-MM-DD");
         let nowDate: any = formatDate("YYYY-MM-DD");
@@ -682,6 +697,7 @@ export default defineComponent({
             timerArr: timerArr,
             timerArr: timerArr,
           });
           });
         }
         }
+        // debugger
         proxyData.dateArr.map((item: any, index: any) => {
         proxyData.dateArr.map((item: any, index: any) => {
           if (index === proxyData.activeIndex) {
           if (index === proxyData.activeIndex) {
             proxyData.checkDate(item, index);
             proxyData.checkDate(item, index);
@@ -714,7 +730,9 @@ export default defineComponent({
         nextTick(() => {
         nextTick(() => {
           proxyData.setOptionnalTime(proxyData.nowTimerArr);
           proxyData.setOptionnalTime(proxyData.nowTimerArr);
           let nowIndex: any = proxyData.getNowIndex();
           let nowIndex: any = proxyData.getNowIndex();
-          proxyData.setPastTime(nowIndex);
+          if (proxyData.nowData.week === "今天") {
+            proxyData.setPastTime(nowIndex);
+          }
           // // 已经被选择的时间
           // // 已经被选择的时间
           proxyData.setCheckTimeStyle();
           proxyData.setCheckTimeStyle();
           // // 固定服务时间
           // // 固定服务时间
@@ -821,7 +839,11 @@ export default defineComponent({
         }
         }
         let relNowTime: any = getRelNowTime();
         let relNowTime: any = getRelNowTime();
         let type = "0";
         let type = "0";
-        if (proxyData.nowData.week === "今天" && relNowTime >= startTime && relNowTime <= endTime) {
+        if (
+          proxyData.nowData.week === "今天" &&
+          relNowTime >= startTime &&
+          relNowTime <= endTime
+        ) {
           type = "2";
           type = "2";
         }
         }
 
 
@@ -996,12 +1018,13 @@ export default defineComponent({
         saveBatchCustomScene(formTimerArr)
         saveBatchCustomScene(formTimerArr)
           .then((res) => {
           .then((res) => {
             let timer: any = setTimeout(() => {
             let timer: any = setTimeout(() => {
-              proxyGlobal.proxy.$loadinngEnd();
               if (type === 1) {
               if (type === 1) {
                 context.emit("closeWork");
                 context.emit("closeWork");
+                proxyGlobal.proxy.$loadinngEnd();
               } else if (type === 2) {
               } else if (type === 2) {
                 // 删除
                 // 删除
-                proxyData.setWorkTimeList();
+                proxyData.isUpdate = true;
+                // proxyData.setWorkTimeList();
               }
               }
               timer = null;
               timer = null;
               clearTimeout(timer);
               clearTimeout(timer);
@@ -1014,6 +1037,7 @@ export default defineComponent({
           });
           });
       },
       },
       // 删除
       // 删除
+      isUpdate: false, // 删除更新弹窗数据
       triggerDelTime() {
       triggerDelTime() {
         let formTimeArr: any = proxyData.formateDelTimer();
         let formTimeArr: any = proxyData.formateDelTimer();
         if (formTimeArr && formTimeArr.length) {
         if (formTimeArr && formTimeArr.length) {
@@ -1038,8 +1062,10 @@ export default defineComponent({
     watch(props, (newProps: any) => {
     watch(props, (newProps: any) => {
       proxyData.workkArr = newProps.workkArr;
       proxyData.workkArr = newProps.workkArr;
       proxyData.projectId = newProps.projectId;
       proxyData.projectId = newProps.projectId;
-      // console.log("数据更新了")
-      // proxyData.setWorkTimeList();
+      if (proxyData.isUpdate) {
+        console.log("数据更新了");
+        proxyData.setWorkTimeList();
+      }
       // proxyData.getWorkTimeList();
       // proxyData.getWorkTimeList();
     });
     });
     onMounted(() => {
     onMounted(() => {
@@ -1134,6 +1160,7 @@ export default defineComponent({
 
 
     .date-item-active {
     .date-item-active {
       background: rgba(206, 159, 39, 0.4);
       background: rgba(206, 159, 39, 0.4);
+      border: 1px solid rgba(206, 159, 39, 0.4);
     }
     }
   }
   }
 
 

+ 14 - 2
src/views/envmonitor/detail.vue

@@ -518,8 +518,15 @@ export default defineComponent({
           ],
           ],
           yAxis: [
           yAxis: [
             {
             {
-              name: "",
+              name: "",
               type: "value",
               type: "value",
+              nameGap: 12, // y轴name与横纵坐标轴线的间距
+              // nameLocation: "left", // y轴name处于y轴的什么位置
+              nameTextStyle: {
+                color: "#9FA9BC",
+                padding : [0, 25, 0, 0],
+                // margin : [5, 0, 0, -20],
+              },
               axisTick: {
               axisTick: {
                 show: false,
                 show: false,
               },
               },
@@ -540,7 +547,12 @@ export default defineComponent({
               },
               },
             },
             },
             {
             {
-              name: "",
+              name: "%  ",
+              nameGap: 12, // y轴name与横纵坐标轴线的间距
+              nameTextStyle: {
+                color: "#9FA9BC",
+                padding : [0, 0, 0, 40],
+              },
               type: "value",
               type: "value",
               axisTick: {
               axisTick: {
                 show: false,
                 show: false,

+ 1 - 0
src/views/envmonitor/index.vue

@@ -186,6 +186,7 @@
     >
     >
       <work-overtime
       <work-overtime
         v-if="isShowWork"
         v-if="isShowWork"
+        :spaceInfo="spaceInfo"
         @closeWork="closeWork"
         @closeWork="closeWork"
         :projectId="projectId"
         :projectId="projectId"
         :workkArr="workkArr"
         :workkArr="workkArr"