diff --git a/src/api/index.js b/src/api/index.js index 32e4ab0..3138e0c 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -23,7 +23,9 @@ const api = { refund:'/governance/icEvent/reply', agencyRootDepttree:'/gov/org/customeragency/rootAgencyGridDepttree', getStreetConfigDetail:'/governance/icEventConfig/getStreetConfigDetail', - + healingList:'/governance/healing/list', + healingSave:'/governance/healing/save', + } export default api diff --git a/src/api/summer.js b/src/api/summer.js new file mode 100644 index 0000000..d73a466 --- /dev/null +++ b/src/api/summer.js @@ -0,0 +1,16 @@ +import api from './index' +import request from '@/utils/request' +export function healingList(params) { + return request({ + url: api.healingList, + method: 'get', + params + }) + } + export function healingSave(data) { + return request({ + url: api.healingSave, + method: 'post', + data + }) + } \ No newline at end of file diff --git a/src/assets/css/common.less b/src/assets/css/common.less index 572e6af..5714f5f 100644 --- a/src/assets/css/common.less +++ b/src/assets/css/common.less @@ -6,7 +6,10 @@ .mr10 { margin-right: 10px; } - +.img30{ + width: 15px; + height: 15px; +} .primary-color { color: @blue; } @@ -61,6 +64,9 @@ &-fend{ justify-content: flex-end; } + &-flexwrap{ + justify-content: flex-end; + } } .m{ &-left8{ @@ -84,15 +90,33 @@ &-top5{ margin-top: 5px; } + + &-top10{ + margin-top: 10px; + } &-bottom{ margin-bottom: 5px; } + &-bottom10{ + margin-bottom: 10px; + } } .p-18{ padding: 0 18px; } - +.p-10{ + padding: 10px; +} +.p-10s{ + padding: 10px; +} +.p-5{ + padding: 5px 10px; +} +.p-5s{ + padding: 0 10px; +} .font-size13{ font-size: 13px; } @@ -171,3 +195,6 @@ box-sizing: border-box; text-align: right; } +.grey{ + color: #999999; +} diff --git a/src/assets/images/summer/bannder.png b/src/assets/images/summer/bannder.png new file mode 100644 index 0000000..52dc357 Binary files /dev/null and b/src/assets/images/summer/bannder.png differ diff --git a/src/assets/images/summer/data.png b/src/assets/images/summer/data.png new file mode 100644 index 0000000..13df590 Binary files /dev/null and b/src/assets/images/summer/data.png differ diff --git a/src/assets/images/summer/dropdown.png b/src/assets/images/summer/dropdown.png new file mode 100644 index 0000000..b631590 Binary files /dev/null and b/src/assets/images/summer/dropdown.png differ diff --git a/src/assets/images/summer/fillInRecords.png b/src/assets/images/summer/fillInRecords.png new file mode 100644 index 0000000..23d1f7e Binary files /dev/null and b/src/assets/images/summer/fillInRecords.png differ diff --git a/src/assets/images/summer/redFlag.png b/src/assets/images/summer/redFlag.png new file mode 100644 index 0000000..34ed402 Binary files /dev/null and b/src/assets/images/summer/redFlag.png differ diff --git a/src/router/index.js b/src/router/index.js index 341052a..44eb56b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -53,6 +53,14 @@ router.beforeEach((to, from, next) => { localStorage.setItem('token_work',urlParams.worktoken) next({ }) } + else if(urlParams.worktoken&&to.path=='/Summer'){ + console.log(store.state.app,"store.state.app.userInfo"); + store.state.app.isRouterLoading = true + console.log(to,"to"); + console.log(urlParams.worktoken,"Sdfsfdjhjh") + localStorage.setItem('token_work',urlParams.worktoken) + next({ }) + } else{ next() console.log(urlParams.worktoken,"Sdfsfd") diff --git a/src/router/router.config.js b/src/router/router.config.js index 6766072..ce51f88 100644 --- a/src/router/router.config.js +++ b/src/router/router.config.js @@ -45,6 +45,18 @@ export const constantRouterMap = [ component: () => import('@/views/AttackEvent'), meta: { title: '', keepAlive: false } }, + { + path: '/Summer', + name:'Summer', + component: () => import('@/views/summer/index.vue'), + meta: { title: '夏病春治', keepAlive: false } + }, + { + path: '/addingRecord', + name:'addingRecord', + component: () => import('@/views/summer/addingRecord.vue'), + meta: { title: '填写记录', keepAlive: false } + }, { path: '/HotlineDetail', name:'HotlineDetail', diff --git a/src/views/Hotline/index.vue b/src/views/Hotline/index.vue index 0930f42..c1d8e48 100644 --- a/src/views/Hotline/index.vue +++ b/src/views/Hotline/index.vue @@ -6,26 +6,14 @@ - {{ operationTypeType?operationTypeType:'办理状态' }} - - - 检索 - diff --git a/src/views/summer/addingRecord.vue b/src/views/summer/addingRecord.vue new file mode 100644 index 0000000..f73c35b --- /dev/null +++ b/src/views/summer/addingRecord.vue @@ -0,0 +1,322 @@ + + + + diff --git a/src/views/summer/index.vue b/src/views/summer/index.vue new file mode 100644 index 0000000..277bc90 --- /dev/null +++ b/src/views/summer/index.vue @@ -0,0 +1,285 @@ + + + +