From 2b8b2cac4fe3f05474459a034bc4034f2d7aa0cb Mon Sep 17 00:00:00 2001 From: wujingjing <gersonwu@qq.com> Date: 星期三, 09 四月 2025 10:14:06 +0800 Subject: [PATCH] Merge branch 'test' into huishui_iframe --- src/layout/component/header/Header.vue | 46 ++++++++++++++++++++-------------------------- 1 files changed, 20 insertions(+), 26 deletions(-) diff --git a/src/layout/component/header/Header.vue b/src/layout/component/header/Header.vue index 3c12b81..c10cbd8 100644 --- a/src/layout/component/header/Header.vue +++ b/src/layout/component/header/Header.vue @@ -1,19 +1,20 @@ <template> - <div class="top_text flex justify-between px-6 items-center" :class="sidebarIsShow ? 'px-6' : 'pl-[unset] pr-6'"> + <div class="top_text flex justify-between px-6 items-center pl-[unset] pr-6"> <div class="flex-items-center h-full"> <div class="nav-menu"> <router-link :to="firstToPath" class="nav-item" active-class="active"> <i class="icon-park-outline-robot"></i> 鏅鸿兘鍔╂墜 </router-link> - <router-link to="/workspace/situation" class="nav-item" active-class="active"> + <!-- <router-link to="/workspace/situation" class="nav-item" active-class="active"> <i class="icon-park-outline-workbench"></i> 涓汉宸ヤ綔鍙� </router-link> - <router-link to="/gis/situation" class="nav-item" active-class="active"> + + <!-- <router-link to="/gis/situation" class="nav-item" active-class="active"> <i class="icon-park-outline-system"></i> GIS绯荤粺 - </router-link> + </router-link> --> </div> </div> <el-dialog @@ -33,28 +34,10 @@ </p> </template> </el-dialog> - </div> - <div class="notice " v-if="!isSharePage"> - <el-badge :value="`${state.announcementList.length}`" :hidden="announcementIsRead || state.announcementList?.length === 0"> - <el-button link size="small" icon="ele-Message" class="set-notice" @click="handleAnnouncementClick">绯荤粺鍏憡</el-button> - </el-badge> - <div class="notice_box notice_box_show" v-show="state.isShowAnnouncement" ref="noticeRef"> - <div class="notice_box_header"> - <span>鏈�鏂板叕鍛�</span> - </div> - <div class="notice_box_body"> - <div class="notice_item" v-for="item in state.announcementList" :key="item.notify_id" @click="announcementContentClick(item)"> - <div class="flex items-center"> - <p class="set-circle"></p> - <p>{{ item.notify_message }}</p> - </div> - <p class="text-right mr-[19px]"> - <span>{{ item.notify_time }}</span> - </p> - </div> - </div> - </div> + <el-tooltip content="鏈�灏忓寲" placement="bottom"> + <span class="cursor-pointer ywifont ywicon-tuichuquanping" size="15px" @click="smallScreenClick" /> + </el-tooltip> </div> </template> @@ -65,7 +48,8 @@ import { systemNotifyList } from '/@/api/ai/chat'; import router from '/@/router'; import pinia from '/@/stores'; -import { activeChatRoom, activeRoomId, isSharePage, newChatRoomClick } from '/@/stores/chatRoom'; +import { activeChatRoom, newChatRoomClick, sidebarIsShow } from '/@/stores/chatRoom'; +import { ParentRegister } from '/@/stores/global'; import { useThemeConfig } from '/@/stores/themeConfig'; import emitter from '/@/utils/mitt'; import { userInfoKey } from '/@/utils/request'; @@ -79,6 +63,16 @@ announcementContent: '', announcementTime: '', }); + +const smallScreenClick = () => { + const pathname = window.location.pathname; + const basePath = pathname.replace(/\/web\/index\.html$/, ''); + window.location.href = basePath || '/'; + ParentRegister.notify?.({ + type: 'fullScreen', + value: false, + }); +}; const firstToPath = computed(() => { if (!activeChatRoom.value) return { -- Gitblit v1.9.3