From 51a843446895ebfbb8b3f0bf74df6f222d8a5d9d Mon Sep 17 00:00:00 2001 From: zhengzhou Date: Mon, 31 May 2021 11:26:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BD=8D=E7=BD=AE=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router.js | 2 +- .../components/link-project.vue | 0 .../components/members-picker.vue | 0 .../components/plain-folder-list.vue | 0 .../components/temp-selected-user-list.vue | 0 .../{project => project-detail}/index.vue | 0 .../{project => project-detail}/service.js | 0 .../components/create-project-modal.vue | 3 ++ src/views/main_web/project-list/list-view.vue | 50 +------------------ 9 files changed, 5 insertions(+), 50 deletions(-) rename src/views/main_web/{project => project-detail}/components/link-project.vue (100%) rename src/views/main_web/{project => project-detail}/components/members-picker.vue (100%) rename src/views/main_web/{project => project-detail}/components/plain-folder-list.vue (100%) rename src/views/main_web/{project => project-detail}/components/temp-selected-user-list.vue (100%) rename src/views/main_web/{project => project-detail}/index.vue (100%) rename src/views/main_web/{project => project-detail}/service.js (100%) create mode 100644 src/views/main_web/project-list/components/create-project-modal.vue diff --git a/src/router.js b/src/router.js index 573c647b..c3772750 100644 --- a/src/router.js +++ b/src/router.js @@ -21,7 +21,7 @@ const router = new Router({ path:'/projdetail', name: 'projdetail', // component: () => import('@/views/components_web/projDetail/projDetail') - component: () => import('@/views/main_web/project') + component: () => import('@/views/main_web/project-detail') }, { diff --git a/src/views/main_web/project/components/link-project.vue b/src/views/main_web/project-detail/components/link-project.vue similarity index 100% rename from src/views/main_web/project/components/link-project.vue rename to src/views/main_web/project-detail/components/link-project.vue diff --git a/src/views/main_web/project/components/members-picker.vue b/src/views/main_web/project-detail/components/members-picker.vue similarity index 100% rename from src/views/main_web/project/components/members-picker.vue rename to src/views/main_web/project-detail/components/members-picker.vue diff --git a/src/views/main_web/project/components/plain-folder-list.vue b/src/views/main_web/project-detail/components/plain-folder-list.vue similarity index 100% rename from src/views/main_web/project/components/plain-folder-list.vue rename to src/views/main_web/project-detail/components/plain-folder-list.vue diff --git a/src/views/main_web/project/components/temp-selected-user-list.vue b/src/views/main_web/project-detail/components/temp-selected-user-list.vue similarity index 100% rename from src/views/main_web/project/components/temp-selected-user-list.vue rename to src/views/main_web/project-detail/components/temp-selected-user-list.vue diff --git a/src/views/main_web/project/index.vue b/src/views/main_web/project-detail/index.vue similarity index 100% rename from src/views/main_web/project/index.vue rename to src/views/main_web/project-detail/index.vue diff --git a/src/views/main_web/project/service.js b/src/views/main_web/project-detail/service.js similarity index 100% rename from src/views/main_web/project/service.js rename to src/views/main_web/project-detail/service.js diff --git a/src/views/main_web/project-list/components/create-project-modal.vue b/src/views/main_web/project-list/components/create-project-modal.vue new file mode 100644 index 00000000..61c7765c --- /dev/null +++ b/src/views/main_web/project-list/components/create-project-modal.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/main_web/project-list/list-view.vue b/src/views/main_web/project-list/list-view.vue index 4c8a447a..21319699 100644 --- a/src/views/main_web/project-list/list-view.vue +++ b/src/views/main_web/project-list/list-view.vue @@ -86,21 +86,6 @@ > - - - - @@ -115,7 +100,6 @@ import * as prjService from "@/services/project"; import Timer from "./components/time"; import ProjList from "./components/proj-list"; // import IconTriangleCircle from "@/components/icon-triangle-circle"; -import LinkProjectInfoModal from '@/components/link-project-info-modal'; import { debounce } from "lodash"; import { wrapErrorHint } from '@/utils/request'; @@ -124,7 +108,6 @@ export default { elNew: "#new", //样式ID,用于动画 components: { SearchBar, - LinkProjectInfoModal, // DistWork, // NewProj, // ProjSetting, @@ -161,9 +144,7 @@ export default { // linkDialogVisible: false, // linkDialogContextData: null, - pickedProject: {}, - linkProjectInfoModalVisible: false, - linkProjectId: undefined, + pickedProject: {}, // 选中项 }; }, computed: { @@ -303,35 +284,6 @@ export default { ); } }, - - /* 互链邀请相关API */ - // - checkParentProject(projectItem) { - this.pickedProject = projectItem; - this.linkProjectInfoModalVisible = true; - this.linkProjectId = projectItem.ParentProjId; - }, - // 解除互链关系 - severNestProject() { - const pickedProject = this.pickedProject; - this.$confirm( - "解除互链不会影响双方项目的文件数据，解除后将无法进行文件交付，确定解除吗？", - { - confirmButtonText: "解除互链关系", - cancelButtonText: "取消", - type: "danger", - } - ) - .then(async () => { - const res = await this.$fetchApi('project/deleteProjectLink', { folderId: pickedProject.ParentFolderId, nestProjectId: pickedProject.Id }) - wrapErrorHint(res); - if(res.Code !== 0) { return; } - notify.success('互链关系已接触'); - this.linkProjectInfoModalVisible = false; - // this.fetchProjectDetail(); - this.listProjects(); - }); - }, }, };