From 0c00fa931e43f13ea5abb88492c6532b174479f2 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 23 Apr 2025 10:46:26 +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=EF=BC=8C=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/backstage/ProProgressMapper.xml   |  5 +-
 .../synthesisQuery/proProgressUpdateDetail.js |  9 ++-
 .../proProgressUpdateDetailAjax.js            | 63 +++++++++++++++++++
 .../proProgressUpdateDetail.html              | 46 +++++++-------
 4 files changed, 94 insertions(+), 29 deletions(-)

diff --git a/src/main/resources/mappers/backstage/ProProgressMapper.xml b/src/main/resources/mappers/backstage/ProProgressMapper.xml
index fd7eb62..fdb3f43 100644
--- a/src/main/resources/mappers/backstage/ProProgressMapper.xml
+++ b/src/main/resources/mappers/backstage/ProProgressMapper.xml
@@ -131,11 +131,12 @@
         SELECT su.user_name AS userName,
                tp.create_time AS updateDate,
                tp.create_time AS updateTime,
-               tp.update_desc AS updateContent,
+               tp.update_desc AS updateDesc,
                tp.finish_progress AS finishProgress
         FROM tb_progress tp
         LEFT JOIN sys_user su ON tp.create_user_id = su.id
-        ORDER BY create_time DESC
+        WHERE tp.pro_id = #{id}
+        ORDER BY tp.create_time DESC
     </select>
     <!--工程进度更新-更新进度-查询更新项目工序数据-->
     <select id="getGxData"
diff --git a/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetail.js b/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetail.js
index 863a832..05482ad 100644
--- a/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetail.js
+++ b/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetail.js
@@ -16,11 +16,14 @@ function setParams(obj) {
                 $('#layui-tab-content>div').eq(0).addClass('layui-show');
                 $('#layui-tab-title li').eq(1).removeClass('layui-this');
                 $('#layui-tab-content>div').eq(1).removeClass('layui-show');
+                initSetProData();
+                query();
             } else if (value === '2') {
                 $('#layui-tab-title li').eq(0).removeClass('layui-this');
                 $('#layui-tab-content>div').eq(0).removeClass('layui-show');
                 $('#layui-tab-title li').eq(1).addClass('layui-this');
                 $('#layui-tab-content>div').eq(1).addClass('layui-show');
+                setUpdateRecord();
             }
         });
         initSetProData();
@@ -160,12 +163,8 @@ function getReqParams(page, limit, type) {
 }
 
 // 查询/重置
-function query(type) {
+function query() {
     pageNum = 1;
-    if (type === 2) {
-        $('#keyWord').val('');
-        layui.form.render();
-    }
     pages(1, limitSize);
 }
 
diff --git a/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetailAjax.js b/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetailAjax.js
index 4b60ce4..bef16ad 100644
--- a/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetailAjax.js
+++ b/src/main/resources/static/js/synthesisQuery/proProgressUpdateDetailAjax.js
@@ -41,4 +41,67 @@ function initSetProData() {
         }
         element.render();
     }
+}
+
+/**更新记录*/
+function setUpdateRecord(){
+    let url = dataUrl + "/backstage/proProgress/updateRecord"
+    let obj = {
+        id: objParams.id
+    }
+    let params = {
+        encryptedData: encryptCBC(JSON.stringify(obj))
+    }
+    let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
+    ajaxRequest(url, "POST", params, true, function () {
+    }, function (result) {
+        layer.close(loadingMsg);
+        if (result.status === 200) {
+            setUpdateRecordInfo(result.data);
+        } else {
+            layer.msg(result.msg, {icon: 2})
+        }
+    }, function (xhr) {
+        layer.close(loadingMsg);
+        error(xhr)
+    });
+    function setUpdateRecordInfo(list, obj) {
+        let html = '';
+        if (list && list.length > 0) {
+            let imgUrl = '../../img/synthesisQuery/user_head_icon.png';
+            let imgUrl2 = '../../img/synthesisQuery/time_icon.png';
+            $.each(list, function (index, item) {
+                html += '<div class="layui-timeline-item">' +
+                    '<i class="layui-icon layui-timeline-axis"></i>' +
+                    '<div class="layui-timeline-content layui-text">' +
+                    '<h3 class="layui-timeline-title">' + item.updateDate + '</h3>' +
+                    '<div class="layui-panel">' +
+                    '<div class="oper-info layout">' +
+                    '<div class="layout">' +
+                    '<img src="' + imgUrl + '">' +
+                    '</div>' +
+                    '<div class="user-oper layout">' +
+                    '<div style="width: 100%">' +
+                    '<span>' + item.userName + '</span>' +
+                    '</div>' +
+                    '<div style="width: 100%">' +
+                    '<span>' + item.updateDesc + '</span>' +
+                    '</div>' +
+                    '<div style="width: 100%">' +
+                    '<img src="' + imgUrl2 + '">' +
+                    '<span style="margin: 0 5px 0 5px;">' + item.updateTime + '</span>' +
+                    '</div>' +
+                    '</div>' +
+                    '<div class="layout">' +
+                    '<span style="margin: 0 5px 0 5px;">完成进度 ' + item.finishProgress + ' % </span>' +
+                    '</div>' +
+                    '</div>' +
+                    '</div>' +
+                    '</div>' +
+                    '</div>';
+            })
+        }
+        console.log(html)
+        $('.layui-timeline').empty().append(html);
+    }
 }
\ No newline at end of file
diff --git a/src/main/resources/static/pages/synthesisQuery/proProgressUpdateDetail.html b/src/main/resources/static/pages/synthesisQuery/proProgressUpdateDetail.html
index 862bedc..834c3f9 100644
--- a/src/main/resources/static/pages/synthesisQuery/proProgressUpdateDetail.html
+++ b/src/main/resources/static/pages/synthesisQuery/proProgressUpdateDetail.html
@@ -114,33 +114,35 @@
                     </div>
                 </div>
                 <div class="layui-tab-item">
-                    <div class="layui-timeline-item">
-                        <i class="layui-icon layui-timeline-axis"></i>
-                        <div class="layui-timeline-content layui-text">
-                            <h3 class="layui-timeline-title">8月18日</h3>
-                            <div class="layui-panel">
-                                <div class="oper-info layout">
-                                    <div class="layout">
-                                        <img src="../../img/synthesisQuery/user_head_icon.png">
-                                    </div>
-                                    <div class="user-oper layout">
-                                        <div style="width: 100%;">
-                                            <span>王天峰</span><span>（13787220576）</span><span>项目管理中心</span>
+                    <div class="layui-timeline">
+                        <!--<div class="layui-timeline-item">
+                            <i class="layui-icon layui-timeline-axis"></i>
+                            <div class="layui-timeline-content layui-text">
+                                <h3 class="layui-timeline-title">8月18日</h3>
+                                <div class="layui-panel">
+                                    <div class="oper-info layout">
+                                        <div class="layout">
+                                            <img src="../../img/synthesisQuery/user_head_icon.png">
                                         </div>
-                                        <div style="width: 100%">
-                                            <span>完结-审核确认通过，共耗时：21小时16分钟 原因备注：无</span>
+                                        <div class="user-oper layout">
+                                            <div style="width: 100%;">
+                                                <span>王天峰</span><span>（13787220576）</span><span>项目管理中心</span>
+                                            </div>
+                                            <div style="width: 100%">
+                                                <span>完结-审核确认通过，共耗时：21小时16分钟 原因备注：无</span>
+                                            </div>
+                                            <div style="width: 100%">
+                                                <img src="../../img/synthesisQuery/time_icon.png">
+                                                <span style="margin: 0 5px 0 5px;">2020-12-23 22:31</span>
+                                            </div>
                                         </div>
-                                        <div style="width: 100%">
-                                            <img src="../../img/synthesisQuery/time_icon.png">
-                                            <span style="margin: 0 5px 0 5px;">2020-12-23 22:31</span>
+                                        <div class="layout">
+                                            <span
+                                                style="margin: 0 5px 0 5px;">2020-12-23 22:31</span>
                                         </div>
                                     </div>
-                                    <div class="layout">
-                                        <img src="../../img/synthesisQuery/time_icon.png"> <span
-                                            style="margin: 0 5px 0 5px;">2020-12-23 22:31</span>
-                                    </div>
                                 </div>
-                            </div>
+                            </div>-->
                         </div>
                     </div>
                 </div>