فهرست منبع

fix: 平板的bug修改

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

+ 3 - 0
src/views/choiceSpace/choiceSpace.vue

@@ -408,6 +408,9 @@ export default defineComponent({
         proxyData.checkPositon.floorId = item.id;
         proxyData.checkPositon.floorName = item.localName;
         proxyData.show = false;
+        nextTick(() => {
+            proxyData.setPageScroolTop();
+          });
         proxyData.clearSearchName();
         proxyData.getPadSpaceList();
       },

+ 2 - 1
src/views/envmonitor/components/Curtain.vue

@@ -307,6 +307,7 @@ export default defineComponent({
 
 .curtain-top {
   padding-left: 20px;
+  min-height: 130px;
   //padding-bottom: 30px;
   display: flex;
   justify-content: space-between;
@@ -327,7 +328,7 @@ export default defineComponent({
 
 .curtain-right {
   position: relative;
-  width: 92px;
+  width: 110px;
   text-align: center;
 
   img {

+ 13 - 0
src/views/envmonitor/components/Scenario/ScenarioConfig.vue

@@ -76,7 +76,20 @@ export default defineComponent({
         // debugger
         proxyData.scenarioArr.map((item: any) => {
           item.img = proxyData.scenarioImgArr[item.sceneType];
+          if (item.sceneType === "DISCUSSING") {
+            item.order = 1;
+          } else if (item.sceneType === "PROJECTING") {
+            item.order = 2;
+          } else if (item.sceneType === "ADJOURNMENT") {
+            item.order = 3;
+          } else {
+            item.order = 4;
+          }
         });
+        // 数组排序
+        proxyData.scenarioArr = proxyData.scenarioArr.sort(
+          (a: any, b: any) => a.order - b.order
+        );
       },
       // 切换场景
       handleScene(item: any) {

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

@@ -24,7 +24,7 @@
         </div>
         <div class="weixiin" @click="showContact">
           <img :src="parseImgUrl('ipdImages', 'weixin.svg')" />
-          <span> 联系客</span>
+          <span> 联系客</span>
         </div>
       </div>
       <div class="left-space">
@@ -47,7 +47,7 @@
               v-if="officeData.isPassengerPass"
             />
             <img
-              :src="parseImgUrl('ipdImages', 'vector')"
+              :src="parseImgUrl('ipdImages', 'vector.svg')"
               v-if="!officeData.isPassengerPass"
             />
             <span v-if="officeData.isPassengerPass">有人</span>
@@ -1632,6 +1632,10 @@ export default defineComponent({
         proxyData.spaceData.map((item: any) => {
           item.active = false;
         });
+        proxyData.roomType = "";
+         //  切换空间的时候把加班按钮平板
+         proxyData.setForceOverTimeFlag(false)
+        proxyData.isWork = false;
       },
       // 更多空间
       isShowMap: false,
@@ -1666,8 +1670,6 @@ export default defineComponent({
         proxyData.clearTimerSpaceInfo();
         // 重置当前选中空间的状态
         proxyData.resetSpaceStatus();
-        proxyData.roomType = "";
-        proxyData.isWork = false;
         proxyData.spaceInfo = item;
         proxyData.init();
         if (type === 1) {