diff --git a/src/api/project-manage/attachment.js b/src/api/project-manage/attachment.js index 6a53b27..cbe1916 100644 --- a/src/api/project-manage/attachment.js +++ b/src/api/project-manage/attachment.js @@ -15,3 +15,17 @@ export const uploadFileList = (data) => { data: data }); }; +export const searchImplementationFileList = (params) => { + return request({ + url: '/workflow/mosr/attachment/implementation/list', + method: "get", + params: params + }); +}; +export const switchAttachmentState = (data) => { + return request({ + url: '/workflow/mosr/project/filing/attachment/switch', + method: "post", + data + }); +}; diff --git a/src/components/NameCircle.vue b/src/components/NameCircle.vue index 75a1481..4e016aa 100644 --- a/src/components/NameCircle.vue +++ b/src/components/NameCircle.vue @@ -3,7 +3,7 @@
- +
-
+
{{ props.content }} @@ -17,10 +17,12 @@ const props = defineProps({ content: { type: String, default: '' - }, width: { + }, + width: { type: String, - default: '' - }, lines: { + default: '100%' + }, + lines: { type: Boolean, default: false } @@ -40,6 +42,7 @@ const isShowTooltip = () => { overflow: hidden; } .content-lines{ + word-break:break-all; overflow:hidden; text-overflow: ellipsis; -webkit-line-clamp: 2; diff --git a/src/layout/navbar/index.vue b/src/layout/navbar/index.vue index ecd4904..7803cc6 100644 --- a/src/layout/navbar/index.vue +++ b/src/layout/navbar/index.vue @@ -17,7 +17,10 @@
  • 主次账号切换
  • - {{ item.nickName }} + + {{ item.nickName }} + + {{ item.nickName }}
    @@ -66,6 +69,7 @@ import {useTagsView} from '@/stores/tagsview'; import {getUserAccount} from "@/api/user/user"; import {switchAccount} from "@/api/login"; import {setToken} from "../../utils/auth"; +import {ElNotification} from "element-plus"; const authStore = useAuthStore() const permisstionStore = usePermisstionStroe() @@ -89,7 +93,13 @@ const nullBlockClick = () => { } const handleVisitedP = () => { getUserAccount().then(res => { - console.log(res) + if (res.code !== 1000) { + ElNotification({ + title: '提示', + message: res.msg, + type: res.code === 1000 ? 'success' : 'error' + }) + } accountList.value = res.data nextTick(() => { visitedP.value = !visitedP.value @@ -129,13 +139,23 @@ const handleLogout = () => { :deep(.el-avatar--circle) { display: inline-block; line-height: 40px; - margin-right: 10px; + margin-right: 14px; background-color: #8a7243; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } +:deep(.el-badge) { + padding: 0 2px; +} + +:deep(.el-badge__content.is-fixed) { + position: absolute; + right: 26px; + top: 2px; +} + .navbar { height: 65px; padding: 0 15px 0 0; diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue index 78526c2..20dde41 100644 --- a/src/views/project-management/filing/attachment.vue +++ b/src/views/project-management/filing/attachment.vue @@ -20,7 +20,7 @@ const router = useRouter() const activeName = ref('50') const attachment = ref({}) const loading = ref(false) -const uploadState = ref(true) +const uploadState = ref(false) const fileList = ref([]) const projectId = ref(route.query.id) const requirementId = ref(route.query.requirementId) diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue index 4dc848a..b8c158d 100644 --- a/src/views/project-management/filing/index.vue +++ b/src/views/project-management/filing/index.vue @@ -10,6 +10,8 @@ diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue index c18d945..2c35432 100644 --- a/src/views/project-management/implementation/attachment.vue +++ b/src/views/project-management/implementation/attachment.vue @@ -29,15 +29,14 @@