From 767f732c52ab0ee299f97acc4bd48e887363ab4e Mon Sep 17 00:00:00 2001 From: zhang <494089941@qq.com> Date: Tue, 3 Nov 2020 17:19:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=BF=E5=8C=96=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/manage/ic_renwu.png | Bin 0 -> 860 bytes assets/manage/ic_time.png | Bin 0 -> 1783 bytes lib/ui/home/announcement/All_anouncement.dart | 14 +- .../home/application/applications_page.dart | 20 ++- lib/ui/manage_pages/green_manage_page.dart | 148 ++++++++++++++++++ pubspec.yaml | 1 + 6 files changed, 173 insertions(+), 10 deletions(-) create mode 100644 assets/manage/ic_renwu.png create mode 100644 assets/manage/ic_time.png create mode 100644 lib/ui/manage_pages/green_manage_page.dart diff --git a/assets/manage/ic_renwu.png b/assets/manage/ic_renwu.png new file mode 100644 index 0000000000000000000000000000000000000000..acc9c3fbd901c27db29c5a4b75c3f37bdf93ba29 GIT binary patch literal 860 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdoh8U{>~YaSW-5dwbhHBREim?L#q> z===){i%YjOH8(3fQq$mQYHFV8w7~h@+*i+5G+S7%I=xq4)+ow_#gRSMH6Z4w{p=m$ ze}d0kC|9|nv`?*4|7YAKwVM31KmFeQeY)rRr08 z6H~$*VGoA@hMr<3P7bbyLca$(OvfZ%r+wpyskYnqY;S!;;rT;lzl|CdTdb9eRu_~m z7TvP<``U|26<_x;9Fv$o%2m5TP9VRBz_v*?`e zsw^`nHodu44~`vk+q84%&tR9V53h=OL%y~YulxSc=j{xu1dfMWI`*7@9}pVfed72e zYx}IU>7TZ4je1+P`f63oCU@1;V0NF&TV|$4F6V!c`ut9}(e5t8bu(@*x3hg`^?cR8 z$0jA7!R$PWcZ4U-u3h##V)fNuVQd%9WEmclS1M8o|9_^seydOas;qOA6V# zVg5|nSLJ_$uijsrbLtG=_n8jD6W?jn&M7{r@wNJ%Fz5G8iY@mRrGNWyPrUBMVKeqt zPK_VFs(uO;p9Bk-8dlx{mqOUP3*I974-Oq?HA zL1t#=#<=z0^CbV23v5_o!RYP8tEH^K=-O60bHcKhn#Q|%t$2I%b#zR^!o$Dck()6) z`@xb2UB84jc&vC(iWaK}WE=gKZ@%-kZ2gq42AiMX`@KH(HT%`GXIZx0e#?FP_U-kj znpR}JT)wUCt4c!TN5)bXl?Qzc{txe{e5p1|yD^=Ug@y6@_3PrBb#8y|Ikmvp#B-8< zuiInm3bxaCVweLv3O}>Rgul!0YhYnvJz$}Z>{DaYMx{@Vq4yiA*O}y{J$HGMvhQVM z&51pi=KAlDWOPh`I`lv!JIi(Z&xJppuQS$X$ZNo25=s*N&uE{&B0ueF^+sT>VeoYI Kb6Mw<&;$U8`iiLl literal 0 HcmV?d00001 diff --git a/assets/manage/ic_time.png b/assets/manage/ic_time.png new file mode 100644 index 0000000000000000000000000000000000000000..65ff2e1500ebc47d77a5eeafe83244df489fe128 GIT binary patch literal 1783 zcmaLY`9GA40tWDR>_klBFqSf$p%`mwEM<%rkql)WL)McF$1+BwQ`3>m*d4}}teqH) zec$ff7A_-M=1eh`qA^^I4rM8EyMMsFKRnO(A9y~Whw9>NFCzt$0suh9;WBvbhc5q( zgxHVHgl;haKy1JPw04X4+bD?)Rkc0IT;SrbJI#E|Ol2!pNM#(2%cdd~A{cwsoEf)T zaSV8+$D~Z8UG$bhYWW04_ukxeD^%qmioy1PO-Mm~QgI6HE~an~o27-Qf;P9}k2}Nf zbn%?I-qA6EZ*6PTY|7)^<=2r5qkRb`M2Y1II2ku-rzDNOs%;3!psxxQFAfU-FAd_z z`*#QEUV8H)K&LR%bjt?x1ekcRM3-w1Rzu#OgCB=5J9%$D#F~G%J^vVa%Xs`mBt_gj z(}dMh{};%%1#b(Z6JL6y!xuHc^=-?>GU6quD>k^fM`)D4U2rn(l{Ph09vDpvCpEp7 zfD4?ery750o&HB4N3FI&9|*airl$7W>~X^}4&>kPTWl z1GQ|sZz*6!{4bT2UDs3mMyVmfJkkNC4<){dPG4;m2m~L(j5C+;VcwjxaGX83E5t0p zkxnlj#+uL3UjOojeYWmv;yRF+nD|phR@NzitWv9-L`k8BCfeH%CF*)Ml(?DV^EWp) z%Pv}4-o?`0?kEEJobl+s?(T$*M=~nTc641Qga15^>W!m zCPkx+XcFHG7?FHIn)}Utuup^4!g<&6omArY(=!%n&cgByS4EL9Vl>gQA-+`T6$n{D zjim*&BH{O@+3eW+jA4ymn|k9mdctC2wg9N_smk6IqW+LG!(PSTY-~-od9jYe;qZKY zeS>fwb|(dEYXpnLo%IPr3Z)Bo!I>?jAMC>&$EnLN$QFC)v1UTKJB0Swm+FK6dWo)Z z*}D`R(VI*>jB%^_Bb%toKLf=7jNYX?AzD#kLhu%GDUA*}*Q|xppk=;ub%E`MV&;+v zvRi~-vPMRxptOHq1i{%6rCg(@Tk?|SqkIU{Kx1j-iMe&mHQ?u>m?q>4l_Sl9+yeVy zZ9Acro?ol^36bJTF%OCQCajz?Er?^4>d-zabo!<@$DG@-TL)8@ESC#3fHGuj!e#ge z<+V^6FITLP#Z%XzImR$9@vL9=r#Gj#M|g^P9ru08`Zo1R^T&d>s}N%PN~Pz}MPwxy z?5oM?G?U`t;AMK|+z3GIp8ew*T}xi<@WP7mVBx=2J{MqN{t0@sHlVC%TYzNHdZD9A z9z;r`6jAvELc47|c=(s8Tl$$SSL*0_8 zU8l33qde5Ud_ouHiIS~^YCfX)9V1sf#dIF-Q7F$w+bDY~LE!_AuL45WAWiG5F^vh1 z=Y0?f%0VpmnF{Ig=#oQA@xdM0k4T--spo~w$=}}`LyQMo->klv#BFM&j3&RKgsgxK#)9!Ib zX)>8WpC2|`z}LC(HZhb7)D`Fri$Ud}R`<_JWQ8_4qXcs161)Ex_Jw9;ynj$nR1zWw zCryKxXHFG5XssIBNkrEuB9AsHT|*ra6>#l`s3j|&OQRuT0*w>Juv-EioP(b=u&;80 zQ}ub37}p%a$~9++=wr~~tHo!qd7aghD=5~ZKbPc;_Jc8#tMw>r(bcec^D8h~Fvj#2 zSq57(B8DiM#KPXEUtZPjrsrufm0RgBL0s(X4ypv4h;Ma2;7|XYs-};`#%uM>HA3x4uiO zlgrOZ(yB)e=tA8iqwM;`^exh7EbARx}2VoF}I#D9|6W9;eNgw zkyy%#1$Z#nQm+{i5m8pBKAiF4JJz*=HkQgQOmi)R)a-Ml(ZVjd2ZP|2Q { Widget _anouncementList( String date, - List cards, + List cards, ) { return Column( children: [ @@ -136,18 +136,18 @@ class _AllAnouncementState extends State { padding: EdgeInsets.only(left: 32.w, right: 32.w), children: [ _anouncementList('2020-10-22', [ - AnouncementCard( + AnouncementCardModel( '关于国庆放假的通知和安排', '2020-10-22 10:00', ), - AnouncementCard( + AnouncementCardModel( '关于绿化组人员调动通知', '2020-10-22 11:00', ), ]), _anouncementList('2020-10-20', [ - AnouncementCard('关于中秋放假通知与工作安排', '2020-10-22 10:00'), - AnouncementCard('疫情期间对大家的表扬和鼓励', '2020-10-22 11:00'), + AnouncementCardModel('关于中秋放假通知与工作安排', '2020-10-22 10:00'), + AnouncementCardModel('疫情期间对大家的表扬和鼓励', '2020-10-22 11:00'), ]), ], ), diff --git a/lib/ui/home/application/applications_page.dart b/lib/ui/home/application/applications_page.dart index 93e8eff..d651a54 100644 --- a/lib/ui/home/application/applications_page.dart +++ b/lib/ui/home/application/applications_page.dart @@ -1,4 +1,6 @@ +import 'package:aku_community_manager/ui/manage_pages/green_manage_page.dart'; import 'package:aku_community_manager/ui/sub_pages/activity_manager/activity_manager_page.dart'; +import 'package:aku_community_manager/ui/sub_pages/visitor_manager/visitor_manager_page.dart'; import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -39,7 +41,7 @@ class _ApplicationPageState extends State List _recommandApplications = [ AppApplication( '活动管理', R.ASSETS_HOME_IC_ACTIVITY_PNG, ActivityManagerPage()), - AppApplication('访客管理', R.ASSETS_HOME_IC_VISITORS_PNG, Scaffold()), + AppApplication('访客管理', R.ASSETS_HOME_IC_VISITORS_PNG, VisitorManagerPage()), AppApplication('便民电话', '', Scaffold()), AppApplication('借还管理', R.ASSETS_HOME_IC_BORROW_PNG, Scaffold()), AppApplication('工单管理', '', Scaffold()), @@ -47,7 +49,9 @@ class _ApplicationPageState extends State AppApplication('一键报警', R.ASSETS_HOME_IC_POLICE_PNG, Scaffold()), AppApplication('问卷调查', '', Scaffold()), ]; - +List _wisdomApplications=[ + AppApplication('绿化管理', R.ASSETS_HOME_IC_GREENING_PNG, GreenManagePage()), +]; @override Widget build(BuildContext context) { final appProvider = Provider.of(context); @@ -198,7 +202,17 @@ class _ApplicationPageState extends State }, itemCount: _recommandApplications.length, ), - Text('23'), + GridView.builder( + gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: 3, + ), + physics: NeverScrollableScrollPhysics(), + itemBuilder: (context, index) { + final application = _wisdomApplications[index]; + return _buildBottomAppCard(application); + }, + itemCount: _wisdomApplications.length, + ), ], ), ), diff --git a/lib/ui/manage_pages/green_manage_page.dart b/lib/ui/manage_pages/green_manage_page.dart new file mode 100644 index 0000000..b691f2d --- /dev/null +++ b/lib/ui/manage_pages/green_manage_page.dart @@ -0,0 +1,148 @@ +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/tools/widget_tool.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_ui/common_widgets/aku_common_widgets.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:aku_community_manager/const/resource.dart'; + +class GreenManageCardModel { + String title; + String task; + String timestart; + String timeend; + String name; + GreenManageCardModel(this.title,this.task,this.timestart,this.timeend,this.name); +} + +class GreenManagePage extends StatefulWidget { + GreenManagePage({Key key}) : super(key: key); + + @override + _GreenManagePageState createState() => _GreenManagePageState(); +} + +class _GreenManagePageState extends State { + + List _cards=[ + GreenManageCardModel('中部广场周围绿化调整', '除杂草、松土、培土', '2020-10-08','2020-10-18', '杨雄会', ), + GreenManageCardModel('东区周围绿化调整', '修剪、造型', '2020-10-08', '2020-10-18', '刘小青'), + GreenManageCardModel('西区周围绿化调整', '修剪、造型', '2020-10-10', '2020-10-20', '张空间'), + GreenManageCardModel('北区周围绿化调整', '修剪造型', '2020-10-15', '2020-10-25', '凯尔希'), + ]; + + @override + Widget build(BuildContext context) { + return AkuScaffold( + title: '绿化管理', + body: ListView( + padding: EdgeInsets.only(left: 32.w, right: 32.w), + children: _cards.map((e) => _greenManageCard(e.title, e.task, e.timestart, e.timeend, e.name),).toList(), + ), + ); + } +///绿化管理页面卡片 + Widget _greenManageCard(String title, String task, String timestart, + String timeend, String name) { + return Column( + children: [ + AkuBox.h(16), + //跳转管理详情按钮 + AkuButton( + onPressed: () {}, + child: Container( + height: 302.w, + width: 686.w, + padding: EdgeInsets.only( + left: 24.w, + right: 24.w, + bottom: 40.w, + ), + color: Color(0xFFFFFFFF), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 93.w, + alignment: Alignment.centerLeft, + child: Text( + title, + style: TextStyle( + color: AppStyle.primaryTextColor, + fontSize: 32.w, + fontWeight: FontWeight.bold), + ), + ), + Divider( + height: 1.w, + ), + AkuBox.h(24), + Row( + children: [ + Image.asset( + R.ASSETS_MANAGE_IC_RENWU_PNG, + width: 40.w, + height: 40.w, + ), + AkuBox.w(4), + Text('任务概要', + style: TextStyle( + color: AppStyle.primaryTextColor, + fontSize: 28.sp, + )), + Spacer(), + Text( + task, + style: AppStyle().primaryStyle, + ), + ], + ), + Spacer(), + Row( + children: [ + Image.asset( + R.ASSETS_MANAGE_IC_TIME_PNG, + width: 40.w, + height: 40.w, + ), + AkuBox.w(4), + Text('时间期限', + style: TextStyle( + color: AppStyle.primaryTextColor, fontSize: 28.sp)), + Spacer(), + Text( + '$timestart至$timeend', + style: AppStyle().primaryStyle, + ), + ], + ), + Spacer(), + Row( + children: [ + Image.asset( + R.ASSETS_MESSAGE_IC_PEOPLE_PNG, + width: 40.w, + height: 40.w, + ), + AkuBox.w(4), + Text('负责人员', + style: TextStyle( + color: AppStyle.primaryTextColor, + fontSize: 28.sp, + )), + Spacer(), + Text( + name, + style: AppStyle().primaryStyle, + ), + ], + ), + ], + ), + ), + ), + ], + ); + } +} diff --git a/pubspec.yaml b/pubspec.yaml index 718fc11..9091d6f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -72,6 +72,7 @@ flutter: - assets/home/ - assets/user/ - assets/message/ + - assets/manage/ - assets/static_temp/ # To add assets to your application, add an assets section, like this: