From af27c7e07d7717d25ef06d4a4ae9e56ea184116a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 09 九月 2023 14:20:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/webapp/views/home/dashboard.html | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/views/home/dashboard.html b/src/main/webapp/views/home/dashboard.html
index 3cd2869..fd45064 100644
--- a/src/main/webapp/views/home/dashboard.html
+++ b/src/main/webapp/views/home/dashboard.html
@@ -45,7 +45,7 @@
<div class="layui-col-xs12 layui-col-md8">
<div class="layui-card" style="">
- <div class="layui-card-header">娲诲姩瀹炴椂浜ゆ槗鎯呭喌</div>
+ <div class="layui-card-header">鍥㈤槦娲诲姩瀹炴椂浜ゆ槗鎯呭喌</div>
<div class="layui-card-body" style="padding-bottom: 20px;">
<div class="layui-row">
<div>鍥㈤槦鏁版嵁</div>
@@ -72,7 +72,12 @@
<div class="numberInfoValue"><span id="companyRate">92</span>%</div>
</div>
</div>
- <div class="layui-row" style="margin-top: 50px;">
+ </div>
+ </div>
+ <div class="layui-card" style="">
+ <div class="layui-card-header">瀹炴椂閿�鍞儏鍐�</div>
+ <div class="layui-card-body" style="padding-bottom: 20px;">
+ <div class="layui-row">
<div>涓汉鏁版嵁</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
<div class="numberInfoSubTitle">骞村害閿�鍞洰鏍�</div>
@@ -101,11 +106,11 @@
<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>
+ <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">璺熻釜椤圭洰閲戦</div>
<div class="numberInfoValue">
<span id="progressMoney">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
@@ -113,11 +118,11 @@
<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>
+ <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">鎴愪氦椤圭洰閲戦</div>
<div class="numberInfoValue">
<span id="successMoney">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
@@ -131,7 +136,7 @@
<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><a href="#" id="openCompanyPost" style="color: #1E9FFF">鏌ョ湅鏇村>></a></div>
</div>
<div class="layui-card-body" id="companyPostId">
</div>
@@ -144,7 +149,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">
@@ -162,7 +167,7 @@
</colgroup>
<thead>
<tr style="background: none;color: #333;">
- <th colspan="3">鍛樺伐閿�鍞笟缁╂帓琛�</th>
+ <th colspan="3">閿�鍞笟缁╂帓琛屾</th>
</tr>
</thead>
<tbody id="staffRankId">
@@ -186,7 +191,7 @@
</colgroup>
<thead>
<tr style="background: none;color: #333;">
- <th colspan="3">鍛樺伐閿�鍞鎺掕</th>
+ <th colspan="3">閿�鍞笟缁╂帓琛屾</th>
</tr>
</thead>
<tbody>
@@ -327,11 +332,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)
}
--
Gitblit v1.9.1