diff --git a/src/views/floodSys/floodYP/riskAsses.vue b/src/views/floodSys/floodYP/riskAsses.vue index 25ae659..340eeff 100644 --- a/src/views/floodSys/floodYP/riskAsses.vue +++ b/src/views/floodSys/floodYP/riskAsses.vue @@ -375,7 +375,7 @@ .part { color: #5b9cd8; cursor: pointer; - width: 85%; + width: 95%; margin-bottom: 15px; border-bottom: 1px dashed #c6c6c6; .el-radio { diff --git a/src/views/floodSys/floodYP/riskAsses.vue b/src/views/floodSys/floodYP/riskAsses.vue index 25ae659..340eeff 100644 --- a/src/views/floodSys/floodYP/riskAsses.vue +++ b/src/views/floodSys/floodYP/riskAsses.vue @@ -375,7 +375,7 @@ .part { color: #5b9cd8; cursor: pointer; - width: 85%; + width: 95%; margin-bottom: 15px; border-bottom: 1px dashed #c6c6c6; .el-radio { diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue index 7a865e6..ade6f4a 100644 --- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue +++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue @@ -221,7 +221,7 @@ getProjectStatisticsM(); setTimeout(() => { initEcharts(); - }, 500); + }, 1500); }); diff --git a/src/views/floodSys/floodYP/riskAsses.vue b/src/views/floodSys/floodYP/riskAsses.vue index 25ae659..340eeff 100644 --- a/src/views/floodSys/floodYP/riskAsses.vue +++ b/src/views/floodSys/floodYP/riskAsses.vue @@ -375,7 +375,7 @@ .part { color: #5b9cd8; cursor: pointer; - width: 85%; + width: 95%; margin-bottom: 15px; border-bottom: 1px dashed #c6c6c6; .el-radio { diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue index 7a865e6..ade6f4a 100644 --- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue +++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue @@ -221,7 +221,7 @@ getProjectStatisticsM(); setTimeout(() => { initEcharts(); - }, 500); + }, 1500); }); diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index 6fbf7c4..13116a5 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -212,7 +212,7 @@ chartOption.floodOneMapFXYP.series[1].markLine.data[0].label.formatter = '设防水位 ' + datas.sfZ + 'm'; let arrs2 = []; datas.riverX.map(item => { - arrs2.push(Number(datas.z) + 59); + arrs2.push(Number(datas.z) + Number(datas.gcZ)); }); chartOption.floodOneMapFXYP.series[0].data = arrs2; //当前水位 diff --git a/src/views/floodSys/floodYP/riskAsses.vue b/src/views/floodSys/floodYP/riskAsses.vue index 25ae659..340eeff 100644 --- a/src/views/floodSys/floodYP/riskAsses.vue +++ b/src/views/floodSys/floodYP/riskAsses.vue @@ -375,7 +375,7 @@ .part { color: #5b9cd8; cursor: pointer; - width: 85%; + width: 95%; margin-bottom: 15px; border-bottom: 1px dashed #c6c6c6; .el-radio { diff --git a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue index 7a865e6..ade6f4a 100644 --- a/src/views/sponeScreen/Echarts/ConstructionDrawings.vue +++ b/src/views/sponeScreen/Echarts/ConstructionDrawings.vue @@ -221,7 +221,7 @@ getProjectStatisticsM(); setTimeout(() => { initEcharts(); - }, 500); + }, 1500); }); diff --git a/src/views/sponeScreen/gisMF/cesiumPopup.vue b/src/views/sponeScreen/gisMF/cesiumPopup.vue index 6fbf7c4..13116a5 100644 --- a/src/views/sponeScreen/gisMF/cesiumPopup.vue +++ b/src/views/sponeScreen/gisMF/cesiumPopup.vue @@ -212,7 +212,7 @@ chartOption.floodOneMapFXYP.series[1].markLine.data[0].label.formatter = '设防水位 ' + datas.sfZ + 'm'; let arrs2 = []; datas.riverX.map(item => { - arrs2.push(Number(datas.z) + 59); + arrs2.push(Number(datas.z) + Number(datas.gcZ)); }); chartOption.floodOneMapFXYP.series[0].data = arrs2; //当前水位 diff --git a/src/views/sponeScreen/waterFlood/rainReport.vue b/src/views/sponeScreen/waterFlood/rainReport.vue index 4897ac9..d7eef8b 100644 --- a/src/views/sponeScreen/waterFlood/rainReport.vue +++ b/src/views/sponeScreen/waterFlood/rainReport.vue @@ -34,7 +34,7 @@ - +