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

Merge remote-tracking branch 'origin/main'

main
hs 2025-09-02 16:22:23 +08:00
parent 6351d00c4b 5af97be503
commit b361f796f6
8 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/customWidget/ItemWidgetFactory.dart
View File

@ -40,14 +40,13 @@ class ListItemFactory {
],
),
if (isRight)
Row(
mainAxisSize: MainAxisSize.min,
children: [
Flexible(
fit: FlexFit.loose,
child: Text(
rightText,
_truncateText(rightText,17) ,
style: TextStyle(fontSize: 13, color: Colors.grey),
maxLines: 1,
overflow: TextOverflow.ellipsis,
@ -65,7 +64,7 @@ class ListItemFactory {
Flexible(
fit: FlexFit.loose,
child: Text(
rightText,
_truncateText(rightText,17) ,
style: TextStyle(fontSize: 13, color: Colors.grey),
maxLines: 1,
overflow: TextOverflow.ellipsis,

6
lib/http/ApiService.dart
View File

@ -2867,6 +2867,7 @@ U6Hzm1ninpWeE+awIDAQAB
"CHECK_CONTENT": item["CHECK_CONTENT"] ?? "",
"CHECK_STANDARD": item["CHECK_STANDARD"] ?? "",
"REFERENCE_BASIS": item["REFERENCE_BASIS"] ?? "",
"SOURCE": '2',
"STATE": '0',
"CLEARIMG": '1',
@ -3092,6 +3093,7 @@ U6Hzm1ninpWeE+awIDAQAB
String hiddenType3,
result,
) {
print("======>$type");
return HttpManager().request(
basePath,
@ -3104,10 +3106,12 @@ U6Hzm1ninpWeE+awIDAQAB
"HIDDEN_CATEGORY": result["HIDDEN_CATEGORY"] ?? '',
"LISTMANAGER_ID": item["LISTMANAGER_ID"],
"RISKITEM_ID": result["LISTCHECKITEM_ID"],
"RISKITEM_ID": item["LISTCHECKITEM_ID"],
"CHECK_CONTENT": item["CHECK_CONTENT"] ?? "",
"RECORDITEM_ID": item["RECORDITEM_ID"] ?? "",
"HIDDENDESCR": hazardDescription,
"HIDDENPART": partDescription,
"LATITUDE": latitude,

1
lib/http/HttpManager.dart
View File

@ -96,6 +96,7 @@ class HttpManager {
);
try {
print("======>$data");
switch (method) {
case Method.get:
resp = await _dio.get(url,

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

@ -557,7 +557,7 @@ class _HiddenDangerAcceptancePageState extends State<HiddenDangerAcceptancePage>
String hiddenCheckId="";
try{
data['check']['HIDDENCHECK_ID'];
hiddenCheckId= data['check']['HIDDENCHECK_ID'];
}catch(e){
hiddenCheckId="";
}

8
lib/pages/app/hidden_record_detail_page.dart
View File

@ -137,7 +137,13 @@ class _HiddenRecordDetailPageState extends State<HiddenRecordDetailPage> {
files5.add(img["FILEPATH"]);
}
files6 = data['yImgs'] ?? [];
checkList = data['checkList'] ?? [];
if(checkList.isNotEmpty) {
for (var img in checkList[0]['cImgs']) {
files7.add(img["FILEPATH"]);
}
}
});
}
@ -398,7 +404,7 @@ class _HiddenRecordDetailPageState extends State<HiddenRecordDetailPage> {
// _buildImageGrid(files2, onTap: (index) => _showImageGallery(files2, index)),
ListItemFactory.createTextImageItem(
text: "验收图片",
imageUrls: files5,
imageUrls: files7,
onImageTapped: (index) {
presentOpaque(
SingleImageViewer(imageUrl: ApiService.baseImgPath +files5[index]),

16
lib/pages/app/pending_rectification_detail_page.dart
View File

@ -213,14 +213,14 @@ class _PendingRectificationDetailPageState extends State<PendingRectificationDet
Divider(height: 1),
// 条件渲染部分
if (pd['SOURCE'] == '2') ...[
// _buildInfoItem('风险点（单元）', pd['RISK_UNIT'] ?? ''),
// Divider(height: 1),
// _buildInfoItem('辨识部位', pd['IDENTIFICATION'] ?? ''),
// Divider(height: 1),
// _buildInfoItem('存在风险', pd['RISK_DESCR'] ?? ''),
// Divider(height: 1),
// _buildInfoItem('风险分级', pd['LEVEL'] ?? ''),
// Divider(height: 1),
_buildInfoItem('风险点（单元）', pd['RISK_UNIT'] ?? ''),
Divider(height: 1),
_buildInfoItem('辨识部位', pd['IDENTIFICATION'] ?? ''),
Divider(height: 1),
_buildInfoItem('存在风险', pd['RISK_DESCR'] ?? ''),
Divider(height: 1),
_buildInfoItem('风险分级', pd['LEVEL'] ?? ''),
Divider(height: 1),
_buildInfoItem('检查内容', pd['CHECK_CONTENT'] ?? ''),
Divider(height: 1),
],

33
lib/pages/home/study/strengthen_video_study_page.dart
View File

@ -166,16 +166,31 @@ class _StrengthenStudyPageState extends State<StrengthenStudyPage> {
body: Column(
children: [
ListItemFactory.createBuildSimpleSection('加强学习课件'),
SizedBox(
width: double.infinity,
height: 250,
child: VideoPlayerWidget(
allowSeek: false,
controller: _videoController,
coverUrl:'',
aspectRatio: _videoController?.value.aspectRatio ?? 16 / 9,
if(_videoList.isEmpty)
Stack(children: [
Container(
width: double.infinity,
height: 200,
color: Colors.white,
child: Center(
child:Text("暂未播放",
),
),
),
),
if(_videoList.isNotEmpty)
SizedBox(
width: double.infinity,
height: 250,
child: VideoPlayerWidget(
allowSeek: false,
controller: _videoController,
coverUrl:'',
aspectRatio: _videoController?.value.aspectRatio ?? 16 / 9,
),
),
],),
Expanded(
child: ListView.builder(
padding: const EdgeInsets.all(12),

2
lib/pages/home/work/danger_project_page.dart
View File

@ -584,7 +584,7 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
}
if (hasNoSelectItem) {
ToastUtil.showNormal(context, "还有位选择的排查项");
ToastUtil.showNormal(context, "还有未选择的排查项");
LoadingDialogHelper.hide();
return;
}