patton99/hyzp_ybqx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hyzp_ybqx-Commit119：版本号更新为1.4.24+20220409。按公司要求修改审核逻辑，即使 当前时间 > 抓拍时间 + 审核间隔，也允许用户进行初审和复审审核，只是禁止推送

Browse Source
This commit is contained in:
WinUser01
2022-04-09 21:50:15 +08:00
parent 55a95cb3aa
commit 38ce516148
2 changed files with 95 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/components/UserInfo.dart
+4 -4
View File
@@ -99,10 +99,10 @@ class UserInfo {
copyright_info = '© ' + qx_name_long + '城乡融合发展局 四川省踏石科技\n版权所有，' + service_tel.substring(1);
copyright_info_PinYin = 'YIBIN SANJIANG NEW AREA BLACK SMOKE CAR CAPTURE SYSTEM';
// 中心地址：
// mapPoi = {text: 四川轻化工大学宜宾校区, pt: {latitude: 28.811272454489966, longitude: 104.67718748580859}, uid: f79d3a036020ce5fa3d23041}
center_latitude = 28.811272454489966; // 区县中心纬度
center_longitude = 104.69745647939359; // 区县中心经度
g_zoomLevel = g_zoomLevel_default = 12; //地图默认缩放倍数
// 点击底图空白处响应：coordinate = {latitude: 28.822633806922394, longitude: 104.75964294854222}
center_latitude = 28.822633806922394; // 区县中心纬度
center_longitude = 104.75964294854222; // 区县中心经度
g_zoomLevel = g_zoomLevel_default = 13; //地图默认缩放倍数
break;
case 511523: // 江安县
service_tel = '';
lib/pages/Works/HYSH/hysh_group.dart
+16 -18
View File
@@ -176,17 +176,17 @@ class _HyshGroupState extends State<HyshGroup> {
getBtnSizeX(
text: '复审提交',
fontColor: 0 == _selectedRadio ? Colors.red : Colors.green,
onPressedFun: 1 == sfyc
? null
: () async {
// onPressedFun: 1 == sfyc
// ? null
// : () async {
onPressedFun: () async {
int ret = -1;
print('等待复审提交确认');
await Navigator.of(context)
.push(
PageRouteBuilder(
opaque: false,
pageBuilder: (context, animation, secondaryAnimation) =>
CustomDialogHysh(
pageBuilder: (context, animation, secondaryAnimation) => CustomDialogHysh(
shjg: 0 == _selectedRadio ? hyc_text : fhyc_text,
title: '复审',
content:
@@ -210,20 +210,18 @@ class _HyshGroupState extends State<HyshGroup> {
widget.id,
widget.index,
mapHyshlx[hyshlx]['audit_workflow'],
topTabs_map['auditShuoming_Controller_List'][widget.index]
.text,
topTabs_map['auditShuoming_Controller_List'][widget.index].text,
topTabs_map['auditTitle'][widget.index],
sfyc: sfyc,
).then((value) {
eventBus.fire(HycsDataUpdateEvent(
'${mapHyshlx[hyshlx]['text']}数据已更新'));
eventBus.fire(
HycsDataUpdateEvent('${mapHyshlx[hyshlx]['text']}数据已更新'));
//必须等待审核过程完成后，再处理同时推送交警，否则推送交警总是失败
print('tsjj = $tsjj');
if (tsjj) {
print('before tsjjFun(widget.id, _plateAndID)');
String _plateAndID =
topTabs_map['car_number_List'].toString() +
String _plateAndID = topTabs_map['car_number_List'].toString() +
'(ID:${widget.id.toString()})';
tsjjFun(widget.id, _plateAndID);
@@ -271,9 +269,10 @@ class _HyshGroupState extends State<HyshGroup> {
getBtnSizeX(
text: '初审提交',
fontColor: 0 == _selectedRadio ? Colors.red : Colors.green,
onPressedFun: 1 == sfyc
? null
: () async {
// onPressedFun: 1 == sfyc
// ? null
// : () async {
onPressedFun: () async {
int ret = -1;
print('等待初审提交确认');
await Navigator.of(context)
@@ -297,13 +296,12 @@ class _HyshGroupState extends State<HyshGroup> {
widget.id,
widget.index,
mapHyshlx[hyshlx]['audit_workflow'],
topTabs_map['auditShuoming_Controller_List'][widget.index]
.text,
topTabs_map['auditShuoming_Controller_List'][widget.index].text,
topTabs_map['auditTitle'][widget.index],
sfyc: 0,
).then((value) {
eventBus.fire(
HycsDataUpdateEvent('${mapHyshlx[hyshlx]['text']}数据已更新'));
eventBus
.fire(HycsDataUpdateEvent('${mapHyshlx[hyshlx]['text']}数据已更新'));
});
} else {
print('用户取消了初审提交');