diff --git a/src/style.less b/src/style.less index 4aa1cd5..6d994fa 100644 --- a/src/style.less +++ b/src/style.less @@ -344,6 +344,12 @@ body { } // 输入框样式 +.ant-calendar-input{ + background-color: transparent !important; +} +.ant-calendar-range-middle{ + color: #fff; +} .ant-input { background-color: @formInputBgColor !important; border-color: @formInputBorderColor !important; diff --git a/src/views/abnormalAlarm/alarmCenter/alarmContactGroup/index.vue b/src/views/abnormalAlarm/alarmCenter/alarmContactGroup/index.vue index fb10f3c..897e80e 100644 --- a/src/views/abnormalAlarm/alarmCenter/alarmContactGroup/index.vue +++ b/src/views/abnormalAlarm/alarmCenter/alarmContactGroup/index.vue @@ -350,6 +350,7 @@ export default { display: flex; align-items: center; padding: 0 10px; + background: rgba(12, 235, 201, 0.05); .group-add{ background-color: #1397a3; font-family: ArialMT; @@ -403,13 +404,13 @@ export default { } .group-assign{ position: relative; - width: 672px; + width: 690px; margin: 0 auto; .ant-transfer { margin-bottom: 10px; ::v-deep { .ant-transfer-list { - width: 282px; + width: 291px; height: 411px; padding-top: 0; &-header { diff --git a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue index 5e6b618..27b841b 100644 --- a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue +++ b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue @@ -18,7 +18,7 @@ @@ -70,7 +70,7 @@ const columns = [ title: 'NAME', align: 'left', dataIndex: 'name', - width: 150, + width: 250, }, { title: 'TYPE', @@ -181,7 +181,7 @@ export default { grid: { left: '0%', right: '0%', - bottom: '0%', + bottom: '15', containLabel: true }, xAxis: { @@ -304,7 +304,7 @@ export default { { name: 'Access From', type: 'pie', - radius: ['40%', '70%'], + radius: ['40%', '60%'], data: this.pieData.map((item, index) => { item.label = { color: this.pieColors[index] @@ -312,6 +312,8 @@ export default { return item; }), itemStyle: { + borderColor: '#02282b', + borderWidth: 5, color: (params) => { var index = params.dataIndex; return this.pieColors[index]; @@ -359,8 +361,8 @@ export default { grid: { top:"3%", left: '0%', - right: '1%', - bottom: '2%', + right: '30', + bottom: '20', containLabel: true }, xAxis: { diff --git a/src/views/abnormalAlarm/components/searchBar.vue b/src/views/abnormalAlarm/components/searchBar.vue index ca83215..c7bb55d 100644 --- a/src/views/abnormalAlarm/components/searchBar.vue +++ b/src/views/abnormalAlarm/components/searchBar.vue @@ -75,7 +75,7 @@ export default { }, data() { return { - allVal: false, + allVal: true, typeOptions: [ { label: "Server", @@ -142,6 +142,7 @@ export default { border-bottom: 1px solid rgba(13, 235, 201, 0.3); margin-left: 20px; padding: 8px 10px; + background: rgba(12, 235, 201, 0.05); } .ant-input{ width: 166px; @@ -203,13 +204,13 @@ export default { position: relative; background: #03353f; } -:global{ - .asd{ - .ant-calendar-range .ant-calendar-input , - .ant-calendar-range .ant-calendar-time-picker-input{ - color: red !important; - background: none !important; - } - } -} + + // .asd{ + // .ant-calendar-range .ant-calendar-input , + // .ant-calendar-range .ant-calendar-time-picker-input{ + // color: red !important; + // background: none !important; + // } + // } + \ No newline at end of file