Prechádzať zdrojové kódy

fix: 项目id切换bug处理

chenzhen2 2 rokov pred
rodič
commit
562aeac8ed

+ 27 - 33
src/apis/envmonitor.ts

@@ -6,7 +6,7 @@ import { getUserInfo, setQueryConfig } from '@/utils'
 import { duoduoenvService, objectService, setupService, testApi, weachatService } from '@/config'
 
 const comInfo = getUserInfo()
-const comParams: string = setQueryConfig(comInfo)
+const comParams: string = ""
 
 // https://sagacare-h5.tenants.link/api/company/config/245e7060643811eb934c0237aedb39a6
 export const getCompanyInfo = (companyInfo: RequestParams) => {
@@ -16,70 +16,65 @@ export const getWeather = (params: string) => {
   return https().request<RootWeatherObject<OutherWeather>>(`${objectService}weather/getCurrent?${params}`, Method.GET, undefined, ContentType.json)
 }
 export const getSpaceInfo = (data: any) => {
-  return https().request<RootWeatherObject<SpaceModel>>(`${duoduoenvService}space/property?${comParams}`, Method.POST, data, ContentType.json)
+  return https().request<RootWeatherObject<SpaceModel>>(`${duoduoenvService}space/property`, Method.POST, data, ContentType.json)
 }
 
 // 获取会议室场景
 export const getMeetingSceneHttp = (params: any) => {
-  return https().request<any>(`${duoduoenvService}meeting/room/scene/getMeetingScene/V2?${comParams}&spaceId=${params.spaceId}`, Method.GET, undefined, ContentType.json)
+  return https().request<any>(`${duoduoenvService}meeting/room/scene/getMeetingScene/V2?spaceId=${params.spaceId}`, Method.GET, undefined, ContentType.json)
 }
 // 获取设备信息
 export const getEquipmentListHttp = (params: any) => {
-  return https().request<any>(`${duoduoenvService}object/equipment/findForServe?${comParams}&spaceId=${params.spaceId}`, Method.POST, undefined, ContentType.json)
+  return https().request<any>(`${duoduoenvService}object/equipment/findForServe?spaceId=${params.spaceId}`, Method.POST, undefined, ContentType.json)
 }
 // 查询定制时间
 export const getSetTimeHttp = (params: any) => {
-  return https().request<any>(`${duoduoenvService}customScene/queryCustom?${comParams}&spaceId=${params.spaceId}`, Method.GET, undefined, ContentType.json)
+  return https().request<any>(`${duoduoenvService}customScene/queryCustom?spaceId=${params.spaceId}`, Method.GET, undefined, ContentType.json)
 }
 //  空调 - 调节文案/空调信息
 export const getFeedbackDocumentsHttp = (data: any) => {
-  return https().request<any>(`${duoduoenvService}custom/feedback/documents?${comParams}`, Method.POST, data, ContentType.json)
+  return https().request<any>(`${duoduoenvService}custom/feedback/documents`, Method.POST, data, ContentType.json)
 }
 
 // 空调调节
 export const changeTempHttp = (params: any) => {
-  return https().request<RootObject<any>>(`${duoduoenvService}custom/feedbackCreate/v2?${comParams}`, Method.POST, params, ContentType.json)
+  return https().request<RootObject<any>>(`${duoduoenvService}custom/feedbackCreate/v2`, Method.POST, params, ContentType.json)
 }
 // 查询灯的状态(优先查采集的状态)
 export const getLampHttp = (params: any) => {
-  return https({ timeout: 1000 }).request<RootObject<any>>(`${duoduoenvService}light/status/query?${comParams}&spaceId=${params.spaceId}`, Method.GET, undefined, ContentType.json)
+  return https({ timeout: 1000 }).request<RootObject<any>>(`${duoduoenvService}light/status/query?spaceId=${params.spaceId}`, Method.GET, undefined, ContentType.json)
 }
 
 // 批量操作 灯
 export const setallLampHttp = (data: any) => {
-  // return https().httpClient.post<Array<any>>(`${duoduoenvService}light/onoff/set?${comParams}`, data)
   return post(`${duoduoenvService}light/onoff/set?${comParams}`, data)
 }
 // 设置窗帘
 export const setEquipeHttp = (data: any) => {
-  // return https().httpClient.post<Array<any>>(`${duoduoenvService}object/eqp/infocode/set?${comParams}`, data)
-  return post(`${duoduoenvService}object/eqp/infocode/set?${comParams}`, data)
+  return post(`${duoduoenvService}object/eqp/infocode/set`, data)
 }
 
 // 指令失败的时候轮询查询灯的状态
 export const getStatusHttp = (data: any) => {
-  // return https().request<RootObject<any>>(`${duoduoenvService}light/onoff/setSatus?${comParams}`, Method.POST, params, ContentType.json)
-  // return https().httpClient.post<Array<any>>(`${duoduoenvService}light/onoff/setSatus?${comParams}`, data)
-  return post(`${duoduoenvService}light/onoff/setSatus?${comParams}`, data)
+  return post(`${duoduoenvService}light/onoff/setSatus`, data)
 }
 
 // 获取窗帘数据列表
 export const getObjectDataEqpGroupHttp = (params: any) => {
-  return https().request<RootObject<any>>(`${duoduoenvService}object/objectDataEqpGroup/query?${comParams}`, Method.POST, params, ContentType.json)
+  return https().request<RootObject<any>>(`${duoduoenvService}object/objectDataEqpGroup/query`, Method.POST, params, ContentType.json)
 }
 
 // 切换场景
 export const switchoverSceneHttp = (params: any) => {
-  return https().request<RootObject<any>>(`${duoduoenvService}meeting/room/scene/switchover?${comParams}`, Method.POST, params, ContentType.json)
+  return https().request<RootObject<any>>(`${duoduoenvService}meeting/room/scene/switchover`, Method.POST, params, ContentType.json)
 }
 
 export const changeSetTimeHttp = (params: any) => {
-  return https().request<RootObject<any>>(`${duoduoenvService}customScene/create?${comParams}`, Method.POST, params, ContentType.json)
+  return https().request<RootObject<any>>(`${duoduoenvService}customScene/create`, Method.POST, params, ContentType.json)
 }
 //  详情页面的图表数据
 export const getChartListHTTP = (params: any) => {
-  // return https().request<RootObject<any>>(`${duoduoenvService}spaceAdjust/queryPropertyData?${comParams}&${params}`, Method.GET, undefined, ContentType.json)
-  return https().request<RootObject<any>>(`/test1/spaceAdjust/queryPropertyData?${comParams}&${params}`, Method.GET, undefined, ContentType.json)
+  return https().request<RootObject<any>>(`/test1/spaceAdjust/queryPropertyData?${params}`, Method.GET, undefined, ContentType.json)
 }
 
 // 查询建筑的信息
@@ -132,35 +127,34 @@ export const permanentSpace = (params: any) => {
  * 获取常驻空间
  */
 export const getPermanentSpace = () => {
-  // return https().request<any>(`${testApi}permanentSpace/query?${comParams}`, Method.GET, undefined, ContentType.json)
-  return https().request<any>(`${setupService}permanentSpace/query?${comParams}`, Method.GET, undefined, ContentType.json)
+  return https().request<any>(`${setupService}permanentSpace/query`, Method.GET, undefined, ContentType.json)
 }
 
 /**
  * 删除常驻空间
  */
 export const delPermanentSpace = (params: any) => {
-  return https().request<any>(`${setupService}permanentSpace/delete?${comParams}&${params}`)
+  return https().request<any>(`${setupService}permanentSpace/delete?${params}`)
 }
 
 /**
  *  获取用户使用权限
  */
 export const getUserControlAuth = () => {
-  return https().request<any>(`${setupService}permanentSpace/queryZJ?${comParams}`, Method.GET, undefined, ContentType.json)
+  return https().request<any>(`${setupService}permanentSpace/queryZJ`, Method.GET, undefined, ContentType.json)
 }
 
 /**
  * 获取空间运行模式
  */
 export const getSpaceMode = () => {
-  return https().request<any>(`${objectService}object/equipment/querySpaceModeSet?${comParams}`, Method.GET, undefined, ContentType.json)
+  return https().request<any>(`${objectService}object/equipment/querySpaceModeSet`, Method.GET, undefined, ContentType.json)
 }
 /**
  * 获取空调设备温度
  */
 export const getSpaceTemp = () => {
-  return https().request<any>(`${objectService}object/equipment/querySpaceTempSet?${comParams}`, Method.GET, undefined, ContentType.json)
+  return https().request<any>(`${objectService}object/equipment/querySpaceTempSet`, Method.GET, undefined, ContentType.json)
 }
 
 /**
@@ -169,14 +163,14 @@ export const getSpaceTemp = () => {
  * @returns 
  */
 export const querySpaceSceneConfig = (params: any) => {
-  return https().request<any>(`${setupService}scene/querySpaceSceneConfig?${comParams}&${params}`, Method.GET, undefined, ContentType.json)
+  return https().request<any>(`${setupService}scene/querySpaceSceneConfig?${params}`, Method.GET, undefined, ContentType.json)
 }
 
 /**
  *  查询加班记录
  */
 export const queryCustomAndScence = (params: any) => {
-  return https().request<any>(`${duoduoenvService}customScene/queryCustomAndScence?${comParams}&${params}`, Method.GET, undefined, ContentType.json)
+  return https().request<any>(`${duoduoenvService}customScene/queryCustomAndScence?${params}`, Method.GET, undefined, ContentType.json)
 }
 
 /**
@@ -184,42 +178,42 @@ export const queryCustomAndScence = (params: any) => {
  * @param params
  */
 export const saveBatchCustomScene = (data: any) => {
-  return post(`${duoduoenvService}customScene/saveBatchCustomScene?${comParams}`, data)
+  return post(`${duoduoenvService}customScene/saveBatchCustomScene`, data)
 }
 
 /**
  *  查询默认位置
  */
 export const getDefaultLocation = (params: any) => {
-  return https().request<any>(`${testApi}padSpace/getDefaultLocation?${comParams}&${params}`, Method.GET, undefined, ContentType.json)
+  return https().request<any>(`${testApi}padSpace/getDefaultLocation?${params}`, Method.GET, undefined, ContentType.json)
 }
 
 /**
  * 查询空间列表
  */
 export const getPadSpaceList = (params: any) => {
-  return https().request<any>(`${testApi}padSpace/getPadSpaceList?${comParams}&${params}`, Method.GET, undefined, ContentType.json)
+  return https().request<any>(`${testApi}padSpace/getPadSpaceList?${params}`, Method.GET, undefined, ContentType.json)
 }
 
 /**
  * 设置成办公空间
  */
 export const saveWorkSpace = (params: any) => {
-  return https().request<any>(`${testApi}padSpace/saveWorkSpace?${comParams}`, Method.POST, params, ContentType.json)
+  return https().request<any>(`${testApi}padSpace/saveWorkSpace`, Method.POST, params, ContentType.json)
 }
 
 /**
  * 查询平板下面的办公空间
  */
 export const queryWorkSpace = (params: any) => {
-  return https().request<any>(`${testApi}padSpace/queryWorkSpace?${comParams}`, Method.POST, params, ContentType.json)
+  return https().request<any>(`${testApi}padSpace/queryWorkSpace`, Method.POST, params, ContentType.json)
 }
 
 /**
  * 查询客户列表
  */
 export const queryCustomerservice = (params: any) => {
-  return https().request<RootObject<any>>(`${weachatService}/wechat-service-duoduoenv/duoduoenv/customerservice/query?${comParams}`, Method.POST, params, ContentType.json)
+  return https().request<RootObject<any>>(`${weachatService}/wechat-service-duoduoenv/duoduoenv/customerservice/query`, Method.POST, params, ContentType.json)
 }
 
 

+ 5 - 5
src/apis/portrait.ts

@@ -9,21 +9,21 @@ import { duoduoenvService } from '@/config'
 const comInfo: any = {}
 comInfo.userId = getUserInfo().userId
 comInfo.projectId = getUserInfo().projectId
-const comParams: string = setQueryConfig(comInfo)
+const comParams: string = ''
 
 //查询 今日新增 排名
 export const queryTotalIntegral = (params: any) => {
-  return https().request<any>(`${duoduoenvService}userIntegral/queryUserMessage?${comParams}&${params}`, Method.GET, undefined, ContentType.json)
+  return https().request<any>(`${duoduoenvService}userIntegral/queryUserMessage?${params}`, Method.GET, undefined, ContentType.json)
 }
 
 // 查询空调使用统计
 export const queryPortraitTempUserTotal = () => {
-  return https().request<any>(`${duoduoenvService}userPortrait/portraitTemp/queryPortraitTempUserTotal?${comParams}`, Method.GET, undefined, ContentType.json)
+  return https().request<any>(`${duoduoenvService}userPortrait/portraitTemp/queryPortraitTempUserTotal`, Method.GET, undefined, ContentType.json)
 }
 
 // 灯的使用统计
 export const queryTotalPortraitLight = () => {
-  return https().request<any>(`${duoduoenvService}userPortrait/portraitLight/queryTotalPortraitLight?${comParams}`, Method.GET, undefined, ContentType.json)
+  return https().request<any>(`${duoduoenvService}userPortrait/portraitLight/queryTotalPortraitLight`, Method.GET, undefined, ContentType.json)
 }
 /**
  * 空调统计数据 chart详情
@@ -83,7 +83,7 @@ export const tempFeedbackQuery = (params: any) => {
  * 判断模块的显示和隐藏
  */
 export const queryPortraitModule = () => {
-  return https().request<any>(`${duoduoenvService}userPortrait/queryPortraitModuleList?${comParams}`, Method.GET, undefined, ContentType.json)
+  return https().request<any>(`${duoduoenvService}userPortrait/queryPortraitModuleList`, Method.GET, undefined, ContentType.json)
 }
 
 

+ 37 - 12
src/components/header/Comheader.vue

@@ -4,7 +4,10 @@
       <div class="header-return" @click="goBack">
         <VanIcon name="arrow-left" />
       </div>
-      <div class="header-title">选择所属公司</div>
+      <div class="header-title">
+        <span>{{ route.meta.title }}</span>
+        <span>{{ route.meta.title1 }}</span>
+      </div>
     </div>
   </div>
 </template>
@@ -12,20 +15,27 @@
 <script lang="ts">
 import { defineComponent, onMounted, reactive, toRefs } from "vue";
 import { Icon } from "vant";
-import { useRouter } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 
 export default defineComponent({
   props: {
-    color: String,
-    default: () => "#fff",
+    color: {
+      type: String,
+      default: () => "#fff",
+    },
+    // title: {
+    //   type: String,
+    //   default: () => "",
+    // },
   },
   components: {
     VanIcon: Icon,
   },
   setup(props) {
     const router = useRouter();
-
+    const route: any = useRoute();
     const proxyData = reactive({
+      route: route,
       goBack() {
         router.back();
       },
@@ -64,13 +74,28 @@ export default defineComponent({
 }
 .header-title {
   display: inline-block;
-  padding-left: 20px;
   line-height: 26px;
-  font-family: "Noto Sans SC";
-  font-style: normal;
-  font-weight: 500;
-  font-size: 16px;
-  line-height: 26px;
-  vertical-align: middle;
+  span {
+    &:nth-child(1) {
+      display: inline-block;
+      padding-left: 20px;
+      font-family: "Noto Sans SC";
+      font-style: normal;
+      font-weight: 500;
+      font-size: 16px;
+      vertical-align: middle;
+    }
+    &:nth-child(2) {
+      padding-left: 5px;
+      display: inline-block;
+      font-family: "PingFang SC";
+      font-style: normal;
+      font-weight: 400;
+      font-size: 12px;
+      transform: scale(0.9);
+      color: #656872;
+      vertical-align: middle;
+    }
+  }
 }
 </style>

+ 2 - 1
src/store/modules/user/mutations.ts

@@ -35,9 +35,10 @@ export const mutations: MutationTree<UserState> & Mutations = {
     state.userPhone = userPhone
   },
   [UserMutationTypes.SET_PROJECT_ID](state: UserState, projectId: string) {
-    state.projectId = projectId
     // Cookies.set(Keys.projectId, projectId)
     setProjectId(projectId)
+    // debugger
+    state.projectId = projectId
   },
   [UserMutationTypes.SET_COMPANY_ID](state: UserState, companyId: string) {
     state.companyId = companyId

+ 2 - 2
src/styles/comMedia.scss

@@ -3,12 +3,12 @@
       width: 100% !important;
     }
   }
-  @media screen and (min-width: 414px) and (max-width: 768px) {
+  @media screen and (min-width: 414px) and (max-width: 640px) {
     .space-box {
       width: 50% !important;
     }
   }
-  @media screen and (min-width: 768px) and (max-width: 1200px) {
+  @media screen and (min-width: 640px) and (max-width: 1200px) {
     .space-box {
       width: 33.33% !important;
     }

+ 1 - 0
src/styles/index.scss

@@ -143,6 +143,7 @@ div:focus {
   img {
     display: block;
     width: 60%;
+    max-width: 450px;
     margin: 0 auto;
   }
 

+ 1 - 1
src/utils/cookies.ts

@@ -6,7 +6,7 @@ export const setLanguage = (language: string) => Cookies.set(Keys.languageKey, l
 export const setSize = (size: string) => Cookies.set(Keys.sizeKey, size)
 export const getToken = () => Cookies.get(Keys.tokenKey)
 export const getProjectId = () => Cookies.get(Keys.projectId)
-export const setProjectId = (projectId: string) => Cookies.set(Keys.projectId, projectId)
+export const setProjectId = (projectId: any) => Cookies.set(Keys.projectId, projectId)
 export const setToken = (token: string) => Cookies.set(Keys.tokenKey, token)
 export const removeToken = () => Cookies.remove(Keys.tokenKey)
 export const setCookieUserInfo = (userInfo: any) => Cookies.set(Keys.userInfoKey, userInfo)

+ 21 - 6
src/utils/https.ts

@@ -4,6 +4,8 @@ import networkConfig from '@/config/default/net.config'
 import { getToken } from '@/utils/cookies'
 import { Toast } from 'vant'
 import Cookies from 'js-cookie'
+import { request } from 'http'
+import { getUserInfo, setQueryConfig } from '.'
 
 export const https = (configobj: any = { timeout: '' }) => {
   // debugger
@@ -19,18 +21,31 @@ export const https = (configobj: any = { timeout: '' }) => {
     config.timeout = configobj.timeout
   }
   const https = new HttpClient(config)
+  https.httpClient.interceptors.request.use(function (request) {
+    const comInfo = getUserInfo()
+    const comParams: string = setQueryConfig(comInfo)
+    let url: any = request.url
+    if (url.indexOf("?") != -1) {
+      request.url = request.url + "&" + comParams
+    } else {
+      request.url = request.url + "?" + comParams
+    }
+    return request
+  }, function (error) {
+
+  })
   https.httpClient.interceptors.response.use(function (response) {
     return response
   }, function (error) {
     // console.log('error===')
     // console.log(error.response.status)
     // console.log(error.status)
-    if (error.response.status === 401) {
-      Toast('登录失效,请退出app重新登录')
-      sessionStorage.clear()
-      const tokenOld: any = Cookies.get('accessToken')
-      window.location.href = `/sgh5/home?accessToken=${tokenOld}`
-    }
+    // if (error.response.status === 401) {
+    //   Toast('登录失效,请退出app重新登录')
+    //   sessionStorage.clear()
+    //   const tokenOld: any = Cookies.get('accessToken')
+    //   window.location.href = `/sgh5/home?accessToken=${tokenOld}`
+    // }
     return Promise.reject(error)
   })
   return https

+ 1 - 0
src/utils/index.ts

@@ -108,6 +108,7 @@ export const setQueryConfig = function (queryConfig: any) {
 
 // 获取用户信息
 export const getUserInfo = function () {
+  // debugger
   let userInfo = store.state.user
   const paramsInfo: any = {
     openid: userInfo.openid,

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

@@ -20,6 +20,8 @@ import { useRoute, onBeforeRouteUpdate } from "vue-router";
 import { Search } from "vant";
 import router from "@/router";
 import { getUsersInfo } from "@/apis/user";
+import { store } from "@/store";
+import { UserMutationTypes } from "@/store/modules/user/mutation-types";
 
 export default defineComponent({
   components: {
@@ -34,6 +36,7 @@ export default defineComponent({
       showHeader: false,
       // 去选择空间
       goCheckSpace(item: any) {
+        store.commit(UserMutationTypes.SET_PROJECT_ID, item.id);
         router.push({ path: "/choice-space", query: { id: item.id } });
       },
       projects: projects,

+ 77 - 51
src/views/choiceSpace/choiceSpace.vue

@@ -27,24 +27,32 @@
       </div>
     </div>
     <div class="space-content">
-      <div
-        class="space-box"
-        v-for="(item, index) in spaceData"
-        :key="'space' + index"
-      >
-        <div class="space-item">
-          <span class="item-text">
-            {{ item.spaceName }}
-          </span>
-          <van-checkbox
-            class="item-check"
-            v-model="item.checked"
-            shape="square"
-          ></van-checkbox>
+      <template v-if="showSpace">
+        <div
+          class="space-box"
+          v-for="(item, index) in spaceData"
+          :key="'space' + index"
+        >
+          <div class="space-item">
+            <span class="item-text">
+              {{ item.spaceName }}
+            </span>
+            <van-checkbox
+              class="item-check"
+              v-model="item.checked"
+              shape="square"
+            ></van-checkbox>
+          </div>
         </div>
-      </div>
+      </template>
+      <template v-else>
+        <div class="no-data" height="100%" width="100%">
+          <img :src="parseImgUrl('page-officehome', 'empty.png')" alt="" />
+          <span>暂无数据</span>
+        </div>
+      </template>
     </div>
-    <div class="next-btn-box">
+    <div class="next-btn-box" v-if="spaceData && spaceData.length">
       <button @click="goNext">下一步</button>
     </div>
     <!--弹出模块-->
@@ -53,7 +61,7 @@
         @click-nav="checkBuilding"
         @click-item="checkFloor"
         v-model:active-id="checkPositon.floorId"
-        v-model:main-active-id="checkPositon.buildingId"
+        v-model:main-active-index="activeIndex"
         :items="positionArr"
       />
     </van-popup>
@@ -75,7 +83,12 @@
 import { defineComponent, nextTick, onMounted, reactive, toRefs } from "vue";
 import { useRoute, useRouter, onBeforeRouteUpdate } from "vue-router";
 import { Search, TreeSelect, Popup, Checkbox, Toast } from "vant";
-import { getUserInfo, parseImgUrl, setLocalProjectId, setQueryConfig } from "@/utils";
+import {
+  getUserInfo,
+  parseImgUrl,
+  setLocalProjectId,
+  setQueryConfig,
+} from "@/utils";
 import { store } from "@/store";
 import { UserMutationTypes } from "@/store/modules/user/mutation-types";
 import {
@@ -143,7 +156,9 @@ export default defineComponent({
     const spaceData: any = [];
     const proxyData = reactive({
       parseImgUrl: parseImgUrl,
-      userInfo:userInfo,
+      showSpace: true,
+      userInfo: userInfo,
+      activeIndex: 0,
       spaceType: spaceType,
       searchSpaceName: "",
       checked: false,
@@ -172,33 +187,40 @@ export default defineComponent({
         // 获取空间列表
         proxyData.searchSpace();
       },
-      // 设置建筑id
-      setProjectId() {
-        let nowProjectId: any = route.query.id;
-        // setLocalProjectId(nowProjectId)
-        store.commit(UserMutationTypes.SET_PROJECT_ID, nowProjectId);
-      },
       buildingData: buildingData,
       buildingItem: buildingItem,
       // 获取建筑列表
       getBuildingList() {
         let params: any = {
           criteria: {
-            projectId: store.state.user.projectId, //类型:String  必有字段  备注:项目id
+            projectId: proxyData.userInfo.projectId, //类型:String  必有字段  备注:项目id
           },
         };
-        return getBuildingList(params).then((res) => {
+        getBuildingList(params).then((res) => {
           let resData: any = res;
           if (resData.result === "success") {
             let content: any = resData?.content ?? [];
             proxyData.buildingData = content;
+            proxyData.setBbuildingName();
+            proxyData.getFloorList();
           } else {
             proxyData.buildingData = [];
           }
         });
       },
+      //  设置建筑名称
+      setBbuildingName() {
+        proxyData.buildingData.map((item: any, index: any) => {
+          if (item.id === proxyData.checkPositon.buildingId) {
+            proxyData.checkPositon.buildingName = item.localName;
+            proxyData.activeIndex = index;
+          }
+        });
+        console.log(proxyData.checkPositon);
+      },
       // 格式化建筑数据
       formateBuildingData() {
+        // debugger
         proxyData.positionArr = [];
         for (let i = 0; i < proxyData.buildingData.length; i++) {
           let obj = {
@@ -209,8 +231,7 @@ export default defineComponent({
           if (
             proxyData.buildingData[i].id === proxyData.checkPositon.buildingId
           ) {
-            proxyData.buildingItem.buildingName =
-              proxyData.buildingData[i].localName;
+            proxyData.activeIndex = i;
             proxyData.floorData.map((item: any) => {
               item.text = item.localName;
               if (item.id === proxyData.checkPositon.floorId) {
@@ -221,19 +242,22 @@ export default defineComponent({
               proxyData.buildingData[i].localName;
             obj.children = proxyData.floorData;
           }
+          // debugger
+          console.log(proxyData.floorData);
           proxyData.positionArr.push(obj);
         }
+        console.log(proxyData.positionArr);
       },
       floorData: floorData,
       /**
        * 查询楼层信息
        */
       getFloorList() {
-        if (proxyData.buildingItem.buildingId) {
+        if (proxyData.checkPositon.buildingId) {
           let params: any = {
             criteria: {
-              projectId: store.state.user.projectId,
-              buildingId: proxyData.buildingItem.buildingId,
+              projectId: proxyData.userInfo.projectId,
+              buildingId: proxyData.checkPositon.buildingId,
             },
             orders: [
               {
@@ -242,7 +266,7 @@ export default defineComponent({
               },
             ],
           };
-          return getFloorList(params)
+          getFloorList(params)
             .then((res) => {
               let resData: any = res;
               if (res.result === "success") {
@@ -250,6 +274,9 @@ export default defineComponent({
               } else {
                 proxyData.floorData = [];
               }
+              proxyData.formateBuildingData();
+              proxyData.getPadSpaceList();
+              // console.log(proxyData.floorData);
             })
             .catch(() => {});
         }
@@ -263,12 +290,13 @@ export default defineComponent({
           // projectId: store.state.user.projectId,
         };
         let paramsStr: any = setQueryConfig(params);
-        return getDefaultLocation(paramsStr).then((res) => {
+        getDefaultLocation(paramsStr).then((res) => {
           let resData: any = res;
           proxyData.defaultSpaceData = resData?.data ?? {};
-          proxyData.buildingItem.buildingId =
+          proxyData.checkPositon.buildingId =
             proxyData.defaultSpaceData.buildingId;
           proxyData.setCheckPersiton();
+          proxyData.getBuildingList();
         });
       },
       // 设置选中的位置
@@ -291,7 +319,7 @@ export default defineComponent({
             floorId: proxyData.checkPositon.floorId,
             workSpaceList: idArr,
             majorSpaceId: idArr[0], //类型:String  必有字段  备注:主空间
-            macAddress: "test", //类型:String  必有字段  备注:平板地址
+            macAddress: proxyData.userInfo.mac, //类型:String  必有字段  备注:平板地址
           };
           proxyData.saveWorkSpace(params);
         } else {
@@ -313,16 +341,12 @@ export default defineComponent({
       },
       // 选择建筑
       checkBuilding(index: any) {
-        console.log(index);
-        proxyData.buildingItem.buildingId = proxyData.positionArr[index].id;
-        proxyData.buildingItem.buildingName = proxyData.positionArr[index].text;
+        proxyData.checkPositon.buildingId = proxyData.positionArr[index].id;
+        proxyData.checkPositon.buildingName = proxyData.positionArr[index].text;
         proxyData.getFloorList();
       },
       // 选择楼层
       checkFloor(item: any) {
-        proxyData.checkPositon.buildingId = item.buildingId;
-        proxyData.checkPositon.buildingName =
-          proxyData.buildingItem.buildingName;
         proxyData.checkPositon.floorId = item.id;
         proxyData.checkPositon.floorName = item.localName;
         proxyData.show = false;
@@ -343,7 +367,7 @@ export default defineComponent({
           : {
               floorId: proxyData.checkPositon.floorId,
               buildingId: proxyData.checkPositon.buildingId,
-              macAddress: "test",
+              macAddress: proxyData.userInfo.mac,
             };
         let str: any = setQueryConfig(params);
         getPadSpaceList(str).then((res) => {
@@ -360,6 +384,11 @@ export default defineComponent({
           } else {
             proxyData.spaceData = [];
           }
+          if (proxyData && proxyData.spaceData.length) {
+            proxyData.showSpace = true;
+          } else {
+            proxyData.showSpace = false;
+          }
         });
       },
       searchSpace() {
@@ -368,20 +397,15 @@ export default defineComponent({
           buildingId: proxyData.checkPositon.buildingId,
           funcType: proxyData.spaceType.type,
           spaceName: proxyData.searchSpaceName,
-          macAddress: "test",
+          macAddress: proxyData.userInfo.mac,
         };
         proxyData.getPadSpaceList(query);
       },
-      async init() {
-        await proxyData.getDefaultLocation();
-        await proxyData.getBuildingList();
-        await proxyData.getFloorList();
-        proxyData.formateBuildingData();
-        proxyData.getPadSpaceList();
+      init() {
+        proxyData.getDefaultLocation();
       },
     });
     onMounted(() => {
-      proxyData.setProjectId();
       proxyData.init();
     });
     return {
@@ -403,6 +427,7 @@ export default defineComponent({
     z-index: 333;
     .arrow-down {
       position: absolute;
+      font-size: 16px;
       right: 16px;
       top: 50%;
       transform: translateY(-50%);
@@ -446,6 +471,7 @@ export default defineComponent({
         background: #fff;
         .com-text {
           height: 44px;
+          font-size: 16px;
           line-height: 44px;
           padding-left: 30px;
         }

+ 12 - 2
src/views/home/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="home">
-    <div class="home-btn" @click="checkLoginType">二维码登录</div>
+    <div class="home-btn" @click="checkLoginType">
+      <span v-if="type === 1">二维码登录</span>
+      <span v-else>账号登录</span>
+    </div>
     <div class="home-content">
       <div class="home-left">
         <div class="box">
@@ -63,6 +66,7 @@ import {
   onBeforeMount,
   onMounted,
   ref,
+  onBeforeUnmount,
 } from "vue";
 import QrcodeVue from "qrcode.vue";
 import { useRouter } from "vue-router";
@@ -170,12 +174,18 @@ export default defineComponent({
               proxyData.timer = null;
             }
             proxyData.timer = setTimeout(() => {
-              proxyData.getPadQrCodeStatus()
+              proxyData.getPadQrCodeStatus();
             }, 500);
           }
         });
       },
     });
+    onBeforeUnmount(() => {
+      if (proxyData.timer) {
+        clearTimeout(proxyData.timer);
+        proxyData.timer = null;
+      }
+    });
     onMounted(() => {
       // 设置二维码路径
       proxyData.setCodeUrl();