diff --git a/src/assets/styles/common.scss b/src/assets/styles/common.scss index 6053090..baab07b 100644 --- a/src/assets/styles/common.scss +++ b/src/assets/styles/common.scss @@ -106,6 +106,7 @@ } } // 表格始终显示右侧滚动条 +.scrollable-table, .scrollable-table .el-table__body-wrapper { &::-webkit-scrollbar { -webkit-appearance: none; @@ -117,19 +118,31 @@ border-radius: 8px; background-color: rgba(144, 147, 153, 0.5); box-shadow: 0 0 5px rgba(255, 255, 255, 0.5); + visibility: visible !important; + opacity: 1 !important; } &::-webkit-scrollbar-track { background-color: rgba(0, 0, 0, 0.05); } - overflow-y: scroll !important; + // 确保滚动条始终显示 + &::-webkit-scrollbar-thumb { + visibility: visible !important; + } + + overflow-y: auto !important; // 使用 auto 而不是 scroll 避免始终显示滚动条轨道 } -::v-deep .scrollable-table .el-table__body-wrapper { - overflow-x: hidden !important; +// 确保滚动条始终可见的关键规则 +.scrollable-table::-webkit-scrollbar-thumb { + visibility: visible !important; + opacity: 1 !important; } +::v-deep .scrollable-table .el-table__body-wrapper { + overflow-x: auto !important; // 改为 auto 以支持横向滚动 +} .vxe-select--panel.is--transfer { z-index: 999999 !important; } diff --git a/src/components/ChartsBarLine/index.vue b/src/components/ChartsBarLine/index.vue index 593a7bf..854a9ff 100644 --- a/src/components/ChartsBarLine/index.vue +++ b/src/components/ChartsBarLine/index.vue @@ -148,7 +148,7 @@ return { name: props.legendData[index], type: item.type, - barWidth: "20", + barWidth: item.data.length > 100 ? '15%' : "20", yAxisIndex: index, showSymbol: false, itemStyle: { diff --git a/src/components/ChartsTimeBar/index.vue b/src/components/ChartsTimeBar/index.vue index 0ca5275..148b878 100644 --- a/src/components/ChartsTimeBar/index.vue +++ b/src/components/ChartsTimeBar/index.vue @@ -182,7 +182,7 @@ return { name: props.legendData[index], type: props.echartType, - barWidth: "20", + barWidth: item.data.length > 100 ? '15%' : "20", showSymbol: false, itemStyle: { normal: { diff --git a/src/components/ChartsTimeLine/index.vue b/src/components/ChartsTimeLine/index.vue index 64d1f54..75437ce 100644 --- a/src/components/ChartsTimeLine/index.vue +++ b/src/components/ChartsTimeLine/index.vue @@ -173,7 +173,7 @@ return { name: props.legendData[index], type: "line", - barWidth: "20", + barWidth: item.data.length > 100 ? '15%' : "20", showSymbol: false, itemStyle: { normal: { diff --git a/src/components/ESelectSingle/index.vue b/src/components/ESelectSingle/index.vue index 638477f..19d506e 100644 --- a/src/components/ESelectSingle/index.vue +++ b/src/components/ESelectSingle/index.vue @@ -1,14 +1,7 @@ - + @@ -45,7 +38,9 @@ const stnmId = ref('') - const handleChange = (val) => { + const handleChange = (id,name) => { + console.log(id,name) + return stnmId.value = val emit('stationChange', val, options.value, stnm.value) emit('loadingChange', false); @@ -65,8 +60,7 @@ } await nextTick() stnmId.value = options.value[0].stnmId - stnm.value = options.value[0].stnm - + stnm.value = options.value[0].stnm || options.value[0].name emit('stationChange', stnmId.value, options.value, stnm.value) } catch (error) { diff --git a/src/views/statistic/rain/area_rain.vue b/src/views/statistic/rain/area_rain.vue new file mode 100644 index 0000000..6eb3a9b --- /dev/null +++ b/src/views/statistic/rain/area_rain.vue @@ -0,0 +1,502 @@ + + + \ No newline at end of file diff --git a/src/views/statistic/rain/sdjsl.vue b/src/views/statistic/rain/sdjsl.vue new file mode 100644 index 0000000..2fd3464 --- /dev/null +++ b/src/views/statistic/rain/sdjsl.vue @@ -0,0 +1,261 @@ + + + \ No newline at end of file