-
@@ -38,7 +18,14 @@
import router from "@/router";
import RightPanel from "@/components/RightPanel";
import notFound from "@/views/error/404";
-import { AppMain, Navbar, Settings, Sidebar, TagsView } from "./components";
+import {
+ AppMain,
+ Navbar,
+ Settings,
+ Sidebar,
+ TagsView,
+ NewMenu,
+} from "./components";
import ResizeMixin from "./mixin/ResizeHandler";
import { mapState } from "vuex";
import variables from "@/assets/styles/variables.scss";
@@ -52,6 +39,7 @@ export default {
Settings,
Sidebar,
TagsView,
+ NewMenu,
notFound,
},
mixins: [ResizeMixin],
@@ -64,6 +52,7 @@ export default {
notFound: (state) => state.app.notFound,
conciseMenu: (state) => state.settings.conciseMenu,
needTagsView: (state) => state.settings.tagsView,
+ showTagsView: (state) => state.settings.showTagsView,
fixedHeader: (state) => state.settings.fixedHeader,
}),
classObj() {
@@ -84,50 +73,12 @@ export default {
childrenWidth: "1200px",
};
},
- watch: {
- sidebar: {
- handler: function (val, oldVal) {
- if (!val.opened && this.childrenType) {
- this.$nextTick(() => {
- let newWidth = this.$refs.sidebar.childrenWidth + 128 + "px";
- this.childrenWidth = newWidth;
- });
- }
- },
- deep: true,
- },
- },
- mounted() {
- this.getMenu();
- this.childrenWidth = this.$refs.sidebar.childrenWidth;
- // console.log(this.childrenWidth )
- },
methods: {
- openChildren(val) {
- let newWidth = this.$refs.sidebar.childrenWidth + 128 + "px";
- this.childrenWidth = newWidth;
- this.childrenType = val;
- },
- changeWidth(width) {
- this.childrenWidth = width + 128 + "px";
- },
handleClickOutside() {
this.$store.dispatch("app/closeSideBar", {
withoutAnimation: false,
});
},
- getMenu() {
- //动态路由注释
- // this.$store.dispatch("GenerateRoutes").then((accessRoutes) => {
- // // console.log(accessRoutes)
- // // 根据roles权限生成可访问的路由表
- // for (let i = 0, length = accessRoutes.length; i < length; i += 1) {
- // const element = accessRoutes[i];
- // router.addRoutes(accessRoutes); // 动态添加可访问路由表
- // }
- // localStorage.setItem("routeList", JSON.stringify(accessRoutes));
- // });
- },
},
};
@@ -141,14 +92,25 @@ export default {
position: relative;
height: 100%;
width: 100%;
- padding: 0 8px;
- background: #fafafa;
+ // padding: 0 8px;
+ background: #ffffff;
&.mobile.openSidebar {
position: fixed;
top: 0;
}
}
-
+.newVersionSystem {
+ display: flex;
+ height: 100%;
+ width: 100%;
+}
+.newMenuWidth {
+ width: 114px;
+}
+.newMenuAppMain {
+ width: calc(100% - 114px);
+ overflow: hidden;
+}
.drawer-bg {
background: #000;
opacity: 0.3;
diff --git a/src/layout/index_v3.vue b/src/layout/index_v3.vue
new file mode 100644
index 0000000..50a4346
--- /dev/null
+++ b/src/layout/index_v3.vue
@@ -0,0 +1,199 @@
+
+
+
+
+
+
+
diff --git a/src/router/index.js b/src/router/index.js
index e81993f..a92ef3c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -40,225 +40,233 @@ export const constantRoutes = [{
component: () => import('@/views/redirect')
}]
},
- {
- path: '/apiLogs',
- component: () => import('@/views/apiLogs/index.vue'),
- hidden: true
- },
- {
- path: '/login',
- component: () => import('@/views/login'),
- hidden: true
- },
- {
- path: '/test',
- component: () => import('@/views/test'),
- hidden: true
- },
- {
- path: '/register',
- component: () => import('@/views/register/index'),
- hidden: true
- },
- {
- path: '/systemInit',
- // name: "databaseIndex",
- component: () => import('@/views/systemInit/index'),
- hidden: true
- },
- {
- path: '/404',
- component: () => import('@/views/error/404'),
- hidden: true
- },
- {
- path: '/401',
- component: () => import('@/views/error/401'),
- hidden: true
- },
+{
+ path: '/apiLogs',
+ component: () => import('@/views/apiLogs/index.vue'),
+ hidden: true
+},
+{
+ path: '/login',
+ component: () => import('@/views/login'),
+ hidden: true
+},
+{
+ path: '/test',
+ component: () => import('@/views/test'),
+ hidden: true
+},
+{
+ path: '/register',
+ component: () => import('@/views/register/index'),
+ hidden: true
+},
+{
+ path: '/systemInit',
+ // name: "databaseIndex",
+ component: () => import('@/views/systemInit/index'),
+ hidden: true
+},
+{
+ path: '/404',
+ component: () => import('@/views/error/404'),
+ hidden: true
+},
+{
+ path: '/401',
+ component: () => import('@/views/error/401'),
+ hidden: true
+},
// {
// path: "/contractAssistant",
// component: () => import("@/views/contractAssistant"),
// hidden: true,
// },
- {
- path: '',
- component: Layout,
- redirect: 'index',
- children: [{
- path: 'index',
- component: () => import('@/views/index_v2'),
- name: 'Index',
- meta: {
- title: '首页',
- icon: 'dashboard',
- affix: true
- }
- },
- {
- path: 'notFound',
- component: () => import('@/views/notFound'),
- name: 'notFound',
- meta: {
- title: '404',
- icon: 'dashboard'
- // affix: true,
- }
- }
- ]
+{
+ path: '',
+ component: Layout,
+ redirect: 'index',
+ children: [{
+ path: 'index',
+ component: () => import('@/views/index_v2'),
+ name: 'Index',
+ meta: {
+ title: '首页',
+ icon: 'dashboard',
+ affix: true
+ }
},
{
- path: '/user',
- component: Layout,
- hidden: true,
- redirect: 'Profile',
- children: [{
- path: 'Profile',
- // component: () => import('@/views/system/user/personalCenter/index'),
- component: () =>
- import(
- '@/views/systemSettings/userSettings/PersonnelSettings/personalCenter/index'
- ),
- name: 'Profile',
- meta: {
- title: '个人中心',
- icon: 'user'
+ path: 'notFound',
+ component: () => import('@/views/notFound'),
+ name: 'notFound',
+ meta: {
+ title: '404',
+ icon: 'dashboard'
+ // affix: true,
+ }
+ },{
+ path: "Workbench",
+ component: () => import("@/views/newVersionView/Workbench/index"),
+ name: "Workbench",
+ meta: {
+ title: "工作台",
+ icon: "dashboard",
+ },
+ },
+ ]
+},
+{
+ path: '/user',
+ component: Layout,
+ hidden: true,
+ redirect: 'Profile',
+ children: [{
+ path: 'Profile',
+ // component: () => import('@/views/system/user/personalCenter/index'),
+ component: () =>
+ import(
+ '@/views/systemSettings/userSettings/PersonnelSettings/personalCenter/index'
+ ),
+ name: 'Profile',
+ meta: {
+ title: '个人中心',
+ icon: 'user'
- }
- }]
- }
-// {
-// path: "/integrationOption",
-// component: Layout,
-// name: "integrationOption",
-// redirect: "dataOption",
-// meta: {
-// title: "主数据中心",
-// icon: "documentation",
-// },
-// children: [
-// {
-// path: "dataOption",
-// component: () => import("@/views/integrationOption/index.vue"),
-// name: "dataOption",
-// meta: {
-// title: "主数据中心",
-// },
-// },
-// ],
-// },
-// {
-// path: "/applicationList",
-// component: Layout,
-// name: "applicationList",
-// redirect: "applicationListAdmin",
-// meta: {
-// title: "应用列表",
-// icon: "el-icon-s-home",
-// },
-// children: [
-// {
-// path: "applicationListAdmin",
-// component: () => import("@/views/applicationList/index.vue"),
-// name: "applicationListAdmin",
-// meta: {
-// title: "应用列表",
-// },
-// },
-// {
-// path: "settingMenu",
-// component: () => import("@/views/applicationList/settingMenu.vue"),
-// name: "settingMenu",
-// redirect: 'settingMenu/applicationEdit',
-// hidden: true,
-// meta: {
-// title: "应用设置",
-// hidden: true,
-// },
-// children: [
-// {
-// path: "applicationEdit",
-// component: () => import("@/views/applicationList/masterDataAdd.vue"),
-// name: "applicationEdit",
-// hidden: true,
-// meta: {
-// title: "应用编辑",
-// hidden: true,
-// },
-// },
-// {
-// path: "exploit",
-// component: () => import("@/views/applicationList/exploit"),
-// name: "exploit",
-// hidden: true,
-// meta: {
-// title: "开发管理",
-// hidden: true,
-// },
-// },
-// {
-// path: "authority",
-// component: () => import("@/views/applicationList/authority"),
-// name: "authority",
-// hidden: true,
-// meta: {
-// title: "权限管理",
-// hidden: true,
-//
-// },
-// },
-// {
-// path: "appApiAdmin",
-// name: "appApiAdmin",
-// component: () => import("@/views/applicationList/apiList/apiAdmin"),
-// meta: {
-// title: "API管理",
-// hidden: true
-// }
-// },
-// {
-// path: "inserterAdmin",
-// name: "inserterAdmin",
-// component: () => import("@/views/applicationList/inserterAdmin"),
-// meta: {
-// title: "插件管理",
-// hidden: true,
-// }
-// },
-// {
-// path: "appApiadd",
-// name: "appApiAdd",
-// redirect: "",
-// hidden: "true",
-// component: () => import("@/views/applicationList/apiList/apiAdd"),
-// meta: {
-// title: "API新增",
-//
-// },
-// },
-// {
-// path: "appApiview",
-// name: "appApiView",
-// hidden: "true",
-// component: () => import("@/views/applicationList/apiList/apiView"),
-// meta: {
-// title: "API查看"
-// }
-// },
-// ]
-// },
-// {
-// path: "applicationAdd",
-// component: () => import("@/views/applicationList/masterDataAdd.vue"),
-// name: "applicationAdd",
-// hidden: true,
-// meta: {
-// title: "应用新增",
-// hidden: true,
-// },
-// },
-// ],
-// },
+ }
+ }]
+},
+ // {
+ // path: "/integrationOption",
+ // component: Layout,
+ // name: "integrationOption",
+ // redirect: "dataOption",
+ // meta: {
+ // title: "主数据中心",
+ // icon: "documentation",
+ // },
+ // children: [
+ // {
+ // path: "dataOption",
+ // component: () => import("@/views/integrationOption/index.vue"),
+ // name: "dataOption",
+ // meta: {
+ // title: "主数据中心",
+ // },
+ // },
+ // ],
+ // },
+ // {
+ // path: "/applicationList",
+ // component: Layout,
+ // name: "applicationList",
+ // redirect: "applicationListAdmin",
+ // meta: {
+ // title: "应用列表",
+ // icon: "el-icon-s-home",
+ // },
+ // children: [
+ // {
+ // path: "applicationListAdmin",
+ // component: () => import("@/views/applicationList/index.vue"),
+ // name: "applicationListAdmin",
+ // meta: {
+ // title: "应用列表",
+ // },
+ // },
+ // {
+ // path: "settingMenu",
+ // component: () => import("@/views/applicationList/settingMenu.vue"),
+ // name: "settingMenu",
+ // redirect: 'settingMenu/applicationEdit',
+ // hidden: true,
+ // meta: {
+ // title: "应用设置",
+ // hidden: true,
+ // },
+ // children: [
+ // {
+ // path: "applicationEdit",
+ // component: () => import("@/views/applicationList/masterDataAdd.vue"),
+ // name: "applicationEdit",
+ // hidden: true,
+ // meta: {
+ // title: "应用编辑",
+ // hidden: true,
+ // },
+ // },
+ // {
+ // path: "exploit",
+ // component: () => import("@/views/applicationList/exploit"),
+ // name: "exploit",
+ // hidden: true,
+ // meta: {
+ // title: "开发管理",
+ // hidden: true,
+ // },
+ // },
+ // {
+ // path: "authority",
+ // component: () => import("@/views/applicationList/authority"),
+ // name: "authority",
+ // hidden: true,
+ // meta: {
+ // title: "权限管理",
+ // hidden: true,
+ //
+ // },
+ // },
+ // {
+ // path: "appApiAdmin",
+ // name: "appApiAdmin",
+ // component: () => import("@/views/applicationList/apiList/apiAdmin"),
+ // meta: {
+ // title: "API管理",
+ // hidden: true
+ // }
+ // },
+ // {
+ // path: "inserterAdmin",
+ // name: "inserterAdmin",
+ // component: () => import("@/views/applicationList/inserterAdmin"),
+ // meta: {
+ // title: "插件管理",
+ // hidden: true,
+ // }
+ // },
+ // {
+ // path: "appApiadd",
+ // name: "appApiAdd",
+ // redirect: "",
+ // hidden: "true",
+ // component: () => import("@/views/applicationList/apiList/apiAdd"),
+ // meta: {
+ // title: "API新增",
+ //
+ // },
+ // },
+ // {
+ // path: "appApiview",
+ // name: "appApiView",
+ // hidden: "true",
+ // component: () => import("@/views/applicationList/apiList/apiView"),
+ // meta: {
+ // title: "API查看"
+ // }
+ // },
+ // ]
+ // },
+ // {
+ // path: "applicationAdd",
+ // component: () => import("@/views/applicationList/masterDataAdd.vue"),
+ // name: "applicationAdd",
+ // hidden: true,
+ // meta: {
+ // title: "应用新增",
+ // hidden: true,
+ // },
+ // },
+ // ],
+ // },
// {
// path: "/scene",
// component: Layout,
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index 4838092..e3965fd 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -1,6 +1,6 @@
import defaultSettings from '@/settings'
-const { sideTheme, showSettings,conciseMenu, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings
+const { sideTheme, showSettings,conciseMenu, topNav, tagsView, showTagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings
const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
const state = {
title: '',
@@ -12,6 +12,7 @@ const state = {
tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,
+ showTagsView: storageSetting.showTagsView === undefined ? showTagsView : storageSetting.showTagsView,
dynamicTitle: storageSetting.dynamicTitle === undefined ? dynamicTitle : storageSetting.dynamicTitle
}
const mutations = {
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index 9a88c2b..48e854a 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -95,6 +95,9 @@ const mutations = {
return false
})
},
+ CLEAR_VISTEDVIEWS:state =>{
+ state.visitedViews = []
+ },
DEL_LEFT_VIEWS: (state, view) => {
const index = state.visitedViews.findIndex(v => v.path === view.path)
if (index === -1) {
@@ -122,6 +125,9 @@ const actions = {
dispatch('addVisitedView', view)
dispatch('addCachedView', view)
},
+ clearVisted({commit}){
+ commit('CLEAR_VISTEDVIEWS')
+ },
addIframeView({ commit }, view) {
commit('ADD_IFRAME_VIEW', view)
},
diff --git a/src/views/applicationList/applicationAdd.vue b/src/views/applicationList/applicationAdd.vue
index a6bdb5f..36dea94 100644
--- a/src/views/applicationList/applicationAdd.vue
+++ b/src/views/applicationList/applicationAdd.vue
@@ -3,14 +3,21 @@
@@ -19,14 +26,27 @@
应用logo
-
-
![]()
+
- 点击上传
- 上传中
+ 点击上传
+ 上传中
@@ -46,16 +74,28 @@
-
-
@@ -63,59 +103,57 @@
\ No newline at end of file
diff --git a/src/views/newVersionView/logo1.png b/src/views/newVersionView/logo1.png
new file mode 100644
index 0000000..1ed9d0c
Binary files /dev/null and b/src/views/newVersionView/logo1.png differ
diff --git a/src/views/systemMaintenance/menuManagement/configData.js b/src/views/systemMaintenance/menuManagement/configData.js
index c705d6e..c0e399f 100644
--- a/src/views/systemMaintenance/menuManagement/configData.js
+++ b/src/views/systemMaintenance/menuManagement/configData.js
@@ -1,32 +1,43 @@
// 详情页面结构JSON
-const formRow = [{
- elCol: [{
- label: '父节点',
- prop: 'parentMenuName',
- tag: 'elDialog',
- span:24,
+const formRow = [
+ {
+ elCol: [
+ {
+ label: '菜单图标',
+ prop: 'menuIcon',
+ tag: 'elSlot',
+ slotName:"menuIcon"
+ },
+ ]
+ },
+ {
+ elCol: [{
+ label: '父节点',
+ prop: 'parentMenuName',
+ tag: 'elDialog',
+ span: 24,
+ },
+ // {
+ // label: '菜单顺序',
+ // prop: 'mc_Sort',
+ // tag: 'elInput',
+ // rules:true
+ // // type:'number'
+ // },
+ ]
},
- // {
- // label: '菜单顺序',
- // prop: 'mc_Sort',
- // tag: 'elInput',
- // rules:true
- // // type:'number'
- // },
- ]
-},
{
elCol: [{
label: '菜单名称',
prop: 'menuName',
tag: 'elInput',
},
- {
- label: '菜单英文名称',
- prop: 'menuEnglishName',
- tag: 'elInput',
- },
+ {
+ label: '菜单英文名称',
+ prop: 'menuEnglishName',
+ tag: 'elInput',
+ },
]
},
{
@@ -34,16 +45,7 @@ const formRow = [{
label: '菜单路径',
prop: 'route',
tag: 'elInput',
- },
- {
- label: '菜单图标',
- prop: 'menuIcon',
- tag: 'elInput',
- },
- ]
- },
- {
- elCol: [{
+ },{
label: '页面路径',
prop: 'menuPage',
tag: 'elInput',
@@ -59,7 +61,7 @@ const formRow = [{
options: [{
label: '菜单',
value: "1"
- },{
+ }, {
label: '弹窗',
value: "2"
}
@@ -72,7 +74,7 @@ const formRow = [{
options: [{
label: '是',
value: "0"
- },{
+ }, {
label: '否',
value: "1",
}
@@ -114,38 +116,38 @@ const roleOptions = [{
label: '超级管理员',
value: 1
},
- {
- label: '业务员',
- value: 2
- },
- {
- label: '管理员',
- value: 3
- },
- {
- label: '开发成员',
- value: 4
- },
- {
- label: '项目经理',
- value: 5
- },
- {
- label: '实施人员',
- value: 6
- },
- {
- label: '财务',
- value: 7
- },
- {
- label: '总经理',
- value: 8
- },
- {
- label: '副总',
- value: 9
- }
+{
+ label: '业务员',
+ value: 2
+},
+{
+ label: '管理员',
+ value: 3
+},
+{
+ label: '开发成员',
+ value: 4
+},
+{
+ label: '项目经理',
+ value: 5
+},
+{
+ label: '实施人员',
+ value: 6
+},
+{
+ label: '财务',
+ value: 7
+},
+{
+ label: '总经理',
+ value: 8
+},
+{
+ label: '副总',
+ value: 9
+}
]
const rules = {
villageId: [{
diff --git a/src/views/systemMaintenance/menuManagement/index.vue b/src/views/systemMaintenance/menuManagement/index.vue
index 5b96ad7..0774283 100644
--- a/src/views/systemMaintenance/menuManagement/index.vue
+++ b/src/views/systemMaintenance/menuManagement/index.vue
@@ -3,52 +3,99 @@
* @date: 2022-09-09
-->
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
-
+