Browse Source

fix: 平板跳转的bug修改

chenzhen2 2 years ago
parent
commit
43eadd01f3
3 changed files with 28 additions and 21 deletions
  1. 1 1
      src/router/index.ts
  2. 26 19
      src/views/envmonitor/index.vue
  3. 1 1
      src/views/home/index.vue

+ 1 - 1
src/router/index.ts

@@ -157,7 +157,7 @@ export const constantRoutes: Array<RouteRecordRaw> = [
     name: 'choiceSpace',
     meta: {
       title: '选择办公空间',
-      toName: "choiceProject",
+      // toName: "choiceProject",
       color: '#F5F5F5',
       hideHeader: false
     }

+ 26 - 19
src/views/envmonitor/index.vue

@@ -11,13 +11,20 @@
   >
     <div class="main-left">
       <div class="left-top">
-        <img class="logo-icon" v-if="logImg" :src="logImg" alt="" />
-        <img
-          class="logo-icon"
-          v-else
-          :src="parseImgUrl('ipdImages', 'shangeyun_logo.svg')"
-          alt=""
-        />
+        <div
+          class="logo-box"
+          @touchstart="gtouchstart"
+          @touchmove="gtouchmove()"
+          @touchend="showDeleteButton"
+        >
+          <img class="logo-icon" v-if="logImg" :src="logImg" alt="" />
+          <img
+            class="logo-icon"
+            v-else
+            :src="parseImgUrl('ipdImages', 'shangeyun_logo.svg')"
+            alt=""
+          />
+        </div>
         <div class="left-time">
           <span>{{ nowDate }} </span>
           <span>{{ nowWeek }}</span>
@@ -40,11 +47,7 @@
       </div>
       <div class="left-space">
         <div class="text">
-          <div
-            @touchstart="gtouchstart"
-            @touchmove="gtouchmove()"
-            @touchend="showDeleteButton"
-          >
+          <div>
             {{ officeData.localName }}
           </div>
           <div
@@ -1638,12 +1641,12 @@ export default defineComponent({
         proxyData.padNumber = 0;
         // proxyData.roomType = "";
         // 获取场景配置
-        proxyData.querySpaceSceneConfig();
-        // 查询加班记录
-        proxyData.queryCustomAndScenceTimer(0);
         proxyData.timerSpaceInfo(0);
         // 获取空间下的设备信息
         proxyData.getEquipments();
+        proxyData.querySpaceSceneConfig();
+        // 查询加班记录
+        proxyData.queryCustomAndScenceTimer(0);
         proxyData.setTime();
         // 定时获取空间模式
         // proxyData.getSpaceModeTimer()
@@ -1773,7 +1776,7 @@ export default defineComponent({
       gtouchstart() {
         proxyData.timeOutEvent = setTimeout(function () {
           proxyData.longPress();
-        }, 500); //这里设置定时器,定义长按500毫秒触发长按事件
+        }, 10000); //这里设置定时器,定义长按500毫秒触发长按事件
         return false;
       },
       //手释放,如果在500毫秒内就释放,则取消长按事件,此时可以执行onclick应该执行的事件
@@ -1794,8 +1797,8 @@ export default defineComponent({
         //执行长按要执行的内容,如弹出菜单
         // console.log("长按");
         router.push({
-          name: "choiceSpace",
-          query: { id: proxyData.projectId },
+          name: "home",
+          query: { mac: proxyData.userInfo.mac },
         });
       },
     });
@@ -1819,10 +1822,10 @@ export default defineComponent({
       proxyData.defaultSpace = {
         spaceId: spaceId,
       };
-      proxyData.getWeather();
       proxyData.init();
       // 获取当前平板绑定的空间
       proxyData.queryWorkSpace();
+      proxyData.getWeather();
     });
     return {
       ...toRefs(proxyData),
@@ -1858,6 +1861,10 @@ export default defineComponent({
       white-space: nowrap;
       text-overflow: ellipsis;
       -o-text-overflow: ellipsis;
+      .logo-box {
+        display: inline-block;
+        vertical-align: middle;
+      }
       .left-time {
         span {
           font-family: "Montserrat";

+ 1 - 1
src/views/home/index.vue

@@ -107,7 +107,7 @@ export default defineComponent({
     console.log(to);
     console.log(from);
     // next()
-    if (from.name !== "choiceProject") {
+    if (from.name !== "envmonitor") {
       next((e: any) => {
         console.log(e);
         e.queryWorkSpace();