diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue index e2d7df1..eec2203 100644 --- a/src/views/DialogTabs/component/GongDanPaiFa.vue +++ b/src/views/DialogTabs/component/GongDanPaiFa.vue @@ -1,10 +1,48 @@ @@ -12,5 +50,43 @@ #GongDanPaiFa { width: 100%; height: 100%; + text-align: center; + + :deep(.GongDanPaiForm) { + width: 100%; + height: calc(100% - 60px); + overflow: auto; + + .cell1 { + float: left; + width: 100%; + } + .cell2 { + float: left; + width: 50%; + + .el-form-item__label { + width: 200px !important; + } + } + .el-form-item__label { + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 16px; + color: #ffffff; + } + .el-input__wrapper { + background: rgba(14, 69, 89, 0.9); + border: 1px solid #1cf5fc; + box-shadow: none; + + .el-input__inner { + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 16px; + color: #c1d3d4; + } + } + } } diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue index e2d7df1..eec2203 100644 --- a/src/views/DialogTabs/component/GongDanPaiFa.vue +++ b/src/views/DialogTabs/component/GongDanPaiFa.vue @@ -1,10 +1,48 @@ @@ -12,5 +50,43 @@ #GongDanPaiFa { width: 100%; height: 100%; + text-align: center; + + :deep(.GongDanPaiForm) { + width: 100%; + height: calc(100% - 60px); + overflow: auto; + + .cell1 { + float: left; + width: 100%; + } + .cell2 { + float: left; + width: 50%; + + .el-form-item__label { + width: 200px !important; + } + } + .el-form-item__label { + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 16px; + color: #ffffff; + } + .el-input__wrapper { + background: rgba(14, 69, 89, 0.9); + border: 1px solid #1cf5fc; + box-shadow: none; + + .el-input__inner { + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 16px; + color: #c1d3d4; + } + } + } } diff --git a/src/views/oneMap/components/ZHRQ.vue b/src/views/oneMap/components/ZHRQ.vue index 3bc6665..372cbb4 100644 --- a/src/views/oneMap/components/ZHRQ.vue +++ b/src/views/oneMap/components/ZHRQ.vue @@ -94,7 +94,7 @@ class="TableChangeList2" :class="AllData.YJChangeIndex == item.id ? 'TableCheck2' : ''" v-for="item in AllData.YJChangeData" - @click="AllData.YJChangeIndex = item.id" + @click="initEcharts(item.id)" > {{ item.name }} @@ -344,7 +344,23 @@ }, }); // 初始化预警统计的Echarts -const initEcharts = () => { +const initEcharts = (id) => { + AllData.YJChangeIndex = id; + let Data1 = []; + let Data2 = []; + if (AllData.YJChangeIndex == 1) { + Data1 = [6, 2, 1, 5, 7, 6, 3]; + Data2 = [16, 7, 8, 12, 16, 13, 12]; + } else if (AllData.YJChangeIndex == 2) { + Data1 = [2, 3, 8, 3, 2, 1, 4]; + Data2 = [7, 16, 13, 16, 12, 8, 12]; + } else { + Data1 = [6, 4, 3, 5, 8, 3, 8]; + Data2 = [8, 12, 16, 13, 16, 7, 12]; + } + if (!!AllData.timer) { + clearTimeout(AllData.timer); + } if (!!myChart.value) { myChart.value.dispose(); } @@ -392,8 +408,8 @@ type: "value", name: "预警次数", min: 0, - max: 120, - interval: 20, + max: 12, + interval: 2, axisLabel: { formatter: "{value}", }, @@ -413,8 +429,8 @@ type: "value", name: "持续时长", min: 0, - max: 24, - interval: 4, + max: 30, + interval: 5, axisLabel: { formatter: "{value}", }, @@ -446,7 +462,7 @@ // borderRadius: 10, // 统一设置四个角的圆角大小 borderRadius: [10, 10, 0, 0], //(顺时针左上,右上,右下,左下) }, - data: [105, 50, 55, 70, 110, 90, 68], + data: Data1, }, { name: "持续时长", @@ -471,7 +487,7 @@ ]), }, - data: [16, 7, 8, 12, 16, 13, 12], + data: Data2, }, ], }); @@ -526,7 +542,7 @@ newfiberMapbox.map.setLayoutProperty("rq_pipeline_info", "visibility", "visible"); clearInterval(initeRQTimer); }, 100); - initEcharts(); + initEcharts(1); }); onBeforeUnmount(() => { newfiberMapbox.map.setLayoutProperty("rq_pipeline_info", "visibility", "none"); diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue index e2d7df1..eec2203 100644 --- a/src/views/DialogTabs/component/GongDanPaiFa.vue +++ b/src/views/DialogTabs/component/GongDanPaiFa.vue @@ -1,10 +1,48 @@ @@ -12,5 +50,43 @@ #GongDanPaiFa { width: 100%; height: 100%; + text-align: center; + + :deep(.GongDanPaiForm) { + width: 100%; + height: calc(100% - 60px); + overflow: auto; + + .cell1 { + float: left; + width: 100%; + } + .cell2 { + float: left; + width: 50%; + + .el-form-item__label { + width: 200px !important; + } + } + .el-form-item__label { + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 16px; + color: #ffffff; + } + .el-input__wrapper { + background: rgba(14, 69, 89, 0.9); + border: 1px solid #1cf5fc; + box-shadow: none; + + .el-input__inner { + font-family: Source Han Sans CN; + font-weight: 400; + font-size: 16px; + color: #c1d3d4; + } + } + } } diff --git a/src/views/oneMap/components/ZHRQ.vue b/src/views/oneMap/components/ZHRQ.vue index 3bc6665..372cbb4 100644 --- a/src/views/oneMap/components/ZHRQ.vue +++ b/src/views/oneMap/components/ZHRQ.vue @@ -94,7 +94,7 @@ class="TableChangeList2" :class="AllData.YJChangeIndex == item.id ? 'TableCheck2' : ''" v-for="item in AllData.YJChangeData" - @click="AllData.YJChangeIndex = item.id" + @click="initEcharts(item.id)" > {{ item.name }} @@ -344,7 +344,23 @@ }, }); // 初始化预警统计的Echarts -const initEcharts = () => { +const initEcharts = (id) => { + AllData.YJChangeIndex = id; + let Data1 = []; + let Data2 = []; + if (AllData.YJChangeIndex == 1) { + Data1 = [6, 2, 1, 5, 7, 6, 3]; + Data2 = [16, 7, 8, 12, 16, 13, 12]; + } else if (AllData.YJChangeIndex == 2) { + Data1 = [2, 3, 8, 3, 2, 1, 4]; + Data2 = [7, 16, 13, 16, 12, 8, 12]; + } else { + Data1 = [6, 4, 3, 5, 8, 3, 8]; + Data2 = [8, 12, 16, 13, 16, 7, 12]; + } + if (!!AllData.timer) { + clearTimeout(AllData.timer); + } if (!!myChart.value) { myChart.value.dispose(); } @@ -392,8 +408,8 @@ type: "value", name: "预警次数", min: 0, - max: 120, - interval: 20, + max: 12, + interval: 2, axisLabel: { formatter: "{value}", }, @@ -413,8 +429,8 @@ type: "value", name: "持续时长", min: 0, - max: 24, - interval: 4, + max: 30, + interval: 5, axisLabel: { formatter: "{value}", }, @@ -446,7 +462,7 @@ // borderRadius: 10, // 统一设置四个角的圆角大小 borderRadius: [10, 10, 0, 0], //(顺时针左上,右上,右下,左下) }, - data: [105, 50, 55, 70, 110, 90, 68], + data: Data1, }, { name: "持续时长", @@ -471,7 +487,7 @@ ]), }, - data: [16, 7, 8, 12, 16, 13, 12], + data: Data2, }, ], }); @@ -526,7 +542,7 @@ newfiberMapbox.map.setLayoutProperty("rq_pipeline_info", "visibility", "visible"); clearInterval(initeRQTimer); }, 100); - initEcharts(); + initEcharts(1); }); onBeforeUnmount(() => { newfiberMapbox.map.setLayoutProperty("rq_pipeline_info", "visibility", "none"); diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue index 8fa49ea..c56ad00 100644 --- a/src/views/oneMap/index.vue +++ b/src/views/oneMap/index.vue @@ -3,7 +3,11 @@
@@ -22,7 +26,9 @@ - + @@ -30,7 +36,12 @@ - + - + - +