Merge remote-tracking branch 'origin/main'

linwe

2024-11-07 05affc703e81728cc58cc89c1815407ad4997dfe

 src/views/layout/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:24
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-11-06 11:05:46
 * @LastEditTime: 2024-11-07 19:24:45
 * @FilePath: \bigScreen\src\views\layout\index.vue
 * @Description:
 *
@@ -10,11 +10,35 @@
-->
<template>
  <div class="wrapper">
    <map-container ref="MapContainer">
    <div v-if="showSinglePage" class="main-content" id="MainContent">
      <div class="w100 h100">
        <div class="main-header">
          <div class="title">吉水化工园区“一园一策一图”VR平台</div>

          <div class="login-out" @click="signOut">
            <img :src="loginOutBg" class="img" />
            <span>退出</span>
          </div>
        </div>

        <div class="main-container">
          <!-- 地图区域 -->
          <router-view></router-view>
        </div>

        <main-menu></main-menu>
      </div>
    </div>

    <map-container v-if="!showSinglePage" ref="MapContainer">
      <template #content>
        <div v-if="showContent" :class="[showSubLayout ? 'main-content-sub' : 'main-content']" id="MainContent">
          <main-search></main-search>
          <main-tool></main-tool>

          <div v-if="showSubLayout" class="w100 h100">
            <router-view></router-view>
          </div>

          <div v-if="!showSubLayout" class="w100 h100">
            <div class="main-header">
@@ -32,10 +56,6 @@
            </div>

            <main-menu></main-menu>
          </div>

          <div v-if="showSubLayout" class="w100 h100">
            <router-view></router-view>
          </div>
        </div>
      </template>
@@ -60,20 +80,18 @@
const storeRouter = useRouterStore()
const showContent = ref(false)
const showSubLayout = ref(false)

const showSinglePage = ref(false)
// 监听createB的变化
watch(
  [
    () => store.loadMap,
    () => storeRouter.loadSub,
    () => storeRouter.loadSingle,
  ],
  ([newLoadMap, newLoadSub]) => {
    if (newLoadMap) {
      showContent.value = true
    }

    console.log(newLoadSub, 5555)
  ([newLoadMap, newLoadSub, newLoadSingle]) => {
    showContent.value = newLoadMap
    showSubLayout.value = newLoadSub
    showSinglePage.value = newLoadSingle
  },
  { immediate: true } // 设置immediate为true以便在组件挂载时立即检查createB的值
)