Explorar o código

fix: 平板bug修改

chenzhen2 %!s(int64=2) %!d(string=hai) anos
pai
achega
09afe3277f

+ 1 - 1
src/apis/envmonitor.ts

@@ -215,7 +215,7 @@ export const insertWorkSpace = (params: any) => {
  * @param params 
  */
  export const deleteWorkSpace = (params: any) => {
-  return https().request<any>(`${testApi}padSpace/deleteWorkSpace`, Method.POST, params, ContentType.json)
+  return https().request<any>(`${setupService}padSpace/deleteWorkSpace`, Method.POST, params, ContentType.json)
 }
 
 

+ 21 - 2
src/views/choiceSpace/setMainSpace.vue

@@ -9,7 +9,12 @@
       <van-swipe-cell>
         <van-cell :border="false" :title="item.spaceName" />
         <template #right>
-          <van-button square type="danger" text="删除" />
+          <van-button
+            square
+            type="danger"
+            @click="delWorkSpace(item)"
+            text="删除"
+          />
         </template>
       </van-swipe-cell>
     </div>
@@ -34,7 +39,11 @@ import {
 import { useRoute, useRouter, onBeforeRouteUpdate } from "vue-router";
 import { SwipeCell, Cell, Popup, Button, Dialog, Loading } from "vant";
 import { getUserInfo, parseImgUrl } from "@/utils";
-import { queryWorkSpace, saveWorkSpace } from "@/apis/envmonitor";
+import {
+  deleteWorkSpace,
+  queryWorkSpace,
+  saveWorkSpace,
+} from "@/apis/envmonitor";
 
 export default defineComponent({
   components: {
@@ -76,6 +85,16 @@ export default defineComponent({
           proxyData.saveWorkSpace(params);
         }
       },
+      // 删除工作空间
+      delWorkSpace(item: any) {
+        let params: any = {
+          spaceId: item.spaceId,
+          macAddress: proxyData.userInfo.mac,
+        };
+        deleteWorkSpace(params).then(() => {
+          
+        });
+      },
       // 保存空间
       saveWorkSpace(params: any) {
         proxyData.loaging = true;

+ 14 - 1
src/views/envmonitor/components/Map/SpaceBox.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="space-home">
     <div class="com-search">
-      <van-search placeholder="搜索办公区" />
+      <van-search placeholder="搜索办公区"  
+                  v-model="searchValue"
+                  @update:model-value="onSearch"
+                  @clear="onCancel" />
     </div>
     <div class="space-box">
       <div
@@ -50,9 +53,19 @@ export default defineComponent({
     const spaceData: any = [];
     const proxyData = reactive({
       spaceData: spaceData,
+      searchValue:'',  // 搜索val
       changeSpace(item: any) {
         contx.emit("changeSpace", item);
       },
+      // 搜索
+      onSearch(){
+        console.log("====")
+        console.log(proxyData.searchValue)
+      },
+      // 取消搜索
+      onCancel(){
+
+      }
     });
     onMounted(() => {});
     watch(

+ 45 - 7
src/views/envmonitor/components/Map/index.vue

@@ -1,7 +1,15 @@
 <template>
-  <div class="map-home">
+  <div class="map-home map-home-pading">
+    <div class="map-top">
+      <span :class="type == 1 ? 'span-active' : ''" @click="checkMapType(1)"
+        >列表</span
+      >
+      <span :class="type == 2 ? 'span-active' : ''" @click="checkMapType(2)"
+        >地图</span
+      >
+    </div>
     <map-box
-      v-if="showMap == true && floorId"
+      v-if="type === 2"
       :spaceData="spaceData"
       :projectId="projectId"
       :floorId="floorId"
@@ -10,7 +18,7 @@
       @changeSpace="changeSpace"
     ></map-box>
     <space-box
-      v-if="showMap == false"
+      v-if="type === 1"
       :spaceData="spaceData"
       @changeSpace="changeSpace"
     ></space-box>
@@ -74,6 +82,7 @@ export default defineComponent({
     let showMap: any = null;
     const store = useStore();
     const proxyData = reactive({
+      type: 1,
       spaceData: props.spaceData,
       showMap: showMap, // 是否展示地图
       // 切换空间
@@ -83,6 +92,9 @@ export default defineComponent({
       buildingId: props.buildingId,
       floorId: props.floorId,
       spaceInfo: props.spaceInfo,
+      checkMapType(type: any) {
+        proxyData.type = type;
+      },
       /**
        * 获取地图信息
        */
@@ -122,11 +134,12 @@ export default defineComponent({
         proxyData.buildingId = newProps.buildingId;
         proxyData.floorId = newProps.floorId;
         proxyData.spaceInfo = newProps.spaceInfo;
+        // proxyData.getMapInfo();
+      },
+      {
+        deep: false,
+        immediate: true,
       }
-      // {
-      //   deep: false,
-      //   immediate: true,
-      // }
     );
     return {
       ...toRefs(proxyData),
@@ -139,6 +152,31 @@ export default defineComponent({
   width: 100%;
   height: 100%;
   background: $elBg;
+  .map-top {
+    position: fixed;
+    padding-top: 5px;
+    width: 160px;
+    left: 0px;
+    top: 30%;
+    z-index: 333;
+    border-radius: 10px;
+    span {
+      width: 80px;
+      height: 30px;
+      line-height: 30px;
+      text-align: center;
+      background: #fff;
+      display: inline-block;
+    }
+    .span-active {
+      // border-radius: 5px;
+      background: $elCircle;
+      color: #fff;
+    }
+  }
+}
+.map-home-pading {
+  padding-top: 30px;
 }
 </style>
   

+ 24 - 10
src/views/envmonitor/index.vue

@@ -18,7 +18,9 @@
             class="weather-icon"
             alt=""
           />
-          <span>{{ outWeather.temperature ? outWeather.temperature : "--" }}℃</span>
+          <span
+            >{{ outWeather.temperature ? outWeather.temperature : "--" }}℃</span
+          >
         </div>
         <div class="weixiin" @click="showContact">
           <img :src="parseImgUrl('ipdImages', 'weixin.svg')" />
@@ -40,7 +42,14 @@
               officeData.isPassengerPass === false
             "
           >
-            <img :src="parseImgUrl('ipdImages', 'vector.svg')" />
+            <img
+              :src="parseImgUrl('ipdImages', 'vector-active.svg')"
+              v-if="officeData.isPassengerPass"
+            />
+            <img
+              :src="parseImgUrl('ipdImages', 'vector')"
+              v-if="!officeData.isPassengerPass"
+            />
             <span v-if="officeData.isPassengerPass">有人</span>
             <span v-if="!officeData.isPassengerPass">无人</span>
           </div>
@@ -59,10 +68,12 @@
             class="env-item"
             :style="[
               { background: item.bgColor ? item.bgColor : '' },
-              { opacity: item.bgColor ? 0.8 : '' },
-              { borderRadius: item.bgColor ? '25px' : '' },
+              { opacity: item.bgColor ? 0.8 : '' }
+            ]"
+            :class="[
+              index == 1 ? 'env-color' : '',
+              item.bgColor ? 'env-item-radius' : '',
             ]"
-            :class="index == 1 ? 'env-color' : ''"
             :key="'env' + index"
             @click="handleDetail(item)"
             v-for="(item, index) in envlist"
@@ -209,7 +220,7 @@
       v-model:show="isShowMap"
       class="map-popup"
       position="bottom"
-      style="width: 100%; height: 60%"
+      style="width: 100%; height: 70%"
       :close-on-click-overlay="true"
       teleport="#app"
     >
@@ -1797,8 +1808,8 @@ export default defineComponent({
     }
 
     .left-space {
-      padding-top: 20.6vh;
-      padding-right: 80px;
+      padding-top: 12vh;
+      padding-right: 30px;
       .text {
         position: relative;
         width: 100%;
@@ -1924,12 +1935,12 @@ export default defineComponent({
         &:nth-child(3) {
           // text-align: center;
           padding-left: 20px;
-          width: 117px;
+          width: 125px;
         }
         &:nth-child(4) {
           // text-align: center;
           padding-left: 20px;
-          width: 97px;
+          width: 100px;
         }
         div {
           img {
@@ -1975,6 +1986,9 @@ export default defineComponent({
           }
         }
       }
+      .env-item-radius {
+        border-radius: 25px;
+      }
       .env-color {
         // background: linear-gradient(
         //   180deg,