From 998b24b21e7b9111c498c2163a4f4a845179c628 Mon Sep 17 00:00:00 2001 From: Admin <978517621@qq.com> Date: 星期五, 02 九月 2022 10:42:42 +0800 Subject: [PATCH] Default Changelist --- src/views/riskWarningSys/warningBigScreen/components/danger.vue | 12 ++++-- src/views/riskWarningSys/warningBigScreen/components/SPI.vue | 4 ++ src/views/riskWarningSys/warningBigScreen/components/accident.vue | 8 +++- src/views/riskWarningSys/warningBigScreen/index.vue | 49 +++++++++++++++++++++--- src/views/riskWarningSys/warningBigScreen/components/risk.vue | 4 ++ src/views/riskWarningSys/warningBigScreen/components/educate.vue | 14 ++++--- 6 files changed, 72 insertions(+), 19 deletions(-) diff --git a/src/views/riskWarningSys/warningBigScreen/components/SPI.vue b/src/views/riskWarningSys/warningBigScreen/components/SPI.vue index b897098..f148306 100644 --- a/src/views/riskWarningSys/warningBigScreen/components/SPI.vue +++ b/src/views/riskWarningSys/warningBigScreen/components/SPI.vue @@ -53,6 +53,9 @@ fontSize: fontSize(12) } }, + tooltip: { + trigger: 'axis' + }, grid: { left: '4%', right: '4%', @@ -194,6 +197,7 @@ name: 'SPI预警指数值', data: [450, 632, 501, 434, 390, 530, 520,750, 632, 401, 634, 590], type: 'line', + triggerLineEvent: true, label:{ show: true, color: '#fff', diff --git a/src/views/riskWarningSys/warningBigScreen/components/accident.vue b/src/views/riskWarningSys/warningBigScreen/components/accident.vue index 041134b..9e3175d 100644 --- a/src/views/riskWarningSys/warningBigScreen/components/accident.vue +++ b/src/views/riskWarningSys/warningBigScreen/components/accident.vue @@ -62,6 +62,8 @@ legend: { top: '0', left: 'center', + itemWidth: fontSize(10), + itemHeight: fontSize(8), textStyle:{ color: '#fff', fontSize: fontSize(11) @@ -104,7 +106,7 @@ { value: 484, name: '一般事故' }, { value: 300, name: '未遂事故' } ], - center: ['50%','65%'] + center: ['50%','60%'] } ] }; @@ -129,6 +131,8 @@ legend: { top: '0', left: 'center', + itemWidth: fontSize(10), + itemHeight: fontSize(8), textStyle:{ color: '#fff', fontSize: fontSize(11) @@ -171,7 +175,7 @@ { value: 484, name: '一般事故' }, { value: 300, name: '未遂事故' } ], - center: ['50%','65%'] + center: ['50%','60%'] } ] }; diff --git a/src/views/riskWarningSys/warningBigScreen/components/danger.vue b/src/views/riskWarningSys/warningBigScreen/components/danger.vue index 75ef0b1..96bdd13 100644 --- a/src/views/riskWarningSys/warningBigScreen/components/danger.vue +++ b/src/views/riskWarningSys/warningBigScreen/components/danger.vue @@ -65,8 +65,10 @@ }, color: ['#FAC858','#EE6666'], legend: { - top: '0', + top: '8%', left: 'center', + itemWidth: fontSize(10), + itemHeight: fontSize(8), textStyle:{ color: '#fff', fontSize: fontSize(11) @@ -126,8 +128,10 @@ }, color: ['#FAC858','#EE6666'], legend: { - top: '10%', + top: '8%', left: 'center', + itemWidth: fontSize(10), + itemHeight: fontSize(8), textStyle:{ color: '#fff', fontSize: fontSize(11) @@ -164,7 +168,7 @@ { value: 35, name: '一般隐患' }, { value: 1048, name: '重大隐患' } ], - center: ['50%','60%'] + center: ['50%','55%'] } ] }; @@ -200,7 +204,7 @@ .charts-cont{ width: 100%; height: 100%; - padding: 5% 2% 0; + padding: 2% 2% 0; position: relative; .choose{ diff --git a/src/views/riskWarningSys/warningBigScreen/components/educate.vue b/src/views/riskWarningSys/warningBigScreen/components/educate.vue index f85cc76..101504a 100644 --- a/src/views/riskWarningSys/warningBigScreen/components/educate.vue +++ b/src/views/riskWarningSys/warningBigScreen/components/educate.vue @@ -23,7 +23,7 @@ interface stateType { } export default defineComponent({ - name: 'risk', + name: 'educate', components: {}, props:{ size: Number @@ -46,8 +46,10 @@ option = { color: ['#67F9D8', '#FFE434', '#56A3F1', '#FF917C'], legend: { - top: '5%', + top: '8%', left: 'center', + itemWidth: fontSize(10), + itemHeight: fontSize(8), textStyle:{ color: '#fff', fontSize: fontSize(11) @@ -56,12 +58,12 @@ radar: [ { indicator: [ - { text: '设计培训次数' }, - { text: '培训时间(小时)' }, - { text: '完成比例(%)' } + { name: '设计培训次数' }, + { name: '培训时间(小时)' }, + { name: '完成比例(%)' } ], center: ['50%', '60%'], - radius: fontSize(60), + radius: fontSize(65), startAngle: 90, splitNumber: 4, shape: 'circle', diff --git a/src/views/riskWarningSys/warningBigScreen/components/risk.vue b/src/views/riskWarningSys/warningBigScreen/components/risk.vue index 304e597..11c3cc1 100644 --- a/src/views/riskWarningSys/warningBigScreen/components/risk.vue +++ b/src/views/riskWarningSys/warningBigScreen/components/risk.vue @@ -71,6 +71,8 @@ legend: { top: '1%', left: 'center', + itemWidth: fontSize(10), + itemHeight: fontSize(8), textStyle:{ color: '#fff', fontSize: fontSize(12) @@ -181,6 +183,8 @@ legend: { top: '1%', left: 'center', + itemWidth: fontSize(10), + itemHeight: fontSize(8), textStyle:{ color: '#fff', fontSize: fontSize(12) diff --git a/src/views/riskWarningSys/warningBigScreen/index.vue b/src/views/riskWarningSys/warningBigScreen/index.vue index f10734c..7eb9d5f 100644 --- a/src/views/riskWarningSys/warningBigScreen/index.vue +++ b/src/views/riskWarningSys/warningBigScreen/index.vue @@ -50,7 +50,7 @@ <div class="part-tit"> <span>| 隐患等级数量分布</span> <div> - <el-select class="selector" v-model="month" placeholder="Select" size="default"> + <el-select class="selector" v-model="month" placeholder="Select" :teleported="false" size="default"> <el-option v-for="item in optionList" :key="item.value" @@ -73,6 +73,7 @@ <div class="part-tit" style="position: absolute;top: 12%;padding: 0 4%"> <el-cascader class="spiSe" + :teleported="false" v-model="spiValue" :options="spiOptions" :props="props" @@ -356,12 +357,7 @@ <style scoped lang="scss"> $homeNavLengh: 8; - ::v-deep(.el-select-dropdown) { - background-color: transparent !important; - } - ::v-deep(.el-select-dropdown__item){ - background-color: transparent !important; - } + .container { width: 100%; height: 100%; @@ -504,6 +500,28 @@ ::v-deep(.el-cascader){ width: 25% !important; } + ::v-deep(.el-popper){ + background-color: rgba(10,31,92,1); + border: 1px solid rgba(17,254,238,.4); + color: #11FEEE; + .el-cascader-node__label{ + color: #11FEEE; + } + .el-icon{ + color: #11FEEE; + } + .el-cascader-node{ + &:hover{ + background: #0049af; + } + } + } + ::v-deep(.el-popper__arrow){ + &::before{ + background-color: rgba(10,31,92,.6) !important; + border: 1px solid rgba(17,254,238,.4); + } + } ::v-deep(.el-input__wrapper){ width: 20%; box-shadow: none; @@ -524,6 +542,23 @@ width: calc(100% - 1.25rem); margin-right: 0.8rem; + ::v-deep(.el-popper){ + background-color: rgba(10,31,92,1); + border: 1px solid rgba(17,254,238,.4); + color: #11FEEE; + .el-select-dropdown__item{ + color: #11FEEE; + } + .el-select-dropdown__item.hover{ + background: #0049af; + } + } + ::v-deep(.el-popper__arrow){ + &::before{ + background-color: rgba(10,31,92,.6) !important; + border: 1px solid rgba(17,254,238,.4); + } + } ::v-deep(.el-input__wrapper){ box-shadow: none; border: 1px solid rgba(17,254,238,.2); -- Gitblit v1.9.2