From bb86422154878afd9d515fd6efa68b70a7925522 Mon Sep 17 00:00:00 2001 From: liudianxin Date: Wed, 17 Jun 2020 11:35:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=9B=AE=E5=BD=95=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/authority/{ => menu}/menus.vue | 0 .../{ => organization}/organization.vue | 0 .../{ => organization}/organizationdetail.vue | 0 .../{ => organization}/organizationedit.vue | 0 src/pages/authority/{ => role}/addroles.vue | 0 src/pages/authority/{ => role}/roles.vue | 0 .../authority/{ => user}/organizationuser.vue | 0 src/pages/authority/{ => user}/permission.vue | 0 src/pages/authority/{ => user}/userRoles.vue | 0 src/pages/authority/{ => user}/useradd.vue | 0 src/pages/authority/{ => user}/users.vue | 0 src/pages/data-analysis/my-service.vue | 40 +++++++++++++------ src/router/index.js | 32 +++++++-------- 13 files changed, 44 insertions(+), 28 deletions(-) rename src/pages/authority/{ => menu}/menus.vue (100%) rename src/pages/authority/{ => organization}/organization.vue (100%) rename src/pages/authority/{ => organization}/organizationdetail.vue (100%) rename src/pages/authority/{ => organization}/organizationedit.vue (100%) rename src/pages/authority/{ => role}/addroles.vue (100%) rename src/pages/authority/{ => role}/roles.vue (100%) rename src/pages/authority/{ => user}/organizationuser.vue (100%) rename src/pages/authority/{ => user}/permission.vue (100%) rename src/pages/authority/{ => user}/userRoles.vue (100%) rename src/pages/authority/{ => user}/useradd.vue (100%) rename src/pages/authority/{ => user}/users.vue (100%) diff --git a/src/pages/authority/menus.vue b/src/pages/authority/menu/menus.vue similarity index 100% rename from src/pages/authority/menus.vue rename to src/pages/authority/menu/menus.vue diff --git a/src/pages/authority/organization.vue b/src/pages/authority/organization/organization.vue similarity index 100% rename from src/pages/authority/organization.vue rename to src/pages/authority/organization/organization.vue diff --git a/src/pages/authority/organizationdetail.vue b/src/pages/authority/organization/organizationdetail.vue similarity index 100% rename from src/pages/authority/organizationdetail.vue rename to src/pages/authority/organization/organizationdetail.vue diff --git a/src/pages/authority/organizationedit.vue b/src/pages/authority/organization/organizationedit.vue similarity index 100% rename from src/pages/authority/organizationedit.vue rename to src/pages/authority/organization/organizationedit.vue diff --git a/src/pages/authority/addroles.vue b/src/pages/authority/role/addroles.vue similarity index 100% rename from src/pages/authority/addroles.vue rename to src/pages/authority/role/addroles.vue diff --git a/src/pages/authority/roles.vue b/src/pages/authority/role/roles.vue similarity index 100% rename from src/pages/authority/roles.vue rename to src/pages/authority/role/roles.vue diff --git a/src/pages/authority/organizationuser.vue b/src/pages/authority/user/organizationuser.vue similarity index 100% rename from src/pages/authority/organizationuser.vue rename to src/pages/authority/user/organizationuser.vue diff --git a/src/pages/authority/permission.vue b/src/pages/authority/user/permission.vue similarity index 100% rename from src/pages/authority/permission.vue rename to src/pages/authority/user/permission.vue diff --git a/src/pages/authority/userRoles.vue b/src/pages/authority/user/userRoles.vue similarity index 100% rename from src/pages/authority/userRoles.vue rename to src/pages/authority/user/userRoles.vue diff --git a/src/pages/authority/useradd.vue b/src/pages/authority/user/useradd.vue similarity index 100% rename from src/pages/authority/useradd.vue rename to src/pages/authority/user/useradd.vue diff --git a/src/pages/authority/users.vue b/src/pages/authority/user/users.vue similarity index 100% rename from src/pages/authority/users.vue rename to src/pages/authority/user/users.vue diff --git a/src/pages/data-analysis/my-service.vue b/src/pages/data-analysis/my-service.vue index 9f2d734..ea114e8 100644 --- a/src/pages/data-analysis/my-service.vue +++ b/src/pages/data-analysis/my-service.vue @@ -132,24 +132,40 @@ export default { { type: "bar", data: [, 40], - // coordinateSystem: "polar", + coordinateSystem: "polar", barMaxWidth: 10, - z: 2, + z: 1, name: "抢修项目", roundCap: true, color: "#1779ee", barGap: "-100%", label: { - show: true, - position: "inside", - label: { - normal: { - show: true, - fontSize: 18, - fontWeight: "bold", - color: "#333", - position: "top" - } + normal: { + show: true, + fontSize: 18, + fontWeight: "bold", + color: "#333", + position: "top" + } + } + }, + { + type: "bar", + data: [, 20], + coordinateSystem: "polar", + barMaxWidth: 10, + z: 2, + name: "抢修项目", + roundCap: true, + color: "#fff", + barGap: "-100%", + label: { + normal: { + show: true, + fontSize: 18, + fontWeight: "bold", + color: "#333", + position: "top" } } }, diff --git a/src/router/index.js b/src/router/index.js index 29a3285..f88e77f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -148,7 +148,7 @@ export default new Router({ component: () => import("@/pages/service_shop/shop_cloud"), }, { - path: "/shop/service_application_successfully", // 云资源服务 + path: "/shop/service_application_successfully", // 申请服务成功 name: "shopSuccess", component: () => import("@/pages/service_shop/service_application_successfully"), @@ -242,77 +242,77 @@ export default new Router({ { path: "/authority/organization", // 组织管理页 name: "organization", - component: () => import("@/pages/authority/organization"), + component: () => import("@/pages/authority/organization/organization"), }, { path: "/authority/organization/detail/:id", // 组织管理详情 name: "organizationdetail", - component: () => import("@/pages/authority/organizationdetail"), + component: () => import("@/pages/authority/organization/organizationdetail"), }, { path: "/authority/organization/add", // 组织管理组织新增 name: "organizationadd", - component: () => import("@/pages/authority/organizationedit"), + component: () => import("@/pages/authority/organization/organizationedit"), }, { path: "/authority/organization/edit/:id", // 组织管理组织编辑 name: "organizationedit", - component: () => import("@/pages/authority/organizationedit"), + component: () => import("@/pages/authority/organization/organizationedit"), }, { path: "/authority/organization/user/:id", // 组织管理组织用户 name: "organizationuser", - component: () => import("@/pages/authority/organizationuser"), + component: () => import("@/pages/authority/user/organizationuser"), }, { path: "/authority/users", // 用户管理页 name: "users", - component: () => import("@/pages/authority/users"), + component: () => import("@/pages/authority/user/users"), }, { path: "/authority/users/roles/:id", // 分配角色 name: "userRoles", - component: () => import("@/pages/authority/userRoles"), + component: () => import("@/pages/authority/user/userRoles"), }, { path: "/authority/users/add", // 用户管理-新增 name: "usersadd", - component: () => import("@/pages/authority/organizationuser"), + component: () => import("@/pages/authority/user/organizationuser"), }, { path: "/authority/users/detail/:id", // 用户管理-详情 name: "usersdetail", - component: () => import("@/pages/authority/organizationuser"), + component: () => import("@/pages/authority/user/organizationuser"), }, { path: "/authority/users/permission", // 用户管理页 - 权限审批 name: "users", - component: () => import("@/pages/authority/permission"), + component: () => import("@/pages/authority/user/permission"), }, { path: "/authority/menu", // 菜单管理页 name: "menu", - component: () => import("@/pages/authority/menus"), + component: () => import("@/pages/authority/menu/menus"), }, { path: "/authority/roles", // 角色管理页 name: "roles", - component: () => import("@/pages/authority/roles"), + component: () => import("@/pages/authority/role/roles"), }, { path: "/authority/roles/add", // 新建角色 name: "addroles", - component: () => import("@/pages/authority/addroles"), + component: () => import("@/pages/authority/role/addroles"), }, { path: "/authority/roles/edit/:id", // 编辑角色 name: "editroles", - component: () => import("@/pages/authority/addroles"), + component: () => import("@/pages/authority/role/addroles"), }, { path: "/authority/roles/allot/:id", // 分配角色 name: "allotroles", - component: () => import("@/pages/authority/addroles"), + component: () => import("@/pages/authority/role/addroles"), }, ], }, // 权限管理 -- 2.26.0