diff --git a/src/assets/screen/location_icon.png b/src/assets/screen/location_icon.png new file mode 100644 index 0000000..30b0ef3 Binary files /dev/null and b/src/assets/screen/location_icon.png differ diff --git a/src/assets/screen/title_box.png b/src/assets/screen/title_box.png new file mode 100644 index 0000000..14ca44b Binary files /dev/null and b/src/assets/screen/title_box.png differ diff --git a/src/assets/screen/title_income.png b/src/assets/screen/title_income.png new file mode 100644 index 0000000..23f46f5 Binary files /dev/null and b/src/assets/screen/title_income.png differ diff --git a/src/assets/screen/title_iso.png b/src/assets/screen/title_iso.png new file mode 100644 index 0000000..f637c52 Binary files /dev/null and b/src/assets/screen/title_iso.png differ diff --git a/src/assets/screen/title_wp.png b/src/assets/screen/title_wp.png new file mode 100644 index 0000000..56f5d6e Binary files /dev/null and b/src/assets/screen/title_wp.png differ diff --git a/src/assets/screen/title_zxd.png b/src/assets/screen/title_zxd.png new file mode 100644 index 0000000..cb39c48 Binary files /dev/null and b/src/assets/screen/title_zxd.png differ diff --git a/src/views/screen/HomePage.vue b/src/views/screen/HomePage.vue index 163f360..53e6022 100644 --- a/src/views/screen/HomePage.vue +++ b/src/views/screen/HomePage.vue @@ -1,31 +1,62 @@
-
{{ record.standardNameChinese }}
-
{{ record.standardNameEnglish }}
+
{{ record.standardNameChinese }}
+
{{ record.standardNameEnglish }}
@@ -77,14 +78,14 @@ export default { { title: '标准名称', align: 'center', - width: '444px', + width: '500px', dataIndex: 'standardName', scopedSlots: { customRender: 'standard-name' } }, { title: '技术领域', align: 'center', - dataIndex: 'technosphereSc_dictText', + dataIndex: 'technosphere', scopedSlots: { customRender: 'text' } }, { @@ -139,7 +140,7 @@ export default { } else { this.ipagination.total = 0 } - // this.operateData(this.dataSource) + this.operateData(this.dataSource) } if (res.code === 510) { this.$message.warning(res.message) @@ -151,11 +152,19 @@ export default { }, // 操作表格中的数据 operateData(data) { - // data.map(tt => { - // tt.standardNumber = '0000000000000000000099999999999999999999999999999999999999000000000000000000' - // tt.standardNameChinese = '标准名称中文名标准名称中文名标准名称中文名标准名称中文名标准名称中文名标准名称中文名标准名称中文名' - // tt.technosphereSc_dictText = '技术领域技技术领域技术领域技术领域技术领域技术领域技术领域技术领域技术领域技术领域技术领域术领域' - // }) + data.map(tt => { + tt.technosphere = `${tt.technosphereSc_dictText || ''} ${tt.technosphereWg_dictText || ''}` + tt.standardNumber = `ISO ${tt.standardNumber}` + if(tt.standardYear) { + tt.standardNumber = `${tt.standardNumber}:${tt.standardYear}` + } + if(tt.supplement) { + tt.standardNumber = `${tt.standardNumber} / ${tt.supplement}` + } + // tt.standardNameChinese = '评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标评价标准评价标准十个' + tt.standardNameEnglish = '评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个' + tt.standardNameChinese = '评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个评价标准评价标准十个' + }) }, handleTableChange(pagination, filters, sorter) { //分页、排序、筛选变化时触发 @@ -200,23 +209,28 @@ export default { /deep/ .ant-table-tbody tr > td { color: #A1E1FD; border: none; + min-height: 108px; //border-bottom: 1px solid rgb(245,245,246); } +/* /deep/ .ant-table-tbody tr > td:first-child { color: #FFFFFF; font-weight: bold; } +*/ /deep/ .ant-table-tbody tr:nth-of-type(2n + 1) { - background: #233062; + //background: #233062; + background: rgba(136, 216, 251, 0.1); } /deep/ .ant-table-tbody tr:nth-of-type(2n){ background: transparent; } /deep/ .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td { - background: #233062; + //background: #233062; + background: rgba(136, 216, 251, 0.2); } /deep/ .ant-table-content .ant-table-placeholder { @@ -227,18 +241,26 @@ export default { color: white; } +/deep/.ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body{ + background-color: transparent; +} +/deep/.ant-table-fixed{ + border-color: transparent!important; +} + // 高度必须固定否则没有办法出滚动条 .iso-full-table.iso-full-box{ - height: 581px; + //height: 600px; + height: 800px; padding-top: 0; - background-color: transparent; + //background: transparent; /deep/* { - background-color: transparent; + background: transparent; } } .iso-table{ - margin-top: 60px; + margin-top: 80px; width: 100%; height: 100%; //overflow: auto; @@ -270,5 +292,7 @@ export default { /*表格滚动条*/ /deep/.ant-table-body { overflow-x: auto!important; + overflow-y: 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 5cafdf4..51f2fb4 100644 --- a/src/views/screen/iso/MeetingCalendar.vue +++ b/src/views/screen/iso/MeetingCalendar.vue @@ -113,15 +113,19 @@ export default { arrayData.forEach((item) => { if (item.orgType === 'TC22') { item.status = '#5671E7' + item.textColor = '#091C7C' } else if (item.orgType === 'SC') { item.status = '#6CFBCE' + item.textColor = '#115379' } else { item.status = '#69C4F3' + item.textColor = '#115379' } newArr.push({ start: this.dealWithTime(item.time), end: this.addDate(this.dealWithTime(item.endTime), 1), color: item.status, + textColor: item.textColor, id: item.meetingId, title: `${item.name}` }) @@ -321,6 +325,10 @@ div.calendar-box{ background-color: #7599E8; } +::v-deep .fc-event-title{ + font-weight: 800!important; +} + \ No newline at end of file diff --git a/src/views/screen/preparationRevision/index.vue b/src/views/screen/preparationRevision/index.vue index f2a2d0b..7a676a8 100644 --- a/src/views/screen/preparationRevision/index.vue +++ b/src/views/screen/preparationRevision/index.vue @@ -83,7 +83,7 @@ export default { background-size: 100% 100%; /deep/ .box-title { - font-size: 18px; + font-size: 16px; font-family: PingFang SC; font-weight: bold; color: #DDF0FF; @@ -159,6 +159,7 @@ export default { width: 20px; height: 19px; margin: 0 10px; + cursor: pointer; } } @@ -172,6 +173,9 @@ export default { /deep/.ant-select.active .ant-select-selection{ color: @white!important; } +/deep/.ant-select-arrow{ + color: @white!important; +} /deep/.ant-select-focused .ant-select-selection, .ant-select-selection:focus, .ant-select-selection:active{ border: none!important; diff --git a/src/views/screen/util/BarAndLineOptions.js b/src/views/screen/util/BarAndLineOptions.js index 3086a52..27129c7 100644 --- a/src/views/screen/util/BarAndLineOptions.js +++ b/src/views/screen/util/BarAndLineOptions.js @@ -13,13 +13,13 @@ export const BarAndLineOptions = { y2: 1, colorStops: [ { - offset: 0, color: '#4471EF' // 0% 处的颜色 + offset: 0, color: 'rgba(66, 96, 231, 1)' // 0% 处的颜色 }, { - offset: 0.8, color: '#2D419A' // 100% 处的颜色 + offset: 0.8, color: 'rgba(66, 96, 231, 0.5)' // 100% 处的颜色 }, { - offset: 1, color: 'transparent' // 100% 处的颜色 + offset: 1, color: 'rgba(66, 96, 231, 0)' // 100% 处的颜色 } ], global: false // 缺省为 false @@ -32,13 +32,13 @@ export const BarAndLineOptions = { y2: 1, colorStops: [ { - offset: 0, color: '#00D8F1' // 0% 处的颜色 + offset: 0, color: 'rgba(106, 197, 244, 1)' // 0% 处的颜色 }, { - offset: 0.9, color: '#4679B1' // 100% 处的颜色 + offset: 0.8, color: 'rgba(106, 197, 244, 0.5)' // 100% 处的颜色 }, { - offset: 1, color: 'transparent' // 100% 处的颜色 + offset: 1, color: 'rgba(106, 197, 244, 0)' // 100% 处的颜色 } ], global: false // 缺省为 false diff --git a/src/views/screen/util/BarOptions.js b/src/views/screen/util/BarOptions.js index dbafd77..50e78a7 100644 --- a/src/views/screen/util/BarOptions.js +++ b/src/views/screen/util/BarOptions.js @@ -14,13 +14,13 @@ export const BarOptions = { y2: 1, colorStops: [ { - offset: 0, color: '#4471EF' // 0% 处的颜色 + offset: 0, color: 'rgba(88, 115, 234, 1)' }, { - offset: 0.8, color: '#2D419A' // 100% 处的颜色 + offset: 0.8, color: 'rgba(88, 115, 234, 0.6)' }, { - offset: 1, color: 'transparent' // 100% 处的颜色 + offset: 1, color: 'rgba(88, 115, 234, 0)' // 100% 处的颜色 } ], global: false // 缺省为 false @@ -33,13 +33,13 @@ export const BarOptions = { y2: 1, colorStops: [ { - offset: 0, color: '#00D8F1' // 0% 处的颜色 + offset: 0, color: 'rgba(106, 197, 244, 1)' // 0% 处的颜色 }, { - offset: 0.9, color: '#4679B1' // 100% 处的颜色 + offset: 0.8, color: 'rgba(106, 197, 244, 0.5)' // 100% 处的颜色 }, { - offset: 1, color: 'transparent' // 100% 处的颜色 + offset: 1, color: 'rgba(106, 197, 244, 0)' // 100% 处的颜色 } ], global: false // 缺省为 false @@ -180,13 +180,13 @@ export const BarAxisTransformOptions = { y2: 0, colorStops: [ { - offset: 0, color: '#4471EF' // 0% 处的颜色 + offset: 0, color: 'rgba(88, 115, 234, 1)' // 0% 处的颜色 }, { - offset: 0.9, color: '#2D419A' // 100% 处的颜色 + offset: 0.9, color: 'rgba(88, 115, 234, 0.6)' // 100% 处的颜色 }, { - offset: 1, color: 'transparent' // 100% 处的颜色 + offset: 1, color: 'rgba(88, 115, 234, 0)' // 100% 处的颜色 } ], global: false // 缺省为 false diff --git a/src/views/screen/util/LineOptions.js b/src/views/screen/util/LineOptions.js index 1ba2abd..bcf536c 100644 --- a/src/views/screen/util/LineOptions.js +++ b/src/views/screen/util/LineOptions.js @@ -44,7 +44,7 @@ export const LineOptions = { grid: { left: '2.4%', right: '3%', - bottom: '3%', + bottom: '0', containLabel: true }, toolbox: {}, diff --git a/src/views/screen/wp29/MeetingCalendar.vue b/src/views/screen/wp29/MeetingCalendar.vue index 0f3f03c..99eacec 100644 --- a/src/views/screen/wp29/MeetingCalendar.vue +++ b/src/views/screen/wp29/MeetingCalendar.vue @@ -77,6 +77,7 @@ export default { created() { // 获取用户信息 this.$nextTick(() => { + console.log('----this.$refs.fullCalendar---------', this.$refs.fullCalendar) this.calendarApi = this.$refs.fullCalendar.getApi() let currentDate = new Date(this.calendarApi.currentData.currentDate) this.time = currentDate.getFullYear() + '年' + (currentDate.getMonth() + 1) + '月' @@ -130,15 +131,19 @@ export default { arrayData.forEach((item) => { if (item.orgType == 'GR') { item.status = '#5671E7' + item.textColor = '#93D1F5' } else if (item.orgType == 'IWG') { item.status = '#6CFBCE' + item.textColor = '#115379' } else { item.status = '#69C4F3' + item.textColor = '#115379' } newArr.push({ start: this.dealWithTime(item.time), end: this.addDate(this.dealWithTime(item.endTime), 1), color: item.status, + textColor: item.textColor, id: item.meetingId, title: `${item.name}` }) @@ -326,7 +331,9 @@ div.calendar-box{ ::v-deep .fc .fc-daygrid-day.fc-day-today{ background-color: #7599E8; } - +::v-deep .fc-event-title{ + font-weight: 800!important; +}