diff --git a/web/package-lock.json b/web/package-lock.json index 6df373a..4bbc293 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -2139,16 +2139,6 @@ "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=", "dev": true }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, "cacache": { "version": "13.0.1", "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1616431241238&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz", @@ -2175,34 +2165,6 @@ "unique-filename": "^1.1.1" } }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, "cssnano": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz", @@ -2215,25 +2177,6 @@ "postcss": "^7.0.0" } }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", @@ -2250,16 +2193,6 @@ "minipass": "^3.1.1" } }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - }, "terser-webpack-plugin": { "version": "2.3.8", "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz", @@ -2276,18 +2209,6 @@ "terser": "^4.6.12", "webpack-sources": "^1.4.3" } - }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", - "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - } } } }, @@ -14600,6 +14521,87 @@ } } }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz", + "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.4", + "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "vue-quill-editor": { "version": "3.0.6", "resolved": "https://registry.npm.taobao.org/vue-quill-editor/download/vue-quill-editor-3.0.6.tgz", diff --git a/web/src/App.vue b/web/src/App.vue index 0770ed9..c26dcd5 100644 --- a/web/src/App.vue +++ b/web/src/App.vue @@ -21,17 +21,23 @@ html, body, #app { } .el-table th.is-leaf { - background: rgba(250, 250, 250, 1); + background: rgba(235,241,255); border-top: 1px solid #EBEEF5; } +.el-table th.el-table__cell{ + background: rgba(235,241,255)!important; + color: #333333!important; + font-weight: normal!important; +} + .menu-content { margin: 25px; background: #FFFFFF; overflow: auto; position: absolute; - left: 290px; - top: 100px; + left: 260px; + top: 40px; bottom: 0; right: 0; padding: 25px; @@ -70,4 +76,75 @@ html, body, #app { height: 178px; display: block; } + +.login-input .el-input__inner{ + height: 60px!important; + line-height: 60px!important; + border-radius: 10px!important; + font-size: 16px!important; + padding: 0px 30px 0 60px!important; +} + +.login-input i{ + font-size: 30px!important; + line-height: 60px!important; + margin-left: 15px!important; +} + +.login-button{ + height: 60px!important; + width: 100%!important; + border-radius: 10px!important; + //background: rgba(16,108,255, 1); + border: none; + font-size: 16px!important; + letter-spacing:5px!important; + margin-bottom: 20px; +} + +/*滚动条样式*/ +::-webkit-scrollbar {/*滚动条整体样式*/ + width: 8px; /*高宽分别对应横竖滚动条的尺寸*/ + height: 1px; +} + +::-webkit-scrollbar-thumb {/*滚动条里面小方块*/ + border-radius: 5px; + -webkit-box-shadow: inset 0 0 5px #d9d9d9; + background: #d9d9d9; +} + +::-webkit-scrollbar-track { /*滚动条里面轨道*/ + -webkit-box-shadow: inset 0 0 5px #ffffff; + border-radius: 0; + background: #ffffff; +} + +.el-dialog__header{ + background: cornflowerblue; + padding-bottom:15px!important; + padding-top: 15px!important; +} + +.el-dialog__title{ + color: #ffffff!important; +} + +.el-dialog__headerbtn .el-dialog__close{ + color: #ffffff!important; +} + +.el-dialog__body{ + padding-bottom:20px!important; +} + +.content-box .el-input__inner{ + height: 33px!important; + line-height: 33px!important; +} + +.content-box .el-button--primary,.content-box .el-button--default{ + padding: 9px 15px!important; + font-size: 12px!important; +} diff --git a/web/src/assets/image/ambari-logo.png b/web/src/assets/image/ambari-logo.png new file mode 100644 index 0000000..9a00b4c Binary files /dev/null and b/web/src/assets/image/ambari-logo.png differ diff --git a/web/src/assets/image/background.png b/web/src/assets/image/background.png new file mode 100644 index 0000000..4d055fb Binary files /dev/null and b/web/src/assets/image/background.png differ diff --git a/web/src/assets/image/content-logo.png b/web/src/assets/image/content-logo.png new file mode 100644 index 0000000..8c8d88d Binary files /dev/null and b/web/src/assets/image/content-logo.png differ diff --git a/web/src/assets/image/login-img.png b/web/src/assets/image/login-img.png new file mode 100644 index 0000000..1942dba Binary files /dev/null and b/web/src/assets/image/login-img.png differ diff --git a/web/src/assets/image/password.png b/web/src/assets/image/password.png new file mode 100644 index 0000000..d0a5515 Binary files /dev/null and b/web/src/assets/image/password.png differ diff --git a/web/src/assets/image/user.png b/web/src/assets/image/user.png new file mode 100644 index 0000000..2e67164 Binary files /dev/null and b/web/src/assets/image/user.png differ diff --git a/web/src/components/graph/GraphSpace.vue b/web/src/components/graph/GraphSpace.vue index e147b0d..9109b56 100644 --- a/web/src/components/graph/GraphSpace.vue +++ b/web/src/components/graph/GraphSpace.vue @@ -791,7 +791,7 @@ function refreshDragedNodePosition(e) { } .graph-info-box { - left: 0; + left: 20px; width: 230px; } diff --git a/web/src/components/menus/EntrysManage.vue b/web/src/components/menus/EntrysManage.vue index 5d64e1a..37b6b57 100644 --- a/web/src/components/menus/EntrysManage.vue +++ b/web/src/components/menus/EntrysManage.vue @@ -6,11 +6,11 @@
- - + + - - + + 搜 索 @@ -18,10 +18,10 @@
- 添加 + 添 加
- + diff --git a/web/src/components/menus/FeedbackTypeManage.vue b/web/src/components/menus/FeedbackTypeManage.vue index 4576082..c186ba4 100644 --- a/web/src/components/menus/FeedbackTypeManage.vue +++ b/web/src/components/menus/FeedbackTypeManage.vue @@ -6,8 +6,8 @@
- - + + 搜 索 @@ -15,10 +15,10 @@
- 添加 + 添 加
- + diff --git a/web/src/components/menus/GraphImport.vue b/web/src/components/menus/GraphImport.vue index 256423b..6956227 100644 --- a/web/src/components/menus/GraphImport.vue +++ b/web/src/components/menus/GraphImport.vue @@ -26,12 +26,12 @@ :on-change="handleFileChange" :limit="2" :show-file-list="false"> - 上传文件 + 上传文件
- 执行 + 执行 @@ -58,7 +58,7 @@
- + - 上传文件 + 上传文件
* zip文件必须包含vertex.json、edge.json
 - 执行 + 执行
{{message}}
- + diff --git a/web/src/components/menus/GraphModel.vue b/web/src/components/menus/GraphModel.vue index 5d0a2ca..80b5bf7 100644 --- a/web/src/components/menus/GraphModel.vue +++ b/web/src/components/menus/GraphModel.vue @@ -6,8 +6,8 @@
- - + + 搜 索 @@ -15,10 +15,10 @@
- 新建知识图谱本体 + 新建知识图谱本体
- + diff --git a/web/src/components/menus/GraphSpaceManage.vue b/web/src/components/menus/GraphSpaceManage.vue index ebed8e1..4aaf64c 100644 --- a/web/src/components/menus/GraphSpaceManage.vue +++ b/web/src/components/menus/GraphSpaceManage.vue @@ -6,8 +6,8 @@
- - + + 搜 索 @@ -15,10 +15,10 @@
- 新建知识图谱 + 新建知识图谱
- + diff --git a/web/src/components/menus/GraphSpaceSet.vue b/web/src/components/menus/GraphSpaceSet.vue index 3e3a8e8..e28d350 100644 --- a/web/src/components/menus/GraphSpaceSet.vue +++ b/web/src/components/menus/GraphSpaceSet.vue @@ -24,7 +24,7 @@ 新建类
- + @@ -45,7 +45,7 @@ 新建关系
- + @@ -76,7 +76,7 @@ 新建索引
- + diff --git a/web/src/components/menus/HomePage.vue b/web/src/components/menus/HomePage.vue index 9ad388e..2f94b72 100644 --- a/web/src/components/menus/HomePage.vue +++ b/web/src/components/menus/HomePage.vue @@ -5,13 +5,18 @@
-
-
{{ key }}
-
{{ value }}
+
+
+ +
+
+
{{ key }}
+
{{ value }}
+
-
正反馈率
+
正反馈率
@@ -33,7 +38,14 @@ export default { '总反馈': '267,610', '正面反馈': '120,927', '负面反馈': '51,123' - } + }, + colorArray:[ + {color:"linear-gradient(#2196F3, #2196f394)",icon:"el-icon-user-solid",font:"#2196F3"}, + {color:"linear-gradient(#FF9800, #ff980094)",icon:"el-icon-s-goods",font:"#FF9800"}, + {color:"linear-gradient(#F44336, #f44336b5)",icon:"el-icon-document-remove",font:"#F44336"}, + {color:"linear-gradient(#4CAF50, #8bc34abf)",icon:"el-icon-document-checked",font:"#4CAF50"}, + {color:"linear-gradient(#c862d9, #c862d9bf)",icon:"el-icon-document-delete",font:"#c862d9"} + ] } }, mounted() { @@ -46,8 +58,8 @@ export default { let chart = _this.$echarts.init(dom); chart.setOption({ grid: { - left: '3%', - right: '3%' + left: '5%', + right: '5%' }, xAxis: { type: 'category', @@ -60,12 +72,46 @@ export default { { name: 'like', data: [0.1, 0.23, 0.52, 0.44, 0.49, 0.78, 1], - type: 'line' + type: 'line', + // 区域填充样式 + areaStyle: { + color: { + type: 'linear', + x: 0, + y: 0, + x2: 0, + y2: 1, + colorStops: [{ + offset: 0, color: '#557cc7' // 0% 处的颜色 + },{ + offset: 0.2, color: 'rgba(85,124,199,0.2)' // 0% 处的颜色 + }, { + offset: 1, color: 'rgba(58,132,255, 0)' // 100% 处的颜色 + }], + } + }, }, { name: 'star', data: [0.92, 0.7, 0.65, 0.44, 0.55, 0.55, 0.78], - type: 'line' + type: 'line', + // 区域填充样式 + areaStyle: { + color: { + type: 'linear', + x: 0, + y: 0, + x2: 0, + y2: 1, + colorStops: [{ + offset: 0, color: 'rgb(145,204,117)' // 0% 处的颜色 + },{ + offset: 0.2, color: 'rgba(145,204,117,0.2)' // 0% 处的颜色 + }, { + offset: 1, color: 'rgba(58,132,255, 0)' // 100% 处的颜色 + }], + } + }, } ] }); @@ -80,30 +126,33 @@ export default { } .home-box { - padding: 0 30px; + padding: 20px 30px 0 30px; - height: calc(100% - 160px); + height: calc(100% - 100px); .chart-box { background-color: #fff; box-shadow: 0px 5px 12px 1px rgba(105, 105, 105, 0.12); - border-radius: 10px; + border-radius: 4px; overflow: hidden; margin-top: 30px; - height: calc(100% - 200px); + height: calc(100% - 130px); #chart { width: 100%; - height: calc(100% - 60px); + height: calc(100% - 50px); } .title { width: 100%; - height: 60px; - line-height: 60px; - padding-left: 20px; - font-size: 18px; - color: #626672; - border-bottom: 1px solid rgba(105, 105, 105, 0.12); + height: 50px; + margin-top: 10px; + line-height: 50px; + padding-left: 30px; + font-size: 16px; + color: #666666; + font-weight: bold; + //background: #f0f5fa; + //border-bottom: 1px solid rgba(105, 105, 105, 0.12); } } @@ -113,26 +162,44 @@ export default { .count-item { width: 18%; - height: 165px; + height: 100px; background-color: #fff; box-shadow: 0px 5px 12px 1px rgba(105, 105, 105, 0.12); - text-align: center; - border-radius: 10px; + //text-align: center; + border-radius: 4px; + display: flex; &:hover { transform: scale(1.03); } - > div:first-child { - font-size: 18px; - padding-top: 35px; - color: rgba(103, 109, 122, 0.58); + .count-img{ + width: 80px; + color:#ffffff; + font-size: 40px; + text-align: center; + line-height: 100px; + height: 100px; + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; } - > div:last-child { - font-size: 40px; + .count-title{ + flex: 1; + margin: 0 20px; + } + + .name { + font-size: 14px; + padding-top: 20px; + color: #333333; + //font-weight: bold; + } + + .count { + font-size: 30px; color: #3e4c5c; - padding-top: 25px; + padding-top: 15px; } } } diff --git a/web/src/components/menus/UserManage.vue b/web/src/components/menus/UserManage.vue index d9536fe..9b77231 100644 --- a/web/src/components/menus/UserManage.vue +++ b/web/src/components/menus/UserManage.vue @@ -6,8 +6,8 @@
- - + + 搜 索 @@ -15,10 +15,10 @@
- 添加 + 添 加
- + diff --git a/web/src/store/modules/user.js b/web/src/store/modules/user.js index 9342a0c..19c89fb 100644 --- a/web/src/store/modules/user.js +++ b/web/src/store/modules/user.js @@ -1,11 +1,11 @@ import {login, loginUser, getInfoAdmin, logout, getInfo} from '@/api/user' -import {getToken, setToken, removeToken} from '@/utils/auth' +import {getToken, setToken, removeToken, getName, setName} from '@/utils/auth' import {resetRouter} from '@/router' const getDefaultState = () => { return { token: getToken(), - name: '', + name: getName(), avatar: '' } } @@ -20,7 +20,7 @@ const mutations = { state.token = token }, SET_NAME: (state, name) => { - state.name = name + state.name = name; }, SET_AVATAR: (state, avatar) => { state.avatar = avatar @@ -34,8 +34,9 @@ const actions = { return new Promise((resolve, reject) => { login({username: username.trim(), password: password, type: type}).then(response => { const res = response; - commit('SET_TOKEN', res.data); + commit('SET_TOKEN', res.data.Authorization); setToken(res.data.Authorization); + setName(res.data.user.realname); resolve(res) }).catch(error => { reject(error) @@ -53,7 +54,7 @@ const actions = { return reject('权限异常，请重新登录！') } - commit('SET_NAME', data.realName) + commit('SET_NAME', data.realname) resolve(data) }).catch(error => { reject(error) diff --git a/web/src/utils/auth.js b/web/src/utils/auth.js index 58d564b..a50cce2 100644 --- a/web/src/utils/auth.js +++ b/web/src/utils/auth.js @@ -11,3 +11,11 @@ export function setToken(token) { export function removeToken() { return localStorage.removeItem(TokenKey) } + +export function getName() { + return localStorage.getItem(TokenKey + "_name") +} + +export function setName(name) { + return localStorage.setItem(TokenKey + "_name", name) +} \ No newline at end of file diff --git a/web/src/views/Index.vue b/web/src/views/Index.vue index cc565ff..bff330c 100644 --- a/web/src/views/Index.vue +++ b/web/src/views/Index.vue @@ -1,13 +1,11 @@