hanshuang
/
flutter_integrated_whb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' 

# Conflicts:
#	lib/customWidget/photo_picker_row.dart
main
hs 2025-09-01 17:26:29 +08:00
parent ff41cbce60 3167e2f930
commit c75dfba154
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -2,4 +2,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip #distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.10.2-all.zip

2
lib/pages/app/Danger_paicha/check_record_detail_page.dart
View File

@ -515,7 +515,7 @@ class _CheckRecordDetailPageState extends State<CheckRecordDetailPage> {
void _goToDetail(String hiddenId) { void _goToDetail(String hiddenId) {
if (hiddenId.isEmpty) return; if (hiddenId.isEmpty) return;
final dynamic item = {"HIDDEN_RISKSTANDARD": "2", "HIDDEN_ID": hiddenId}; final dynamic item = {"HIDDEN_RISKSTANDARD": "1", "HIDDEN_ID": hiddenId};
pushPage(HiddenRecordDetailPage(DangerType.detailsHiddenInvestigationRecord, item), context); pushPage(HiddenRecordDetailPage(DangerType.detailsHiddenInvestigationRecord, item), context);
} }

2
lib/pages/app/hidden_danger_acceptance_page.dart
View File

@ -317,7 +317,7 @@ class _HiddenDangerAcceptancePageState extends State<HiddenDangerAcceptancePage>
Divider(height: 1), Divider(height: 1),
_buildInfoItem('整改部门', pd['HAVESCHEME']=="0" ? '无':'有'), _buildInfoItem('整改方案', pd['HAVESCHEME']=="0" ? '无':'有'),
Divider(height: 1), Divider(height: 1),
if(pd['HAVESCHEME']=="1") if(pd['HAVESCHEME']=="1")
Column( Column(

2
lib/pages/home/home_page.dart
View File

@ -525,7 +525,7 @@ class HomePageState extends State<HomePage> {
case 0: // 人员信息 case 0: // 人员信息
pushPage(UserinfoPage(), context); pushPage(UserinfoPage(), context);
break; break;
case 1: // 法律法规 case 1: // 工作安排
pushPage(WorkSetPage(), context); pushPage(WorkSetPage(), context);
break; break;
case 2: // 风险布控 case 2: // 风险布控

3
pubspec.yaml
View File

@ -86,6 +86,7 @@ dependencies:
webview_flutter: ^4.4.0 webview_flutter: ^4.4.0
path_provider: ^2.0.1 path_provider: ^2.0.1
camera: ^0.11.2 camera: ^0.11.2
#富文本查看 #富文本查看
flutter_html: ^3.0.0 flutter_html: ^3.0.0
@ -114,6 +115,8 @@ dependencies:
#息屏处理 #息屏处理
wakelock_plus: ^1.3.2 wakelock_plus: ^1.3.2
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter