diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue index 57998f0..00b2558 100644 --- a/src/views/pictureOnMap/inputSearch.vue +++ b/src/views/pictureOnMap/inputSearch.vue @@ -234,6 +234,7 @@ border: 1px solid #0b9bff !important; .el-scrollbar { padding-top: 40px; + display: block!important; } .el-select-dropdown__item { font-family: Source Han Sans CN; diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue index 57998f0..00b2558 100644 --- a/src/views/pictureOnMap/inputSearch.vue +++ b/src/views/pictureOnMap/inputSearch.vue @@ -234,6 +234,7 @@ border: 1px solid #0b9bff !important; .el-scrollbar { padding-top: 40px; + display: block!important; } .el-select-dropdown__item { font-family: Source Han Sans CN; diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index 6c00a85..4cf7273 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -630,13 +630,29 @@ AllData.RightShowID = Row.properties.id; // Row.properties.wellCode // 获取管网信息 - MonitorAPI.pipelinePointPage({ - pointNumber: Row.properties.wellCode, - }).then((res) => { - if (res && res.code == 200) { - AllData.GWBD = res.data[0]; - } - }); + console.log("Row", Row); + if (!!Row.properties.wellCode) { + MonitorAPI.pipelinePointPage({ + pointNumber: Row.properties.wellCode, + }).then((res) => { + if (res && res.code == 200) { + AllData.GWBD = res.data[0]; + } + }); + } else { + AllData.GWBD = { + pointType: "--", + pointNumber: "--", + stCode: "--", + buildTime: "--", + pipelineDiameter: "--", + pipelineTexture: "--", + issueType: "--", + roadName: "--", + repairYear: "--", + }; + } + // 上下游水量分析 getDataSXY(Row.properties); // 获取echarts数据 diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue index 57998f0..00b2558 100644 --- a/src/views/pictureOnMap/inputSearch.vue +++ b/src/views/pictureOnMap/inputSearch.vue @@ -234,6 +234,7 @@ border: 1px solid #0b9bff !important; .el-scrollbar { padding-top: 40px; + display: block!important; } .el-select-dropdown__item { font-family: Source Han Sans CN; diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index 6c00a85..4cf7273 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -630,13 +630,29 @@ AllData.RightShowID = Row.properties.id; // Row.properties.wellCode // 获取管网信息 - MonitorAPI.pipelinePointPage({ - pointNumber: Row.properties.wellCode, - }).then((res) => { - if (res && res.code == 200) { - AllData.GWBD = res.data[0]; - } - }); + console.log("Row", Row); + if (!!Row.properties.wellCode) { + MonitorAPI.pipelinePointPage({ + pointNumber: Row.properties.wellCode, + }).then((res) => { + if (res && res.code == 200) { + AllData.GWBD = res.data[0]; + } + }); + } else { + AllData.GWBD = { + pointType: "--", + pointNumber: "--", + stCode: "--", + buildTime: "--", + pipelineDiameter: "--", + pipelineTexture: "--", + issueType: "--", + roadName: "--", + repairYear: "--", + }; + } + // 上下游水量分析 getDataSXY(Row.properties); // 获取echarts数据 diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 9787bd9..16118ff 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -690,13 +690,27 @@ AllData.RightShowID = Row.properties.id; // Row.properties.wellCode // 获取管网信息 - MonitorAPI.pipelinePointPage({ - pointNumber: Row.properties.wellCode, - }).then((res) => { - if (res && res.code == 200) { - AllData.GWBD = res.data[0]; - } - }); + if (!!Row.properties.wellCode) { + MonitorAPI.pipelinePointPage({ + pointNumber: Row.properties.wellCode, + }).then((res) => { + if (res && res.code == 200) { + AllData.GWBD = res.data[0]; + } + }); + } else { + AllData.GWBD = { + pointType: "--", + pointNumber: "--", + stCode: "--", + buildTime: "--", + pipelineDiameter: "--", + pipelineTexture: "--", + issueType: "--", + roadName: "--", + repairYear: "--", + }; + } // 根据type 判断是管井还是接驳口 if (Row.properties.type == "rainwater_pipeline_quality_area1") { // 接驳口 diff --git a/src/views/pictureOnMap/inputSearch.vue b/src/views/pictureOnMap/inputSearch.vue index 57998f0..00b2558 100644 --- a/src/views/pictureOnMap/inputSearch.vue +++ b/src/views/pictureOnMap/inputSearch.vue @@ -234,6 +234,7 @@ border: 1px solid #0b9bff !important; .el-scrollbar { padding-top: 40px; + display: block!important; } .el-select-dropdown__item { font-family: Source Han Sans CN; diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index 6c00a85..4cf7273 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -630,13 +630,29 @@ AllData.RightShowID = Row.properties.id; // Row.properties.wellCode // 获取管网信息 - MonitorAPI.pipelinePointPage({ - pointNumber: Row.properties.wellCode, - }).then((res) => { - if (res && res.code == 200) { - AllData.GWBD = res.data[0]; - } - }); + console.log("Row", Row); + if (!!Row.properties.wellCode) { + MonitorAPI.pipelinePointPage({ + pointNumber: Row.properties.wellCode, + }).then((res) => { + if (res && res.code == 200) { + AllData.GWBD = res.data[0]; + } + }); + } else { + AllData.GWBD = { + pointType: "--", + pointNumber: "--", + stCode: "--", + buildTime: "--", + pipelineDiameter: "--", + pipelineTexture: "--", + issueType: "--", + roadName: "--", + repairYear: "--", + }; + } + // 上下游水量分析 getDataSXY(Row.properties); // 获取echarts数据 diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 9787bd9..16118ff 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -690,13 +690,27 @@ AllData.RightShowID = Row.properties.id; // Row.properties.wellCode // 获取管网信息 - MonitorAPI.pipelinePointPage({ - pointNumber: Row.properties.wellCode, - }).then((res) => { - if (res && res.code == 200) { - AllData.GWBD = res.data[0]; - } - }); + if (!!Row.properties.wellCode) { + MonitorAPI.pipelinePointPage({ + pointNumber: Row.properties.wellCode, + }).then((res) => { + if (res && res.code == 200) { + AllData.GWBD = res.data[0]; + } + }); + } else { + AllData.GWBD = { + pointType: "--", + pointNumber: "--", + stCode: "--", + buildTime: "--", + pipelineDiameter: "--", + pipelineTexture: "--", + issueType: "--", + roadName: "--", + repairYear: "--", + }; + } // 根据type 判断是管井还是接驳口 if (Row.properties.type == "rainwater_pipeline_quality_area1") { // 接驳口 diff --git a/src/views/pictureOnMap/page/WaterAssets/DrainageFacilitiesLeft/Rain/yushuibengzhanEcharts.vue b/src/views/pictureOnMap/page/WaterAssets/DrainageFacilitiesLeft/Rain/yushuibengzhanEcharts.vue index 02fb7e6..a44cb61 100644 --- a/src/views/pictureOnMap/page/WaterAssets/DrainageFacilitiesLeft/Rain/yushuibengzhanEcharts.vue +++ b/src/views/pictureOnMap/page/WaterAssets/DrainageFacilitiesLeft/Rain/yushuibengzhanEcharts.vue @@ -177,8 +177,17 @@ data: props.YAxis, name: '', // 系列名称, 用于tooltip的显示, legend 的图例筛选 type: 'pictorialBar', // 系列类型 - symbolSize: [barWidth * 2, barWidth * 2], // 标记的大小 - symbolOffset: [barWidth + 2, 0], //记相对于原本位置的偏移 + symbolSize: function (data) { + let arr = [barWidth + 2, 0]; + // 根据数据点的值动态改变图标大小 + console.log('data', data); + if (data != 0) { + return [barWidth * 2, barWidth * 2]; + } else { + return [0, 0]; + } + }, + symbolOffset: [barWidth + 2, 0], symbolPosition: 'end', // 图形的定位位置。可取值:start、end、center z: 10, // 组件的所有图形的z值。控制图形的前后顺序。z值小的图形会被z值大的图形覆盖 itemStyle: {