From 58215177490e572e089f2d3e0130d6ba2a1e18c3 Mon Sep 17 00:00:00 2001 From: binbin0314 Date: Tue, 23 Mar 2021 18:38:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E7=AD=96=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/demand.js | 21 +- src/api/policy.js | 2 + src/router/index.js | 136 ++++----- src/views/enterprise/demand.vue | 110 +++++--- src/views/enterprise/enterprise.vue | 416 ++++++++++++++++++++++------ src/views/firstPages/notice.vue | 202 ++++++++++---- src/views/firstPages/policy.vue | 289 ++++++++++++++----- src/views/firstPages/rotation.vue | 266 +++++++++++++----- src/views/firstPages/train.vue | 295 +++++++++++++++----- src/views/firstPages/typemanage.vue | 75 +++-- vue.config.js | 2 +- 11 files changed, 1323 insertions(+), 491 deletions(-) diff --git a/src/api/demand.js b/src/api/demand.js index 60e07be..30bb5ef 100644 --- a/src/api/demand.js +++ b/src/api/demand.js @@ -1,9 +1,16 @@ +/* + * @Author: wally + * @email: 18603454788@163.com + * @Date: 2021-01-27 15:54:17 + * @LastEditors: wally + * @LastEditTime: 2021-02-02 09:24:21 + */ import request from '@/utils/request' const demand = 'enterprise/demand' const demandPublish = 'enterprise/demandPublish' export function demandQuery(data) { return request({ - url: `/gateway${demand}/demandQuery`, + url: `/gateway/${demand}/demandQuery`, method: 'post', data: { param: { @@ -16,7 +23,7 @@ export function demandQuery(data) { export function updateDemandStatus(data) { return request({ - url: `/gateway${demand}/updateDemandStatus`, + url: `/gateway/${demand}/updateDemandStatus`, method: 'post', data: { param: { @@ -26,17 +33,17 @@ export function updateDemandStatus(data) { } }) } - + export function demandPublishAdd(data) { return request({ - url: `/gateway${demandPublish}/demandPublishAdd`, + url: `/gateway/${demandPublish}/demandPublishAdd`, method: 'post', data: { - + content: data.content, demandId: data.id, type: data.type - + } }) - } \ No newline at end of file + } diff --git a/src/api/policy.js b/src/api/policy.js index 4c871df..b6483ab 100644 --- a/src/api/policy.js +++ b/src/api/policy.js @@ -7,6 +7,7 @@ export function PolicyDetail(data) { method: 'post', data: { param: { + title: data.title, auditStatus: data.auditStatus, pageNum: data.pageNum, pageSize: data.pageSize, @@ -25,6 +26,7 @@ export function PolicyUpdate(data) { auditStatus: data.auditStatus, content: data.content, id: data.id, + labels: data.projectLabels ? data.projectLabels : null, imgUrl: data.imgUrl, intro: data.intro, title: data.title, diff --git a/src/router/index.js b/src/router/index.js index 3a9714a..3fdbe88 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -115,75 +115,75 @@ export const constantRoutes = [ ] }, - { - path: '/nested', - component: Layout, - redirect: '/nested/menu1', - name: 'Nested', - meta: { - title: 'Nested', - icon: 'nested' - }, - children: [ - { - path: 'menu1', - component: () => import('@/views/nested/menu1/index'), // Parent router-view - name: 'Menu1', - meta: { title: 'Menu1' }, - children: [ - { - path: 'menu1-1', - component: () => import('@/views/nested/menu1/menu1-1'), - name: 'Menu1-1', - meta: { title: 'Menu1-1' } - }, - { - path: 'menu1-2', - component: () => import('@/views/nested/menu1/menu1-2'), - name: 'Menu1-2', - meta: { title: 'Menu1-2' }, - children: [ - { - path: 'menu1-2-1', - component: () => import('@/views/nested/menu1/menu1-2/menu1-2-1'), - name: 'Menu1-2-1', - meta: { title: 'Menu1-2-1' } - }, - { - path: 'menu1-2-2', - component: () => import('@/views/nested/menu1/menu1-2/menu1-2-2'), - name: 'Menu1-2-2', - meta: { title: 'Menu1-2-2' } - } - ] - }, - { - path: 'menu1-3', - component: () => import('@/views/nested/menu1/menu1-3'), - name: 'Menu1-3', - meta: { title: 'Menu1-3' } - } - ] - }, - { - path: 'menu2', - component: () => import('@/views/nested/menu2/index'), - name: 'Menu2', - meta: { title: 'menu2' } - } - ] - }, + // { + // path: '/nested', + // component: Layout, + // redirect: '/nested/menu1', + // name: 'Nested', + // meta: { + // title: 'Nested', + // icon: 'nested' + // }, + // children: [ + // { + // path: 'menu1', + // component: () => import('@/views/nested/menu1/index'), // Parent router-view + // name: 'Menu1', + // meta: { title: 'Menu1' }, + // children: [ + // { + // path: 'menu1-1', + // component: () => import('@/views/nested/menu1/menu1-1'), + // name: 'Menu1-1', + // meta: { title: 'Menu1-1' } + // }, + // { + // path: 'menu1-2', + // component: () => import('@/views/nested/menu1/menu1-2'), + // name: 'Menu1-2', + // meta: { title: 'Menu1-2' }, + // children: [ + // { + // path: 'menu1-2-1', + // component: () => import('@/views/nested/menu1/menu1-2/menu1-2-1'), + // name: 'Menu1-2-1', + // meta: { title: 'Menu1-2-1' } + // }, + // { + // path: 'menu1-2-2', + // component: () => import('@/views/nested/menu1/menu1-2/menu1-2-2'), + // name: 'Menu1-2-2', + // meta: { title: 'Menu1-2-2' } + // } + // ] + // }, + // { + // path: 'menu1-3', + // component: () => import('@/views/nested/menu1/menu1-3'), + // name: 'Menu1-3', + // meta: { title: 'Menu1-3' } + // } + // ] + // }, + // { + // path: 'menu2', + // component: () => import('@/views/nested/menu2/index'), + // name: 'Menu2', + // meta: { title: 'menu2' } + // } + // ] + // }, - { - path: 'external-link', - component: Layout, - children: [ - { - path: 'https://panjiachen.github.io/vue-element-admin-site/#/', - meta: { title: 'External Link', icon: 'link' } - } - ] - }, + // { + // path: 'external-link', + // component: Layout, + // children: [ + // { + // path: 'https://panjiachen.github.io/vue-element-admin-site/#/', + // meta: { title: 'External Link', icon: 'link' } + // } + // ] + // }, // 404 page must be placed at the end !!! { path: '*', redirect: '/404', hidden: true } diff --git a/src/views/enterprise/demand.vue b/src/views/enterprise/demand.vue index 76d9f26..413d892 100644 --- a/src/views/enterprise/demand.vue +++ b/src/views/enterprise/demand.vue @@ -1,18 +1,35 @@