diff --git a/src/api/model/wf.js b/src/api/model/wf.js index 4ae09205..0bd01bb7 100644 --- a/src/api/model/wf.js +++ b/src/api/model/wf.js @@ -168,7 +168,7 @@ export default { }, dutyAgg: { url: `${config.API_URL}/wf/ticket/duty_agg/`, - name: "工单待办聚合", + name: "待办审批聚合", req: async function(data){ return await http.get(this.url, data); } diff --git a/src/config/route.js b/src/config/route.js index ddd4f662..556c040c 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -134,6 +134,101 @@ const routes = [ }, ], }, + //审批 + { + name: "wf", + path: "/wf", + meta: { + title: "审批管理", + icon: "sc-icon-Shenpi", + type: "menu", + perms: ["wf"], + }, + children: [ + { + name: "workflow", + path: "/wf/workflow", + meta: { + title: "工作流", + // icon: "el-icon-guide", + perms: ["workflow"], + }, + component: "wf/workflow", + }, + { + name: "configuration", + path: "/wf/configuration", + meta: { + title: "工作流配置", + // icon: "el-icon-menu", + hidden: true, + perms: ["workflow"], + }, + component: "wf/configuration", + }, + { + name: "allwork", + path: "/wf/allwork", + meta: { + title: "全部审批", + // icon: "el-icon-folder", + perms: ["allwork"], + }, + component: "wf/allwork", + }, + { + name: "ownerwork", + path: "/wf/ownerwork", + meta: { + title: "我创建的", + // icon: "el-icon-folder-add", + perms: ["ownerwork"], + }, + component: "wf/ownerwork", + }, + { + name: "duty", + path: "/wf/dutywork", + meta: { + title: "待办审批", + // icon: "el-icon-folder-opened", + perms: ["duty"], + }, + component: "wf/dutywork", + }, + { + name: "worked", + path: "/wf/worked", + meta: { + title: "我处理的", + // icon: "el-icon-expand", + perms: ["worked"], + }, + component: "wf/worked", + }, + { + name: "ccwork", + path: "/wf/ccwork", + meta: { + title: "抄送我的", + // icon: "el-icon-edit-pen", + perms: ["ccwork"], + }, + component: "wf/ccwork", + }, + { + name: "ticketdetail", + path: "/wf/ticketdetail", + meta: { + title: "工单详情", + // icon: "el-icon-menu", + hidden: true, + perms: ["duty"], + }, + component: "wf/ticketdetail", + }, + ], + }, //电石渣 { name: "enm_slag", @@ -2175,101 +2270,6 @@ const routes = [ }, ], }, - //审批 - { - name: "wf", - path: "/wf", - meta: { - title: "审批管理", - icon: "sc-icon-Shenpi", - type: "menu", - perms: ["wf"], - }, - children: [ - { - name: "workflow", - path: "/wf/workflow", - meta: { - title: "工作流", - // icon: "el-icon-guide", - perms: ["workflow"], - }, - component: "wf/workflow", - }, - { - name: "configuration", - path: "/wf/configuration", - meta: { - title: "工作流配置", - // icon: "el-icon-menu", - hidden: true, - perms: ["workflow"], - }, - component: "wf/configuration", - }, - { - name: "allwork", - path: "/wf/allwork", - meta: { - title: "全部工单", - // icon: "el-icon-folder", - perms: ["allwork"], - }, - component: "wf/allwork", - }, - { - name: "ownerwork", - path: "/wf/ownerwork", - meta: { - title: "我创建的", - // icon: "el-icon-folder-add", - perms: ["ownerwork"], - }, - component: "wf/ownerwork", - }, - { - name: "duty", - path: "/wf/dutywork", - meta: { - title: "待办工单", - // icon: "el-icon-folder-opened", - perms: ["duty"], - }, - component: "wf/dutywork", - }, - { - name: "worked", - path: "/wf/worked", - meta: { - title: "我处理的", - // icon: "el-icon-expand", - perms: ["worked"], - }, - component: "wf/worked", - }, - { - name: "ccwork", - path: "/wf/ccwork", - meta: { - title: "抄送我的", - // icon: "el-icon-edit-pen", - perms: ["ccwork"], - }, - component: "wf/ccwork", - }, - { - name: "ticketdetail", - path: "/wf/ticketdetail", - meta: { - title: "工单详情", - // icon: "el-icon-menu", - hidden: true, - perms: ["duty"], - }, - component: "wf/ticketdetail", - }, - ], - }, //区域 { name: "am", diff --git a/src/style/app.scss b/src/style/app.scss index 7c29fc02..82e56ccc 100644 --- a/src/style/app.scss +++ b/src/style/app.scss @@ -59,7 +59,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo .adminui-side-split-scroll::-webkit-scrollbar-track {background-color: rgba(255, 255, 255, 0);} .adminui-side-split-scroll::-webkit-scrollbar-track:hover {background-color: rgba(255, 255, 255, 0);} -.aminui-side {display: flex;flex-flow: column;flex-shrink:0;width:210px;background: #fff;box-shadow: 2px 0 8px 0 rgba(29,35,41,.05);border-right: 1px solid #e6e6e6;transition:width 0.3s;} +.aminui-side {display: flex;flex-flow: column;flex-shrink:0;width:180px;background: #fff;box-shadow: 2px 0 8px 0 rgba(29,35,41,.05);border-right: 1px solid #e6e6e6;transition:width 0.3s;} .adminui-side-top {border-bottom: 1px solid #ebeef5;height:50px;line-height: 50px;} .adminui-side-top h2 {padding:0 20px;font-size: 17px;color: #3c4a54;} .adminui-side-scroll {overflow: auto;overflow-x:hidden;flex: 1;} diff --git a/src/views/home/widgets/components/eventlist.vue b/src/views/home/widgets/components/eventlist.vue index d5a659fe..983f95ea 100644 --- a/src/views/home/widgets/components/eventlist.vue +++ b/src/views/home/widgets/components/eventlist.vue @@ -1,7 +1,7 @@