diff --git a/src/views/screen/HomePage.vue b/src/views/screen/HomePage.vue index 53e6022..a25683b 100644 --- a/src/views/screen/HomePage.vue +++ b/src/views/screen/HomePage.vue @@ -217,14 +217,14 @@ export default { } ::v-deep ::-webkit-scrollbar-track{ - background: yellow; - //border-color: transparent; + //background: yellow; + ////border-color: transparent; } ::v-deep ::-webkit-scrollbar-thumb{ - background: red; + //background: red; } ::v-deep ::-webkit-scrollbar-corner { - background: black; + //background: black; } diff --git a/src/views/screen/incomePayments/index.vue b/src/views/screen/incomePayments/index.vue index a2203df..4d983f1 100644 --- a/src/views/screen/incomePayments/index.vue +++ b/src/views/screen/incomePayments/index.vue @@ -153,6 +153,7 @@ export default { font-weight: bold; background: transparent; border: none; + text-shadow: 0 0 5px #88D8FB; } /deep/ .ant-table-tbody tr > td { @@ -164,6 +165,7 @@ export default { /deep/ .ant-table-tbody tr > td:first-child { color: #FFFFFF; font-weight: bold; + text-shadow: 0 0 5px #88D8FB; } /deep/ .ant-table-tbody tr:nth-of-type(2n + 1) { diff --git a/src/views/screen/iso/LeadingStandardChart.vue b/src/views/screen/iso/LeadingStandardChart.vue index f663a80..075e48a 100644 --- a/src/views/screen/iso/LeadingStandardChart.vue +++ b/src/views/screen/iso/LeadingStandardChart.vue @@ -294,5 +294,8 @@ export default { overflow-x: auto!important; overflow-y: auto!important; } +/deep/ .ant-table-header{ + overflow: auto!important; +} \ No newline at end of file diff --git a/src/views/screen/iso/MeetingCalendar.vue b/src/views/screen/iso/MeetingCalendar.vue index 51f2fb4..4131629 100644 --- a/src/views/screen/iso/MeetingCalendar.vue +++ b/src/views/screen/iso/MeetingCalendar.vue @@ -229,6 +229,7 @@ div.calendar-box{ color: @white; margin-left: 26px; margin-right: 26px; + text-shadow: 0 0 5px #88D8FB; } .header-right { @@ -274,10 +275,25 @@ div.calendar-box{ } /*日历组件的修改 */ ::v-deep .fc-theme-standard td, -::v-deep .fc-theme-standard th, ::v-deep.fc-theme-standard .fc-scrollgrid{ border-color: rgba(86, 113, 231, 0.3); } +// 头部没有边框 +::v-deep .fc-theme-standard th{ + border-top-color: transparent; + border-right-color: transparent; + border-left-color: transparent; + border-bottom-color: rgba(86, 113, 231, 0.3); +} + +::v-deep .fc-theme-standard .fc-scrollgrid { + border-top-color: transparent; + border-left: none; +} +::v-deep .fc .fc-scrollgrid table.fc-scrollgrid-sync-table { + border-left: 1px solid rgba(86, 113, 231, 0.3); +} + ::v-deep .fc-daygrid-day .fc-daygrid-day-number { font-weight: bold; color: @white; @@ -297,21 +313,14 @@ div.calendar-box{ font-family: PingFang SC; font-weight: bold; color: @white; + text-shadow: 0 0 5px #88D8FB; } ::v-deep .fc-col-header-cell { height: 38px; line-height: 38px; - //background: #FCFBFB; } -::v-deep .fc-day-sun .fc-col-header-cell-cushion { - //color: #9E0000; -} - -::v-deep .fc-day-sat .fc-col-header-cell-cushion { - //color: #9E0000; -} ::v-deep .fc-event-main { padding: 2px 10px; diff --git a/src/views/screen/preparationRevision/CompletionProjectChart.vue b/src/views/screen/preparationRevision/CompletionProjectChart.vue index cdd708c..927249f 100644 --- a/src/views/screen/preparationRevision/CompletionProjectChart.vue +++ b/src/views/screen/preparationRevision/CompletionProjectChart.vue @@ -6,11 +6,12 @@ @@ -60,7 +61,7 @@ export default { let {result, success} = await GetShouldBeCompletedProjectData({year}) if(success) { this.initSCData(result || []) - this.selectValue = this.SCOptionData[0] + this.selectValue = undefined } }, getData() { @@ -87,11 +88,19 @@ export default { * */ initData(arr) { this.yData = [[], [], []] - arr.map(item => { - this.yData[0].push(item['应报批总数']) - this.yData[1].push(item['完成数']) - this.yData[2].push(item['完成率数值'] === -1 ? undefined : item['完成率数值']) + this.yearData.map(year => { + let item = arr.find(a => (a.year + '') === (year.value + '')) + if(item) { + this.yData[0].push(item['应报批总数']) + this.yData[1].push(item['完成数']) + this.yData[2].push(item['完成率数值'] === -1 ? undefined : item['完成率数值']) + } }) + // arr.map(item => { + // this.yData[0].push(item['应报批总数']) + // this.yData[1].push(item['完成数']) + // this.yData[2].push(item['完成率数值'] === -1 ? undefined : item['完成率数值']) + // }) }, // 初始化图表 initChart() { diff --git a/src/views/screen/preparationRevision/EnterpriseContributionChart.vue b/src/views/screen/preparationRevision/EnterpriseContributionChart.vue index 4c67769..26c30f5 100644 --- a/src/views/screen/preparationRevision/EnterpriseContributionChart.vue +++ b/src/views/screen/preparationRevision/EnterpriseContributionChart.vue @@ -9,9 +9,8 @@