diff --git a/package.json b/package.json index becf3c6..15c45c3 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "axios": "0.18.1", "core-js": "3.6.5", "echarts": "^5.3.3", + "echarts-wordcloud": "^2.0.0", "element-ui": "^2.13.2", "js-cookie": "2.2.0", "jsmind": "^0.4.8", diff --git a/src/api/person.js b/src/api/person.js index b27ca57..a8aa02b 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -6,4 +6,12 @@ export function getPersonData(params) { method: 'get', params }) +} + +export function getPersonTag(params) { + return request({ + url: '/person/person_tag', + method: 'get', + params + }) } \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 6b49c5d..24d4f74 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -152,7 +152,7 @@ export const constantRoutes = [ { path: '/priority', component: Layout, - + children: [{ path: 'priority', name: 'priority', @@ -178,6 +178,7 @@ export const constantRoutes = [ path: 'show', name: 'JobShow', component: () => import('@/views/job/show'), + // component: () => import('@/views/job/job'), meta: { title: '岗位总览' } }, { @@ -192,30 +193,47 @@ export const constantRoutes = [ { path: '/person', component: Layout, - children: [{ - path: 'person', - name: 'person', - component: () => import('@/views/person/person'), - meta: { - title: '人员', - icon: '人员' - } - }] + redirect: '/person/person', + name: 'Person', + meta: { + title: '人员', + icon: '人员' + }, + children: [ + { + path: 'person', + name: 'PersonAll', + component: () => import('@/views/person/person'), + meta: { title: '人员' } + }, + { + path: 'person_pic_test', + name: 'PersonPicTest', + component: () => import('@/views/person/person_pic'), + meta: { title: '人员画像' } + }, + { + path: 'person_review', + name: 'PersonReview', + component: () => import('@/views/person/person_review'), + meta: { title: '人员盘点' } + }, + ] }, - { - path: '/person_review', - component: Layout, - children: [{ - path: 'person_review', - name: 'person_review', - component: () => import('@/views/person_review/person_review'), - meta: { - title: '人才盘点', - icon: '人员' - } - }] - }, + // { + // path: '/person_review', + // component: Layout, + // children: [{ + // path: 'person_review', + // name: 'person_review', + // component: () => import('@/views/person_review/person_review'), + // meta: { + // title: '人才盘点', + // icon: '人员' + // } + // }] + // }, { path: '/event', diff --git a/src/views/job/job.vue b/src/views/job/job.vue index 6c975fe..78eb514 100644 --- a/src/views/job/job.vue +++ b/src/views/job/job.vue @@ -21,9 +21,9 @@ export default { var config = { containerId: "viz", neo4j: { - serverUrl: "bolt://localhost:7687", - serverUser: "neo4j", - serverPassword: "neo4j123", + serverUrl: "bolt://222.20.95.239:7687", + serverUser: "yzw", + serverPassword: "yzw1234567", }, labels: { Character: { @@ -37,7 +37,7 @@ export default { value: "weight", }, }, - initialCypher: "MATCH (n)-[r:INTERACTS]->(m) RETURN n,r,m limit 100", + initialCypher: "MATCH (n:Person) RETURN n LIMIT 25", }; this.neoViz = new NeoVis(config); this.neoViz.render(); diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 6a8bd0c..b303dad 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -150,6 +150,7 @@ export default { console.log(err); this.loading = false; }); + }, }, }; diff --git a/src/views/person/components/PersonPicture.vue b/src/views/person/components/PersonPicture.vue index 7e9bd3f..7b0cccb 100644 --- a/src/views/person/components/PersonPicture.vue +++ b/src/views/person/components/PersonPicture.vue @@ -1,10 +1,11 @@ @@ -251,5 +406,6 @@ export default { .pic { height: 600px; width: 600px; + border: 1px solid black; } \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index 6357212..49fa9a7 100644 --- a/vue.config.js +++ b/vue.config.js @@ -38,7 +38,8 @@ module.exports = { }, proxy: { '/': { - target: 'http://127.0.0.1:4523/m1/1256020-0-default/', + // target: 'http://127.0.0.1:4523/m1/1256020-0-default/', + target: 'http://127.0.0.1:8000', // target: 'http://192.168.31.102:8000', // target: 'http://222.20.95.239:8000', changeOrigin: true,