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/pages/home/tap/item_list_widget.dart
main
hs 2025-09-05 09:19:03 +08:00
parent 96face82a6 b6334867c5
commit 26c64aa5ea
17 changed files with 223 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
lib/pages/app/Danger_paicha/check_information_one_item.dart
View File

@ -23,11 +23,11 @@ import 'package:shared_preferences/shared_preferences.dart';
import '../../../customWidget/photo_picker_row.dart';
import '../../../http/ApiService.dart';
class ImgData {
class ImgDataTwo {
final String path;
final String id;
const ImgData({
const ImgDataTwo({
required this.path,
required this.id,
});
@ -61,8 +61,8 @@ class _CheckInformationOneItemState extends State<CheckInformationOneItem> {
List<Map<String, dynamic>> _personCache = [];
List<ImgData> _yinHuanImages = [];
List<ImgData> _yinHuanVido = [];
List<ImgDataTwo> _yinHuanImages = [];
List<ImgDataTwo> _yinHuanVido = [];
// String _yinHuanVido="";
dynamic _hazardLeve;
String yinHuanId = "";
@ -74,7 +74,7 @@ class _CheckInformationOneItemState extends State<CheckInformationOneItem> {
String responsibleName="";
String dataTime = "";
List<ImgData> _zhengGaiImages = [];
List<ImgDataTwo> _zhengGaiImages = [];
List<String> _yinHuanTypeIds = [];
List<String> _yinHuanTypeNames = [];
@ -94,12 +94,19 @@ class _CheckInformationOneItemState extends State<CheckInformationOneItem> {
dynamic pd=widget.result["pd"];
for(int i=0;i<hImgs.length;i++){
final ImgData = hImgs[i];
if (ImgData['FILEPATH'].toString().endsWith('.mp4')) {
_yinHuanVido.add(ImgData(path: ApiService.baseImgPath +hImgs[i]['FILEPATH'], id: ImgData['IMGFILES_ID']));
} else {
_yinHuanImages.add(ImgData(path: ApiService.baseImgPath +hImgs[i]['FILEPATH'], id: ImgData['IMGFILES_ID']));
final imgDataMap = hImgs[i]; // 这是一个Map，不是函数
if (imgDataMap['FILEPATH'].toString().endsWith('.mp4')) {
// 使用模型类创建实例，而不是调用Map
_yinHuanVido.add(ImgDataTwo(
id: imgDataMap['IMGFILES_ID']?.toString() ?? '',
path: ApiService.baseImgPath + imgDataMap['FILEPATH'].toString()
));
} else {
_yinHuanImages.add(ImgDataTwo(
id: imgDataMap['IMGFILES_ID']?.toString() ?? '',
path: ApiService.baseImgPath + imgDataMap['FILEPATH'].toString()
));
}
}
// _yinHuanVido视频
@ -118,15 +125,15 @@ class _CheckInformationOneItemState extends State<CheckInformationOneItem> {
_isDanger=false;
}
buMenId=pd["RECTIFICATIONDEPT"];
buMenPDId=pd["HIDDENFINDDEPT"];
buMenName=pd["RECTIFICATIONDEPTNAME"];
responsibleId=pd["RECTIFICATIONOR"];
responsibleName=pd["RECTIFICATIONORNAME"];
dataTime=pd["RECTIFICATIONDEADLINE"];
buMenId=pd["RECTIFICATIONDEPT"]??"";
buMenPDId=pd["HIDDENFINDDEPT"]??"";
buMenName=pd["RECTIFICATIONDEPTNAME"]??"";
responsibleId=pd["RECTIFICATIONOR"]??"";
responsibleName=pd["RECTIFICATIONORNAME"]??"";
dataTime=pd["RECTIFICATIONDEADLINE"]??"";
_dangerDetailController.text=pd["RECTIFYDESCR"];
_zhengGaiImages= rImgs.map((e) => ImgData(path: ApiService.baseImgPath +e["FILEPATH"], id: e['IMGFILES_ID'])).toList();
_zhengGaiImages= rImgs.map((e) => ImgDataTwo(path: ApiService.baseImgPath +e["FILEPATH"], id: e['IMGFILES_ID'])).toList();
// _zhengGaiImages整改图片"rImgs" -> [_GrowableList]
}else{
@ -183,8 +190,8 @@ class _CheckInformationOneItemState extends State<CheckInformationOneItem> {
),
);
}
String _getIDForPath(String path, List<ImgData> imgList) {
for (ImgData data in imgList) {
String _getIDForPath(String path, List<ImgDataTwo> imgList) {
for (ImgDataTwo data in imgList) {
if (data.path == path) {
return data.id;
}
@ -203,13 +210,13 @@ class _CheckInformationOneItemState extends State<CheckInformationOneItem> {
}
// return
}
ImgData _getImageDataForPath(String path, List<ImgData> list) {
for (ImgData data in list) {
ImgDataTwo _getImageDataForPath(String path, List<ImgDataTwo> list) {
for (ImgDataTwo data in list) {
if (data.path == path) {
return data;
}
}
return ImgData(path: '', id: '');
return ImgDataTwo(path: '', id: '');
}
Widget _buildSectionContainer({required Widget child}) {
return Container(
@ -244,7 +251,7 @@ class _CheckInformationOneItemState extends State<CheckInformationOneItem> {
initialMediaPaths:_yinHuanImages.map((item) => item.path).toList(),
isShowAI: true,
onMediaAdded: (value) {
_yinHuanImages.add(ImgData(path: value, id: ''));
_yinHuanImages.add(ImgDataTwo(path: value, id: ''));
},
onMediaRemoved: (value) async {
@ -285,7 +292,7 @@ class _CheckInformationOneItemState extends State<CheckInformationOneItem> {
mediaType: MediaType.video,
initialMediaPaths: _yinHuanVido.map((item) => item.path).toList(),
onMediaAdded: (value) {
_yinHuanVido.add(ImgData(path: value, id: ''));
_yinHuanVido.add(ImgDataTwo(path: value, id: ''));
},
onMediaRemoved: (value) async {
@ -432,7 +439,7 @@ class _CheckInformationOneItemState extends State<CheckInformationOneItem> {
isShowAI: false,
initialMediaPaths:_zhengGaiImages.map((item) => item.path).toList(),
onMediaAdded: (value) {
_zhengGaiImages.add(ImgData(path: value, id: ''));
_zhengGaiImages.add(ImgDataTwo(path: value, id: ''));
},
onMediaRemoved: (value) async {
@ -755,14 +762,14 @@ class _CheckInformationOneItemState extends State<CheckInformationOneItem> {
}
}
Future<bool> _addImgFiles(ImgData imgData,String type,String id) async {
Future<bool> _addImgFiles(ImgDataTwo imgData,String type,String id) async {
if (imgData.id.isEmpty) {
try {
final raw = await ApiService.addImgFiles( imgData.path, type, id);
if (raw['result'] == 'success') {
Map pd = raw['pd'];
imgData = ImgData(path: pd['FILEPATH'], id: pd['IMGFILES_ID']);
imgData = ImgDataTwo(path: pd['FILEPATH'], id: pd['IMGFILES_ID']);
return true;
}else{
// _showMessage('反馈提交失败');

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

@ -144,7 +144,9 @@ class _CustomRecordDrawerState extends State<CustomRecordDrawer> {
_selectedZQTimeId= dangerWaitBean["selectedZQTimeId"];
startTime= dangerWaitBean["startTime"];
_startDate = DateTime.parse(startTime);
endTime= dangerWaitBean["endTime"];
_endDate = DateTime.parse(endTime);
}

5
lib/pages/app/Danger_paicha/quick_report_page.dart
View File

@ -469,7 +469,10 @@ class _QuickReportPageState extends State<QuickReportPage> {
return;
}
buMenId = SessionService.instance.loginUser?["DEPARTMENT_ID"];
buMenName = SessionService.instance.loginUser?["DEPARTMENT_NAME"];
responsibleId=SessionService.instance.loginUser?["USER_ID"];
responsibleName=SessionService.instance.loginUser?["NAME"];
}else{
type="2";

6
lib/pages/app/application_page.dart
View File

@ -46,7 +46,7 @@ class _ApplicationPageState extends State<ApplicationPage> {
}
void _onBadgeChanged() {
setState(() {});
// setState(() {});
}
// 处理项目点击事件
@ -59,7 +59,9 @@ class _ApplicationPageState extends State<ApplicationPage> {
case AppItem.riskInspection:
// 跳转到隐患排查页面
LoadingDialogHelper.show();
bool isRest= await _getIsRest();
LoadingDialogHelper.hide();
if(isRest){
ToastUtil.showNormal(context, "您已经处于离岗状态中");
return;
@ -80,7 +82,9 @@ class _ApplicationPageState extends State<ApplicationPage> {
break;
case AppItem.supervisionRectification:
// 跳转到监管帮扶隐患整改页面
LoadingDialogHelper.show();
bool isRest= await _getIsRest();
LoadingDialogHelper.hide();
if(isRest){
ToastUtil.showNormal(context, "您已经处于离岗状态中");
return;

6
lib/pages/app/danger_wait_list_page.dart
View File

@ -216,6 +216,10 @@ class _DangerWaitListPageState extends State<DangerWaitListPage> {
case 2://待整改隐患
// _getDangerRecord(2,_page,"","","","","","","","",keyWord,addList);
// pushPage(PendingRectificationDetailPage(widget.dangerType,item), context);
if('hiddenLevel0002'==item['HIDDENLEVEL']){
ToastUtil.showNormal(context, "管理人员未确认该隐患");
return;
}
Navigator.push(
context,
MaterialPageRoute(
@ -302,7 +306,7 @@ class _DangerWaitListPageState extends State<DangerWaitListPage> {
),
SizedBox(height: 5),
Text(
item['CREATORNAME'] ?? '',
'整改人：${item['CREATORNAME'] ?? ''}',
style: TextStyle(fontSize: 14, color: Colors.grey),
),
],

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

@ -262,7 +262,7 @@ class DannerRepairState extends State<DannerRepair> {
// const SizedBox(height: 16),
if(acceptedPrepare)
RepairedPhotoSection(
horizontalPadding: 0,
horizontalPadding: 15,
title: "方案图片",
maxCount: 4,
mediaType: MediaType.image,

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

@ -448,7 +448,6 @@ class _HiddenDangerAcceptancePageState extends State<HiddenDangerAcceptancePage>
Column(children: [
Divider(),
Container(
height: 130,
padding: EdgeInsets.only(top: 15,bottom: 15),
child: Column(
children: [
@ -458,6 +457,7 @@ class _HiddenDangerAcceptancePageState extends State<HiddenDangerAcceptancePage>
TextField(
controller: miaoShuController,
keyboardType: TextInputType.multiline,
minLines: 3,
maxLines: null, // 不限制行数，输入多少文字就撑开多少行
style: TextStyle(fontSize: 15),
decoration: InputDecoration(

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

@ -373,7 +373,7 @@ class _HiddenRecordDetailPageState extends State<HiddenRecordDetailPage> {
// 验收信息部分
if (6==widget.dangerType.index&&checkList.isNotEmpty) ...[
if ((6==widget.dangerType.index||1==widget.dangerType.index||0==widget.dangerType.index)&&checkList.isNotEmpty) ...[
// const Divider(height: 10,color: Colors.grey,),
SizedBox(height: 10,),
Row(

22
lib/pages/home/SafetyCommitment/company_safety_commitment_apply.dart
View File

@ -14,7 +14,7 @@ import 'package:qhd_prevention/pages/home/tap/item_list_widget.dart';
import 'package:qhd_prevention/pages/mine/mine_sign_page.dart';
import 'package:qhd_prevention/pages/my_appbar.dart';
import 'package:qhd_prevention/tools/tools.dart';
import 'package:flutter/services.dart';
class CompanySafetyCommitmentApply extends StatefulWidget {
@ -77,6 +77,8 @@ class _CompanySafetyCommitmentApplyState extends State<CompanySafetyCommitmentAp
isEditable: true,
controller: _controller1,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -84,6 +86,8 @@ class _CompanySafetyCommitmentApplyState extends State<CompanySafetyCommitmentAp
isEditable: true,
controller: _controller2,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -91,6 +95,8 @@ class _CompanySafetyCommitmentApplyState extends State<CompanySafetyCommitmentAp
isEditable: true,
controller: _controller3,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -98,6 +104,8 @@ class _CompanySafetyCommitmentApplyState extends State<CompanySafetyCommitmentAp
isEditable: true,
controller: _controller4,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
@ -122,6 +130,8 @@ class _CompanySafetyCommitmentApplyState extends State<CompanySafetyCommitmentAp
isEditable: true,
controller: _controller5,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -129,6 +139,8 @@ class _CompanySafetyCommitmentApplyState extends State<CompanySafetyCommitmentAp
isEditable: true,
controller: _controller6,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -136,6 +148,8 @@ class _CompanySafetyCommitmentApplyState extends State<CompanySafetyCommitmentAp
isEditable: true,
controller: _controller7,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -143,6 +157,8 @@ class _CompanySafetyCommitmentApplyState extends State<CompanySafetyCommitmentAp
isEditable: true,
controller: _controller8,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -150,6 +166,8 @@ class _CompanySafetyCommitmentApplyState extends State<CompanySafetyCommitmentAp
isEditable: true,
controller: _controller9,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -157,6 +175,8 @@ class _CompanySafetyCommitmentApplyState extends State<CompanySafetyCommitmentAp
isEditable: true,
controller: _controller10,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
],

39
lib/pages/home/SafetyCommitment/team_safety_commitment_apply.dart
View File

@ -13,7 +13,7 @@ import 'package:qhd_prevention/pages/home/tap/item_list_widget.dart';
import 'package:qhd_prevention/pages/mine/mine_sign_page.dart';
import 'package:qhd_prevention/pages/my_appbar.dart';
import 'package:qhd_prevention/tools/tools.dart';
import 'package:flutter/services.dart';
class TeamSafetyCommitmentApply extends StatefulWidget {
@ -103,6 +103,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller1,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -110,6 +112,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller2,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
@ -119,6 +123,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller3,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -126,6 +132,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller4,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -133,9 +141,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller5,
text: '',
onChanged: (v) {
}
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
@ -144,6 +151,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller6,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
@ -152,6 +161,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller7,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
@ -160,6 +171,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller8,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -167,6 +180,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller9,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
@ -175,6 +190,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller10,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
@ -183,6 +200,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller11,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
@ -191,6 +210,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller12,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
@ -199,6 +220,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller13,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
// const Divider(),
// ItemListWidget.singleLineTitleText(
@ -250,6 +273,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller14,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ListItemFactory.createYesNoSection(
@ -341,6 +366,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller16,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -348,6 +375,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller17,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -355,6 +384,8 @@ class _TeamSafetyCommitmentApplyState extends State<TeamSafetyCommitmentApply> {
isEditable: true,
controller: _controller18,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
],

42
lib/pages/home/SafetyCommitment/work_shop_safety_commitment_apply.dart
View File

@ -13,7 +13,7 @@ import 'package:qhd_prevention/pages/home/tap/item_list_widget.dart';
import 'package:qhd_prevention/pages/mine/mine_sign_page.dart';
import 'package:qhd_prevention/pages/my_appbar.dart';
import 'package:qhd_prevention/tools/tools.dart';
import 'package:flutter/services.dart';
class WorkShopSafetyCommitmentApply extends StatefulWidget {
@ -101,6 +101,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller1,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ListItemFactory.createYesNoSection(
@ -120,6 +122,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller2,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -127,6 +131,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller3,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -134,6 +140,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller4,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
@ -142,6 +150,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller5,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
@ -150,6 +160,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller6,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
@ -158,6 +170,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller7,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -165,6 +179,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller8,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
@ -173,6 +189,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller9,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
@ -181,6 +199,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller10,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
@ -189,6 +209,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller11,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
@ -197,6 +219,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller12,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -204,6 +228,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller13,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ListItemFactory.createYesNoSection(
@ -235,6 +261,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller14,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ListItemFactory.createYesNoSection(
@ -308,6 +336,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller15,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -315,6 +345,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller16,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -322,6 +354,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller17,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
const Divider(),
ItemListWidget.singleLineTitleText(
@ -329,6 +363,8 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
isEditable: true,
controller: _controller18,
text: '',
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType:TextInputType.number,
),
],
@ -690,10 +726,6 @@ class _WorkShopSafetyCommitmentApplyState extends State<WorkShopSafetyCommitment
if(dataTimeStart.isEmpty){
ToastUtil.showNormal(context, "请选择承诺时间");
return;

50
lib/pages/home/home_danger_page.dart
View File

@ -51,10 +51,10 @@ class _HomeDangerPageState extends State<HomeDangerPage>
listDates.clear();
setState(() {
if(_selectedTab==0){
listDates.addAll(listOne);
getListData();
showBottomTags=true;
}else{
listDates.addAll(listTwo);
getListData();
showBottomTags=false;
}
});
@ -73,8 +73,13 @@ class _HomeDangerPageState extends State<HomeDangerPage>
listOne.clear();
listTwo.clear();
appBarTitle="待排查";
_getHazardInvestigationList();
_getStandardInvestigationList();
if(_selectedTab==0){
_getHazardInvestigationList();
}else{
_getStandardInvestigationList();
}
// case 3://首页-待排查
// appBarTitle="待排查";
// // _getStandardInvestigationRecordList(_page,keyWord,"","","","","","",addList);
@ -127,7 +132,7 @@ class _HomeDangerPageState extends State<HomeDangerPage>
listTwo.add(newList[i]);
}
}
listDates.addAll(listOne);
listDates.addAll(listTwo);
});
}else{
@ -196,19 +201,19 @@ class _HomeDangerPageState extends State<HomeDangerPage>
Widget build(BuildContext context) {
return Scaffold(
appBar: MyAppbar(
title: "隐患排查",
actions: [
TextButton(
onPressed: () {
// pushPage(ScanPage(), context);
_goScan();
},
child: Text(
"清单扫描",
style: TextStyle(color: Colors.white, fontSize: 16),
),
),
],
title: appBarTitle,
// actions: [
// TextButton(
// onPressed: () {
// // pushPage(ScanPage(), context);
// _goScan();
// },
// child: Text(
// "清单扫描",
// style: TextStyle(color: Colors.white, fontSize: 16),
// ),
// ),
// ],
),
body: SafeArea(
child: Column(
@ -223,7 +228,7 @@ class _HomeDangerPageState extends State<HomeDangerPage>
),
labelColor: Colors.blue,
unselectedLabelColor: Colors.grey,
tabs: const [Tab(text: '待排查'), Tab(text: '已排查')],
tabs: const [Tab(text: '隐患排查'), Tab(text: '标准排查')],
),
Container(
@ -243,6 +248,13 @@ class _HomeDangerPageState extends State<HomeDangerPage>
// searchKey=text;
// getListData();
},
onReset: () {
setState(() {
searchKey="";
searchName="";
});
getListData();
},
controller: _searchController,
),
),

32
lib/pages/home/tap/tabList/work_tab_list_page.dart
View File

@ -42,11 +42,6 @@ class _WorkTabListPageState extends State<WorkTabListPage> {
"title": "高处作业",
"unreadCount": eight_work_count['HIGHWORK_COUNT'],
},
{
"icon": "assets/icon-apps/icon-806.png",
"title": "受限空间\n安全作业",
"unreadCount": eight_work_count['CONFINEDSPACE_COUNT'],
},
{
"icon": "assets/icon-apps/icon-804.png",
"title": "吊装作业",
@ -57,16 +52,25 @@ class _WorkTabListPageState extends State<WorkTabListPage> {
"title": "动土作业",
"unreadCount": eight_work_count['BREAKGROUND_COUNT'],
},
{
"icon": "assets/icon-apps/icon-805.png",
"title": "临时用电作业",
"unreadCount": eight_work_count['ELECTRICITY_COUNT'],
},
{
"icon": "assets/icon-apps/open-circuit.png",
"title": "断路作业",
"unreadCount": eight_work_count['OPEN_CIRCUIT_COUNT'],
},
{
"icon": "assets/icon-apps/icon-805.png",
"title": "临时用电作业",
"unreadCount": eight_work_count['ELECTRICITY_COUNT'],
},
{
"icon": "assets/icon-apps/icon-806.png",
"title": "受限空间\n安全作业",
"unreadCount": eight_work_count['CONFINEDSPACE_COUNT'],
},
{
"icon": "assets/icon-apps/icon-801.png",
"title": "盲板抽堵作业",
@ -79,11 +83,11 @@ class _WorkTabListPageState extends State<WorkTabListPage> {
switch (index) {
case 0:await pushPage(WorkTabDhList(), context); break;
case 1:await pushPage(WorkTabGcList(), context); break;
case 2:await pushPage(WorkTabSxkjList(), context); break;
case 3:await pushPage(WorkTabDzList(), context); break;
case 4:await pushPage(WorkTabDtList(), context); break;
case 2:await pushPage(WorkTabDzList(), context); break;
case 3:await pushPage(WorkTabDtList(), context); break;
case 4:await pushPage(WorkTabDlList(), context); break;
case 5:await pushPage(WorkTabLsydList(), context); break;
case 6:await pushPage(WorkTabDlList(), context); break;
case 6:await pushPage(WorkTabSxkjList(), context); break;
case 7:await pushPage(WorkTabMbcdList(), context); break;
}
_getData();

19
lib/pages/home/work/danger_page.dart
View File

@ -126,7 +126,11 @@ class _DangerPageState extends State<DangerPage>
listTwo.add(newList[i]);
}
}
listDates.addAll(listOne);
if(_selectedTab==0) {
listDates.addAll(listOne);
}else{
listDates.addAll(listTwo);
}
});
}else{
@ -154,7 +158,11 @@ class _DangerPageState extends State<DangerPage>
listTwo.add(newList[i]);
}
}
listDates.addAll(listOne);
if(_selectedTab==0) {
listDates.addAll(listOne);
}else{
listDates.addAll(listTwo);
}
});
}else{
@ -270,6 +278,13 @@ class _DangerPageState extends State<DangerPage>
// searchKey=text;
// getListData();
},
onReset: () {
setState(() {
searchKey="";
searchName="";
});
getListData();
},
controller: _searchController,
),
),

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

@ -93,6 +93,7 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
for (int m = 0; m < newListTwo.length; m++) {
if (newListTwo.isNotEmpty && newListTwo[m]["LISTCHECKITEM_ID"] != null) {
if (newListTwo[m]["LISTCHECKITEM_ID"] == listDates[i]["LISTCHECKITEM_ID"]) {
listDates[i]["RECORDITEM_ID"]=newListTwo[m]["RECORDITEM_ID"];
if (listDatesSelect.isNotEmpty) {
switch (listDatesSelect[m]["ISNORMAL"]) {
case 0:
@ -153,6 +154,7 @@ class _DangerProjectPageState extends State<DangerProjectPage> {
for (int m = 0; m < newListTwo.length; m++) {
if (newListTwo.isNotEmpty && newListTwo[m]["CUSTOM_ITEM_ID"] != null) {
if (newListTwo[m]["CUSTOM_ITEM_ID"] == listDates[i]["CUSTOM_ITEM_ID"]) {
listDates[i]["RECORDITEM_ID"]=newListTwo[m]["RECORDITEM_ID"];
if (listDatesSelect.isNotEmpty) {
switch (listDatesSelect[m]["ISNORMAL"]) {
case 0:

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

@ -147,7 +147,9 @@ class DangerWaitDrawerState extends State<DangerWaitDrawer> {
_dangerStatusOption= dangerWaitBean["dangerStatusOption"];
startTime= dangerWaitBean["startTime"];
_startDate = DateTime.parse(startTime);
endTime= dangerWaitBean["endTime"];
_endDate = DateTime.parse(endTime);
itemNameOne= dangerWaitBean["itemNameOne"];
itemNameTwo= dangerWaitBean["itemNameTwo"];
}

14
lib/pages/home/work/risk_list_page.dart
View File

@ -224,11 +224,12 @@ class _riskListPageState extends State<RiskListPage> {
children: [
Image.asset(item["checkmap"].toString().isEmpty?"assets/images/zt-ing.png":"assets/images/zt-over.png", width: 50, height: 50,),
const SizedBox(width: 10), // 添加间距
Column(
Expanded( // 修复3: 文本过长时自动换行
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded( // 修复3: 文本过长时自动换行
child:
Center(child:
Text(
_getTitle(item),
// item.title,
@ -236,10 +237,9 @@ class _riskListPageState extends State<RiskListPage> {
maxLines: 2, // 限制两行
overflow: TextOverflow.ellipsis,
),
),
),
],
),
)
],
@ -253,7 +253,7 @@ class _riskListPageState extends State<RiskListPage> {
if(widget.type==1 ){
return "${item["DEPT_NAME"]}--${item["RISKUNITNAME"]}--${item["PARTSNAME"]}${_dianZiString(item)}";
}else{
return item["DICTIONARY_NAMES"];
return item["DICTIONARY_NAMES"].replaceAll(",", "--");
}
}