From 294d2737765db6b499e98011840840b35dd80326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com> Date: Wed, 8 May 2024 15:15:14 +0800 Subject: [PATCH 01/32] =?UTF-8?q?=E5=AE=89=E6=A3=80=E5=B7=A1=E6=9F=A5?= =?UTF-8?q?=E5=BE=85=E5=A4=8D=E6=A0=B8=E5=B7=B2=E5=90=88=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 17 +++++++++++++++-- pages/work2/work2.js | 5 +++-- pages/work2/work2.wxml | 4 ++-- pages/work2/work2.wxss | 2 +- project.config.json | 3 ++- utils/api.js | 5 +++++ 6 files changed, 28 insertions(+), 8 deletions(-) diff --git a/app.json b/app.json index 5c8b499..30301f9 100644 --- a/app.json +++ b/app.json @@ -11,8 +11,7 @@ "pages/statistics/statistics", "pages/resiAndHouse/resiAndHouse", "pages/setup/setup", - "subpages/house/pages/housePortrait/housePortrait", - "subpages/businessRecord/businessRecord" + "subpages/house/pages/housePortrait/housePortrait" ], "subPackages": [ { @@ -22,6 +21,20 @@ "pages/addhouse/addhouse" ] }, + { + "root": "subpages/securityCheck", + "name": "securityCheck", + "pages": [ + "securityCheck" + ] + }, + { + "root": "subpages/qualified", + "name": "qualified", + "pages": [ + "qualified" + ] + }, { "root": "subpages/morenews", "name": "morenews", diff --git a/pages/work2/work2.js b/pages/work2/work2.js index dce7208..3478d6d 100644 --- a/pages/work2/work2.js +++ b/pages/work2/work2.js @@ -115,8 +115,9 @@ Page({ }) }, onData(){ - wx.switchTab({ - url:'../../pages/statistics/statistics' + // wx.switchTab({ + wx.navigateTo({ + url: '../../subpages/securityCheck/securityCheck' }) } // onAddHouse(){ diff --git a/pages/work2/work2.wxml b/pages/work2/work2.wxml index 1e01914..2013cdb 100644 --- a/pages/work2/work2.wxml +++ b/pages/work2/work2.wxml @@ -60,13 +60,13 @@ - 数据 + 安检管理 - 数据 + 安检巡查 diff --git a/pages/work2/work2.wxss b/pages/work2/work2.wxss index 0f88a7b..d4a9f9e 100644 --- a/pages/work2/work2.wxss +++ b/pages/work2/work2.wxss @@ -28,7 +28,7 @@ } .header { display: flex; - background: #1673ee; + background: #1974ec; width: 100%; height: 400rpx; flex-direction: column; diff --git a/project.config.json b/project.config.json index 243fa51..49963e6 100644 --- a/project.config.json +++ b/project.config.json @@ -46,7 +46,8 @@ "minifyWXML": true, "showES6CompileOption": false, "useCompilerPlugins": false, - "condition": false + "condition": false, + "ignoreUploadUnusedFiles": true }, "compileType": "miniprogram", "libVersion": "2.19.4", diff --git a/utils/api.js b/utils/api.js index 24edf5f..c124760 100644 --- a/utils/api.js +++ b/utils/api.js @@ -76,6 +76,7 @@ module.exports = { houseResidentChangeRecord, waitCollectHouseList, nonIntResiList, + securityCheckk, overView, getFamilyRelationshipListByHouseId } @@ -400,6 +401,10 @@ function waitCollectHouseList(parm){ function nonIntResiList(parm){ return fly.get(`actual/base/residentIntegrity/resiCategoryStats/nonIntResiList`,parm) } +//安检巡查分页查询 +function securityCheckk(parm){ + return fly.post(`actual/base/companyInfo/showRecord`,parm) +} // function overView(parm){ return fly.get(`actual/base/communityHouse/resiAndHouseCollect/overview`,parm) From c0362ac1e5232be9294eb7d8bcdc3088c790a698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Wed, 8 May 2024 18:34:43 +0800 Subject: [PATCH 02/32] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E5=B7=A1=E6=9F=A5?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 15 ++ images/add.png | Bin 0 -> 3171 bytes images/location.png | Bin 0 -> 1914 bytes project.private.config.json | 18 ++ .../InspectionReport/InspectionReport.js | 66 +++++ .../InspectionReport/InspectionReport.json | 6 + .../InspectionReport/InspectionReport.wxml | 94 +++++++ .../InspectionReport/InspectionReport.wxss | 234 ++++++++++++++++++ .../pages/followUpList/followUpList.json | 4 +- .../pages/housePortrait/housePortrait.wxml | 2 +- .../safetyinspection/safetyinspection.js | 95 +++++++ .../safetyinspection/safetyinspection.json | 12 + .../safetyinspection/safetyinspection.wxml | 117 +++++++++ .../safetyinspection/safetyinspection.wxss | 224 +++++++++++++++++ 14 files changed, 884 insertions(+), 3 deletions(-) create mode 100644 images/add.png create mode 100644 images/location.png create mode 100644 subpages/InspectionReport/pages/InspectionReport/InspectionReport.js create mode 100644 subpages/InspectionReport/pages/InspectionReport/InspectionReport.json create mode 100644 subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml create mode 100644 subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxss create mode 100644 subpages/safetyinspection/pages/safetyinspection/safetyinspection.js create mode 100644 subpages/safetyinspection/pages/safetyinspection/safetyinspection.json create mode 100644 subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxml create mode 100644 subpages/safetyinspection/pages/safetyinspection/safetyinspection.wxss diff --git a/app.json b/app.json index 5c8b499..fbb4dd7 100644 --- a/app.json +++ b/app.json @@ -22,6 +22,21 @@ "pages/addhouse/addhouse" ] }, + + { + "root": "subpages/safetyinspection", + "name": "safetyinspection", + "pages": [ + "pages/safetyinspection/safetyinspection" + ] + }, + { + "root": "subpages/InspectionReport", + "name": "InspectionReport", + "pages": [ + "pages/InspectionReport/InspectionReport" + ] + }, { "root": "subpages/morenews", "name": "morenews", diff --git a/images/add.png b/images/add.png new file mode 100644 index 0000000000000000000000000000000000000000..ed3cd408ea83d75a87757065e019bc3d85f86ea5 GIT binary patch literal 3171 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 C9=7QK literal 0 HcmV?d00001 diff --git a/images/location.png b/images/location.png new file mode 100644 index 0000000000000000000000000000000000000000..05a6c617a875afcd8228bc48dfdaf8e94fe7221d GIT binary patch literal 1914 zcmV-=2Zi{FP)Px+G)Y83R9Hu?mw$|0RTam-=gqJ8X8XIl-I=#QijcOHC_>bRO2WD=2#8f9R1p&d zv`w8i%eECtO^{U*N`?N~nXy@ZN+O~Kqku(z)|wDa)gV7YX$feB?wi@}vTbR1-kY6y z?<;R+OLk}8?(A;8e@*6|^L?Lt?z#7zE11M+zLyPwXyFEu*9fo#WE3K!6-YoNPhg*j zJn7^kkM`awgA@HsmD(6?yBLV~6$~MN1mKJjR{a1ElhW(`C&Fexy!plvHis#4U$!Zd z#!7MOfz<`lw_9f+$j1P=#1kXgD~jwafiE5jYX87$DUSL`H$(Gm>+`{&Tt=5`M5MVg z&sR{A>&*`B{qdm21!_zWT@-?|TYwlKLm)ThOZN6-YiA#;w^DC@*0!UwqCvF-A{zmQ z3FL|he5KzAzdDxxm_RM*j}{Q2zXF&GGV3__MsG)S-$X#FZJM{|mjnX%Jw)OFJ`@y} z_82qX@ze4J(z_W&(e_rckifqSqP7ksUM>MmB)4Ug(RFo!Vmqz*iX-m;3_-z7<`1<; z#`>@qNq5Npf&!f5*|@-aN?857-^x#E=)bUTgo}p(DY^kJ$gR;1jnuD+P&{pK6R?B8 zo7sN#v*;Ap52z($uP6Cq0CTG52SnuVo`kx^cOjir;*EvZ1pG81+p~u1?ZhWz6wn!4 zskve6eGrXQWK}kyJ>Vy*r>$QCxS=v9#|a)N|AH(6ICI$NQPa@A=j)%bZU*rnzbc6eVdU)U+>9EM?uH z2!00e8PkZas1eyQ_%#HSKLF@4UG*HaOTjl!x){+F`#k_HaNMt(w=_Ie3zUBfA}d_t zC%L3{*BBA9?gY^(umgflbHx0p9MUrtAV9X5hUyj4QA5vIn?T$S@^Ld6{mytmdMf{Gh+GHa9y6(J ztkFu__W@i#K_LFdG@{p4i^Mb5_2TkZgzV2Iwe!b~P|A8sz{OPLyV->HSS?WgaX`L3 zK2SQp0g!tj@{*ZQFRK=5%AAaa+`u6SB805Y8tVQ2No}tZup307s5tZc64P?E(Y9X% zxg6l_rV*{2+Va&gVzi_SD@pga5IGukBk^~Ak~W^Ux&>GT!2Y7AW|xcdS+ijK8avW z>Cn^m%LLot;=ydY_51HT4WNi_VH39@j+7Kv_+?fk&>uZ{~VZ(Tr^#BxnUw}QP zp)DKfUjr0N<*!vlc9EX2azU;=vVW}PZQ6SL++aAe0_2621dxA~h6+#jt(*DoSU$0? z!eSBkbrA$za%C%H7G-g!!Mh+M7_p;!b9JYU&??y@4)~# zFhqA*f3m?GOQ7z%ta005JRDT^K(NSb#^AVDO%zJccP~_p=yCx*NG-kLVLX`?m;OGTzWVe zd2^(lp2~j_kmn(2@VWxJ#nxQ=^a;UC8mO{;Cz}Joz#ah>gBTDxZ9VPNUa#CUR;wb| z4IoNjzf*GBj&w|`yG$?^8oahTxYpRU~T|-+KUVzZx^N1=GS)A z+qNkId7>4lfLG-gdM{i+!oyFXgGF&#rvfvjEgQMQ;YjTT=s|hc+QFifrVMl1K%PM3 zW=;<@*w=c$ok8`9{ta@X-nRT-j{WI;WHP@01B8?YQa;|wg8%>k07*qoM6N<$f}HW8 A + + + + + 定位的信息 + 如定位不在事发地，请重新选择定位 + + + + 重新定位 + + + + + + * + 企业名称 + 张玉斌 + + + + + + + + + * + 检察人员 + 请选择 + + + + + + + + + * + 检查结论 + 请选择 + + + + + + + + + * + 拟复查时间 + + + + + + + + 附件 + + 备注 + +