浏览代码

fix:场景处理

chenzhen2 2 年之前
父节点
当前提交
fe52b7b1f3

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

@@ -64,9 +64,11 @@ export default defineComponent({
       PROJECTING: parseImgUrl("ipdImages", "touying.svg"),
       ADJOURNMENT: parseImgUrl("ipdImages", "sanhui.svg"),
     };
+    let scenarioArr: any = [];
     const proxyData = reactive({
       parseImgUrl: parseImgUrl,
-      scenarioArr: props.scenarioArr,
+      spaceId: props.spaceId,
+      scenarioArr: scenarioArr,
       scenarioImgArr: scenarioImgArr,
       activeType: props.activeType,
       onSubmit(values: any) {
@@ -97,7 +99,7 @@ export default defineComponent({
         // proxyData.activeType = item.sceneType;
         const userInfo: any = getUserInfo();
         const params = {
-          spaceId: props.spaceId,
+          spaceId: proxyData.spaceId,
           projectId: props.projectId,
           type: item.sceneType,
           pubname: userInfo.pubname,
@@ -105,30 +107,31 @@ export default defineComponent({
 
         item.loading = true;
         item.lodingText = "正在切换至";
-        contx.emit("setHeadScene", item);
+        contx.emit("setHeadScene", item, 1);
         switchoverSceneHttp(params)
           .then((res) => {
             let resData: any = res;
             if (resData.result === "success") {
               item.loading = false;
               item.lodingText = "切换至";
-              contx.emit("setHeadScene", item);
+              contx.emit("setHeadScene", item, 2);
             }
           })
           .catch(() => {
             item.loading = false;
             item.lodingText = "";
-            contx.emit("setHeadScene", item);
-            // contx.emit('timerSpaceInfo')
+            contx.emit("setHeadScene", item, 2);
           });
       },
     });
     watch(
       props,
       (newProps: any) => {
+        proxyData.activeType = newProps.activeType;
         proxyData.scenarioArr = newProps.scenarioArr;
+        proxyData.spaceId = newProps.spaceId;
         proxyData.formatScenarioImg();
-        proxyData.activeType = newProps.activeType;
+        console.log("会议室场景变化了--");
       },
       {
         deep: false,

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

@@ -7,14 +7,12 @@
         切换至
         <i>{{ secenaroStatus.sceneName }}</i> 场景
       </span>
-      <van-loading
-      class="status-text2"
-        v-if="secenaroStatus.loading"
+      <van-loading class="status-text2" v-if="secenaroStatus.loading"
         >切换中...</van-loading
       >
       <span class="status-text2" v-if="!secenaroStatus.loading">
         <span v-if="secenaroStatus.lodingText">
-          已为您切换至适宜{{secenaroStatus.sceneName}}的环境</span
+          已为您切换至适宜{{ secenaroStatus.sceneName }}的环境</span
         >
       </span>
       <!-- <span class="status-text2" v-else> 切换失败</span> -->
@@ -46,10 +44,6 @@ export default defineComponent({
       type: Array,
       default: () => [],
     },
-    activeType: {
-      type: String,
-      default: () => "",
-    },
     secenaroStatus: {
       type: Object,
       default: () => {},

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

@@ -1266,16 +1266,17 @@ export default defineComponent({
       // 切换场景的状态
       secenaroStatus: secenaroStatus,
       // 设置场景名称
-      setHeadScene(item: any) {
-        proxyData.isShowMetting = true;
+      setHeadScene(item: any, flag: any) {
         proxyData.activeType = item.sceneType;
+        if (flag == 1) {
+          proxyData.isShowMetting = true;
+        }
         proxyData.secenaroStatus = {
           localName: proxyData.officeData.localName,
           loading: item.loading,
           lodingText: item.lodingText,
           sceneName: item.sceneName,
         };
-        console.log(proxyData.secenaroStatus);
       },
       closeDailog() {
         proxyData.isShowMetting = false;