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

相关Issues修改

Browse Source
This commit is contained in:
付民康
2025-03-15 17:58:49 +08:00
parent d3560c2fa3
commit 4a7d092519
4 changed files with 75 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/assets/css/jyh.scss
View File

@@ -25,6 +25,10 @@
} }
} }
.jyh-form-operation {
margin-left: 0px !important;
}
.jyh-table { .jyh-table {
.devui-table__cell { .devui-table__cell {
color: #191919; color: #191919;
@@ -195,7 +199,7 @@
margin: 0 12px; margin: 0 12px;
width: 1px; width: 1px;
height: 100%; height: 100%;
background-color: #3c3f41; background-color: #cfcfcf;
} }
.fr { .fr {

32
src/components/Header/UserAvatar.vue
View File

@@ -110,22 +110,22 @@ const blockList = ref([
[ [
{ id: 'myPage', label: '个人中心', to: getRouterLink('PersonalCenter') } { id: 'myPage', label: '个人中心', to: getRouterLink('PersonalCenter') }
], ],
[ // [
// { id: 'dashboard', label: '工作台', icon: 'gt-member-c', to: getRouterLink('dashboard') }, // // { id: 'dashboard', label: '工作台', icon: 'gt-member-c', to: getRouterLink('dashboard') },
// { id: 'myIssues', label: '我的 Issue', icon: 'gt-issue-c', to: getRouterLink('issues') }, // // { id: 'myIssues', label: '我的 Issue', icon: 'gt-issue-c', to: getRouterLink('issues') },
// { id: 'myDiscuss', label: '我的讨论', icon: 'gt-comment-c', to: getRouterLink('discussionCreated') }, // // { id: 'myDiscuss', label: '我的讨论', icon: 'gt-comment-c', to: getRouterLink('discussionCreated') },
// { id: 'myMR', label: '我的合并请求', icon: 'gt-me-merge-c', to: getRouterLink('merge') }, // // { id: 'myMR', label: '我的合并请求', icon: 'gt-me-merge-c', to: getRouterLink('merge') },
{ id: 'notice', label: '消息通知', icon: 'gt-remind-c', to: getRouterLink({ name: 'notice', query: { status: 'all' }}) } // { id: 'notice', label: '消息通知', icon: 'gt-remind-c', to: getRouterLink({ name: 'notice', query: { status: 'all' }}) }
], // ],
[ // [
{ id: 'myOrg', label: '我的组织', icon: 'gt-organizations-c', to: getRouterLink({ name: 'settingOrganization' }) }, // { id: 'myOrg', label: '我的组织', icon: 'gt-organizations-c', to: getRouterLink({ name: 'settingOrganization' }) },
// { id: 'myRepo', label: '我的项目', icon: 'gt-folder-c', to: getRouterLink('userRepos') }, // // { id: 'myRepo', label: '我的项目', icon: 'gt-folder-c', to: getRouterLink('userRepos') },
// { id: 'myStar', label: '我的 Star', icon: 'gt-star-c', to: getRouterLink('userStars') } // // { id: 'myStar', label: '我的 Star', icon: 'gt-star-c', to: getRouterLink('userStars') }
], // ],
[ // [
{ id: 'personalSetting', label: '个人设置', icon: 'gt-setting-c', to: getRouterLink('setting') }, // { id: 'personalSetting', label: '个人设置', icon: 'gt-setting-c', to: getRouterLink('setting') },
// { id: 'help', label: '帮助文档', icon: 'gt-file-c', href: 'https://gitcode.com/Gitcode-offical-team/GitCode-Docs/wiki' } // { id: 'help', label: '帮助文档', icon: 'gt-file-c', href: 'https://gitcode.com/Gitcode-offical-team/GitCode-Docs/wiki' }
], // ],
[ [
{ id: 'logout', label: '退出登录', icon: 'gt-exit', action: logout } { id: 'logout', label: '退出登录', icon: 'gt-exit', action: logout }
] ]

43
src/components/TableSetting/index.vue Normal file
View File

@@ -0,0 +1,43 @@
<template>
<d-dropdown>
<d-button class="output-btn" icon="icon-form-settings" variant="text">设置</d-button>
<template #menu>
<!-- <ul class="list-menu">-->
<!-- <d-dropdown :position="position" :offset="0">-->
<!--&lt;!&ndash; <li class="menu-item">&ndash;&gt;-->
<!--&lt;!&ndash; Item 1&ndash;&gt;-->
<!--&lt;!&ndash; <i class="icon icon-chevron-right"></i>&ndash;&gt;-->
<!--&lt;!&ndash; </li>&ndash;&gt;-->
<!--&lt;!&ndash; <template #menu>&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; <ul class="list-menu">&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; <d-dropdown :position="position" :offset="0" >&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; <li class="menu-item">&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; Item 1-1&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; <i class="icon icon-chevron-right"></i>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; </li>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; <template #menu>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; <ul class="list-menu">&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; <li class="menu-item">Item 1-1-1</li>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; <li class="menu-item">Item 1-1-2</li>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; <li class="menu-item">Item 1-1-3</li>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; </ul>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; </template>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; </d-dropdown>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; <li class="menu-item">Item 1-2</li>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; </ul>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash; </template>&ndash;&gt;-->
<!-- </d-dropdown>-->
<!-- <li class="menu-item">Item 2</li>-->
<!-- </ul>-->
</template>
</d-dropdown>
</template>
<script lang="ts" setup>
import { ref } from 'vue';
const position = ref(['right-start', 'right-end']);
</script>
<style lang="scss" scoped>
</style>

13
src/views/Jyh/Search/Components/OssQuery.vue
View File

@@ -7,7 +7,12 @@
<d-button class="mr-2" variant="solid">筛选</d-button> <d-button class="mr-2" variant="solid">筛选</d-button>
<d-button variant="solid" color="secondary">清空</d-button> <d-button variant="solid" color="secondary">清空</d-button>
</gc-form-operation> </gc-form-operation>
<d-button class="output-btn" icon="icon-share" variant="text">导出</d-button> <div class="left-btn">
<d-button class="output-btn" icon="icon-share" variant="text">导出</d-button>
<span style="height: 14px" class="split"></span>
<TableSetting />
</div>
</template> </template>
</AdvanceSearch> </AdvanceSearch>
</div> </div>
@@ -109,6 +114,7 @@ import { ref,reactive, onMounted } from 'vue';
import { getGroupClaList, setGroupClaStatus, deleteGroupCla } from '@/api/cla'; import { getGroupClaList, setGroupClaStatus, deleteGroupCla } from '@/api/cla';
import { useRouter, useRoute } from 'vue-router'; import { useRouter, useRoute } from 'vue-router';
import { GModal } from '@/components/Setting/index'; import { GModal } from '@/components/Setting/index';
import TableSetting from '@/components/TableSetting/index.vue';
import { reqCatch } from '@/utils/catch'; import { reqCatch } from '@/utils/catch';
import { getOrgInfo } from '@/views/Org/hooks/orgInfo'; import { getOrgInfo } from '@/views/Org/hooks/orgInfo';
import { Message } from 'vue-devui'; import { Message } from 'vue-devui';
@@ -304,10 +310,13 @@ onMounted(() => {
border-radius: 8px 0px 8px 8px; border-radius: 8px 0px 8px 8px;
//background: #F2F5FC; //background: #F2F5FC;
.output-btn { .left-btn {
position: absolute; position: absolute;
right: 28px; right: 28px;
bottom: 4px; bottom: 4px;
}
.output-btn {
color: #191919; color: #191919;
font-family: HarmonyOS Sans SC; font-family: HarmonyOS Sans SC;
font-weight: regular; font-weight: regular;