cfy777/Situation-Awareness-Platform-Frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/api/jyh/index.ts
This commit is contained in:
付民康
2025-03-19 12:35:05 +08:00
parent 847cfdcb4c eb0834fc52
commit 96dc1240ec
13 changed files with 190 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/components/Header/index.vue
View File

@@ -1,10 +1,10 @@
<template>
<div class="full-w" :style="{ height: `${height}px` }">
<div class="g-header fixed z-20" ref="headerRef" :class="{'home-background': isHome}">
<div class="g-header fixed z-20" ref="headerRef" :class="{ 'home-background': isHome }">
<div class="g-toolbar w-full overflow-hidden" :class="[searchClass, route?.meta?.headerClassName]">
<div class="g-toolbar-left flex-shrink items-center">
<div class="flex-center gap-[16px]" v-if="!isHome">
<!-- <g-icon v-if="!asideSetShow" @click="$emit('clickMenu')" name="gt-hamburger" size="20px" class="cursor-pointer hover:!text-black" color="#1D1F3A"></g-icon>-->
<!-- <g-icon v-if="!asideSetShow" @click="$emit('clickMenu')" name="gt-hamburger" size="20px" class="cursor-pointer hover:!text-black" color="#1D1F3A"></g-icon>-->
<GLink class="g-toolbar-left-logo" :href="baseUrl" />
<!-- <GLink class="g-toolbar-left-title" :href="baseUrl">可信代码库</GLink>-->
@@ -12,7 +12,7 @@
</div>
</div>
<div class="flex-1 flex items-center justify-end" v-if="!isHome">
<Search class="g-toolbar-left-search" v-if="!isMobile" :key="$route.fullPath"/>
<Search class="g-toolbar-left-search" v-if="!isMobile" :key="$route.fullPath" />
</div>
<div class="g-toolbar-right gap-[12px] flex-grow-0 flex-shrink-0">
<GLink
@@ -30,21 +30,23 @@
<GIcon name="gt-plane-add" size="16px" color="#9C9DB4" />
<span>新建</span>
</d-button>
<div class="cursor-pointer hidden-m" @click="handleLogin('login')" v-if="inSearch"><span>搜索记录</span></div>
<d-button variant="solid" color="primary" @click="handleLogin('login')">登录</d-button>
<div class="cursor-pointer hidden-m" @click="handleLogin('login')" v-if="inSearch">
<span>搜索记录</span>
</div>
<d-button @click="handleLogin('register')" class="min-w-[64px]">注册</d-button>
<d-button variant="solid" color="primary" @click="handleLogin('login')">Gitcode账号登录</d-button>
</template>
<template v-else>
<!--ai copilot-->
<!-- <a class="g-header-copilot" href="/ai-copilot/">-->
<!-- <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">-->
<!-- <path fill-rule="evenodd" clip-rule="evenodd" d="M2.5 6C2.5 4.89543 3.39543 4 4.5 4H11.5C12.6046 4 13.5 4.89543 13.5 6V12C13.5 13.1046 12.6046 14 11.5 14H4.5C3.39543 14 2.5 13.1046 2.5 12V6ZM4.5 8C4.5 7.44772 4.94772 7 5.5 7C6.05228 7 6.5 7.44772 6.5 8V9C6.5 9.55228 6.05228 10 5.5 10C4.94772 10 4.5 9.55228 4.5 9V8ZM10.5 7C9.94772 7 9.5 7.44772 9.5 8V9C9.5 9.55228 9.94772 10 10.5 10C11.0523 10 11.5 9.55228 11.5 9V8C11.5 7.44772 11.0523 7 10.5 7Z" fill="white"/>-->
<!-- <path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M8.75 3.29933C9.19835 3.03997 9.5 2.55521 9.5 2C9.5 1.17157 8.82843 0.5 8 0.5C7.17157 0.5 6.5 1.17157 6.5 2C6.5 2.55521 6.80165 3.03997 7.25 3.29933V5.5H8.75V3.29933ZM0 7C0 6.44772 0.447715 6 1 6H1.5V12H1C0.447715 12 0 11.5523 0 11V7ZM15 6H14.5V12H15C15.5523 12 16 11.5523 16 11V7C16 6.44772 15.5523 6 15 6Z" fill="white"/>-->
<!-- </svg>-->
<!-- <span class="ml-xs">AI Copilot</span>-->
<!-- </a>-->
<!-- <Create />-->
<!-- <SearchAiHistory />-->
<!-- <a class="g-header-copilot" href="/ai-copilot/">-->
<!-- <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">-->
<!-- <path fill-rule="evenodd" clip-rule="evenodd" d="M2.5 6C2.5 4.89543 3.39543 4 4.5 4H11.5C12.6046 4 13.5 4.89543 13.5 6V12C13.5 13.1046 12.6046 14 11.5 14H4.5C3.39543 14 2.5 13.1046 2.5 12V6ZM4.5 8C4.5 7.44772 4.94772 7 5.5 7C6.05228 7 6.5 7.44772 6.5 8V9C6.5 9.55228 6.05228 10 5.5 10C4.94772 10 4.5 9.55228 4.5 9V8ZM10.5 7C9.94772 7 9.5 7.44772 9.5 8V9C9.5 9.55228 9.94772 10 10.5 10C11.0523 10 11.5 9.55228 11.5 9V8C11.5 7.44772 11.0523 7 10.5 7Z" fill="white"/>-->
<!-- <path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M8.75 3.29933C9.19835 3.03997 9.5 2.55521 9.5 2C9.5 1.17157 8.82843 0.5 8 0.5C7.17157 0.5 6.5 1.17157 6.5 2C6.5 2.55521 6.80165 3.03997 7.25 3.29933V5.5H8.75V3.29933ZM0 7C0 6.44772 0.447715 6 1 6H1.5V12H1C0.447715 12 0 11.5523 0 11V7ZM15 6H14.5V12H15C15.5523 12 16 11.5523 16 11V7C16 6.44772 15.5523 6 15 6Z" fill="white"/>-->
<!-- </svg>-->
<!-- <span class="ml-xs">AI Copilot</span>-->
<!-- </a>-->
<!-- <Create />-->
<!-- <SearchAiHistory />-->
<d-popover content="提示！" trigger="hover" style="background-color: #7693f5; color: #fff">
<d-icon style="font-size: 16px" name="icon-helping" />
</d-popover>
@@ -109,9 +111,7 @@ const { isMobile } = usePageResize();
/* store 用户信息 */
/* @test 后面将清除 */
watchEffect(() => {
});
watchEffect(() => {});
microApp.router.beforeEach({
'micoro-app-homeweb-app': (to, from) => {
if (to.pathname === '/search') {
@@ -134,8 +134,8 @@ $add-radius: 48px;
$header-bg: #fff;
.home-background {
background-color: #fff0 !important;
}
background-color: #fff0 !important;
}
.g-header {
// overflow: hidden;
@@ -150,7 +150,7 @@ $header-bg: #fff;
}
.g-header-copilot {
background: rgba(41, 81, 224, 1);
color: #FFF;
color: #fff;
width: 120px;
border-radius: 48px;
height: 32px;
@@ -159,7 +159,7 @@ $header-bg: #fff;
cursor: pointer;
justify-content: center;
&:hover {
background: rgba(41, 81, 224, .8);
background: rgba(41, 81, 224, 0.8);
}
}
.g-toolbar {
@@ -171,7 +171,7 @@ $header-bg: #fff;
flex-basis: 56px;
overflow: hidden;
padding: 0 24px;
border-bottom: 1px solid #F1F1F8;
border-bottom: 1px solid #f1f1f8;
:deep(.devui-button) {
padding: 6px 16px;
border-radius: $add-radius;
@@ -202,14 +202,14 @@ $header-bg: #fff;
display: flex;
align-items: center;
@media screen and (max-width: 576px) {
@apply gap-[16px];
@apply gap-[16px];
}
}
&.border-b-transparent {
border-bottom-color: transparent !important;
}
&.border-b-show {
border-bottom-color: #F1F1F8 !important;
border-bottom-color: #f1f1f8 !important;
}
}
.g-header-gray {
@@ -256,12 +256,12 @@ $header-bg: #fff;
}
}
@media screen and (max-width:576px) {
.hidden-m {
display: none;
}
.g-header-copilot {
display: none!important;;
}
@media screen and (max-width: 576px) {
.hidden-m {
display: none;
}
.g-header-copilot {
display: none !important;
}
}
</style>