enchantedwyf/tuiche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

睡眠报告周报与上周对比模块修改

Browse Source
This commit is contained in:
czz
2025-11-17 16:41:40 +08:00
parent fa11e2c937
commit 7541c18304
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/pages/sleep_report/chart/weekDataShowWidget.dart
View File

@@ -5,7 +5,7 @@ class Weekdatashowwidget extends StatefulWidget {
final Widget widget1; // 第一个传入的 widget final Widget widget1; // 第一个传入的 widget
final Widget widget2; // 第二个传入的 widget final Widget widget2; // 第二个传入的 widget
final Widget widget3; // 第三个传入的 widget final Widget widget3; // 第三个传入的 widget
final Widget widget4; // 第四个传入的 widget // final Widget widget4; // 第四个传入的 widget
final MainAxisAlignment alignment; // 控制 Row 的对齐方式 final MainAxisAlignment alignment; // 控制 Row 的对齐方式
const Weekdatashowwidget({ const Weekdatashowwidget({
@@ -13,7 +13,7 @@ class Weekdatashowwidget extends StatefulWidget {
required this.widget1, required this.widget1,
required this.widget2, required this.widget2,
required this.widget3, required this.widget3,
required this.widget4, // required this.widget4,
this.alignment = MainAxisAlignment.start, // 默认左对齐 this.alignment = MainAxisAlignment.start, // 默认左对齐
}); });
@@ -50,7 +50,7 @@ class _WeekdatashowwidgetState extends State<Weekdatashowwidget> {
children: [ children: [
// 放入传入的 widget1 // 放入传入的 widget1
Container( Container(
width: MediaQuery.sizeOf(context).width * 0.35, // 固定宽度 width: MediaQuery.sizeOf(context).width * 0.45, // 固定宽度
decoration: BoxDecoration(), decoration: BoxDecoration(),
child: Align( child: Align(
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
@@ -64,7 +64,7 @@ class _WeekdatashowwidgetState extends State<Weekdatashowwidget> {
), ),
// 放入传入的 widget2 // 放入传入的 widget2
Container( Container(
width: MediaQuery.sizeOf(context).width * 0.15, // 固定宽度 width: MediaQuery.sizeOf(context).width * 0.2, // 固定宽度
decoration: BoxDecoration(), decoration: BoxDecoration(),
child: Align( child: Align(
alignment: widget.alignment == MainAxisAlignment.start alignment: widget.alignment == MainAxisAlignment.start
@@ -77,7 +77,7 @@ class _WeekdatashowwidgetState extends State<Weekdatashowwidget> {
), ),
// 放入传入的 widget3 // 放入传入的 widget3
Container( Container(
width: MediaQuery.sizeOf(context).width * 0.15, // 固定宽度 width: MediaQuery.sizeOf(context).width * 0.2, // 固定宽度
decoration: BoxDecoration(), decoration: BoxDecoration(),
child: Align( child: Align(
alignment: widget.alignment == MainAxisAlignment.start alignment: widget.alignment == MainAxisAlignment.start
@@ -89,18 +89,18 @@ class _WeekdatashowwidgetState extends State<Weekdatashowwidget> {
), ),
), ),
// 放入传入的 widget4 // 放入传入的 widget4
Container( // Container(
width: MediaQuery.sizeOf(context).width * 0.25, // 固定宽度 // width: MediaQuery.sizeOf(context).width * 0.25, // 固定宽度
decoration: BoxDecoration(), // decoration: BoxDecoration(),
child: Align( // child: Align(
alignment: widget.alignment == MainAxisAlignment.start // alignment: widget.alignment == MainAxisAlignment.start
? Alignment.centerLeft // ? Alignment.centerLeft
: widget.alignment == MainAxisAlignment.center // : widget.alignment == MainAxisAlignment.center
? Alignment.center // ? Alignment.center
: Alignment.centerRight, // 同样设置对齐 // : Alignment.centerRight, // 同样设置对齐
child: widget.widget4, // 显示传入的 widget4 // child: widget.widget4, // 显示传入的 widget4
), // ),
), // ),
], ],
), ),
), ),

7
lib/pages/sleep_report/component/TrendDataTextPage.dart
View File

@@ -62,7 +62,8 @@ class IndicatorCompareCard extends StatelessWidget {
14.rpx, 10.rpx, 14.rpx, 10.rpx), 14.rpx, 10.rpx, 14.rpx, 10.rpx),
borderRadius: 0.rpx, borderRadius: 0.rpx,
onTap: () { onTap: () {
if (AppConstants().ent_type == APPPackageType.MHT.code) { if (AppConstants().ent_type ==
APPPackageType.MHT.code) {
showTipDialog( showTipDialog(
context, context,
Text( Text(
@@ -112,7 +113,7 @@ class IndicatorCompareCard extends StatelessWidget {
widget1: _buildHeader(headers, 0), widget1: _buildHeader(headers, 0),
widget2: _buildHeader(headers, 1), widget2: _buildHeader(headers, 1),
widget3: _buildHeader(headers, 2), widget3: _buildHeader(headers, 2),
widget4: _buildHeader(headers, 3), // widget4: _buildHeader(headers, 3),
), ),
/// 数据行 /// 数据行
@@ -123,7 +124,7 @@ class IndicatorCompareCard extends StatelessWidget {
widget1: row[0], widget1: row[0],
widget2: row[1], widget2: row[1],
widget3: row[2], widget3: row[2],
widget4: row[3], // widget4: row[3],
).paddingOnly(bottom: 0.rpx); ).paddingOnly(bottom: 0.rpx);
}).toList(), }).toList(),
), ),