From a9636fa1996cb0c4916ceeb77cfabc79821b80b7 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 19 May 2025 17:35:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backstage/dao/ProProgressDao.java | 27 ++++ .../backstage/entity/vo/ProProgressVo.java | 38 ++++-- .../service/impl/ProProgressServiceImpl.java | 33 ++++- .../mappers/backstage/ProProgressMapper.xml | 120 +++++++++++++++--- .../proProgressUpdateDetail.css | 13 +- .../static/img/synthesisQuery/num1.png | Bin 375 -> 339 bytes .../static/img/synthesisQuery/num2.png | Bin 433 -> 338 bytes .../static/img/synthesisQuery/num3.png | Bin 436 -> 343 bytes .../static/img/synthesisQuery/num4.png | Bin 408 -> 319 bytes .../static/img/synthesisQuery/num5.png | Bin 442 -> 358 bytes .../static/img/synthesisQuery/num6.png | Bin 405 -> 317 bytes .../static/img/synthesisQuery/num7.png | Bin 373 -> 300 bytes .../static/img/synthesisQuery/num8.png | Bin 0 -> 356 bytes .../static/img/synthesisQuery/num9.png | Bin 0 -> 347 bytes .../lineManagement/child/towerFormTemp.js | 4 + .../synthesisQuery/proProgressUpdateDetail.js | 30 +++-- .../proProgressUpdateDetailAjax.js | 52 ++++---- .../static/js/synthesisQuery/updateProForm.js | 20 ++- .../proProgressUpdateDetail.html | 22 +++- .../pages/synthesisQuery/updateProForm.html | 38 ++++-- 20 files changed, 307 insertions(+), 90 deletions(-) create mode 100644 src/main/resources/static/img/synthesisQuery/num8.png create mode 100644 src/main/resources/static/img/synthesisQuery/num9.png diff --git a/src/main/java/com/bonus/digitalSignage/backstage/dao/ProProgressDao.java b/src/main/java/com/bonus/digitalSignage/backstage/dao/ProProgressDao.java index 6d02880..fe0e7b6 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/dao/ProProgressDao.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/dao/ProProgressDao.java @@ -122,4 +122,31 @@ public interface ProProgressDao { * @date 2025/4/23 14:46 */ void updateTower(ProProgressVo.UpdateRecordVo vo); + + /** + * 杆塔基础开挖完成后，自动生成A腿B腿C腿D腿 + * @param vo + * @return void + * @author cwchen + * @date 2025/5/19 13:35 + */ + void addTowerPouring(ProProgressVo.UpdateRecordVo vo); + + /** + * 更新杆塔基础浇筑A、B、C、D四个腿的数据 + * @param vo + * @return void + * @author cwchen + * @date 2025/5/19 14:44 + */ + void updatetTowerPouring(ProProgressVo.UpdateRecordVo vo); + + /** + * 查询已经完成4个腿都浇筑完成的杆塔 + * @param list + * @return List + * @author cwchen + * @date 2025/5/19 14:52 + */ + List getTowerPouring(List list); } diff --git a/src/main/java/com/bonus/digitalSignage/backstage/entity/vo/ProProgressVo.java b/src/main/java/com/bonus/digitalSignage/backstage/entity/vo/ProProgressVo.java index 07320b7..42a6fd5 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/entity/vo/ProProgressVo.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/entity/vo/ProProgressVo.java @@ -10,9 +10,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import java.util.Date; -import java.util.List; -import java.util.Optional; +import java.util.*; /** * @className:ProProgressVo @@ -109,33 +107,42 @@ public class ProProgressVo { */ private double proProgress; /** - * 基础开挖 + * 协调完成 */ private int num1; /** - * 基础开挖完成 + * 基础开挖 */ private int num2; + /** - * 基础浇筑完成 + * 基础开挖完成 */ private int num3; /** - * 铁塔组立 + * 基础浇筑 */ private int num4; /** - * 铁塔组立完成 - */ + * 基础浇筑完成 + * */ private int num5; /** - * 架线施工完成 + * 铁塔组立 */ private int num6; /** - * 附件安装完成 + * 铁塔组立完成 */ private int num7; + /** + * 架线施工完成 + */ + private int num8; + /** + * 附件安装完成 + */ + private int num9; } @Data @@ -193,7 +200,7 @@ public class ProProgressVo { * 工序类型 1.基础开挖 2.基础开挖完成 3.基础浇筑完成 4.铁塔组立 5.铁塔组立完成 6.架线施工完成 7.附件安装完成 */ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) - private int progressType; + private Integer progressType; /** * 创建人id @@ -215,6 +222,13 @@ public class ProProgressVo { @Size(min = 1, message = "至少选择一个杆塔数据", groups = {Update.class}) private List towerIds; + private List towerLegIds = new ArrayList<>(); + + private List towerDetailVos; + + /**杆塔腿*/ + private List innerLoops = Arrays.asList("A", "B", "C", "D"); + /** * 修改条件限制 */ diff --git a/src/main/java/com/bonus/digitalSignage/backstage/service/impl/ProProgressServiceImpl.java b/src/main/java/com/bonus/digitalSignage/backstage/service/impl/ProProgressServiceImpl.java index c208854..4d788b3 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/service/impl/ProProgressServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/service/impl/ProProgressServiceImpl.java @@ -11,6 +11,7 @@ import com.bonus.digitalSignage.backstage.service.ProProgressService; import com.bonus.digitalSignage.utils.ServerResponse; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.stereotype.Service; @@ -88,6 +89,9 @@ public class ProProgressServiceImpl implements ProProgressService { vo.setNum5(vo2.getNum5()); vo.setNum6(vo2.getNum6()); vo.setNum7(vo2.getNum7()); + vo.setNum7(vo2.getNum7()); + vo.setNum8(vo2.getNum8()); + vo.setNum9(vo2.getNum9()); return ServerResponse.createSuccess(vo); } catch (Exception e) { log.error(e.toString(), e); @@ -153,14 +157,34 @@ public class ProProgressServiceImpl implements ProProgressService { List progressAndTowers = Optional.ofNullable(dao.getNowProProgress(vo)).orElseGet(ArrayList::new); Long finishTowerNum = progressAndTowers.get(0); Long towerNum = progressAndTowers.get(1); + // 杆塔基础开挖完成后，自动生成A腿B腿C腿D腿 + if (vo.getProgressType() == 3) { + dao.addTowerPouring(vo); + } + // 工序进度为基础浇筑时 + if (vo.getProgressType() == 4) { + // 更新杆塔基础浇筑A、B、C、D四个腿的数据 + dao.updatetTowerPouring(vo); + // 查询已经完成4个腿都浇筑完成的杆塔 + Set set = new HashSet<>(vo.getTowerIds()); + List distinctList = new ArrayList<>(set); + List towerPourings = Optional.ofNullable(dao.getTowerPouring(distinctList)).orElseGet(ArrayList::new); + vo.setTowerLegIds(towerPourings); + } // 计算更新后的进度 - double progress = handleProgress(finishTowerNum, towerNum, vo.getTowerIds().size()); + double progress = handleProgress(finishTowerNum, towerNum, vo.getProgressType() != 4 ? vo.getTowerIds().size():vo.getTowerLegIds().size()); vo.setFinishProgress(progress); // 添加杆塔进度、杆塔进度关系表、更新工程整体进度、更新杆塔进度 dao.addProgress(vo); - dao.addTowerProgress(vo); + if (vo.getProgressType() == 4 && CollectionUtils.isNotEmpty(vo.getTowerLegIds())) { + dao.addTowerProgress(vo); + dao.updateTower(vo); + } + if (vo.getProgressType() != 4) { + dao.addTowerProgress(vo); + dao.updateTower(vo); + } dao.updateProProgress(vo); - dao.updateTower(vo); return ServerResponse.createBySuccessMsg("操作成功"); } catch (Exception e) { log.error(e.toString(), e); @@ -171,6 +195,7 @@ public class ProProgressServiceImpl implements ProProgressService { /** * 计算进度 + * * @param nowProgress * @param towerNum * @param towerNum2 @@ -180,7 +205,7 @@ public class ProProgressServiceImpl implements ProProgressService { */ public static double handleProgress(Long nowProgress, Long towerNum, int towerNum2) { BigDecimal bigDecimal = BigDecimal.valueOf(nowProgress + (long) towerNum2).multiply(BigDecimal.valueOf(100)); - BigDecimal bigDecimal2 = BigDecimal.valueOf(towerNum * 7); + BigDecimal bigDecimal2 = BigDecimal.valueOf(towerNum * 9); BigDecimal result = bigDecimal.divide(bigDecimal2, 2, RoundingMode.HALF_UP); return result.doubleValue(); } diff --git a/src/main/resources/mappers/backstage/ProProgressMapper.xml b/src/main/resources/mappers/backstage/ProProgressMapper.xml index 4d5f38c..88ec1b0 100644 --- a/src/main/resources/mappers/backstage/ProProgressMapper.xml +++ b/src/main/resources/mappers/backstage/ProProgressMapper.xml @@ -21,11 +21,32 @@ - INSERT INTO tb_tower_progress(tower_id,progress_id,progress_type,pro_id) VALUES + + INSERT INTO tb_tower_progress(tower_id,progress_id,progress_type,pro_id) VALUES + + ( + #{item},#{dataId},#{progressType},#{id} + ) + + + + INSERT INTO tb_tower_progress(tower_id,progress_id,progress_type,pro_id) VALUES + + ( + #{item},#{dataId},#{progressType},#{id} + ) + + + + + + INSERT INTO tb_tower_pouring(tower_id,leg,finish_status) VALUES - ( - #{item},#{dataId},#{progressType},#{id} - ) + + ( + ${item},#{innerItem},0 + ) + @@ -35,11 +56,30 @@ - - UPDATE tb_tower + + + UPDATE tb_tower + SET + tower_progress = #{progressType} + WHERE id = #{item} + + + + + UPDATE tb_tower + SET + tower_progress = #{progressType} + WHERE id = #{item} + + + + + + + UPDATE tb_tower_pouring SET - tower_progress = #{progressType} - WHERE id = #{item} + finish_status = '1' + WHERE tower_id = #{item.id} AND leg = #{item.towerName} @@ -132,6 +172,8 @@ COUNT(IF(tower_progress >= 5, 1, NULL)) AS num5, COUNT(IF(tower_progress >= 6, 1, NULL)) AS num6, COUNT(IF(tower_progress >= 7, 1, NULL)) AS num7, + COUNT(IF(tower_progress >= 8, 1, NULL)) AS num8, + COUNT(IF(tower_progress >= 9, 1, NULL)) AS num9, COUNT(*) AS towerNum FROM tb_tower WHERE pro_id = #{id} AND is_actvice = '1' @@ -152,18 +194,50 @@ + + diff --git a/src/main/resources/static/css/synthesisQuery/proProgressUpdateDetail.css b/src/main/resources/static/css/synthesisQuery/proProgressUpdateDetail.css index b4165a7..e08da52 100644 --- a/src/main/resources/static/css/synthesisQuery/proProgressUpdateDetail.css +++ b/src/main/resources/static/css/synthesisQuery/proProgressUpdateDetail.css @@ -67,7 +67,7 @@ body { .num-box { width: 10%; height: 100%; - margin-right: 2%; + /*margin-right: 1%;*/ justify-content: space-around; } @@ -112,6 +112,13 @@ body { color: #00bfbf; } +.num-box:nth-child(9) > p:nth-child(2) { + color: #13227a; +} +.num-box:nth-child(10) > p:nth-child(2) { + color: #1afa29; +} + .layui-tab-brief > .layui-tab-title .layui-this { color: #409eff; } @@ -191,6 +198,10 @@ body { cursor: pointer; } +.tower-info p{ + padding: 0 5px; +} + .biddenChoose{ background-color: #ffff00; } diff --git a/src/main/resources/static/img/synthesisQuery/num1.png b/src/main/resources/static/img/synthesisQuery/num1.png index 03f0aa0747d700ff92439d10d0617ee289a7276a..96de148e6642066bc997deb3f575896485088460 100644 GIT binary patch delta 299 zcmV+`0o4BY0@DJJF@Ft7L_t(oN9~r+4T3NnM!%nb&e9EV5?}^7cvB})Cy}FxxC3s| z4I1z2XNVyh1pz^cNqZ!;yu7B53OXLr@%Ql`0LFyAQgQMPTcrk!36~;R0Z1Gt4%&t& z1vnlj8&c)~H8~7`(@X?DKo<~AA~kdP)KDz|K-^*jDWF7;Fn`8OUEt&b1Fh6n=gqAF z&_q796cLhpg5=5s`vK8%bqC}uiqJJ6`;yiJilWBtO0AF)IfGC7GX3R?H8XM xwMHGtN(c0lq9luD6R1)HO%|^**8+5I;0nX&@F6|_tStZl002ovPDHLkV1oVLeQW># delta 335 zcmV-V0kHnl0`~%tF@G^hL_t(oN9~q9P6IIzg}=E84Hc)zA!ra1iL1nz)$Gk+dhWUoD=N1%Za_yFz& z0PNr_N{R7HeJx>n08+_Il&jLCDFNugUOSMiU$q8+Konfn5X_)f3n051wE=#8!|R}} z0D6$#Jk6zpC;MsXgeUpZk|Dhq79jut002ovPDHLkV1nFUknR8g diff --git a/src/main/resources/static/img/synthesisQuery/num2.png b/src/main/resources/static/img/synthesisQuery/num2.png index 4997036527f7a06067a662670351888b2fb814cc..41e9ad4fb63426443985bd1616fa71afd5ab2b58 100644 GIT binary patch delta 298 zcmV+_0oDGo1JVMJF@Fq6L_t(oN9~ru4T3NjM!&yt2;vDRf$AXY&8R!5JBaZnix_Yd zPQnn%Z%~OQ7AsaIChf7I<>fUzN@#dc!|%s`065Xq&*U=xhApiDCmPR)X$~MxyMg>P zgchK^ootve0FW>pB_R65qRoO-opr({kfm`*W|H%j9bDOivvHS^(`iC?2o?)_^sjHBjD)i4pF5!SJ0= w&8P!q=^*mB>LX%l0;M%zviU1(EkNT2PHNT0Ax5p~TL1t607*qoM6N<$f^pA;jQ{`u delta 394 zcmV;50d@Y;0H; zKG${974TM9QzDv|{|NX{MCXNnpSgFxj%-+vT-67>d9cc2tyBEMG$ z%Kj6Mp20W)^J5+)XI$gWbxNoX$!#GjaC8bxnY{1odDF@P^Bj^swiIv z@$6@dx(3+mHGidPUjSJ?iGAa@z%U0)2fk6V(aa$K zcxRXuz($BA6y70(ba|YN0c>t(GCl_Z2zXmh;$xFyHhT^NfN`A%@tsX^lQRRr;K1O( o;K2WNz)Qp1>b+Jdx=g}v=rkKJoHEnP00000NkvXXt^-0~f&k~T+yDRo diff --git a/src/main/resources/static/img/synthesisQuery/num3.png b/src/main/resources/static/img/synthesisQuery/num3.png index 78741a9fdb7cfffe13c67863652ca30d98433d76..bd99342ad24748c78a56b6739297f2a6ff91d206 100644 GIT binary patch delta 303 zcmV+~0nq-m1J?qOF@F(BL_t(oN9~r~4T3NfM!#DZ!AXP#{Fy*~QMXXHP<)UL)D3Wx zE@H23ViO}sfvUu$O?YWbdvb30xP*=eb$mbm17LOHcsHT^8@8MV78hRYi#JTj4?{{m z4dDb>p83dx82~915+yLzFflPAJuiuo>-lS2LyZ6cL=^_4UVqP?VOA$L`^_VF6Ef?C z(FDN9zD!5d?-Br}d}U?&m4N^d3z37;B$DLcLPA@2JR^?#UVr_LZScw002ovPDHLkV1lAz Be%$~7 delta 397 zcmV;80doG=0<;5=F@J7JL_t(oN9~qBPQx%1#=qxYqzeH<_8pd15=g%fowCiW?=K>cZ$Ky1l zv}&B|f6^^*x#STsW~z_yEi#->Lt428)6LfcOkQ}#gwfW7+kZHqs5O8;3IGr}2CXVk z=Kl@AF#}IYKxaO7zs_()yL#mXfKv%Tzy~q_>QmFL+z-JuLk;!5+bnJ}rvvB| r=oIJ_I9vrLOTJU@x(q))o$wdL8t)-M)`LR;0000f66Hr_3UvzfOGd#>x`^mK*O7a#;}#4Pgg3a6(uD zih_sr0Jzv!vSv0W0M+=K z#`G%#9>5#$1_m{t>IgQa30oyp!K^6_yX8PbnACAQC8S_}`)4%eZ7eG?*Cc!!r*|19 z`zOpzPuA=|8R}xd3eaj4Pm4T&H{cD}4VY80CX)?upHIy#2Tamk$lo0-U7)N6TwdPh eSr0I}fhz1~1iVD5MXPAve27Yu_D+jPPYgHfp=?~CF2 P00000NkvXXu0mjfR5Ye% diff --git a/src/main/resources/static/img/synthesisQuery/num5.png b/src/main/resources/static/img/synthesisQuery/num5.png index 797dd626626051df51b75b407ddec5715164520e..f82e1d8a9be2caa34a6de7cc132b222406f7291c 100644 GIT binary patch delta 318 zcmV-E0m1&d1LgvdF@GRQL_t(oN9~ruZNe}ZM!!EXhbnZ3FbT;dg)=#@0qq7zIOk@R zbQAATRa~6>H3&RmHQE?Qhr`H1Jhb8?*5% z1MO7G^3f2(0IStIh!$X0$z)RYTE7^Wf|zqAQUtU;@Nuu9n|}a6lwUN!tjzu99A>{> z=UVGr2%(;~TjiST4-n#>S!H!S8xH`0F;lvZ>2C}~fM_5Zc&Gtpbx5#{ib-+d)2Kv< znX863b-)#qLvFjSE2!`1$8UyXFwt_l+cjY&ypmJ9ux)<=%j_#DO0 zXCgo}5Dg3)I5+(jgSpA-dU?;Q7SsV-x-?DOOFxz&P=f|S7WbJO0Y*3Q4HSOTAr_1P QOaK4?07*qoM6N<$g66o7&j0`b delta 403 zcmV;E0c`%}0=ff`F@JPPL_t(oN9~n6PQySDhX1jg0@>Ul4Hc)zA!ra1Nu5{&hbZiFA2Z+nGyX@g<9ixFK*xU@pKt$o8r%$x4ko*L9P!8q)+Imy*DO zKv=Xi)&O56A!Dc23T+iB4zT%E6FN@lPbTqSd!-zJZB`34$_4m-{>aops{+`VD6n=< zA=g&!MNuzXqJK&OGRbn?v=)F=316v>@hr#~(QdagX!(7~O`Xsh;861F0LVm(^h{i` z+#VofEiyAnyse%c02!x)i6W0AlOn^(9Khmr20eOs9D{uDqUgjVn9Z5P3XoTR6pd|y xo7`yt8U-2!8U_Bb0zq({I+@n`xk@Me0FOvJirK~8B(~GursI4!cF^w z8_acN$oiR{J_f7+)^jjC-~qe=Z@_Ax^;cZvNczsJ=G1|vbODrIKb9^~Rs$}JzcSYY c3~t~IlmLq%R}Wp&)Bpeg07*qoM6N<$f(7z@O8@`> delta 366 zcmV-!0g?W_0+j=hFnm3YkSLY{iA&&tjWDvTHCcPt7KL4UXJ_928T}DjzFTxw!o>k>t`O4}7y4gZ z3D)RB;o;}(UE%y1DME|6?mGcis4c#zE_?^wBuF+IKtll(=6|CqVEg|GPrwQAm?CFG zyx!(?w!j{&&@FIk0R&zYW&);!=OZw&2Ga+i?eT>|7TTH+fC?->gsiV3F#s%x5y%oG z?>Z~70D7wt8(;@weZ$v52LY(Hp>ofim8ZzE*`lEVe(SZl=~w_oip;%tLBoi;4t6uX zwYaYnh5-Cod}l}iqp|-y0dFOkkmb}xfzGe<8J@iW z0-0;~d%Fn<8%NklkWc16on6)$Ru(mK_*crkxh!5IEtJAz9`UA zv@z*T_(LD}%hzydhRBsg?vFnKFs1<6e8bkV0b`DB;}d`eB)5ie0k{A-w9gHI0Lm7o z0I=)d$;@@FAzuJBohkv=Z!pGaeg{fwd{jOFA@&83#{^Js+I^1cR|XP5GLQ^xYCwth znrez=m&$Ev=$ixMFzMn}5c~e0VS}kaDyD;?crs2OyFRmDFkO-7IXylGmH}K2;$uz% zNCuJt7X!nsxCU9R_|j&VxBv`Er)#eOV+R_91dPB2&{47hP$5y% zJB)!u0R<9U1RW#-fekN?9Z|%M3;*2resXaF*D$69Up93}KZvc1bY|2^H(o_K`&{jE!*QXi+fFKlSHV9K{gaYu+MreSiZzvr! z7C-?~xaXrkM8@y+i4E|oXLZxM08)sEtvl-gaEj}ku+&HOvH7cbOaM0BSmTnROF$#y z14jLJ@CBd{qendFv-i)b3_$7VH0`4SI6|bYxy)ye24Dh_h0o=hGYvqKfhGe@2L3n$ g#>{gkyT)|F8$*}MA@i_@%07*qoM6N<$f+bFpnE(I) diff --git a/src/main/resources/static/img/synthesisQuery/num8.png b/src/main/resources/static/img/synthesisQuery/num8.png new file mode 100644 index 0000000000000000000000000000000000000000..f0a4c258746dd6ffefc71ac715d28ffedb10368d GIT binary patch literal 356 zcmV-q0h|7bP)Px$9!W$&R9HvtmT^wPFcgP>@38|A^Z?q?NIC}tRJiyi` zBa9dsbfd^((kA<_?Y?}?zLn7Ppq}54{{e7$bsv5#pVPmvWi>FG%pO*g9wCzE?=R7* zA*=uwli3`=?ds8`F%dK0kVpt31raSoDKjsQHPi_JfI4763y}PT8LB%K1c54wLVxL3 z-L$p~fQx;dXYsgC01$K3bWGPx$6-h)vR9HvtmQAjLFce0=TNUFDj3b;8Hvz0fU5UDq$5L<;Plla{?!fp%uQ9QS z@u3CllbDntq3y|OI4z;!hZYrT<~eXkf4pW+0j~kZ!zH{B8&{z+vnXv4<|a@)&f+1NS&Huh!i zt%gkkKoQ4f+w>^|4!{|32Ht8wUJ|UMLO@idP^#czSq*D-pe!br+_qYX7$Ur$8Gm>P zJY9QPVq3z8In@*E_6vnjzstMX;+dg328;kzw&MO92jC1i17-u)TQNXM?)^?*`PHmC tpi5U2NFQA+ZJ>+>Y$mTV)&Vqb;0!Vj(ILAv>6`!n002ovPDHLkV1hE`iueEk literal 0 HcmV?d00001 diff --git a/src/main/resources/static/js/basic/lineManagement/child/towerFormTemp.js b/src/main/resources/static/js/basic/lineManagement/child/towerFormTemp.js index 3c87240..98f594e 100644 --- a/src/main/resources/static/js/basic/lineManagement/child/towerFormTemp.js +++ b/src/main/resources/static/js/basic/lineManagement/child/towerFormTemp.js @@ -19,6 +19,9 @@ function setParams(params) { // $('.coordinate-option[data-system="WGS-84"]').addClass('active').trigger('click'); $('#wgs84Fields').show(); $('#2000Fields').hide(); + $('input[name="centralMeridian"]').removeAttr('lay-verify'); + $('input[name="longitude2000"]').removeAttr('lay-verify'); + $('input[name="latitude2000"]').removeAttr('lay-verify'); // 设置验证规则 /* $('input[name^="longitude2000"], input[name^="latitude2000"], input[name="centralMeridian"]').removeAttr('lay-verify'); $('input[name="longitude"]').attr('lay-verify', 'required|longitude'); @@ -44,6 +47,7 @@ function setParams(params) { $('input[name="longitude"]').attr('lay-verify', 'required|longitude'); $('input[name="latitude"]').attr('lay-verify', 'required|latitude'); // $('input[name="longitude"], input[name="latitude"]').attr('lay-verify', 'required|number'); + $('input[name="centralMeridian"]').removeAttr('lay-verify'); } else { $('#wgs84Fields').hide(); $('#2000Fields').show(); diff --git a/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetail.js b/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetail.js index 877c8ce..eac149c 100644 --- a/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetail.js +++ b/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetail.js @@ -92,42 +92,52 @@ function initTable(dataList, limit, page) { return (page - 1) * limit + d.LAY_NUM; } }, - {field: "towerName", title: "杆塔", width: "18%", unresize: true, align: "center"}, - {title: "基础开挖",width: "10%",unresize: true,align: "center", + {field: "towerName", title: "杆塔", width: "14%", unresize: true, align: "center"}, + {title: "协调完成",width: "10%",unresize: true,align: "center", templet: function (d) { return setTowerProgress(d.towerProgress,1); } }, - {title: "基础开挖完成",width: "11%",unresize: true,align: "center", + {title: "基础开挖",width: "9%",unresize: true,align: "center", templet: function (d) { return setTowerProgress(d.towerProgress,2); } }, - {title: "基础浇筑完成",width: "11%",unresize: true,align: "center", + {title: "基础开挖完成",width: "9%",unresize: true,align: "center", templet: function (d) { return setTowerProgress(d.towerProgress,3); } }, - {title: "铁塔组立",width: "11%",unresize: true,align: "center", + {title: "基础浇筑",width: "9%",unresize: true,align: "center", templet: function (d) { return setTowerProgress(d.towerProgress,4); } }, - {title: "铁塔组立完成",width: "11%",unresize: true,align: "center", + {title: "基础浇筑完成",width: "9%",unresize: true,align: "center", templet: function (d) { return setTowerProgress(d.towerProgress,5); } }, - {title: "架线施工完成",width: "11%",unresize: true,align: "center", + {title: "铁塔组立",width: "9%",unresize: true,align: "center", templet: function (d) { return setTowerProgress(d.towerProgress,6); } }, - {title: "附件安装完成",width: "11%",unresize: true,align: "center", + {title: "铁塔组立完成",width: "9%",unresize: true,align: "center", templet: function (d) { return setTowerProgress(d.towerProgress,7); } }, + {title: "架线施工完成",width: "9%",unresize: true,align: "center", + templet: function (d) { + return setTowerProgress(d.towerProgress,8); + } + }, + {title: "附件安装完成",width: "9%",unresize: true,align: "center", + templet: function (d) { + return setTowerProgress(d.towerProgress,9); + } + }, ], ], done: function (res, curr, count) { @@ -186,6 +196,10 @@ function setTowerProgress(value,type){ html = '' }else if(value >= 7 && type === 7){ html = '' + }else if(value >= 8 && type === 8){ + html = '' + }else if(value >= 9 && type === 9){ + html = '' }else { html = ''; } diff --git a/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetailAjax.js b/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetailAjax.js index 51b7e7e..1199838 100644 --- a/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetailAjax.js +++ b/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetailAjax.js @@ -3,7 +3,7 @@ function initSetProData() { let url = dataUrl + "/backstage/proProgress/detailQuery" let obj = { id: objParams.id, - departId:objParams.departId + departId: objParams.departId } let params = { encryptedData: encryptCBC(JSON.stringify(obj)) @@ -25,7 +25,7 @@ function initSetProData() { $('#companyName').html(obj.companyName); $('#proStatus').html(' ● ' + obj.proStatus); $('#voltageLevel').html(obj.voltageLevel); - $('#lineLength').html((obj.lineLength || '/') + 'km'); + $('#lineLength').html((obj.lineLength || '/') + 'km'); $('#towerNum').html(obj.towerNum); $('#towerNum2').html(obj.towerNum); $('#planStartTime').html(obj.planStartTime); @@ -36,7 +36,7 @@ function initSetProData() {
`); - for (let i = 1; i <= 7 ; i++) { + for (let i = 1; i <= 9; i++) { $('#num' + i).html(obj['num' + i]); } element.render(); @@ -44,7 +44,7 @@ function initSetProData() { } /**更新记录*/ -function setUpdateRecord(){ +function setUpdateRecord() { let url = dataUrl + "/backstage/proProgress/updateRecord" let obj = { id: objParams.id @@ -65,6 +65,7 @@ function setUpdateRecord(){ layer.close(loadingMsg); error(xhr) }); + function setUpdateRecordInfo(list, obj) { let html = ''; if (list && list.length > 0) { @@ -111,7 +112,7 @@ function setUpdateProData(value) { let url = dataUrl + "/backstage/proProgress/getGxData" let obj = { id: objParams.id, - type:value + type: value } let params = { encryptedData: encryptCBC(JSON.stringify(obj)) @@ -134,60 +135,65 @@ function setUpdateProData(value) { let obj = data.vo; let list = data.list; $('#towerNum2').html(obj.towerNum); - for (let i = 1; i <= 7 ; i++) { + for (let i = 1; i <= 9; i++) { $('#num' + i).html(obj['num' + i]); } let html = ''; - $.each(list,function (index,item) { - if(item.chooseStatus === 1){ - html += '

'+item.towerName+'

'; - }else if(item.chooseStatus === 0){ - html += '

'+item.towerName+'

'; + $.each(list, function (index, item) { + if (item.chooseStatus === 1) { + html += '

' + item.towerName + '

'; + } else if (item.chooseStatus === 0) { + html += '

' + item.towerName + '

'; } }) $('.tower-box').empty().append(html); } } -function chooseData(that){ +function chooseData(that) { let towerName = $(that).find('p').eq(0).html(); - if($(that).hasClass('choose')){ + if ($(that).hasClass('choose')) { $(that).removeClass('choose'); let oldData = $('#updateDesc').val(); let dataArr = oldData.split(';'); const filteredArray = dataArr.filter(item => !item.includes(towerName)); $('#updateDesc').val(filteredArray.join(';')); - }else{ + } else { $(that).addClass('choose'); let oldData = $('#updateDesc').val(); let value = getTypeName(towerName); $('#updateDesc').val(oldData + value); } - function getTypeName(towerName){ - if(checkType === 1){ + function getTypeName(towerName) { + if (checkType === 1) { + return towerName + '-' + '协调完成;'; + } else if (checkType === 2) { return towerName + '-' + '基础开挖;'; - }else if(checkType === 2){ + } else if (checkType === 3) { return towerName + '-' + '基础开挖完成;'; - }else if(checkType === 3){ + }else if (checkType === 4) { + return towerName + '-' + '基础浇筑;'; + } else if (checkType === 5) { return towerName + '-' + '基础浇筑完成;'; - }else if(checkType === 4){ + } else if (checkType === 6) { return towerName + '-' + '铁塔组立;'; - }else if(checkType === 5){ + } else if (checkType === 7) { return towerName + '-' + '铁塔组立完成;'; - }else if(checkType === 6){ + } else if (checkType === 8) { return towerName + '-' + '架线施工完成;'; - }else if(checkType === 7){ + } else if (checkType === 9) { return towerName + '-' + '附件安装完成;'; } } } // 更新项目保存数据 -function saveData(data,towers) { +function saveData(data, towers, towerNames) { let url = dataUrl + "/backstage/proProgress/updateProgressData"; let paramsObj = data.field; paramsObj.towerIds = towers; + paramsObj.towerDetailVos = towerNames; paramsObj.id = objParams.id; paramsObj.progressType = checkType; let params = { diff --git a/src/main/resources/static/js/synthesisQuery/updateProForm.js b/src/main/resources/static/js/synthesisQuery/updateProForm.js index 6e581d0..a18a1b5 100644 --- a/src/main/resources/static/js/synthesisQuery/updateProForm.js +++ b/src/main/resources/static/js/synthesisQuery/updateProForm.js @@ -17,19 +17,31 @@ function setParams(obj) { setUpdateProData(1); element.render(); form.on('submit(formData)', function (data) { - let towers = getChooseData(); + let towers = getChooseData('dataId'); + let towerNames = getChooseData('towerName'); if(!towers.length){ return layer.msg("请选择杆塔", {icon: 7}) } - saveData(data,towers); + saveData(data,towers,towerNames); }); }); } -function getChooseData(){ +function getChooseData(attr){ let towers = []; $('.tower-info.choose').each(function(){ - towers.push($(this).attr('dataId')); + let value = $(this).attr(attr); + if(attr === 'towerName'){ + const lastDashIndex = value.lastIndexOf("-"); // 找到最后一个 - 的位置 + const result = value.slice(lastDashIndex + 1); // 从 - 后一位开始截取 + let obj = { + towerName: result, + id: $(this).attr('dataId') + } + towers.push(obj); + }else{ + towers.push(value); + } }); return towers; } diff --git a/src/main/resources/static/pages/synthesisQuery/proProgressUpdateDetail.html b/src/main/resources/static/pages/synthesisQuery/proProgressUpdateDetail.html index 1db4eb4..13e4124 100644 --- a/src/main/resources/static/pages/synthesisQuery/proProgressUpdateDetail.html +++ b/src/main/resources/static/pages/synthesisQuery/proProgressUpdateDetail.html @@ -79,33 +79,41 @@

-

基础开挖

+

协调完成

0

-

基础开挖完成

+

基础开挖

0

-

基础浇筑完成

+

基础开挖完成

0

-

铁塔组立

+

基础浇筑

0

-

铁塔组立完成

+

基础浇筑完成

0

-

架线施工完成

+

铁塔组立

0

-

附件安装完成

+

铁塔组立完成

0

+
+

架线施工完成

+

0

+
+
+

附件安装完成

+

0

+
diff --git a/src/main/resources/static/pages/synthesisQuery/updateProForm.html b/src/main/resources/static/pages/synthesisQuery/updateProForm.html index f51e6ff..2c604f9 100644 --- a/src/main/resources/static/pages/synthesisQuery/updateProForm.html +++ b/src/main/resources/static/pages/synthesisQuery/updateProForm.html @@ -30,13 +30,15 @@
    -
  • 基础开挖
    • -
  • 基础开挖完成
    • -
  • 基础浇筑完成
    • -
  • 铁塔组立
    • -
  • 铁塔组立完成
    • -
  • 架线施工完成
    • -
  • 附件安装完成
    • +
  • 协调完成
    • +
  • 基础开挖
    • +
  • 基础开挖完成
    • +
  • 基础浇筑
    • +
  • 基础浇筑完成
    • +
  • 铁塔组立
    • +
  • 铁塔组立完成
    • +
  • 架线施工完成
    • +
  • 附件安装完成
@@ -47,33 +49,41 @@

-

基础开挖

+

协调完成

0

-

基础开挖完成

+

基础开挖

0

-

基础浇筑完成

+

基础开挖完成

0

-

铁塔组立

+

基础浇筑

0

-

铁塔组立完成

+

基础浇筑完成

0

-

架线施工完成

+

铁塔组立

0

-

附件安装完成

+

铁塔组立完成

0

+
+

架线施工完成

+

0

+
+
+

附件安装完成

+

0

+