From dda5c81dbf88549ade7aaaf352a261c7d638f045 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 10 十月 2023 10:23:11 +0800
Subject: [PATCH] #回退流程相关

---
 src/main/webapp/views/home/dashboard.html |  178 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 143 insertions(+), 35 deletions(-)

diff --git a/src/main/webapp/views/home/dashboard.html b/src/main/webapp/views/home/dashboard.html
index fa9efb8..1ab25a8 100644
--- a/src/main/webapp/views/home/dashboard.html
+++ b/src/main/webapp/views/home/dashboard.html
@@ -34,6 +34,10 @@
             margin-left: 4px;
             line-height: 32px;
         }
+
+        .testColorBlack{
+            color: black;
+        }
     </style>
 </head>
 
@@ -43,81 +47,86 @@
 <div class="layui-fluid">
     <div class="layui-row layui-col-space15">
 
-        <div class="layui-col-xs12 layui-col-md8">
-            <div class="layui-card" style="">
-                <div class="layui-card-header">娲诲姩瀹炴椂浜ゆ槗鎯呭喌</div>
-                <div class="layui-card-body" style="padding-bottom: 20px;">
+        <div class="layui-col-xs12 layui-col-md8" >
+            <div class="layui-card" style="" id="popup">
+                <div class="layui-card-header testColorBlack" style="background-color: #FFFA1C1C">鍥㈤槦娲诲姩瀹炴椂浜ゆ槗鎯呭喌</div>
+                <div class="layui-card-body" style="padding-bottom: 20px;background-color: #FFC6A02D">
                     <div class="layui-row">
-                        <div>鍥㈤槦鏁版嵁</div>
+                        <div class="testColorBlack">鍥㈤槦鏁版嵁</div>
                         <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
-                            <div class="numberInfoSubTitle">骞村害閿�鍞洰鏍�</div>
+                            <div class="numberInfoSubTitle testColorBlack" >骞村害閿�鍞洰鏍�</div>
                             <div class="numberInfoValue">
                                 <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 testColorBlack">宸插畬鎴愰攢鍞换鍔�</div>
                             <div class="numberInfoValue">
                                 <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 testColorBlack">鏈畬鎴愰攢鍞换鍔�</div>
                             <div class="numberInfoValue">
                                 <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 testColorBlack">瀹屾垚鐜�</div>
                             <div class="numberInfoValue"><span id="companyRate">92</span>%</div>
                         </div>
                     </div>
-                    <div class="layui-row" style="margin-top: 50px;">
-                        <div>涓汉鏁版嵁</div>
+                </div>
+            </div>
+            <div class="layui-card" style="background-color: #ffffff">
+                <div class="layui-card-header testColorBlack" style="background-color: #FFFA1C1C">瀹炴椂閿�鍞儏鍐�</div>
+                <div class="layui-card-body" style="padding-bottom: 20px;background-color: #FFC6A02D">
+                    <div class="layui-row">
+                        <div class="testColorBlack">涓汉鏁版嵁</div>
                         <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
-                            <div class="numberInfoSubTitle">骞村害閿�鍞洰鏍�</div>
+                            <div class="numberInfoSubTitle testColorBlack">骞村害閿�鍞洰鏍�</div>
                             <div class="numberInfoValue">
                                 <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 testColorBlack">宸插畬鎴愰攢鍞换鍔�</div>
                             <div class="numberInfoValue">
                                 <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 testColorBlack">鏈畬鎴愰攢鍞换鍔�</div>
                             <div class="numberInfoValue">
                                 <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 testColorBlack">瀹屾垚鐜�</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="numberInfoSubTitle testColorBlack">璺熻釜椤圭洰鏁伴噺</div>
                             <div class="numberInfoValue">
-                                <span id="progressCount">124</span><em class="numberInfoSuffix">涓�</em>
+                                <a href="#" id="openProgress" style="color: #1E9FFF"><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="numberInfoSubTitle testColorBlack">璺熻釜椤圭洰閲戦</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="numberInfoSubTitle testColorBlack">鎴愪氦椤圭洰鏁伴噺</div>
                             <div class="numberInfoValue">
-                                <span id="successCount">121</span><em class="numberInfoSuffix">涓�</em>
+                                <a href="#" id="openSuccess" style="color: #1E9FFF"><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="numberInfoSubTitle testColorBlack">鎴愪氦椤圭洰閲戦</div>
                             <div class="numberInfoValue">
                                 <span id="successMoney">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
                             </div>
@@ -128,12 +137,14 @@
         </div>
 
         <div class="layui-col-xs12 layui-col-md4">
-            <div class="layui-card" style="height: 403px;overflow: hidden;">
-                <div class="layui-card-header">鍏徃鍏憡</div>
-                <div class="layui-card-body" id="companyPostId">
+            <div class="layui-card" style="height: 403px;overflow: hidden;background-color: #FFFA1C1C;height: 438px">
+                <div class="layui-card-header" style="display: flex;justify-content: space-between;">
+                    <div>鍏徃鍏憡</div>
+                    <div><a href="#" id="openCompanyPost" style="color: #1E9FFF">鏌ョ湅鏇村>></a></div>
+                </div>
+                <div class="layui-card-body" id="companyPostId" style="background-color: #FFC6A02D">
                 </div>
             </div>
-
         </div>
 
         <div class="layui-col-xs12">
@@ -141,7 +152,7 @@
                 <div class="layui-card-body">
                     <div class="layui-tab layui-tab-brief" lay-filter="tabZZT">
                         <ul class="layui-tab-title">
-                            <li class="layui-this">浜ゆ槗棰�</li>
+                            <li class="layui-this">閿�鍞</li>
 <!--                            <li>璁块棶閲�</li>-->
                         </ul>
                         <div class="layui-tab-content">
@@ -159,7 +170,7 @@
                                             </colgroup>
                                             <thead>
                                             <tr style="background: none;color: #333;">
-                                                <th colspan="3">鍛樺伐浜ゆ槗棰濇帓琛�</th>
+                                                <th colspan="3">閿�鍞笟缁╂帓琛屾</th>
                                             </tr>
                                             </thead>
                                             <tbody id="staffRankId">
@@ -183,7 +194,7 @@
                                             </colgroup>
                                             <thead>
                                             <tr style="background: none;color: #333;">
-                                                <th colspan="3">鍛樺伐閿�鍞鎺掕</th>
+                                                <th colspan="3">閿�鍞笟缁╂帓琛屾</th>
                                             </tr>
                                             </thead>
                                             <tbody>
@@ -237,6 +248,23 @@
 
 </div>
 
+
+<script>
+    // 鏄剧ず鍥㈤槦鏁版嵁
+    function showPopup(res) {
+        if (res==="true"){
+            document.getElementById('popup').style.display = 'block';
+        }else {
+            // 闅愯棌鍥㈤槦鏁版嵁
+            document.getElementById('popup').style.display = 'none';
+        }
+    }
+    // 闅愯棌鍥㈤槦鏁版嵁
+    function hidePopup() {
+        document.getElementById('popup').style.display = 'none';
+    }
+</script>
+
 <!-- js閮ㄥ垎 -->
 <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
@@ -244,10 +272,12 @@
 <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
 
 <script>
+    f()
     layui.use(['layer', 'element'], function () {
         var $ = layui.jquery;
         var layer = layui.layer;
         var element = layui.element;
+        element.init();
 
         //鑾峰彇鍥㈤槦鏁版嵁
         $.ajax({
@@ -280,7 +310,7 @@
                 $("#personRate").text(res.data.yearTransactionRate)
                 $("#progressCount").text(res.data.progressCount)
                 $("#successCount").text(res.data.successCount)
-                $("#progressMoney").text(res.data.progressMoney)
+                $("#progressMoney").text(res.data.progressMoney2)
                 $("#successMoney").text(res.data.successMoney)
             }
         });
@@ -296,7 +326,16 @@
             success: function (res) {
                 let data = res.data
                 for (var i = 0; i < data.length; i++) {
-                    let div = "<tr>";
+                    let div = "";
+                    if (i==0){
+                        div += "<tr style='color: red'>";
+                    }else if (i==1){
+                        div += "<tr style='color: blueviolet'>";
+                    }else if (i==2){
+                        div += "<tr style='color: #0181ee'>";
+                    }else {
+                        div += "<tr>";
+                    }
                     if (i < 3) {
                         div += "<td><span class='layui-badge layui-bg-cyan'>" + (i+1) + "</span></td>"
                     }else {
@@ -304,7 +343,7 @@
                     }
 
                     div += "<td>" + data[i].username + "</td>"
-                    div += "<td>" + data[i].money + "</td>"
+                    div += "<td>" + data[i].money + "涓囧厓</td>"
                     div += "</tr>"
 
                     $("#staffRankId").append(div)
@@ -323,11 +362,24 @@
             success: function (res) {
                 let data = res.data.records
                 for (var i = 0; i < data.length; i++) {
+                    // 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].updateTime$ + "</div>"
+                    // div += "</div>"
                     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>"
+
+                    div += "<div style='width: 79%;'>";
+                    div += "<span class='layui-badge-dot layui-bg-green' style='margin-right: 10px;'></span>";
+                    div += data[i].content;
+                    div += "</div>";
+
+                    div += "<div style='width: 19%;'>";
+                    div += data[i].updateTime$;
+                    div += "</div>";
+
+                    div += "</div>";
+
 
                     $("#companyPostId").append(div)
                 }
@@ -419,7 +471,63 @@
             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){
+
+                }
+            });
+        });
+
     });
+
+    function f() {
+        let token = localStorage.getItem("token");
+        layui.jquery.ajax({
+            url: baseUrl + "/dashboard/popup/auth",
+            data:{token : token},
+            method: 'GET',
+            success: function (res) {
+                if (res.code === 200) {
+                    showPopup(res.msg)
+                }
+            }
+        })
+    }
 </script>
 </body>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1