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-15 15:54:10 +08:00
parent 172ac497b6 22234e8c9b
commit e8bb886e93
9 changed files with 63 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pages/home/SafeCheck/CheckPersonSign/safeCheck_sign_list_page.dart
View File

@ -242,8 +242,10 @@ class _SafecheckSignListPageState extends State<SafecheckSignListPage> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
"检查时间: ${item['INSPECTION_TIME_START'] ?? ''}至${item['INSPECTION_TIME_END'] ?? ''}",
Expanded(
child: Text(
"检查时间: ${item['INSPECTION_TIME_START'] ?? ''}至${item['INSPECTION_TIME_END'] ?? ''}",
),
),
],
),

7
lib/pages/home/SafeCheck/DangeCheck/safeCheck_danger_list_page.dart
View File

@ -251,9 +251,12 @@ class _SafecheckDangerListPageState extends State<SafecheckDangerListPage> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
"检查时间: ${item['INSPECTION_TIME_START'] ?? ''}至${item['INSPECTION_TIME_END'] ?? ''}",
Expanded(
child: Text(
"检查时间: ${item['INSPECTION_TIME_START'] ?? ''}至${item['INSPECTION_TIME_END'] ?? ''}",
),
),
],
),
const SizedBox(height: 8),

7
lib/pages/home/SafeCheck/Record/defend_record_list_page.dart
View File

@ -249,9 +249,12 @@ class _DefendRecordListPageState extends State<DefendRecordListPage> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
"检查时间: ${item['INSPECTION_TIME_START'] ?? ''}至${item['INSPECTION_TIME_END'] ?? ''}",
Expanded(
child: Text(
"检查时间: ${item['INSPECTION_TIME_START'] ?? ''}至${item['INSPECTION_TIME_END'] ?? ''}",
),
),
],
),
const SizedBox(height: 8),

6
lib/pages/home/SafeCheck/Start/safeCheck_defend_set_page.dart
View File

@ -135,7 +135,10 @@ setState(() {
}
Future<void> _submit() async{
if (INSPECTION_STATUS == '-2') {
await pushPage(SafecheckStartDetail(INSPECTION_ID: form['INSPECTION_ID'] ?? '', type: 'edit'), context);
String text= await pushPage(SafecheckStartDetail(INSPECTION_ID: form['INSPECTION_ID'] ?? '', type: 'edit'), context);
if("success"==text){
Navigator.of(context).pop();
}
return;
}
if (INSPECTION_STATUS == '3' && form['INSPECTED_EXPLAIN_REFUSE'] == '') {
@ -158,6 +161,7 @@ setState(() {
}else{
ToastUtil.showError(context, '保存失败');
}
Navigator.of(context).pop();
}catch(e){}
}

2
lib/pages/home/SafeCheck/Start/safeCheck_start_detail.dart
View File

@ -539,7 +539,7 @@ class _SafecheckStartDetailState extends State<SafecheckStartDetail> {
LoadingDialogHelper.hide();
ToastUtil.showNormal(context, '提交成功');
Navigator.of(context).pop();
Navigator.of(context).pop("success");
} else {
LoadingDialogHelper.hide();
final msgErr =

4
lib/pages/home/SafeCheck/Start/safeCheck_start_list_page.dart
View File

@ -307,7 +307,7 @@ class _SafecheckStartListPageState extends State<SafecheckStartListPage> {
Row(
spacing: 5,
children: [
if (item['INSPECTION_STATUS'] == '-1')
if (item['INSPECTION_STATUS'] == '-1'&&item['INSPECTION_ORIGINATOR_ID'] == SessionService.instance.loginUserId)
CustomButton(
text: '编辑',
height: 35,
@ -316,7 +316,7 @@ class _SafecheckStartListPageState extends State<SafecheckStartListPage> {
backgroundColor: Colors.green,
onPressed: () => _goToDetail(item, 'edit'),
),
if (item['INSPECTION_STATUS'] == '-1')
if (item['INSPECTION_STATUS'] == '-1'&&item['INSPECTION_ORIGINATOR_ID'] == SessionService.instance.loginUserId)
CustomButton(
text: '查看',
height: 35,

22
lib/pages/login_page.dart
View File

@ -116,10 +116,10 @@ class _LoginPageState extends State<LoginPage> {
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 30),
child: SingleChildScrollView(
// child: SingleChildScrollView(
child: Column(
children: [
const SizedBox(height: 150),
const SizedBox(height: 70),
Row(
children: [
Image.asset('assets/image/logo.png', height: 50),
@ -128,7 +128,7 @@ class _LoginPageState extends State<LoginPage> {
child: Text(
'欢迎使用，\n智守安全云平台!',
style: TextStyle(
fontSize: 22,
fontSize: 20,
color: Colors.white,
fontWeight: FontWeight.bold,
),
@ -188,8 +188,10 @@ class _LoginPageState extends State<LoginPage> {
style: const TextStyle(color: Colors.blue),
),
),
Padding(
padding: const EdgeInsets.symmetric(vertical: 24),
padding: const EdgeInsets.symmetric(vertical: 0),
child: SizedBox(
width: double.infinity,
height: 48,
@ -215,8 +217,10 @@ class _LoginPageState extends State<LoginPage> {
),
),
Spacer(),
Padding(
padding: const EdgeInsets.all(0),
padding: const EdgeInsets.only(bottom: 10),
child: Row(
children: [
Checkbox(
@ -240,12 +244,14 @@ class _LoginPageState extends State<LoginPage> {
text: '我已阅读并同意',
style: const TextStyle(
color: Colors.white,
fontSize: 12,
),
),
TextSpan(
text: '《服务协议》',
style: const TextStyle(
color: Color(0xFF0D1D8C),
fontSize: 12,
),
recognizer:
TapGestureRecognizer()
@ -264,12 +270,14 @@ class _LoginPageState extends State<LoginPage> {
text: '和',
style: const TextStyle(
color: Colors.white,
fontSize: 12,
),
),
TextSpan(
text: '《隐私政策》',
style: const TextStyle(
color: Color(0xFF0D1D8C),
fontSize: 12,
),
recognizer:
TapGestureRecognizer()
@ -293,7 +301,7 @@ class _LoginPageState extends State<LoginPage> {
),
],
),
),
// ),
),
],
),
@ -319,7 +327,7 @@ class _LoginPageState extends State<LoginPage> {
Text(
label,
style: const TextStyle(
fontSize: 20,
fontSize: 15,
fontWeight: FontWeight.w500,
color: Colors.white,
),

35
lib/pages/mine/mine_first_sign_page.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'dart:io';
import 'package:flutter/services.dart';
import 'package:qhd_prevention/customWidget/single_image_viewer.dart';
import 'package:qhd_prevention/customWidget/toast_util.dart';
import 'package:qhd_prevention/http/ApiService.dart';
import 'package:qhd_prevention/pages/my_appbar.dart';
@ -95,20 +96,30 @@ class _SignatureUpdatePageState extends State<FirstSignPage> {
),
const SizedBox(width: 15),
if (imagePath.isNotEmpty&&!imagePath.startsWith('http'))
Image.file(
File(imagePath),
width: 200,
height: 100,
fit: BoxFit.fill,
),
if (imagePath.isNotEmpty&&imagePath.startsWith('http'))
Image.network(
imagePath,
width: 200,
height: 100,
fit: BoxFit.fill,
GestureDetector(
onTap: () {
presentOpaque(SingleImageViewer(imageUrl: imagePath), context);
},
child: Image.file(
File(imagePath),
width: 200,
height: 100,
fit: BoxFit.contain ,
),
),
if (imagePath.isNotEmpty&&imagePath.startsWith('http'))
GestureDetector(
onTap: () {
presentOpaque(SingleImageViewer(imageUrl: imagePath), context);
},
child: Image.network(
imagePath,
width: 200,
height: 100,
fit: BoxFit.contain ,
),
),
],
),

3
lib/pages/notif/notif_page.dart
View File

@ -113,12 +113,14 @@ class _NotifPageState extends State<NotifPage>
Future<void> _getNotifEnterprise() async {
// LoadingDialogHelper.show();
try {
LoadingDialogHelper.show();
final result = await ApiService.getNotifEnterprise(
"-1",
pageNum.toString(),
keyWord,
_selectedTabTwo.toString(),
);
LoadingDialogHelper.hide();
if (result['result'] == 'success') {
final List<dynamic> newList = result['varList'] ?? [];
setState(() {
@ -126,6 +128,7 @@ class _NotifPageState extends State<NotifPage>
});
}
} catch (e) {
LoadingDialogHelper.hide();
print('加载出错: $e');
} finally {
LoadingDialogHelper.hide();