diff --git a/back/src/views/modules/workBench/components/bottom-view.vue b/back/src/views/modules/workBench/components/bottom-view.vue index e3adf2d0..206a7e11 100644 --- a/back/src/views/modules/workBench/components/bottom-view.vue +++ b/back/src/views/modules/workBench/components/bottom-view.vue @@ -79,7 +79,7 @@ export default { } ], tableData: [], - maxSize: { y: 195 }, + maxSize: { y: 235 }, loadingDynamic: false, loadingTable: false } @@ -170,6 +170,7 @@ export default { font-size: 16px; color: #212121; text-align: center; + box-shadow: 2px 2px 5px #ccc; } .container { background: #fff; @@ -177,6 +178,7 @@ export default { height: 335px; padding: 0px 0 0 10px; box-sizing: border-box; + box-shadow: 2px 2px 5px #ccc; } } @@ -256,6 +258,10 @@ export default { ::v-deep .ant-table-thead { background-color: #f4f5f8; } +::v-deep .ant-table-header{ + margin-right: -17px; +} +::v-deep .ant-table-body::-webkit-scrollbar{width:0;} diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue index e49554d9..450307a3 100644 --- a/back/src/views/modules/workBench/components/dept-todo-view.vue +++ b/back/src/views/modules/workBench/components/dept-todo-view.vue @@ -211,6 +211,7 @@ export default { .num { font-size: 30px; + font-weight: 600; } .unit { diff --git a/back/src/views/modules/workBench/components/trend-view.vue b/back/src/views/modules/workBench/components/trend-view.vue index 202ad275..573f04cc 100644 --- a/back/src/views/modules/workBench/components/trend-view.vue +++ b/back/src/views/modules/workBench/components/trend-view.vue @@ -68,7 +68,6 @@ export default { const valueItem = y + '-' + m + '-' + d // 组合 days.unshift(valueItem) // 添加至数组 } - return days }, @@ -88,7 +87,6 @@ export default { endDate: this.endDate }, (res) => { - if (res.data.data && res.data.data.length > 0) { this.data = res.data.data[0].values this.data.map((item) => { @@ -106,23 +104,23 @@ export default { } else { this.trendChartData = { xaxis: this.ydata, - ydata:this.xaxis + ydata: this.xaxis } } - + this.$nextTick(() => { trendLineChart('trendId', this.trendChartData) }) }, (err) => { - + } ) }, handleTitleSwitch (idx) { this.selectedTitle = idx this.startDate = this.getData(this.selectedTitle == 0 ? 7 : 30) - + this.initChart() }, getData (aa) { diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue index d0555de2..d3e6b140 100644 --- a/back/src/views/modules/workBench/workBench.vue +++ b/back/src/views/modules/workBench/workBench.vue @@ -73,13 +73,13 @@ export default { }, // 部门申请 resourceData: [], - resourceColor: ['#7b2cff', '#fd5151' , '#2ca1ff', '#0adbfa', '#febe13', '#65e5dd', '#f071ff', '#85f67a'], + resourceColor: ['#fe845e', '#0058e1', '#48c6c7', '#48c760', '#9c78ed', '#ff9999', '#d5c438', '#ff3e55'], // 部门申请 applyData: [], - applyColor: ['#5085f2', '#e75fc3', '#f87be2', '#f2719a', '#fca4bb', '#f59a8f', '#fdb301', '#57e7ec', '#cf9ef1'], + applyColor: ['#fe845e', '#0058e1', '#48c6c7', '#48c760', '#9c78ed', '#ff9999', '#d5c438', '#ff3e55'], // 部门需求 requireData: [], - requireColor: ['#FD866A', '#9E87FF', '#58D5FF', '#73DDFF', '#73ACFF', '#FDD56A', '#FDB36A'], + requireColor: ['#fe845e', '#0058e1', '#48c6c7', '#48c760', '#9c78ed', '#ff9999', '#d5c438', '#ff3e55'], loadingToDo: false, loadingHasToDo: false, loadingResource: false, @@ -252,12 +252,20 @@ export default { width: 836px; background: #fff; margin-right: 16px; + box-shadow: 2px 2px 5px #ccc; } .dept-chart-box { width: 780px; height: 100%; background: #fff; + box-shadow: 2px 2px 5px #ccc; + &>div{ + border-left: 1px solid rgba($color: #d0d4de, $alpha: 0.5); + } + &>div:nth-of-type(1){ + border: none; + } } }