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

Compare commits

base: hanshuang:ef5b1ff2299a74c569bb63764051e46a32cf0f47
Branches Tags
hanshuang:main
hanshuang:v2.0.0
hanshuang:v2.2.1-60
..
compare: hanshuang:fc40593ab355aff5552bdeec0e666f5f46e087da
Branches Tags
hanshuang:main
hanshuang:v2.0.0
hanshuang:v2.2.1-60

No commits in common. "ef5b1ff2299a74c569bb63764051e46a32cf0f47" and "fc40593ab355aff5552bdeec0e666f5f46e087da" have entirely different histories.
ef5b1ff229 ... fc40593ab3

4 changed files with 268 additions and 289 deletions
Show Stats Expand all files Collapse all files

109
lib/pages/app/Danger_paicha/danger_image_updata_page.dart
View File

@ -7,6 +7,7 @@ import 'package:qhd_prevention/customWidget/toast_util.dart';
import 'package:qhd_prevention/http/ApiService.dart';
import 'package:qhd_prevention/pages/my_appbar.dart';
class PhotoItem {
final String id;
final String filePath;
@ -19,9 +20,9 @@ class PhotoItem {
});
}
class DangerImageUpdataPage extends StatefulWidget {
const DangerImageUpdataPage(this.id, {super.key, required this.imgList});
final List<PhotoItem> imgList;
const DangerImageUpdataPage(this.id, {super.key});
final String id;
@ -30,38 +31,39 @@ class DangerImageUpdataPage extends StatefulWidget {
}
class _DangerImageUpdataPageState extends State<DangerImageUpdataPage> {
late List<PhotoItem> _imgList = [];
List<PhotoItem> _imgList = [];
List<String> _yinHuanImages = [];
// List<dynamic> alreadyImageList=[];
@override
void initState() {
// TODO: implement initState
super.initState();
_imgList = widget.imgList;
_getAlreadyUpImages();
}
Future<void> _getAlreadyUpImages() async {
try {
final result = await ApiService.getAlreadyUpImages(widget.id);
if (result['result'] == 'success') {
final List<dynamic> newList = result['imgs'] ?? [];
setState(() {
for (Map item in newList) {
String id = item['IMGFILES_ID'] ?? '';
String filePath = item['FILEPATH'] ?? '';
_imgList.add(
PhotoItem(
id: id, // 新图片没有ID
filePath: ApiService.baseImgPath+filePath,
for(int i=0;i<newList.length;i++){
_imgList.add(PhotoItem(
id: newList[i]["IMGFILES_ID"], // 新图片没有ID
filePath: newList[i]["FILEPATH"],
type: "1",
),
)
);
_yinHuanImages.add(ApiService.baseImgPath +newList[i]["FILEPATH"]);
}
// alreadyImageList.addAll(newList);
});
}else{
ToastUtil.showNormal(context, "加载数据失败");
// _showMessage('加载数据失败');
@ -79,31 +81,43 @@ class _DangerImageUpdataPageState extends State<DangerImageUpdataPage> {
appBar: MyAppbar(title: "检查照片"),
body: Column(
children: [
RepairedPhotoSection(
title: "检查照片",
maxCount: 4,
mediaType: MediaType.image,
isShowAI: false,
initialMediaPaths: _imgList.map((e)=> e.filePath).toList(),
initialMediaPaths: _yinHuanImages,
onMediaAdded: (value) {
setState(() {
_imgList.add(
PhotoItem(
_imgList.add(PhotoItem(
id: "", // 新图片没有ID
filePath: value,
type: "2",
),
);
));
_yinHuanImages.add(value);
});
},
onMediaRemoved: (path) {
int delete=0;
for(int i=0;i<_yinHuanImages.length;i++){
if(_yinHuanImages[i]==path){
delete=i;
}
}
_onImageRemoved(_imgList[delete]);
_yinHuanImages.removeAt(delete);
_imgList.removeAt(delete);
},
onAiIdentify: () {},
onChanged: (List<File> value) {},
onAiIdentify: () {
}, onChanged: (List<File> value) {
},
),
// 下一步按钮
@ -121,16 +135,23 @@ class _DangerImageUpdataPageState extends State<DangerImageUpdataPage> {
),
],
),
child: SizedBox(
child:
SizedBox(
width: screenWidth - 30,
height: 50,
child: TextButton(
onPressed: () async {
onPressed: () {
if(_imgList.length>4){
ToastUtil.showNormal(context, "图片不能大于4张");
return;
}
_submitAll();
for(int i=0;i<_imgList.length;i++){
if(_imgList[i].type=="2") {
_addImgFiles(_yinHuanImages[i], "14", widget.id);
}
}
ToastUtil.showNormal(context, "提交成功");
Navigator.pop(context);
},
child: Text(
"提交",
@ -143,46 +164,32 @@ class _DangerImageUpdataPageState extends State<DangerImageUpdataPage> {
),
),
),
],
),
],)
);
}
Future<void> _submitAll() async {
int i = 0;
for (PhotoItem item in _imgList) {
if (item.type == '2') {
String imgPath = await _addImgFiles(item.filePath, "14", widget.id);
if (imgPath.isEmpty) {
// 单张上传失败时的处理
ToastUtil.showError(context, "第${i+1}张上传失败");
return;
}
}
i++;
}
ToastUtil.showNormal(context, "提交成功");
Navigator.of(context).pop();
}
Future<String> _addImgFiles(String imagePath,String type,String id) async {
try {
final raw = await ApiService.addImgFiles( imagePath, type, id);
if (raw['result'] == 'success') {
Map pd = raw['pd'];
final String img = pd['FILEPATH'];
return img;
return raw['imgPath'];
}else{
// _showMessage('反馈提交失败');
return "";
}
} catch (e) {
print('上传图片失败：$e');
return "";
}
}
} catch (e) {
// 出错时可以 Toast 或者在页面上显示错误状态
print('加载首页数据失败：$e');
return "";
}
}
Future<String> _onImageRemoved(PhotoItem item) async {
try {
final raw = await ApiService.onImageRemoved( item.id);
if (raw['result'] == 'success') {
return raw['imgPath'];
@ -190,10 +197,12 @@ class _DangerImageUpdataPageState extends State<DangerImageUpdataPage> {
// _showMessage('反馈提交失败');
return "";
}
} catch (e) {
// 出错时可以 Toast 或者在页面上显示错误状态
print('加载首页数据失败：$e');
return "";
}
}
}

18
lib/pages/home/tap/tabList/special_wrok/gc_work/highwork_list_page.dart
View File

@ -364,19 +364,17 @@ class _HighworkListPageState extends State<HighworkListPage> {
Text("所在单位负责人: ${item['LEADER_USER_NAME'] ?? ''}"),
],
),
// const SizedBox(height: 8),
// Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// Text("作业负责人: ${item['CONFIRM_USER_NAME'] ?? ''}"),
// Text("动火点负责人: ${item['LEADER_USER_NAME'] ?? ''}"),
// ],
// ),
const SizedBox(height: 8),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("作业负责人: ${item['CONFIRM_USER_NAME'] ?? ''}"),
Text("动火点负责人: ${item['LEADER_USER_NAME'] ?? ''}"),
],
),
const SizedBox(height: 8),
if (item['AUDIT_USER_NAME'] != null)
Text("安全管理部门负责人: ${item['AUDIT_USER_NAME'] ?? ''}"),
if (item['APPROVE_USER_NAME'] != null)
Text("安全管理部门负责人: ${item['APPROVE_USER_NAME'] ?? ''}"),
const SizedBox(height: 8),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,

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

@ -182,7 +182,7 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
color: option['color'],
screenWidth: screenWidth,
onImageTap: () {
_getAlreadyUpImages(item);
pushPage(DangerImageUpdataPage(item["RECORDITEM_ID"]), context);
},
);
}).toList(),
@ -209,34 +209,6 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
),
);
}
Future<void> _getAlreadyUpImages(Map item) async {
try {
final result = await ApiService.getAlreadyUpImages(item["RECORDITEM_ID"]);
if (result['result'] == 'success') {
final List<dynamic> newList = result['imgs'] ?? [];
List<PhotoItem> imgList = [];
for (Map item in newList) {
String id = item['IMGFILES_ID'] ?? '';
String filePath = item['FILEPATH'] ?? '';
imgList.add(
PhotoItem(
id: id, // 新图片没有ID
filePath: ApiService.baseImgPath+filePath,
type: "1",
),
);
}
pushPage(DangerImageUpdataPage(item["RECORDITEM_ID"], imgList: imgList), context);
} else {
ToastUtil.showNormal(context, "加载数据失败");
// _showMessage('加载数据失败');
}
} catch (e) {
// 出错时可以 Toast 或者在页面上显示错误状态
print('加载数据失败：$e');
}
}
// 构建单选按钮
Widget _buildOptionButton({

282
pubspec.lock
View File

File diff suppressed because it is too large Load Diff