Merge remote-tracking branch 'origin/master'

master
hs 2026-04-08 15:04:00 +08:00
commit ecd2fb5591
6 changed files with 119 additions and 22 deletions

View File

@ -347,10 +347,25 @@ class _DoorareaCarAddPageState extends State<DoorareaCarAddPage> {
activeColor: Colors.blue,
checkColor: Colors.white,
side: const BorderSide(color: Colors.grey),
onChanged: (value) {
setState(() {
// _agreed = value ?? false;
});
onChanged: (value) async {
final path = await Navigator.push(
context,
MaterialPageRoute(builder: (context) => SignInstructionsWebview(
name: "安全进港须知",
url:
'http://47.92.102.56:7811/file/xieyi/zsyhxy.htm',
)),
);
await NativeOrientation.setPortrait();
if (path != null) {
setState(() {
setState(() {
_agreed = true;
signImages = [];
signImages.add(path);
});
});
}
},
),
Flexible(

View File

@ -280,10 +280,25 @@ class _FirstlevelCarAddPageState extends State<FirstlevelCarAddPage> {
activeColor: Colors.blue,
checkColor: Colors.white,
side: const BorderSide(color: Colors.grey),
onChanged: (value) {
setState(() {
// _agreed = value ?? false;
});
onChanged: (value) async {
final path = await Navigator.push(
context,
MaterialPageRoute(builder: (context) => SignInstructionsWebview(
name: "安全进港须知",
url:
'http://47.92.102.56:7811/file/xieyi/zsyhxy.htm',
)),
);
await NativeOrientation.setPortrait();
if (path != null) {
setState(() {
setState(() {
_agreed = true;
signImages = [];
signImages.add(path);
});
});
}
},
),
Flexible(

View File

@ -274,10 +274,25 @@ class _DoorareaPersonApplyPageState extends State<DoorareaPersonApplyPage> {
activeColor: Colors.blue,
checkColor: Colors.white,
side: const BorderSide(color: Colors.grey),
onChanged: (value) {
setState(() {
// _agreed = value ?? false;
});
onChanged: (value) async {
final path = await Navigator.push(
context,
MaterialPageRoute(builder: (context) => SignInstructionsWebview(
name: "安全进港须知",
url:
'http://47.92.102.56:7811/file/xieyi/zsyhxy.htm',
)),
);
await NativeOrientation.setPortrait();
if (path != null) {
setState(() {
setState(() {
_agreed = true;
signImages = [];
signImages.add(path);
});
});
}
},
),
Flexible(

View File

@ -176,10 +176,25 @@ class _FirstlevelPersonAddPageState extends State<FirstlevelPersonAddPage> {
activeColor: Colors.blue,
checkColor: Colors.white,
side: const BorderSide(color: Colors.grey),
onChanged: (value) {
setState(() {
// _agreed = value ?? false;
});
onChanged: (value) async {
final path = await Navigator.push(
context,
MaterialPageRoute(builder: (context) => SignInstructionsWebview(
name: "安全进港须知",
url:
'http://47.92.102.56:7811/file/xieyi/zsyhxy.htm',
)),
);
await NativeOrientation.setPortrait();
if (path != null) {
setState(() {
setState(() {
_agreed = true;
signImages = [];
signImages.add(path);
});
});
}
},
),
Flexible(

View File

@ -36,6 +36,24 @@ class _SignInstructionsWebviewState extends State<SignInstructionsWebview> {
List<String> signImages = [];
final String noticeContent = '''
访
1.访访
2."禁止入内""危险区域"线
3.
4.
5.穿
6.线
''';
@override
void initState() {
@ -68,7 +86,24 @@ class _SignInstructionsWebviewState extends State<SignInstructionsWebview> {
Navigator.of(context).pop();
}
},),
Expanded( child: WebViewWidget(controller: _controller),),
Expanded(
child:SingleChildScrollView(
padding: const EdgeInsets.all(20),
child: Text(
noticeContent,
style: const TextStyle(
fontSize: 14,
height: 1.6,
color: Colors.black87,
),
),
),
),
// Expanded( child: WebViewWidget(controller: _controller),),
// ValueListenableBuilder<bool>(
// valueListenable: isLoading,
// builder: (context, loading, _) {

View File

@ -869,6 +869,7 @@ class HomePageState extends RouteAwareState<HomePage>
case "消防检查":
// await pushPage(FireManagementTabPage(), context);
break;
case "口门门禁管理":
case "一级口门管理":
await pushPage(DoorcarTabPage(), context);
break;
@ -891,16 +892,17 @@ class HomePageState extends RouteAwareState<HomePage>
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
// Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
Text(
item['title'],
style: const TextStyle(fontSize: 15, fontWeight: FontWeight.bold, color: Colors.black87),
),
SizedBox(height: 4,),
Text(item['content'], style: TextStyle(fontSize: 12, color: Colors.grey[500])),
],
),
// ],
// ),
const Divider(),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,