diff --git a/cdTMP/src/api/project/project.js b/cdTMP/src/api/project/project.js
new file mode 100644
index 0000000..bfeafe3
--- /dev/null
+++ b/cdTMP/src/api/project/project.js
@@ -0,0 +1,30 @@
+import { request } from "@/api/request"
+
+export default {
+ /**
+ * 根据项目名确定round初始节点
+ * @returns round初始节点
+ */
+ getRoundInfo(projectId) {
+ return request({
+ url: `project/getRoundInfo/${projectId}`,
+ method: "get"
+ })
+ },
+
+ /**
+ * 根据项目名、轮次round查询轮次下面的设计需求
+ * @returns 设计需求树状节点信息
+ */
+ getDemandInfo(projectId, key, level) {
+ return request({
+ url: `project/getdemandInfo`,
+ method: "get",
+ params: {
+ projectId: projectId,
+ key: key,
+ level: level
+ }
+ })
+ }
+}
diff --git a/cdTMP/src/components/ma-treeSlider/index.vue b/cdTMP/src/components/ma-treeSlider/index.vue
index cb3edab..25a7353 100644
--- a/cdTMP/src/components/ma-treeSlider/index.vue
+++ b/cdTMP/src/components/ma-treeSlider/index.vue
@@ -1,7 +1,13 @@
-
+
{
diff --git a/cdTMP/src/layout/components/navbar.vue b/cdTMP/src/layout/components/navbar.vue
index fd6b066..a9c6a02 100644
--- a/cdTMP/src/layout/components/navbar.vue
+++ b/cdTMP/src/layout/components/navbar.vue
@@ -13,7 +13,8 @@
/>
-
+
+ {{ title }}
@@ -110,6 +111,13 @@ import useUser from "@/hooks/logout"
import { Message } from "@arco-design/web-vue"
import Menu from "@/layout/components/menu.vue"
const appStore = useAppStore()
+// title管理-默认在后台
+const props = defineProps({
+ title: {
+ type: String,
+ default: ""
+ }
+})
// 是否menu在顶部-暂时不用
const topMenu = computed(() => appStore.topMenu && appStore.menu)
// 全屏设置,使用了@vueuse/core
diff --git a/cdTMP/src/layout/components/project-tab-bar.vue b/cdTMP/src/layout/components/project-tab-bar.vue
new file mode 100644
index 0000000..962f9a7
--- /dev/null
+++ b/cdTMP/src/layout/components/project-tab-bar.vue
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
diff --git a/cdTMP/src/layout/project-layout.vue b/cdTMP/src/layout/project-layout.vue
new file mode 100644
index 0000000..0ff6cbc
--- /dev/null
+++ b/cdTMP/src/layout/project-layout.vue
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cdTMP/src/router/index.js b/cdTMP/src/router/index.js
index 449267d..523f3de 100644
--- a/cdTMP/src/router/index.js
+++ b/cdTMP/src/router/index.js
@@ -2,7 +2,7 @@ import { createRouter, createWebHistory } from "vue-router"
// appRoutes为modules下面的所有路由
import { appRoutes } from "./routes"
// 引入基本重定向路由和notFound路由
-import { REDIRECT_MAIN, NOT_FOUND_ROUTE } from "./routes/base"
+import { REDIRECT_MAIN, NOT_FOUND_ROUTE, PROJECT_LAYOUT } from "./routes/base"
import createRouteGuard from "@/router/guard/index"
const router = createRouter({
@@ -20,6 +20,21 @@ const router = createRouter({
requiresAuth: false
}
},
+ // 项目工作区路由
+ {
+ path: "/project",
+ name: "project",
+ component: PROJECT_LAYOUT,
+ meta: {
+ requiresAuth: true,
+ roles: ["*"],
+ order: 0,
+ locale: "项目工作区",
+ icon: "icon-home"
+ },
+ },
+
+ // 后台管理的路由以及404和重定向路由
...appRoutes,
REDIRECT_MAIN,
NOT_FOUND_ROUTE
diff --git a/cdTMP/src/router/routes/base.js b/cdTMP/src/router/routes/base.js
index 16c68a1..8e83b85 100644
--- a/cdTMP/src/router/routes/base.js
+++ b/cdTMP/src/router/routes/base.js
@@ -4,7 +4,8 @@ import { REDIRECT_ROUTE_NAME } from "@/router/constants"
* @description: import('@/layout/default-layout.vue')
* @type: Promise对象
*/
-export const DEFAULT_LAYOUT = () => import('@/layout/default-layout.vue')
+export const DEFAULT_LAYOUT = () => import("@/layout/default-layout.vue")
+export const PROJECT_LAYOUT = () => import("@/layout/project-layout.vue")
export const REDIRECT_MAIN = {
path: "/redirect",
diff --git a/cdTMP/src/router/routes/modules/dashboard.js b/cdTMP/src/router/routes/modules/dashboard.js
index 930c369..a3eca44 100644
--- a/cdTMP/src/router/routes/modules/dashboard.js
+++ b/cdTMP/src/router/routes/modules/dashboard.js
@@ -7,7 +7,7 @@ const DASHBOARD = {
meta: {
requiresAuth: true,
icon: "icon-home",
- order: 0,
+ order: 99,
locale: "首页"
},
children: [
diff --git a/cdTMP/src/router/routes/modules/testmanage.js b/cdTMP/src/router/routes/modules/testmanage.js
index a15e2a4..ba4443c 100644
--- a/cdTMP/src/router/routes/modules/testmanage.js
+++ b/cdTMP/src/router/routes/modules/testmanage.js
@@ -7,7 +7,7 @@ const TESTMANAGE = {
meta: {
requiresAuth: true,
icon: "icon-apps",
- order: 1,
+ order: 98,
locale: "测试管理"
},
children: [
diff --git a/cdTMP/src/store/index.js b/cdTMP/src/store/index.js
index b85f6b7..134b54b 100644
--- a/cdTMP/src/store/index.js
+++ b/cdTMP/src/store/index.js
@@ -9,5 +9,12 @@ import useTagStore from "./modules/tag"
const pinia = createPinia()
-export { useUserStore, useAppStore, useTabBarStore, useFormStore, useKeepAliveStore, useTagStore }
+export {
+ useUserStore,
+ useAppStore,
+ useTabBarStore,
+ useFormStore,
+ useKeepAliveStore,
+ useTagStore,
+}
export default pinia
diff --git a/cdTMP/src/views/testmanage/projmanage/config/crudOptionsConfig.js b/cdTMP/src/views/testmanage/projmanage/config/crudOptionsConfig.js
deleted file mode 100644
index 53c2d8b..0000000
--- a/cdTMP/src/views/testmanage/projmanage/config/crudOptionsConfig.js
+++ /dev/null
@@ -1,125 +0,0 @@
-import projectApi from "@/api/testmanage/project"
-export const crudOptions = {
- showIndex: false,
- rowSelection: { showCheckedAll: true },
- api: projectApi.getPageList,
- add: { show: true },
- edit: { show: true },
- delete: { show: true },
- searchColNumber: 3,
- tablePagination: true,
- operationColumn: true,
- operationWidth: 200,
- showIndex: false,
- formOption: {
- isFull: true,
- layout: [
- {
- formType: "grid",
- cols: [
- { span: 8, formList: [{ dataIndex: "ident" }] },
- { span: 8, formList: [{ dataIndex: "name" }] },
- { span: 8, formList: [{ dataIndex: "engin_model" }] }
- ]
- },
- {
- formType: "grid",
- cols: [
- { span: 8, formList: [{ dataIndex: "section_system" }] },
- { span: 8, formList: [{ dataIndex: "sub_system" }] },
- { span: 8, formList: [{ dataIndex: "device" }] }
- ]
- },
- {
- formType: "divider"
- },
- {
- formType: "grid",
- cols: [
- { span: 8, formList: [{ dataIndex: "beginTime" }] },
- { span: 8, formList: [{ dataIndex: "endTime" }] },
- { span: 8, formList: [{ dataIndex: "duty_person" }] },
- { span: 8, formList: [{ dataIndex: "member" }] }
- ]
- },
- {
- formType: "grid",
- cols: [{ span: 24, formList: [{ dataIndex: "security_level" }] }]
- },
- {
- formType: "grid",
- cols: [
- { span: 12, formList: [{ dataIndex: "test_level" }] },
- { span: 12, formList: [{ dataIndex: "plant_type" }] }
- ]
- },
- {
- formType: "grid",
- cols: [{ span: 24, formList: [{ dataIndex: "report_type" }] }]
- },
- {
- formType: "grid",
- cols: [{ span: 24, formList: [{ dataIndex: "language" }] }]
- },
- {
- formType: "grid",
- cols: [{ span: 24, formList: [{ dataIndex: "standard" }] }]
- },
- {
- formType: "grid-tailwind",
- customClass: ["mt-0"],
- colNumber: 3,
- cols: [
- {
- formList: [
- {
- formType: "card",
- title: "委托方信息",
- customClass: ["mt-3", "mb-5", "mx-1"],
- formList: [
- { dataIndex: "entrust_ident" },
- { dataIndex: "entrust_legal" },
- { dataIndex: "entrust_contact" },
- { dataIndex: "entrust_contact_phone" },
- { dataIndex: "entrust_email" }
- ]
- }
- ]
- },
- {
- formList: [
- {
- formType: "card",
- title: "研制方信息",
- customClass: ["mt-3", "mb-5", "mx-1"],
- formList: [
- { dataIndex: "dev_ident" },
- { dataIndex: "dev_legal" },
- { dataIndex: "dev_contact" },
- { dataIndex: "dev_contact_phone" },
- { dataIndex: "dev_email" }
- ]
- }
- ]
- },
- {
- formList: [
- {
- formType: "card",
- title: "测评中心信息",
- customClass: ["mt-3", "mb-5", "mx-1"],
- formList: [
- { dataIndex: "test_ident" },
- { dataIndex: "test_legal" },
- { dataIndex: "test_contact" },
- { dataIndex: "test_contact_phone" },
- { dataIndex: "test_email" }
- ]
- }
- ]
- }
- ]
- }
- ]
- }
-}
diff --git a/cdTMP/src/views/testmanage/projmanage/cpns/preview.vue b/cdTMP/src/views/testmanage/projmanage/cpns/preview.vue
index 376272f..13df213 100644
--- a/cdTMP/src/views/testmanage/projmanage/cpns/preview.vue
+++ b/cdTMP/src/views/testmanage/projmanage/cpns/preview.vue
@@ -2,7 +2,7 @@
{{ previewRecord.name }}
-
+
diff --git a/cdTMP/src/views/testmanage/projmanage/index.vue b/cdTMP/src/views/testmanage/projmanage/index.vue
index 3017660..00d9f8c 100644
--- a/cdTMP/src/views/testmanage/projmanage/index.vue
+++ b/cdTMP/src/views/testmanage/projmanage/index.vue
@@ -4,6 +4,7 @@
+ 进入工作区
预览
@@ -11,7 +12,6 @@
-