From 1a3cc4ab77b1384ecdbabfcb52b5cd562af31d91 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 23 Apr 2025 10:20:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E8=BF=9B=E5=BA=A6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2=E6=90=AD=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backstage/entity/vo/ProProgressVo.java    |   2 +-
 .../service/impl/ProProgressServiceImpl.java  |   2 +-
 .../mappers/backstage/ProProgressMapper.xml   |   5 +-
 .../proProgressUpdateDetail.css               |   2 +-
 .../static/img/synthesisQuery/num1.png        | Bin 0 -> 375 bytes
 .../static/img/synthesisQuery/num2.png        | Bin 0 -> 433 bytes
 .../static/img/synthesisQuery/num3.png        | Bin 0 -> 436 bytes
 .../static/img/synthesisQuery/num4.png        | Bin 0 -> 408 bytes
 .../static/img/synthesisQuery/num5.png        | Bin 0 -> 442 bytes
 .../static/img/synthesisQuery/num6.png        | Bin 0 -> 405 bytes
 .../static/img/synthesisQuery/num7.png        | Bin 0 -> 373 bytes
 .../synthesisQuery/proProgressUpdateDetail.js |  69 +++++++++++-------
 .../proProgressUpdateDetailAjax.js            |  44 +++++++++++
 .../static/js/system/child/userFormTemp.js    |   2 +
 .../proProgressUpdateDetail.html              |  39 +++++-----
 15 files changed, 114 insertions(+), 51 deletions(-)
 create mode 100644 src/main/resources/static/img/synthesisQuery/num1.png
 create mode 100644 src/main/resources/static/img/synthesisQuery/num2.png
 create mode 100644 src/main/resources/static/img/synthesisQuery/num3.png
 create mode 100644 src/main/resources/static/img/synthesisQuery/num4.png
 create mode 100644 src/main/resources/static/img/synthesisQuery/num5.png
 create mode 100644 src/main/resources/static/img/synthesisQuery/num6.png
 create mode 100644 src/main/resources/static/img/synthesisQuery/num7.png

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 16467cc..07320b7 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
@@ -111,7 +111,7 @@ public class ProProgressVo {
         /**
          * 基础开挖
          */
-        private int num;
+        private int num1;
         /**
          * 基础开挖完成
          */
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 5aa3b14..c2f6cf2 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
@@ -81,7 +81,7 @@ public class ProProgressServiceImpl implements ProProgressService {
         try {
             ProProgressVo.ProDetailVo vo = Optional.ofNullable(dao.detailQuery(dto)).orElseGet(ProProgressVo.ProDetailVo::new);
             ProProgressVo.ProDetailVo vo2 = Optional.ofNullable(dao.getTowerProgress(dto)).orElseGet(ProProgressVo.ProDetailVo::new);
-            vo.setNum(vo2.getNum());
+            vo.setNum1(vo2.getNum1());
             vo.setNum2(vo2.getNum2());
             vo.setNum3(vo2.getNum3());
             vo.setNum4(vo2.getNum4());
diff --git a/src/main/resources/mappers/backstage/ProProgressMapper.xml b/src/main/resources/mappers/backstage/ProProgressMapper.xml
index fbf4f8f..fd7eb62 100644
--- a/src/main/resources/mappers/backstage/ProProgressMapper.xml
+++ b/src/main/resources/mappers/backstage/ProProgressMapper.xml
@@ -76,7 +76,8 @@
                IFNULL(C.num,0) AS towerNum,
                tp.plan_start_time AS planStartTime,
                tp.plan_end_time AS planEndTime,
-               tp.update_time AS updateTime
+               tp.update_time AS updateTime,
+               tp.pro_progress AS proProgress
         FROM tb_project tp
         LEFT JOIN (
             SELECT pro_id,COUNT(*) AS num
@@ -115,7 +116,7 @@
     <!--查询工程杆塔进度-->
     <select id="getTowerProgress"
             resultType="com.bonus.digitalSignage.backstage.entity.vo.ProProgressVo$ProDetailVo">
-        SELECT COUNT(IF(tower_progress &gt;= 1, 1, NULL)) AS num,
+        SELECT COUNT(IF(tower_progress &gt;= 1, 1, NULL)) AS num1,
                COUNT(IF(tower_progress &gt;= 2, 1, NULL)) AS num2,
                COUNT(IF(tower_progress &gt;= 3, 1, NULL)) AS num3,
                COUNT(IF(tower_progress &gt;= 4, 1, NULL)) AS num4,
diff --git a/src/main/resources/static/css/synthesisQuery/proProgressUpdateDetail.css b/src/main/resources/static/css/synthesisQuery/proProgressUpdateDetail.css
index e44913d..a0e73e0 100644
--- a/src/main/resources/static/css/synthesisQuery/proProgressUpdateDetail.css
+++ b/src/main/resources/static/css/synthesisQuery/proProgressUpdateDetail.css
@@ -85,7 +85,7 @@ body {
 }
 
 .num-box:nth-child(2) > p:nth-child(2) {
-    color: #ffff00;
+    color: #f0f054;
 }
 
 .num-box:nth-child(3) > p:nth-child(2) {
diff --git a/src/main/resources/static/img/synthesisQuery/num1.png b/src/main/resources/static/img/synthesisQuery/num1.png
new file mode 100644
index 0000000000000000000000000000000000000000..03f0aa0747d700ff92439d10d0617ee289a7276a
GIT binary patch
literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$F-b&0R9HvtmOV}bF%X5nxd{ywr^q2_5EA4Fxk1vU%ng7FiJAk1V?;`k6iD2{
z(TjFb6xnFjKP!rLV`=>}-;Ccr+eow!xB;GkH!}{Yd8OYiwm}Fy125g!H}Gi2wlr95
zeF{Lq1<|*q8LKe?E-Rq8v#~3n^Zx|yfOj(<T4b+1qeq~D5cmM@1pw^eEJ}&-OMNY2
zdH_<%OO&h9qbULC!CpI%tY5VTfIt*n)ey{}Rtq4z8npp_eZ%XZtpIwE-aXIyFk^mw
zKCJ;R<3-(cEP$;UGxuF^WkiEi9hsaA?sdWvfIow`1d!<F9+#}G0U41VFz&ZQE`S0l
z%VXDPUrs{+2509Hj|X6H#;s?woH-tVg&CWi%{^--fT;pg1*Qu8>k6zpC;MsXgeUpZ
Vk|Dhq79jut002ovPDHLkV1jZ}mT&+7

literal 0
HcmV?d00001

diff --git a/src/main/resources/static/img/synthesisQuery/num2.png b/src/main/resources/static/img/synthesisQuery/num2.png
new file mode 100644
index 0000000000000000000000000000000000000000..4997036527f7a06067a662670351888b2fb814cc
GIT binary patch
literal 433
zcmV;i0Z#sjP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$Ye_^wR9HvtmAy{GFcgK)H7^l$>cYfRq<IDwghaa`GVumvV`Lx^TiXeVnYBuI
z3?v3K(BvV&7bX2sgdA$@Bw|QL$G+$DxmU-8hR;hc$AGv1)Uxm&WYa#^b<!2^R##IZ
znwS3w_)tXWg@2#9is{a40Y<BE&V=di02AL7eiHQtP<NmdWg@><2g?2vj-J6d0rO)X
zBxhaRe%oSw=}{U!G2^rZV1ZYmXsiTFK)e8-vaP|?&OnK@2WY-}#zc{8Yg_;-G-522
z_=;>DaR%5LB$+uXf@Ja6S!oNv+KpBL>bYT>pq&8J+EAq@F{&tE2l4D@i@FBb>ouim
zUjSJ?iGAa@z%U0)2fk6<ED23z^!t7l?-D>V(aa<zTb+STD$>$KcxRXuz($BA6y70(
zba|YN0c>t(GCl_Z2zXmh;$xFyHhT^NfN`A%@tsX^lQRRr;K1O(;K2WNz)Qp1>b+Jd
bx=g}v=rkKJoHEnP00000NkvXXu0mjfXqvcc

literal 0
HcmV?d00001

diff --git a/src/main/resources/static/img/synthesisQuery/num3.png b/src/main/resources/static/img/synthesisQuery/num3.png
new file mode 100644
index 0000000000000000000000000000000000000000..78741a9fdb7cfffe13c67863652ca30d98433d76
GIT binary patch
literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$Zb?KzR9HvtmOoCzFcikW=U$`>6Q}3}8ZxjTB-#PW$_>cI$XJr0WkTu#R2-lj
z1BoFFNL(U$#BM5;%4v)pM;+oNQvB!r{JrPTCRDWRXYS_$7b3^wG^Dg@oa=wmEpWNy
z5iw?}kMJ!roKHhqxdzkC*8)slc*ca$)`Z(Qpr|!~KMDX4IR>pNQ0D&)z%c_)NkC^l
zcE8SWMZ0?C1%OitK)?qv`bApOLXCF-X;Xz+3jo$*GGW!r5V@wt8ek(_q0F3Efmj_?
zXMhqUWkQq;Y5w0@X$oL%85U|Z3b5@PrVi>0K(WX|m0yuV)yKmLjdxSz6<{Zr)=gUh
zkV+&&8W`UNa^S{@s(iq-+V=%FazYn?y5K$mq-BpyT(Z#`D1AUaV2s}mRsb@PyqK8q
z)yvcov%Z{+0c>_>QmFL+z-JuLk;!5<W9k8N+{7W>+bnJ}rvvB|=oIJ_I9vrLOTJU@
ex(q))o$wdL8t)-M)`LR;0000<MNUMnLSTaCKeavp

literal 0
HcmV?d00001

diff --git a/src/main/resources/static/img/synthesisQuery/num4.png b/src/main/resources/static/img/synthesisQuery/num4.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbb080066cda16bf41214e6d6dd2d1cbd677eeab
GIT binary patch
literal 408
zcmV;J0cZY+P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$Qb|NXR9HvtmN8DlKoCXWaFR4soFa#yK}aNxP0HLL?kMSiGzk?FH3u-qKuTc>
zBrXvz*=!;(tYNZiTNHL_@6NpWGyc0m&0}sDaKr^A_cEcVTNnFYd;!dy5r)O?+Z!e4
zG9iym=G*TFxMhJb`m$jrDOq;_RRy4A*sTJt|4+aP!h<B7wNbr|>1~1iVD5MXPAve2
z7Yu_<TZ)Yu&p^@CVEzqISGth1CW~!NIKUpvu*7UZf_~L_00&YaWRkEvbXJ-IaCrmN
zXcpkJ{F&B4+X8SXc2Mn8y7`bx#@}1iE<iP#*G;<t5OPTvs?UOo5gj_#KQ*pRu5-c|
zfL|)#hi$6`*0RSMmuwcm`GCE^sP7J805*|5n1ol>+g~jBaMA+=RHqpq4ZuoLjy1tT
z)@T5xl5!mqT(hSK=oRP{=oR?K3e36M-E`mEbixmVQK=#Ci{beI0000<MNUMnLSTY1
C#jH61

literal 0
HcmV?d00001

diff --git a/src/main/resources/static/img/synthesisQuery/num5.png b/src/main/resources/static/img/synthesisQuery/num5.png
new file mode 100644
index 0000000000000000000000000000000000000000..797dd626626051df51b75b407ddec5715164520e
GIT binary patch
literal 442
zcmV;r0Y(0aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$bV)=(R9Hvtl{-$uKoExiv77?g+#wAWr^q2_5E4n9SPD0YJIY8|*Kw*y)Epoj
z1Bt>ENF0Di6YWo&5FVD3EbE6T>~bG7-~KcHN3i329}e4kxx92-cXl)$C%euSU6;H7
zFG0{1a=P9lpR~xuu~Lho$@1>!0=)M7Q;2kbTo`#ug|z|vQUHJkI<+eBS^rxCrvT=@
zQs-5?K8=}Mf^_3;Ft{ObMqn<$J;?T|EXhiZJJ)rSvKrF_AeWNBf<RcbG}ZuLB_U&{
z)e3DDDGsptRTDZ+=ual`Uwfq-fNfR_HOd9}e*VbRL8}7Tm?*GzPa)S<?nO~ATcSz<
zGRbn?v=)F=316v>@hr#~(QdagX!(7~O`Xsh;861F0LVm(^h{i`+#VofEiyAnyse%c
z02!x)i6W0AlOn^(9Khmr20eOs9D{uDqUgjVn9Z5P3XoTR6pd|yo7`yt8U-2!8U_Bb
k0zq({I+@n`xk@Me0F<pRFzC0*kpKVy07*qoM6N<$f_W*sIRF3v

literal 0
HcmV?d00001

diff --git a/src/main/resources/static/img/synthesisQuery/num6.png b/src/main/resources/static/img/synthesisQuery/num6.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea4ade146d1bf52353362197b7cd423c493a340f
GIT binary patch
literal 405
zcmV;G0c!q<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$Pf0{UR9Hvtl`&4kKoCXW00&7!#VK+K8iYi01WIHhVJQ)m+yJLSO3eYxF_0*h
z0*OoDfsHV-tTkDC*A|6cdS_?e{u%udTE1I!R>H*rY_1T~78m+oTnX0bLgC@(>|Npf
z8Yx1Hx$ZjwR;Vq$s4jd5-6Tjh8bCt<6y~EUVEg|GPrwQAm?CFGyx!(?w!j{&&@FIk
z0R&zYW&);!=OZw&2Ga+i?eT>|7TTH+fC?->gsiV3F#s%x5y%oG?>Z~70D7wt8(;@w
zeZ$v52LY(Hp>ofim8ZzE*`lEVe(SZl=~w_oip;%tLBoi;4t6uXwYaYnh5-Cod`JMJ
zu=H`s*fWqTY<vpWR=r!{+A?wl<aRLuZzY(J<<v!i&ad+sp1lA9uL*MOldMn7UI5@S
zMeh3~_qj6xObSd2ObYy81=i@DbuxvIA)W9G0)?O<)t8)x00000NkvXXu0mjfw>PHP

literal 0
HcmV?d00001

diff --git a/src/main/resources/static/img/synthesisQuery/num7.png b/src/main/resources/static/img/synthesisQuery/num7.png
new file mode 100644
index 0000000000000000000000000000000000000000..5140c625bfea495d5119d18eca830ff7630ea4ea
GIT binary patch
literal 373
zcmV-*0gC>KP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$FG)l}R9Hvtmc0$aFcgF@o6t}(#bXB=ganMh2GCKm0Z<`P(>siTL;(d7TLc{>
z0)Y)LjvZ0NjSK(W_kMD50@pC61z-qZ4Uv;`U&V#Qdfu23fMvdR0Wg3_T2ae-+yy{!
zLKI^Pky)JpuNk1O)SUs=e+Qt0EZd;l?Z=3ociKz9l{DQV%X)W!Bsl;e6q|8>p93}K
zZvc1bY|2^H(o_K`&{jE!*QXi+fFKlSHV9K{gaYu+MreSiZzvr!7C-?~xaXrkM8@y+
zi4E|oXLZxM08)sEtvl-gaEj}ku+&HOvH7cbOaM0BSmTnROF$#y14jLJ@CBd{qde!c
z_s^*eK<Vf-?V|xWLZq#^%x8}VU;>ea&*hpk4M3BDCId|d{x}21%yTEZ#&p6PLzl`S
T_RW^-00000NkvXXu0mjf=qs2-

literal 0
HcmV?d00001

diff --git a/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetail.js b/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetail.js
index 4ba4929..863a832 100644
--- a/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetail.js
+++ b/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetail.js
@@ -1,5 +1,5 @@
 let form, layer, element, table, tableIns;
-let pageNum = 1, pageSize = 15; // 图片定义分页
+let pageNum = 1, pageSize = 30;
 let objParams = {};
 
 function setParams(obj) {
@@ -23,13 +23,15 @@ function setParams(obj) {
                 $('#layui-tab-content>div').eq(1).addClass('layui-show');
             }
         });
+        initSetProData();
         pages(1, 10, 1);
+        element.render();
     });
 }
 
 function pages(pageNum, pageSize, typeNum) {
     let params = getReqParams(pageNum, pageSize, typeNum);
-    let url = dataUrl + "/backstage/proProgress/getList"
+    let url = dataUrl + "/backstage/proProgress/getProProgress"
     ajaxRequest(url, "POST", params, true, function () {
     }, function (result) {
         console.log(result);
@@ -86,47 +88,40 @@ function initTable(dataList, limit, page) {
                         return (page - 1) * limit + d.LAY_NUM;
                     }
                 },
-                {field: "towName", title: "杆塔", width: "25%", unresize: true, align: "center"},
+                {field: "towerName", title: "杆塔", width: "18%", unresize: true, align: "center"},
                 {title: "基础开挖",width: "10%",unresize: true,align: "center",
                     templet: function (d) {
-                        let html = '';
-                        return html;
+                        return setTowerProgress(d.towerProgress,1);
                     }
                 },
-                {title: "基础开挖完成",width: "10%",unresize: true,align: "center",
+                {title: "基础开挖完成",width: "11%",unresize: true,align: "center",
                     templet: function (d) {
-                        let html = '';
-                        return html;
+                        return setTowerProgress(d.towerProgress,2);
                     }
                 },
-                {title: "基础浇筑完成",width: "10%",unresize: true,align: "center",
+                {title: "基础浇筑完成",width: "11%",unresize: true,align: "center",
                     templet: function (d) {
-                        let html = '';
-                        return html;
+                        return setTowerProgress(d.towerProgress,3);
                     }
                 },
-                {title: "铁塔组立",width: "10%",unresize: true,align: "center",
+                {title: "铁塔组立",width: "11%",unresize: true,align: "center",
                     templet: function (d) {
-                        let html = '';
-                        return html;
+                        return setTowerProgress(d.towerProgress,4);
                     }
                 },
-                {title: "铁塔组立完成",width: "10%",unresize: true,align: "center",
+                {title: "铁塔组立完成",width: "11%",unresize: true,align: "center",
                     templet: function (d) {
-                        let html = '';
-                        return html;
+                        return setTowerProgress(d.towerProgress,5);
                     }
                 },
-                {title: "架线施工完成",width: "10%",unresize: true,align: "center",
+                {title: "架线施工完成",width: "11%",unresize: true,align: "center",
                     templet: function (d) {
-                        let html = '';
-                        return html;
+                        return setTowerProgress(d.towerProgress,6);
                     }
                 },
-                {title: "附件安装完成",width: "10%",unresize: true,align: "center",
+                {title: "附件安装完成",width: "11%",unresize: true,align: "center",
                     templet: function (d) {
-                        let html = '';
-                        return html;
+                        return setTowerProgress(d.towerProgress,7);
                     }
                 },
             ],
@@ -149,14 +144,13 @@ function getReqParams(page, limit, type) {
         obj = {
             pageNum: page + "",
             pageSize: limit + "",
-            keyWord: $('#keyWord').val(),
-
+            id: objParams.id
         };
     } else {
         obj = {
             pageNum: '1',
             pageSize: '10',
-            keyWord: '',
+            id: objParams.id
         };
     }
     obj = {
@@ -173,4 +167,27 @@ function query(type) {
         layui.form.render();
     }
     pages(1, limitSize);
+}
+
+function setTowerProgress(value,type){
+    let html = '';
+    value = parseInt(value);
+    if(value >= 1 && type === 1){
+        html = '<img src="../../img/synthesisQuery/num1.png" alt="">'
+    }else if(value >= 2 && type === 2){
+        html = '<img src="../../img/synthesisQuery/num2.png" alt="">'
+    }else if(value >= 3 && type === 3){
+        html = '<img src="../../img/synthesisQuery/num3.png" alt="">'
+    }else if(value >= 4 && type === 4){
+        html = '<img src="../../img/synthesisQuery/num4.png" alt="">'
+    }else if(value >= 5 && type === 5){
+        html = '<img src="../../img/synthesisQuery/num5.png" alt="">'
+    }else if(value >= 6 && type === 6){
+        html = '<img src="../../img/synthesisQuery/num6.png" alt="">'
+    }else if(value >= 7 && type === 7){
+        html = '<img src="../../img/synthesisQuery/num7.png" alt="">'
+    }else {
+        html = '';
+    }
+    return html;
 }
\ No newline at end of file
diff --git a/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetailAjax.js b/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetailAjax.js
index e69de29..4b60ce4 100644
--- a/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetailAjax.js
+++ b/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetailAjax.js
@@ -0,0 +1,44 @@
+// 基本数据赋值
+function initSetProData() {
+    let url = dataUrl + "/backstage/proProgress/detailQuery"
+    let obj = {
+        id: objParams.id,
+        departId:objParams.departId
+    }
+    let params = {
+        encryptedData: encryptCBC(JSON.stringify(obj))
+    }
+    ajaxRequest(url, "POST", params, true, function () {
+    }, function (result) {
+        if (result.status === 200) {
+            setData(result.data);
+        } else {
+            layer.msg(result.msg, {icon: 2})
+        }
+    }, function (xhr) {
+        error(xhr)
+    });
+
+    function setData(obj) {
+        $('.layui-progress').remove();
+        $('#proName').html(obj.proName);
+        $('#companyName').html(obj.companyName);
+        $('#proStatus').html('<span style="color: #51d351;"> ● </span>' + obj.proStatus);
+        $('#voltageLevel').html(obj.voltageLevel);
+        $('#lineLength').html((obj.lineLength ||  '/') + 'km');
+        $('#towerNum').html(obj.towerNum);
+        $('#towerNum2').html(obj.towerNum);
+        $('#planStartTime').html(obj.planStartTime);
+        $('#planEndTime').html(obj.planEndTime);
+        $('#updateTime').html(obj.updateTime);
+        $("#progress").after(`
+             <div class="layui-progress" lay-showpercent="true" lay-filter="demo-filter-progress">
+                 <div class="layui-progress-bar layui-bg-blue" lay-percent="${obj.proProgress}%"></div>
+             </div>
+           `);
+        for (let i = 1; i <= 7 ; i++) {
+            $('#num' + i).html(obj['num' + i]);
+        }
+        element.render();
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/static/js/system/child/userFormTemp.js b/src/main/resources/static/js/system/child/userFormTemp.js
index 541ba0f..8183b7c 100644
--- a/src/main/resources/static/js/system/child/userFormTemp.js
+++ b/src/main/resources/static/js/system/child/userFormTemp.js
@@ -189,6 +189,8 @@ function setFormData(data) {
         }
         $('#orgId').val(data.dept)
         $('#roleId').val(data.roleId)
+        dtree.dataInit("orgId", data.dept);
+        dtree.selectVal("orgId");
         layui.form.render();
     }
 }
diff --git a/src/main/resources/static/pages/synthesisQuery/proProgressUpdateDetail.html b/src/main/resources/static/pages/synthesisQuery/proProgressUpdateDetail.html
index 3bbbcfc..862bedc 100644
--- a/src/main/resources/static/pages/synthesisQuery/proProgressUpdateDetail.html
+++ b/src/main/resources/static/pages/synthesisQuery/proProgressUpdateDetail.html
@@ -21,8 +21,8 @@
         <div class="layout">
             <img src="../../img/synthesisQuery/pro_icon.png" width="48px" height="48px" style="margin-right: 10px;">
             <div class="layout" style="flex-direction: column;">
-                <p style="font-size: 20px;font-weight: bold;color: #666;" id="proName">安全工器具需求计划</p>
-                <p style="font-size: 14px;color: #999;" id="companyName">安全工器具需求计划</p>
+                <p style="font-size: 20px;font-weight: bold;color: #666;" id="proName"></p>
+                <p style="font-size: 14px;color: #999;" id="companyName"></p>
             </div>
         </div>
         <div>
@@ -34,35 +34,34 @@
     <div id="pro-basic-detail-box" class="layout">
         <div class="basic-detail layout">
             <p>项目状态</p>
-            <p><span style="color: #51d351;"> ● </span>在建</p>
+            <p id="proStatus"></p>
         </div>
         <div class="basic-detail layout">
             <p>电压等级</p>
-            <p>110kV</p>
+            <p id="voltageLevel"></p>
         </div>
         <div class="basic-detail layout">
             <p>线路长度</p>
-            <p>121.35 km</p>
+            <p id="lineLength"></p>
         </div>
         <div class="basic-detail layout">
             <p>杆塔数量</p>
-            <p>67</p>
+            <p id="towerNum"></p>
         </div>
         <div class="basic-detail layout">
             <p>项目计划开始时间</p>
-            <p>2022-11-01</p>
+            <p id="planStartTime"></p>
         </div>
         <div class="basic-detail layout">
             <p>项目计划结束时间</p>
-            <p>2023-11-30</p>
+            <p id="planEndTime"></p>
         </div>
         <div class="basic-detail layout">
             <p>最后更新</p>
-            <p>2022-11-25 23:26:08</p>
+            <p id="updateTime"></p>
         </div>
-        <div class="basic-detail layout">
-            <p>项目进度</p>
-            <p></p>
+        <div class="basic-detail">
+            <p id="progress" style="margin: 10px 0 18px 0;">项目进度</p>
         </div>
     </div>
     <div id="data-box">
@@ -77,35 +76,35 @@
                         <div id="gx-num-box" class="layout">
                             <div class="layout num-box">
                                 <p>杆塔数</p>
-                                <p>67</p>
+                                <p id="towerNum2"></p>
                             </div>
                             <div class="layout num-box">
                                 <p>基础开挖</p>
-                                <p>60</p>
+                                <p id="num1">0</p>
                             </div>
                             <div class="layout num-box">
                                 <p>基础开挖完成</p>
-                                <p>60</p>
+                                <p id="num2">0</p>
                             </div>
                             <div class="layout num-box">
                                 <p>基础浇筑完成</p>
-                                <p>60</p>
+                                <p id="num3">0</p>
                             </div>
                             <div class="layout num-box">
                                 <p>铁塔组立</p>
-                                <p>52</p>
+                                <p id="num4">0</p>
                             </div>
                             <div class="layout num-box">
                                 <p>铁塔组立完成</p>
-                                <p>32</p>
+                                <p id="num5">0</p>
                             </div>
                             <div class="layout num-box">
                                 <p>架线施工完成</p>
-                                <p>32</p>
+                                <p id="num6">0</p>
                             </div>
                             <div class="layout num-box">
                                 <p>附件安装完成</p>
-                                <p>12</p>
+                                <p id="num7">0</p>
                             </div>
                         </div>
                         <div class="table-box" table-responsive style="z-index: 1;">