浏览代码

fix:会议室场景测试

chenzhen2 2 年之前
父节点
当前提交
4bd73644ec

+ 16 - 7
src/views/envmonitor/components/Scenario/ScenarioConfig.vue

@@ -91,14 +91,23 @@ export default defineComponent({
         };
 
         item.loading = true;
+        item.lodingText = "正在切换至";
         contx.emit("setHeadScene", item);
-        // switchoverSceneHttp(params).then(res => {
-
-        //   contx.emit('setHeadScene', item)
-        // }).catch(() => {
-        //   contx.emit('setHeadScene', item)
-        //   // contx.emit('timerSpaceInfo')
-        // })
+        switchoverSceneHttp(params)
+          .then((res) => {
+            let resData: any = res;
+            if (resData.result === "success") {
+              item.loading = false;
+              item.lodingText = "切换至";
+              contx.emit("setHeadScene", item);
+            }
+          })
+          .catch(() => {
+            item.loading = false;
+            item.lodingText = "";
+            contx.emit("setHeadScene", item);
+            // contx.emit('timerSpaceInfo')
+          });
       },
     });
     watch(

+ 25 - 8
src/views/envmonitor/components/Scenario/scenarioDailog.vue

@@ -1,12 +1,25 @@
 <template>
   <div class="scene-dailog">
-    <div class="title">{{secenaroStatus.localName}}</div>
+    <div class="title">{{ secenaroStatus.localName }}</div>
     <div class="dailog-content">
       <img :src="parseImgUrl('ipdImages', 'taolun-big.svg')" />
-      <span class="status-text1"> 切换至 <i>讨论</i> 场景 </span>
-      <span class="status-text2"> 已为您切换至适宜讨论的环境 </span>
+      <span class="status-text1">
+        切换至
+        <i>{{ secenaroStatus.sceneName }}</i> 场景
+      </span>
+      <van-loading
+      class="status-text2"
+        v-if="secenaroStatus.loading"
+        >切换中...</van-loading
+      >
+      <span class="status-text2" v-if="!secenaroStatus.loading">
+        <span v-if="secenaroStatus.lodingText">
+          已为您切换至适宜讨论的环境</span
+        >
+      </span>
+      <!-- <span class="status-text2" v-else> 切换失败</span> -->
     </div>
-    <div class="dailog-btn" @click="closeDailog">我知道了</div>
+    <buttons class="dailog-btn" @click="closeDailog">我知道了</buttons>
   </div>
 </template>
   
@@ -20,6 +33,7 @@ import {
   ref,
   watch,
 } from "vue";
+import { Loading, Toast } from "vant";
 import { parseImgUrl } from "@/utils";
 
 export default defineComponent({
@@ -41,13 +55,16 @@ export default defineComponent({
       default: () => {},
     },
   },
-  setup(props,contx) {
+  components: {
+    VanLoading: Loading,
+  },
+  setup(props, contx) {
     const proxyData = reactive({
       parseImgUrl: parseImgUrl,
       secenaroStatus: props.secenaroStatus,
-      closeDailog(){
+      closeDailog() {
         contx.emit("closeDailog");
-      }
+      },
     });
     watch(
       props,
@@ -82,7 +99,7 @@ export default defineComponent({
   .dailog-content {
     position: absolute;
     // top: 50%;
-    top:19vh;
+    top: 19vh;
     left: 50%;
     transform: translate(-50%);
     width: 100%;

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

@@ -93,6 +93,8 @@
           v-if="roomType === '会议室' && scenarioArr && scenarioArr.length"
           :activeType="activeType"
           :scenarioArr="scenarioArr"
+          :spaceId="spaceInfo.spaceId"
+          :projectId="projectId"
           @setHeadScene="setHeadScene"
         ></scenario-config>
       </div>
@@ -246,7 +248,7 @@ export default defineComponent({
     const document: any = window.document;
     const screenHeight: any = document.body.clientHeight;
     const outWeather: any = {};
-    const secenaroStatus: any = {};
+    let secenaroStatus: any = {};
     // 空间数据(包括空间下的设备的状态)
     const officeData: any = {};
     let spaceEqFlagObj: SpaceInfoModel = {
@@ -1002,10 +1004,11 @@ export default defineComponent({
         proxyData.isShowMetting = true;
         proxyData.secenaroStatus = {
           localName: proxyData.officeData.localName,
-          loding: item.loading,
-          lofingText: "正在切换至",
+          loading: item.loading,
+          lodingText: item.lodingText,
           sceneName: item.sceneName,
         };
+        console.log(proxyData.secenaroStatus)
       },
       closeDailog() {
         proxyData.isShowMetting = false;