Merge branch 'master' of http://gogs.gisvg.com/YDM/museums-ui

Signed-off-by: wwj <2760333092@qq.com>

src/layout/components/Setting/src/Setting.vue

@@ -200,13 +200,14 @@ const clear = () => {
 </script>
 
 <template>
-  <div
-    :class="prefixCls"
-    class="fixed right-0 top-[45%] h-40px w-40px cursor-pointer bg-[var(--el-color-primary)] text-center leading-40px"
-    @click="drawer = true"
-  >
-    <Icon color="#fff" icon="ep:setting" />
-  </div>
+<!-- 王文杰 关闭配置面板、关闭设置、设置图标 -->
+<!--  <div-->
+<!--    :class="prefixCls"-->
+<!--    class="fixed right-0 top-[45%] h-40px w-40px cursor-pointer bg-[var(&#45;&#45;el-color-primary)] text-center leading-40px"-->
+<!--    @click="drawer = true"-->
+<!--  >-->
+<!--    <Icon color="#fff" icon="ep:setting" />-->
+<!--  </div>-->
 
   <ElDrawer v-model="drawer" :z-index="4000" direction="rtl" size="350px">
     <template #header>

src/layout/components/ToolHeader.vue

@@ -56,7 +56,7 @@ export default defineComponent({
       <TagsView/>
         {layout.value !== 'top' ? (
           <div class="h-full flex items-center">
-           
+
             {breadcrumb.value ? <Breadcrumb class="lt-md:hidden"></Breadcrumb> : undefined}
             {hamburger.value && layout.value !== 'cutMenu' ? (
               <Collapse class="custom-hover" color="var(--top-header-text-color)"></Collapse>
@@ -78,9 +78,9 @@ export default defineComponent({
               color="var(--top-header-text-color)"
             ></LocaleDropdown>
           ) : undefined} */}
-          {/* {message.value ? (
+          {message.value ? (
             <Message class="custom-hover" color="var(--top-header-text-color)"></Message>
-          ) : undefined} */}
+          ) : undefined}
           <UserInfo></UserInfo>
         </div>
       </div>