diff --git a/src/assets/style/pageCommon.component.scss b/src/assets/style/pageCommon.component.scss
index a3aebad..6f00a69 100644
--- a/src/assets/style/pageCommon.component.scss
+++ b/src/assets/style/pageCommon.component.scss
@@ -3009,7 +3009,7 @@ i.red-cycle {
}
.el-checkbox__label {
- color: #FFFFFF;
+ // color: #FFFFFF;
}
.center-right {
diff --git a/src/components/center/centerSide.component.html b/src/components/center/centerSide.component.html
index 9c42f02..9fd195f 100644
--- a/src/components/center/centerSide.component.html
+++ b/src/components/center/centerSide.component.html
@@ -4,7 +4,7 @@
重大危险源包保责任制履职情况
-
@@ -38,7 +38,7 @@
个人隐患任务执行情况/近3月
-
diff --git a/src/components/center/centerSide.component.scss b/src/components/center/centerSide.component.scss
index bd76b68..069f3a0 100644
--- a/src/components/center/centerSide.component.scss
+++ b/src/components/center/centerSide.component.scss
@@ -10,7 +10,7 @@
.echarts {
width: 100%;
}
- .common-select {
+ .screen-select {
position: absolute;
top: 0;
width: 110px;
@@ -18,14 +18,21 @@
background: rgba(0, 0, 0, 0.5);
z-index: 1;
border-radius: 12px;
- .el-input__inner {
- width: 110px;
- height: 20px;
- background: rgba(0, 0, 0, 0.5);
- border: 1px solid rgba(255, 255, 255, 0.6);
- border-radius: 12px;
- font-size: 8px;
- color: #fff;
+ ::v-deep {
+ .el-input__inner {
+ width: 110px;
+ height: 20px;
+ background: rgba(0, 0, 0, 0.5);
+ border: 1px solid rgba(255, 255, 255, 0.6);
+ border-radius: 12px;
+ font-size: 8px;
+ color: #fff;
+ }
+ .el-input__icon {
+ width: 16px;
+ height: 16px;
+ line-height: 14px;
+ }
}
.el-input__icon {
width: 16px;
@@ -167,22 +174,6 @@
}
}
}
-.el-select-dropdown {
- background: rgba(0, 0, 0, 0.5);
- border: 0px solid #fff;
- .el-select-dropdown__item {
- color: #fff;
- &:hover {
- color: rgba(0, 0, 0, 0.8);
- }
- }
- .el-select-dropdown__item.hover {
- color: rgba(0, 0, 0, 0.8);
- }
- .el-select-dropdown__item.selected {
- color: #409eff;
- }
-}
.popperDateClass {
width: 520px;
@@ -237,3 +228,28 @@
}
}
}
+
+.el-select-dropdown {
+ background: rgba(0, 0, 0, 0.5) !important;
+ border: 0px solid #fff;
+ .el-scrollbar__wrap {
+ background: rgba(0, 0, 0, 0.5);
+ }
+ .el-select-dropdown__item {
+ color: #fff;
+ &:hover {
+ color: rgba(0, 0, 0, 0.8);
+ }
+ }
+ .el-select-dropdown__item.hover {
+ color: rgba(0, 0, 0, 0.8);
+ }
+ .el-select-dropdown__item.selected {
+ color: #409eff;
+ }
+}
+
+.el-select-dropdown .el-popper{
+ background: rgba(0, 0, 0, 0.5) !important;
+ border: 0px solid #fff;
+}
diff --git a/src/components/center/centerSide.component.vue b/src/components/center/centerSide.component.vue
index d1540c0..2e715f6 100644
--- a/src/components/center/centerSide.component.vue
+++ b/src/components/center/centerSide.component.vue
@@ -511,7 +511,7 @@ export default class CenterSideComponent extends Vue {
{ value: res.data.completeNumber, name: "已完成数" },
{ value: res.data.taskNumber, name: "未完成" },
];
- const personalTaskOption = this.statisticalPresonalTaskChart(personalTasksData)
+ const personalTaskOption = this.statisticalPresonalTaskChart(personalTasksData)
if (this.personaltaskchart) {
this.personaltaskchart.clear();
this.personaltaskchart.setOption(personalTaskOption);
@@ -522,7 +522,7 @@ export default class CenterSideComponent extends Vue {
* 个人排查任务执行情况 环形图
* @returns
*/
- public statisticalPresonalTaskChart(personalTasksData:any) {
+ public statisticalPresonalTaskChart(personalTasksData: any) {
return {
tooltip: {},
color: ["#C9FFD7 ", "#FADFA4"],
@@ -614,13 +614,39 @@ export default class CenterSideComponent extends Vue {
+
+
+
-
-
-
-
diff --git a/src/views/risk/area/area.component.vue b/src/views/risk/area/area.component.vue
index 61e5f3a..20a17cd 100644
--- a/src/views/risk/area/area.component.vue
+++ b/src/views/risk/area/area.component.vue
@@ -278,8 +278,9 @@ export default class AreaManagerComponent extends BaseRecordComponent {
"重大危险源名称": row.majorHazardName
}
}).then((res: any) => {
- this.showQrCode = true;
this.qrUrl = res.data.url;
+ this.showQrCode = true;
+
})
}