diff --git a/src/pages/health/statistic/doctorStatistic/index.vue b/src/pages/health/statistic/doctorStatistic/index.vue index 4b01316..3c77b06 100644 --- a/src/pages/health/statistic/doctorStatistic/index.vue +++ b/src/pages/health/statistic/doctorStatistic/index.vue @@ -267,6 +267,8 @@ :chartData="chartData" :opts="lineChartOpts" :loadingType="1" + :ontouch="true" + :inScrollView="true" /> @@ -278,6 +280,8 @@ :chartData="chartData" :opts="columnChartOpts" :loadingType="1" + :ontouch="true" + :inScrollView="true" /> @@ -526,7 +530,7 @@ const lineChartOpts = computed(() => { color: ['#667eea'], padding: [15, 15, 30, 5], enableScroll: false, - enableMarkLine: true, + enableMarkLine: false, dataLabel: false, dataPointShape: true, legend: { @@ -572,6 +576,30 @@ const lineChartOpts = computed(() => { linearOpacity: 0.2, onShadow: true, animation: true + }, + tooltip: { + showBox: true, + showArrow: true, + showCategory: false, + bgColor: '#000000', + bgOpacity: 0.7, + gridType: 'dash', + dashLength: 4, + gridColor: '#CCCCCC', + fontColor: '#FFFFFF', + fontSize: 11, + lineHeight: 16, + borderRadius: 4, + borderWidth: 0, + borderColor: '#000000', + padding: [8, 10, 8, 10], + splitLine: false, + horizentalLine: false, + xAxisLabel: true, + yAxisLabel: true, + labelBgColor: '#000000', + labelBgOpacity: 0.7, + labelFontColor: '#FFFFFF' } } } @@ -627,6 +655,30 @@ const columnChartOpts = computed(() => { linearType: 'none', barBorderCircle: true, seriesGap: 2 + }, + tooltip: { + showBox: true, + showArrow: true, + showCategory: false, + bgColor: '#000000', + bgOpacity: 0.7, + gridType: 'dash', + dashLength: 4, + gridColor: '#CCCCCC', + fontColor: '#FFFFFF', + fontSize: 11, + lineHeight: 16, + borderRadius: 4, + borderWidth: 0, + borderColor: '#000000', + padding: [8, 10, 8, 10], + splitLine: false, + horizentalLine: false, + xAxisLabel: true, + yAxisLabel: true, + labelBgColor: '#000000', + labelBgOpacity: 0.7, + labelFontColor: '#FFFFFF' } } } @@ -1122,7 +1174,7 @@ page { left: 0; top: 270rpx; background-color: rgba(0, 0, 0, 0.5); - z-index: 999; + z-index: 9999; .filter-panel-content { background-color: #ffffff; @@ -1315,7 +1367,7 @@ page { border-radius: 16rpx; box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08); width: calc(100% - 48rpx); - height: 500rpx; + height: 750rpx; overflow: visible; position: relative; } @@ -1467,19 +1519,18 @@ page { .info-row { display: flex; flex-wrap: wrap; - gap: 24rpx; - margin-bottom: 0; + margin: 0 -12rpx; .info-item { - flex: 0 0 calc(50% - 12rpx); + width: 50%; + padding: 0 12rpx; + box-sizing: border-box; display: flex; flex-direction: column; - gap: 4rpx; - min-width: 0; - margin-bottom: -5rpx; + margin-bottom: 20rpx; &.info-item-full { - flex: 0 0 100%; + width: 100%; } .info-label { @@ -1490,6 +1541,7 @@ page { padding: 6rpx 12rpx; border-radius: 8rpx; align-self: flex-start; + margin-bottom: 8rpx; } .info-value { diff --git a/src/pages/health/statistic/healthStatistic/index.vue b/src/pages/health/statistic/healthStatistic/index.vue index 00d3d3b..6c2bed9 100644 --- a/src/pages/health/statistic/healthStatistic/index.vue +++ b/src/pages/health/statistic/healthStatistic/index.vue @@ -271,6 +271,8 @@ :chartData="chartData" :opts="lineChartOpts" :loadingType="1" + :ontouch="true" + :inScrollView="true" /> @@ -282,6 +284,8 @@ :chartData="chartData" :opts="columnChartOpts" :loadingType="1" + :ontouch="true" + :inScrollView="true" /> @@ -416,7 +420,7 @@ const lineChartOpts = computed(() => { color: ['#667eea'], padding: [15, 15, 30, 5], enableScroll: false, - enableMarkLine: true, + enableMarkLine: false, dataLabel: false, dataPointShape: true, legend: { @@ -461,15 +465,21 @@ const lineChartOpts = computed(() => { tooltip: { showBox: true, showArrow: true, - showCategory: true, + showCategory: false, bgColor: '#000000', bgOpacity: 0.7, gridType: 'dash', dashLength: 4, gridColor: '#CCCCCC', fontColor: '#FFFFFF', - splitLine: true, - horizentalLine: true, + fontSize: 11, + lineHeight: 16, + borderRadius: 4, + borderWidth: 0, + borderColor: '#000000', + padding: [8, 10, 8, 10], + splitLine: false, + horizentalLine: false, xAxisLabel: true, yAxisLabel: true, labelBgColor: '#000000', @@ -546,15 +556,21 @@ const columnChartOpts = computed(() => { tooltip: { showBox: true, showArrow: true, - showCategory: true, + showCategory: false, bgColor: '#000000', bgOpacity: 0.7, gridType: 'dash', dashLength: 4, gridColor: '#CCCCCC', fontColor: '#FFFFFF', - splitLine: true, - horizentalLine: true, + fontSize: 11, + lineHeight: 16, + borderRadius: 4, + borderWidth: 0, + borderColor: '#000000', + padding: [8, 10, 8, 10], + splitLine: false, + horizentalLine: false, xAxisLabel: true, yAxisLabel: true, labelBgColor: '#000000', @@ -811,6 +827,7 @@ function settingCancel() { } +