瀏覽代碼

fix:pad相关的页面bug修改

chenzhen2 1 年之前
父節點
當前提交
c276abe550

+ 2 - 2
src/App.vue

@@ -9,7 +9,7 @@
       :class="!route.meta.hideHeader ? 'ptheader' : ''"
       :style="{ background: route.meta.color }"
     />
-    <router-view :key="route.fullPath" v-if="isRouterAlive" />
+    <router-view :key="route.fullPath + 'f'" />
   </div>
 </template>
 
@@ -81,7 +81,7 @@ export default defineComponent({
       clearInterval(proxyData.itervel);
     });
     onMounted(() => {
-      proxyData.timerPadVersion();
+      // proxyData.timerPadVersion();
     });
     return {
       ...toRefs(proxyData),

+ 1 - 0
src/main.ts

@@ -8,6 +8,7 @@ import '@/utils/flexible.js'
 import '@/styles/index.scss'
 import { Toast, Icon, Tab, Tabs, Loading, Popup } from 'vant'
 import '@/permission'
+import 'default-passive-events'
 
 const app = createApp(App)
 

+ 1 - 1
src/router/index.ts

@@ -165,7 +165,7 @@ export const constantRoutes: Array<RouteRecordRaw> = [
   },
   {
     path: '/set-main-space',
-    component: () => SetMainSpace,
+    component: SetMainSpace,
     name: 'setMainSpace',
     meta: {
       title: '设置主空间',

+ 1 - 1
src/views/choiceSpace/choiceProject.vue

@@ -9,7 +9,7 @@
     <div class="choice-content">
       <div
         class="choice-item"
-        :key="index"
+        :key="index+''+item.localName"
         @click="goCheckSpace(item)"
         v-for="(item, index) in projects"
       >

+ 2 - 1
src/views/choiceSpace/choiceSpace.vue

@@ -32,7 +32,7 @@
           class="space-box"
           :id="'space' + index"
           v-for="(item, index) in spaceData"
-          :key="'space' + index"
+          :key="'space' + item.spaceId"
         >
           <div class="space-item">
             <span class="item-text">
@@ -324,6 +324,7 @@ export default defineComponent({
       },
       // 格式工作办公数据
       formataWorkData() {
+        // debugger
         let data: any = proxyData.spaceData.filter((item: any) => {
           return item.checked;
         });

+ 1 - 1
src/views/choiceSpace/setMainSpace.vue

@@ -4,7 +4,7 @@
       class="space-item"
       @click="checkMainSpace(item)"
       v-for="(item, index) in spaceData"
-      :key="'space' + index"
+      :key="'spaceMain' + index"
     >
       <van-swipe-cell>
         <van-cell :border="false" :title="item.spaceName" />

+ 2 - 2
src/views/envmonitor/NavBar.vue

@@ -6,7 +6,7 @@
            v-for="(item,index) in navData"
            v-show="index<3 && item.noShow"
            @click="checkNav(item,index)"
-           :key="'nav'+index"
+           :key="'navC'+index"
       >
         <img :src="item.activeImg" v-if="activeCode===item.code" alt="">
         <img :src="item.img" v-else alt="">
@@ -18,7 +18,7 @@
            v-for="(item,index) in navData"
            v-show="index>=3 && item.noShow"
            @click="checkNav(item,index)"
-           :key="'nav'+index"
+           :key="'navR'+index"
       >
         <img :src="item.activeImg" v-if="activeCode===item.code" alt="">
         <img :src="item.img" v-else alt="">

+ 1 - 1
src/views/envmonitor/components/Map/MapBox.vue

@@ -108,7 +108,7 @@
     >
       <div
         class="buiding-item"
-        :key="item.id"
+        :key="item.id+'X'"
         :class="buildingItem.buildingId === item.id ? 'active' : ''"
         @click.stop="comfirmBuilding(item)"
         v-for="item in buildingData"

+ 1 - 1
src/views/envmonitor/components/Scenario/Scenario.vue

@@ -6,7 +6,7 @@
         class="scenario-item"
         @click="handleScene(item, index)"
         :class="item.code === activeIndex ? 'active' : ''"
-        :key="index"
+        :key="index+'scenario'"
         v-for="(item, index) in popList"
       >
         <img :src="parseImgUrl('page-officehome', item.img)" alt="" />

+ 1 - 1
src/views/envmonitor/components/workOvertime/index.vue

@@ -10,7 +10,7 @@
           class="date-item"
           :class="item.isActive ? 'date-item-active' : ''"
           @click.stop="checkDate(item, index)"
-          :key="'date' + index"
+          :key="'dater' + index"
           v-for="(item, index) in dateArr"
         >
           <span>{{ item.week }}</span>

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

@@ -193,7 +193,6 @@
           (officeData.temperature || spaceExistenceDevice.airConditioner)
         "
         id="airId"
-        key="airId"
         @triggerWork="triggerWork"
         :forceOverTimeFlag="forceOverTimeFlag"
         @updateAirTemp="updateAirTemp"
@@ -214,7 +213,6 @@
         @triggerWork="triggerWork"
         @showLightColorCtrol="showLightColorCtrol"
         id="lightId"
-        key="lightId"
         :userIsControl="userIsControl"
         :spaceId="spaceInfo.spaceId"
         :projectId="projectId"
@@ -222,7 +220,6 @@
       <Curtain
         :spaceId="spaceInfo.spaceId"
         id="curtainId"
-        key="curtainId"
         :userIsControl="userIsControl"
         v-if="spaceExistenceDevice.curtain"
         :projectId="projectId"

+ 1 - 1
src/views/envmonitor/index1.vue

@@ -100,7 +100,7 @@
                 class="house-col"
                 v-for="(item,index) in realEevList"
                 @click="handleDetail(item)"
-                :key="'env'+index"
+                :key="'Renv'+index"
               >
                 <template v-if="item.num">
                   <p>{{ item.name }}</p>

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

@@ -79,25 +79,21 @@ import {
   getUserInfo,
   newNumber,
   parseImgUrl,
-  setLocalProjectId,
   setQueryConfig,
 } from "@/utils";
-import { UserActionTypes } from "@/store/modules/user/action-types";
 import { store, useStore } from "@/store";
 import { login } from "@/apis/user";
 import { Form, Field, CellGroup, Button, Toast } from "vant";
 import { getCookieMac, setToken } from "@/utils/cookies";
 import { getPadQrCodeStatus, queryWorkSpace } from "@/apis/envmonitor";
-import { getUrlParams } from "@/utils/https";
 import { UserMutationTypes } from "@/store/modules/user/mutation-types";
-import router from "@/router";
 
 export default defineComponent({
   components: {
     QrcodeVue,
     vanForm: Form,
     vanField: Field,
-    CellGroup,
+    CellGroup:CellGroup,
     vanButton: Button,
   },
   beforeRouteEnter(to, from, next) {

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

@@ -27,7 +27,7 @@
         "
         :src="parseImgUrl('map-icon', 'device.svg')"
         alt=""
-        :key="index"
+        :key="index+'mapi'"
         v-for="(item, index) in spaceList"
       />
     </canvas>