diff --git a/src/assets/img/issue.png b/src/assets/img/issue.png new file mode 100644 index 0000000..3ed3399 Binary files /dev/null and b/src/assets/img/issue.png differ diff --git a/src/assets/img/project-end.png b/src/assets/img/project-end.png new file mode 100644 index 0000000..b9c6570 Binary files /dev/null and b/src/assets/img/project-end.png differ diff --git a/src/assets/img/project.png b/src/assets/img/project.png new file mode 100644 index 0000000..a2f18dd Binary files /dev/null and b/src/assets/img/project.png differ diff --git a/src/assets/img/superviseItem.png b/src/assets/img/superviseItem.png new file mode 100644 index 0000000..c4b16a2 Binary files /dev/null and b/src/assets/img/superviseItem.png differ diff --git a/src/assets/img/topic.png b/src/assets/img/topic.png new file mode 100644 index 0000000..47e6495 Binary files /dev/null and b/src/assets/img/topic.png differ diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue index dfd21dd..af26508 100644 --- a/src/views/modules/sys/user-add-or-update.vue +++ b/src/views/modules/sys/user-add-or-update.vue @@ -17,6 +17,7 @@ :label="$t('user.deptName')" class="dept-list"> @@ -83,6 +84,25 @@ + + + + + + + + + + +
@@ -151,6 +171,7 @@ export default { deptListVisible: false, roleList: [], roleIdListDefault: [], + uploadUrl: '', dataForm: { id: '', username: '', @@ -162,6 +183,8 @@ export default { gender: 1, email: '', mobile: '', + headUrl: '', + proverbs: '', roleIdList: [], status: 1, verifyFlag: '0', @@ -179,7 +202,8 @@ export default { } }, verifyMobileList: [], - userTagDictList: [] + userTagDictList: [], + loading: false } }, computed: { @@ -235,6 +259,9 @@ export default { { required: true, message: this.$t('validate.required'), trigger: 'blur' }, { validator: validateMobile, trigger: 'blur' } ], + headUrl: [ + { required: true, message: this.$t('validate.required'), trigger: 'blur' } + ], userTagKey: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } ] @@ -395,7 +422,19 @@ export default { }) }).catch(() => { }) }) - }, 1000, { 'leading': true, 'trailing': false }) + }, 1000, { 'leading': true, 'trailing': false }), + handleAvatarActSuccess (res, file) { + this.loading = false + this.dataForm.headUrl = res.data.url + this.btnAble = false + }, + beforeAvatarUpload (file) { + this.loading = true + this.btnAble = false + }, + handelError () { + this.loading = false + } } } @@ -414,4 +453,32 @@ export default { } } } +.scroll-tree { + width: 500px; + height: 600px; + overflow: auto; +} +.avatar-uploader .el-upload { + border: 1px dashed #d9d9d9; + border-radius: 6px; + cursor: pointer; + position: relative; + overflow: hidden; +} +.avatar-uploader .el-upload:hover { + border-color: #409eff; +} +.avatar-uploader-icon { + font-size: 28px; + color: #8c939d; + width: 80px; + height: 80px; + line-height: 80px; + text-align: center; +} +.avatar { + width: 80px; + height: 80px; + display: block; +} diff --git a/src/views/modules/workbench/barOption.js b/src/views/modules/workbench/barOption.js new file mode 100644 index 0000000..7681a37 --- /dev/null +++ b/src/views/modules/workbench/barOption.js @@ -0,0 +1,95 @@ +import echarts from 'echarts' +export default function getBarOption (xdata, ydata1, ydata2) { + return { + legend: { + data: ['用户数', '党员数'], + right: 10, + textStyle: { + color: "#666666" + }, + itemWidth: 15, + itemHeight: 10, + itemGap: 25 + }, + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'shadow' + } + }, + grid: { + left: '2%', + top:'16%', + containLabel: true + }, + xAxis: { + type: 'category', + data: xdata, + axisLine: { + lineStyle: { + color: '#cdd5e2' + } + }, + axisLabel: { + textStyle: { + color: "#666666" + }, + interval: 0, + rotate: 30 + }, + }, + yAxis: {}, + dataZoom: [ + { + show: false, + realtime: true, + start: 0, + end: 50 + }, + { + type: 'inside', + realtime: true, + start: 0, + end: 50 + } + ], + series: [ + { + name: '用户数', + type: 'bar', + barWidth: '15px', + itemStyle: { + normal: { + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ + offset: 0, + color: '#e21d1b' + }, { + offset: 1, + color: '#f88e6b' + }]), + barBorderRadius: [ 6, 6, 0, 0 ] + }, + }, + data: ydata2 + }, + { + name: '党员数', + type: 'bar', + barWidth: '15px', + itemStyle: { + normal: { + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ + offset: 0, + color: '#ff8705' + }, { + offset: 1, + color: '#ffb139' + }]), + barBorderRadius: [ 6, 6, 0, 0 ], + } + }, + data: ydata1 + } + ] + } +} \ No newline at end of file diff --git a/src/views/modules/workbench/lineOption.js b/src/views/modules/workbench/lineOption.js new file mode 100644 index 0000000..3e7768e --- /dev/null +++ b/src/views/modules/workbench/lineOption.js @@ -0,0 +1,113 @@ +import echarts from 'echarts' +export default function getLineOption (xdata, ydata1, ydata2, ydata3) { + return { + legend: { + data: ['议题数', '项目数', '话题数'], + right: 10, + textStyle: { + color: "#666666" + }, + itemWidth: 15, + itemHeight: 10, + itemGap: 25 + }, + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'shadow' + } + }, + grid: { + left: '2%', + top:'16%', + containLabel: true + }, + xAxis: { + type: 'category', + data: xdata, + axisLine: { + lineStyle: { + color: '#cdd5e2' + } + }, + axisLabel: { + textStyle: { + color: "#666666" + }, + interval: 0, + rotate: 30 + }, + }, + yAxis: {}, + dataZoom: [ + { + show: false, + realtime: true, + start: 0, + end: 50 + }, + { + type: 'inside', + realtime: true, + start: 0, + end: 50 + } + ], + series: [ + { + name: '议题数', + type: 'bar', + barWidth: '15px', + itemStyle: { + normal: { + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ + offset: 0, + color: '#5291ff' + }, { + offset: 1, + color: '#78aafe' + }]), + barBorderRadius: [ 6, 6, 0, 0 ] + }, + }, + data: ydata1 + }, + { + name: '项目数', + type: 'bar', + barWidth: '15px', + itemStyle: { + normal: { + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ + offset: 0, + color: '#f28c68' + }, { + offset: 1, + color: '#f8b4a0' + }]), + barBorderRadius: [ 6, 6, 0, 0 ] + }, + }, + data: ydata2 + }, + { + name: '话题数', + type: 'bar', + barWidth: '15px', + itemStyle: { + normal: { + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ + offset: 0, + color: '#8a79fe' + }, { + offset: 1, + color: '#aca2ff' + }]), + barBorderRadius: [ 6, 6, 0, 0 ], + } + }, + data: ydata3 + } + ] + } +} \ No newline at end of file diff --git a/src/views/modules/workbench/workbench.vue b/src/views/modules/workbench/workbench.vue new file mode 100644 index 0000000..4be11db --- /dev/null +++ b/src/views/modules/workbench/workbench.vue @@ -0,0 +1,337 @@ + + + + + \ No newline at end of file