From 34f99d106551b51bf2af3bbd40c64624a3af25eb Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 09 九月 2023 09:43:57 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/home/dashboard.html |  119 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 98 insertions(+), 21 deletions(-)

diff --git a/src/main/webapp/views/home/dashboard.html b/src/main/webapp/views/home/dashboard.html
index 9c8d6e5..3cd2869 100644
--- a/src/main/webapp/views/home/dashboard.html
+++ b/src/main/webapp/views/home/dashboard.html
@@ -50,51 +50,77 @@
                     <div class="layui-row">
                         <div>鍥㈤槦鏁版嵁</div>
                         <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
-                            <div class="numberInfoSubTitle">鍏ㄥ勾鐩爣</div>
+                            <div class="numberInfoSubTitle">骞村害閿�鍞洰鏍�</div>
                             <div class="numberInfoValue">
-                                <span id="companyYearTarget">124,543,233</span><em class="numberInfoSuffix">鍏�</em>
+                                <span id="companyYearTarget">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
                             </div>
                         </div>
                         <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
-                            <div class="numberInfoSubTitle">宸插畬鎴愪氦鏄�</div>
+                            <div class="numberInfoSubTitle">宸插畬鎴愰攢鍞换鍔�</div>
                             <div class="numberInfoValue">
-                                <span id="companySuccess">124,543,233</span><em class="numberInfoSuffix">鍏�</em>
+                                <span id="companySuccess">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
                             </div>
                         </div>
                         <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
-                            <div class="numberInfoSubTitle">鏈畬鎴愪氦鏄�</div>
+                            <div class="numberInfoSubTitle">鏈畬鎴愰攢鍞换鍔�</div>
                             <div class="numberInfoValue">
-                                <span id="companyProgress">124,543,233</span><em class="numberInfoSuffix">鍏�</em>
+                                <span id="companyProgress">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
                             </div>
                         </div>
                         <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
-                            <div class="numberInfoSubTitle">浜ゆ槗鐜�</div>
+                            <div class="numberInfoSubTitle">瀹屾垚鐜�</div>
                             <div class="numberInfoValue"><span id="companyRate">92</span>%</div>
                         </div>
                     </div>
                     <div class="layui-row" style="margin-top: 50px;">
                         <div>涓汉鏁版嵁</div>
                         <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
-                            <div class="numberInfoSubTitle">鍏ㄥ勾鐩爣</div>
+                            <div class="numberInfoSubTitle">骞村害閿�鍞洰鏍�</div>
                             <div class="numberInfoValue">
-                                <span id="personYearTarget">124,543,233</span><em class="numberInfoSuffix">鍏�</em>
+                                <span id="personYearTarget">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
                             </div>
                         </div>
                         <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
-                            <div class="numberInfoSubTitle">宸插畬鎴愪氦鏄�</div>
+                            <div class="numberInfoSubTitle">宸插畬鎴愰攢鍞换鍔�</div>
                             <div class="numberInfoValue">
-                                <span id="personSuccess">124,543,233</span><em class="numberInfoSuffix">鍏�</em>
+                                <span id="personSuccess">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
                             </div>
                         </div>
                         <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
-                            <div class="numberInfoSubTitle">鏈畬鎴愪氦鏄�</div>
+                            <div class="numberInfoSubTitle">鏈畬鎴愰攢鍞换鍔�</div>
                             <div class="numberInfoValue">
-                                <span id="personProgress">124,543,233</span><em class="numberInfoSuffix">鍏�</em>
+                                <span id="personProgress">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
                             </div>
                         </div>
                         <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
-                            <div class="numberInfoSubTitle">浜ゆ槗鐜�</div>
+                            <div class="numberInfoSubTitle">瀹屾垚鐜�</div>
                             <div class="numberInfoValue"><span id="personRate">92</span>%</div>
+                        </div>
+                    </div>
+                    <div class="layui-row" style="margin-top: 40px;">
+                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
+                            <div class="numberInfoSubTitle">璺熻釜椤圭洰鏁伴噺</div>
+                            <div class="numberInfoValue">
+                                <a href="#" id="openProgress"><span id="progressCount">124</span><em class="numberInfoSuffix">涓�</em></a>
+                            </div>
+                        </div>
+                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
+                            <div class="numberInfoSubTitle">閲戦</div>
+                            <div class="numberInfoValue">
+                                <span id="progressMoney">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
+                            </div>
+                        </div>
+                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
+                            <div class="numberInfoSubTitle">鎴愪氦椤圭洰鏁伴噺</div>
+                            <div class="numberInfoValue">
+                                <a href="#" id="openSuccess"><span id="successCount">121</span><em class="numberInfoSuffix">涓�</em></a>
+                            </div>
+                        </div>
+                        <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
+                            <div class="numberInfoSubTitle">閲戦</div>
+                            <div class="numberInfoValue">
+                                <span id="successMoney">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -102,8 +128,11 @@
         </div>
 
         <div class="layui-col-xs12 layui-col-md4">
-            <div class="layui-card" style="height: 299px;overflow: hidden;">
-                <div class="layui-card-header">鍏徃鍏憡</div>
+            <div class="layui-card" style="height: 403px;overflow: hidden;">
+                <div class="layui-card-header" style="display: flex;justify-content: space-between;">
+                    <div>鍏徃鍏憡</div>
+                    <div><a href="#" id="openCompanyPost">鏌ョ湅鏇村</a></div>
+                </div>
                 <div class="layui-card-body" id="companyPostId">
                 </div>
             </div>
@@ -133,7 +162,7 @@
                                             </colgroup>
                                             <thead>
                                             <tr style="background: none;color: #333;">
-                                                <th colspan="3">鍛樺伐浜ゆ槗棰濇帓琛�</th>
+                                                <th colspan="3">鍛樺伐閿�鍞笟缁╂帓琛�</th>
                                             </tr>
                                             </thead>
                                             <tbody id="staffRankId">
@@ -222,6 +251,7 @@
         var $ = layui.jquery;
         var layer = layui.layer;
         var element = layui.element;
+        element.init();
 
         //鑾峰彇鍥㈤槦鏁版嵁
         $.ajax({
@@ -252,6 +282,10 @@
                 $("#personSuccess").text(res.data.successMoney)
                 $("#personProgress").text(res.data.progressMoney)
                 $("#personRate").text(res.data.yearTransactionRate)
+                $("#progressCount").text(res.data.progressCount)
+                $("#successCount").text(res.data.successCount)
+                $("#progressMoney").text(res.data.progressMoney)
+                $("#successMoney").text(res.data.successMoney)
             }
         });
 
@@ -274,7 +308,7 @@
                     }
 
                     div += "<td>" + data[i].username + "</td>"
-                    div += "<td>" + data[i].money + "</td>"
+                    div += "<td>" + data[i].money + "涓囧厓</td>"
                     div += "</tr>"
 
                     $("#staffRankId").append(div)
@@ -293,9 +327,10 @@
             success: function (res) {
                 let data = res.data.records
                 for (var i = 0; i < data.length; i++) {
-                    let div = "<div style='margin-top: 10px;'>";
-                    div += '<span class="layui-badge-dot layui-bg-green" style="margin-right: 10px;"></span>'
-                    div += data[i].content
+                    let div = "<div style='margin-top: 10px;display: flex;justify-content: space-between;'>";
+                    div += '<div><span class="layui-badge-dot layui-bg-green" style="margin-right: 10px;"></span>'
+                    div += data[i].content + "</div>"
+                    div += "<div>" + data[i].createTime$ + "</div>"
                     div += "</div>"
 
                     $("#companyPostId").append(div)
@@ -388,6 +423,48 @@
             myCharts3.resize();
         };
 
+        $("#openProgress").on("click", () => {
+            layer.open({
+                type: 2,
+                title: '璺熻釜椤圭洰',
+                maxmin: true,
+                area: [top.detailWidth, top.detailHeight],
+                shadeClose: true,
+                content: '../order/order.html?status=0',
+                success: function(layero, index){
+
+                }
+            });
+        });
+
+        $("#openSuccess").on("click", () => {
+            layer.open({
+                type: 2,
+                title: '璺熻釜椤圭洰',
+                maxmin: true,
+                area: [top.detailWidth, top.detailHeight],
+                shadeClose: true,
+                content: '../order/order.html?status=1',
+                success: function(layero, index){
+
+                }
+            });
+        });
+
+        $("#openCompanyPost").on("click", () => {
+            layer.open({
+                type: 2,
+                title: '鍏憡',
+                maxmin: true,
+                area: [top.detailWidth, top.detailHeight],
+                shadeClose: true,
+                content: '../companyPost/companyPost_view.html',
+                success: function(layero, index){
+
+                }
+            });
+        });
+
     });
 </script>
 </body>

--
Gitblit v1.9.1