diff --git a/package.json b/package.json index 2413824..63086e9 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "dependencies": { "axios": "0.18.1", "core-js": "3.6.5", + "echarts": "^5.4.3", "element-ui": "2.13.2", "js-cookie": "2.2.0", "normalize.css": "7.0.0", diff --git a/src/api/formation.js b/src/api/formation.js new file mode 100644 index 0000000..1472510 --- /dev/null +++ b/src/api/formation.js @@ -0,0 +1,41 @@ +import request from '@/utils/request' + +export function list(data) { + return request({ + url: '/formation/list', + method: 'post', + data + }) +} + +export function deletes(formationId) { + return request({ + url: '/formation/deletes?formationId='+formationId, + method: 'post', + }) +} + +export function insert(data) { + return request({ + url: '/formation/insert', + method: 'post', + data + }) +} + +export function update(data) { + return request({ + url: '/formation/update', + method: 'post', + data + }) +} + +export function zhu() { + return request({ + url: '/formation/zhu', + method: 'post', + }) +} + + diff --git a/src/api/trees.js b/src/api/trees.js new file mode 100644 index 0000000..85cbc16 --- /dev/null +++ b/src/api/trees.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function treeList(data) { + return request({ + url: '/trees/trees', + method: 'post', + data + }) +} diff --git a/src/router/index.js b/src/router/index.js index 13459e9..c25ecdb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -55,27 +55,27 @@ export const constantRoutes = [ }] }, - { - path: '/example', - component: Layout, - redirect: '/example/table', - name: 'Example', - meta: { title: 'Example', icon: 'el-icon-s-help' }, - children: [ - { - path: 'table', - name: 'Table', - component: () => import('@/views/table/index'), - meta: { title: 'Table', icon: 'table' } - }, - { - path: 'tree', - name: 'Tree', - component: () => import('@/views/tree/index'), - meta: { title: 'Tree', icon: 'tree' } - } - ] - }, + // { + // path: '/example', + // component: Layout, + // redirect: '/example/table', + // name: 'Example', + // meta: { title: 'Example', icon: 'el-icon-s-help' }, + // children: [ + // { + // path: 'table', + // name: 'Table', + // component: () => import('@/views/table/index'), + // meta: { title: 'Table', icon: 'table' } + // }, + // { + // path: 'tree', + // name: 'Tree', + // component: () => import('@/views/tree/index'), + // meta: { title: 'Tree', icon: 'tree' } + // } + // ] + // }, { path: '/form', @@ -90,75 +90,119 @@ export const constantRoutes = [ ] }, + // { + // path: '/formation', + // component: Layout, + // children: [ + // { + // path: 'index', + // name: '用户管理', + // component: () => import('@/views/formation/index'), + // meta: { title: '用户管理', icon: 'form' } + // } + // ] + // }, + { - path: '/nested', + path: '/formation', component: Layout, - redirect: '/nested/menu1', - name: 'Nested', + redirect: '/formation/index', + name: 'Formation', meta: { - title: 'Nested', + title: '用户管理', icon: 'nested' }, children: [ { path: 'menu1', - component: () => import('@/views/nested/menu1/index'), // Parent router-view + component: () => import('@/views/formation/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' } - } - ] + meta: { title: '用户管理列表' }, }, { path: 'menu2', - component: () => import('@/views/nested/menu2/index'), + component: () => import('@/views/formation/menu2/index'), name: 'Menu2', - meta: { title: 'menu2' } + meta: { title: '血压区域分析' } + }, + { + path: 'menu3', + component: () => import('@/views/formation/menu3/index'), + name: 'menu3', + meta: { title: '树形控件' } } ] }, - { - path: 'external-link', - component: Layout, - children: [ - { - path: 'https://panjiachen.github.io/vue-element-admin-site/#/', - meta: { title: 'External Link', icon: 'link' } - } - ] - }, + // { + // 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' } + // } + // ] + // }, // 404 page must be placed at the end !!! { path: '*', redirect: '/404', hidden: true } diff --git a/src/views/formation/menu1/index.vue b/src/views/formation/menu1/index.vue new file mode 100644 index 0000000..916df72 --- /dev/null +++ b/src/views/formation/menu1/index.vue @@ -0,0 +1,330 @@ + + + + + + diff --git a/src/views/formation/menu2/index.vue b/src/views/formation/menu2/index.vue new file mode 100644 index 0000000..7453015 --- /dev/null +++ b/src/views/formation/menu2/index.vue @@ -0,0 +1,77 @@ + + + + + + diff --git a/src/views/formation/menu3/index.vue b/src/views/formation/menu3/index.vue new file mode 100644 index 0000000..465534d --- /dev/null +++ b/src/views/formation/menu3/index.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/views/login/index.vue b/src/views/login/index.vue index ae4145e..17b2f31 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -51,8 +51,8 @@ 登录 - 注册 - 找回密码 + 注册 + 找回密码
username: admin password: any @@ -140,8 +140,8 @@ export default { dialogFormVisible:false, From:false, loginForm: { - username: 'admin', - password: '111111', + username: 'tom', + password: '999999', role:'请选择身份' }, loginRules: { diff --git a/src/views/nested/menu1/index.vue b/src/views/nested/menu1/index.vue deleted file mode 100644 index 30cb670..0000000 --- a/src/views/nested/menu1/index.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/src/views/nested/menu1/menu1-1/index.vue b/src/views/nested/menu1/menu1-1/index.vue deleted file mode 100644 index 27e173a..0000000 --- a/src/views/nested/menu1/menu1-1/index.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/src/views/nested/menu1/menu1-2/index.vue b/src/views/nested/menu1/menu1-2/index.vue deleted file mode 100644 index 0c86276..0000000 --- a/src/views/nested/menu1/menu1-2/index.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue b/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue deleted file mode 100644 index f87d88f..0000000 --- a/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue b/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue deleted file mode 100644 index d88789f..0000000 --- a/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/views/nested/menu1/menu1-3/index.vue b/src/views/nested/menu1/menu1-3/index.vue deleted file mode 100644 index f7cd073..0000000 --- a/src/views/nested/menu1/menu1-3/index.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/views/nested/menu2/index.vue b/src/views/nested/menu2/index.vue deleted file mode 100644 index 19dd48f..0000000 --- a/src/views/nested/menu2/index.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/views/table/index.vue b/src/views/table/index.vue deleted file mode 100644 index a1ed847..0000000 --- a/src/views/table/index.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - diff --git a/src/views/tree/index.vue b/src/views/tree/index.vue deleted file mode 100644 index 89c6b01..0000000 --- a/src/views/tree/index.vue +++ /dev/null @@ -1,78 +0,0 @@ - - - -