diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js index fd10bb1cb..bad618de2 100644 --- a/fe/PC/src/router/index.js +++ b/fe/PC/src/router/index.js @@ -118,22 +118,22 @@ export const constantRoutes = [ } }] }, - // { - // path: '/', - // component: Layout, - // redirect: '/gridlayout', - // // hidden: true, - // children: [{ - // path: 'gridlayout', - // component: () => import('@/views/gridLayout/indexShow'), - // name: 'Gridlayout', - // meta: { - // keepAlive : true, - // title: '首页编辑器', - // icon: '系统首页', - // } - // }] - // }, + { + path: '/', + component: Layout, + redirect: '/gridlayout', + hidden: true, + children: [{ + path: 'gridlayout', + component: () => import('@/views/gridLayout/indexShow'), + name: 'Gridlayout', + meta: { + keepAlive : true, + title: '首页编辑器', + icon: '系统首页', + } + }] + }, // 开发中模拟路由 // { // path: '/', diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue index e793d4717..42e46e8df 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue @@ -223,6 +223,7 @@ export default { focus: (type,val) => { return this.getFilterList(type, val, "basedata/project")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/project', 'Project', '项目选择', this.CreateFormData) }, colSpan: 12 }, { type: "input", label: "E-LEVEL等级", prop: 'elevel', colSpan: 12 }, + { type: "input", label: "颜色", prop: 'color', colSpan: 12 }, { label: "类型", prop: 'type', type: "select", options: "ItemTypeBasic", colSpan: 12 }, { type: "input", label: "种类", prop: 'category', colSpan: 12 }, { type: "input", label: "分组", prop: 'group', colSpan: 12 }, @@ -255,6 +256,7 @@ export default { focus: (type,val) => { return this.getFilterList(type, val, "basedata/project")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/project', 'Project', '项目选择', this.editFormData) }, colSpan: 12 }, { type: "input", label: "E-LEVEL等级", prop: 'elevel', colSpan: 12 }, + { type: "input", label: "颜色", prop: 'color', colSpan: 12 }, { label: "类型", prop: 'type', type: "select", options: "ItemTypeBasic", disabled: true, colSpan: 12 }, { type: "input", label: "种类", prop: 'category', colSpan: 12 }, { type: "input", label: "分组", prop: 'group', colSpan: 12 },