From bb71b47a43244e6db57cbc3cd0223bc5a64023d7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 10:40:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/webapp/views/home/dashboard.html | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 167 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/views/home/dashboard.html b/src/main/webapp/views/home/dashboard.html
index e2b8150..ece7371 100644
--- a/src/main/webapp/views/home/dashboard.html
+++ b/src/main/webapp/views/home/dashboard.html
@@ -47,8 +47,57 @@
<div class="layui-fluid">
<div class="layui-row layui-col-space15">
+ <div class="layui-col-xs12 layui-col-md12" >
+ <div class="layui-card" style="" id="popup1">
+ <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-lg2 text-center">
+ <div class="numberInfoSubTitle testColorBlack">瑙勫垝鐢宠鍗�</div>
+ <div class="numberInfoValue">
+ <a href="#" id="openPlanPendingTasks" style="color: #1E9FFF"><span id="planPendingTaskCount">666</span><em class="numberInfoSuffix">涓�</em></a>
+ </div>
+ </div>
+ <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
+ <div class="numberInfoSubTitle testColorBlack">鏍镐环瀹℃壒</div>
+ <div class="numberInfoValue">
+ <a href="#" id="openPriOnlinePendingTasks" style="color: #1E9FFF"><span id="priOnlinePendingTaskCount">999</span><em class="numberInfoSuffix">涓�</em></a>
+ </div>
+ </div>
+ <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
+ <div class="numberInfoSubTitle testColorBlack">鎶ヤ环瀹℃壒</div>
+ <div class="numberInfoValue">
+ <a href="#" id="openPriQuotePendingTasks" style="color: #1E9FFF"><span id="priQuotePendingTaskCount">777</span><em class="numberInfoSuffix">涓�</em></a>
+ </div>
+ </div>
+ <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
+ <div class="numberInfoSubTitle testColorBlack">鍑哄樊瀹℃壒</div>
+ <div class="numberInfoValue">
+<!-- <a href="#" id="openBusinessTripPendingTasks" style="color: #1E9FFF"><span id="businessTripPendingTaskCount">2333</span><em class="numberInfoSuffix">涓�</em></a>-->
+ <span id="businessTripPendingTaskCount">2333</span><em class="numberInfoSuffix">涓�</em>
+ </div>
+ </div>
+ <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
+ <div class="numberInfoSubTitle testColorBlack">鎶ラ攢瀹℃壒</div>
+ <div class="numberInfoValue">
+ <a href="#" id="openReimburseOnlinePendingTasks" style="color: #1E9FFF"><span id="reimburseOnlinePendingTaskCount">12121</span><em class="numberInfoSuffix">涓�</em></a>
+ </div>
+ </div>
+ <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center">
+ <div class="numberInfoSubTitle testColorBlack">鍙帴鏀舵牳浠蜂换鍔�</div>
+ <div class="numberInfoValue">
+<!-- <a href="#" id="openPlanPriOnlinePendingTasks" style="color: #1E9FFF"><span id="planPriOnlinePendingTaskCount">888</span><em class="numberInfoSuffix">涓�</em></a>-->
+ <span id="planPriOnlinePendingTaskCount">888</span><em class="numberInfoSuffix">涓�</em>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
<div class="layui-col-xs12 layui-col-md8" >
- <div class="layui-card" style="">
+ <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">
@@ -82,53 +131,65 @@
<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="testColorBlack" style="">涓汉鏁版嵁</div>
+ <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center" style="margin-left: 3%">
<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="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center" style="margin-left: 3%">
<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="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center" style="margin-left: 3%">
<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="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center" style="margin-left: 3%">
<div class="numberInfoSubTitle testColorBlack">瀹屾垚鐜�</div>
<div class="numberInfoValue"><span id="personRate">92</span>%</div>
</div>
+ <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center" style="margin-left: 3%">
+ <div class="numberInfoSubTitle testColorBlack">涓汉椤圭洰瀹為檯鏀舵</div>
+ <div class="numberInfoValue">
+ <span id="successMoney2">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
+ </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="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center" style="margin-left: 3%">
<div class="numberInfoSubTitle testColorBlack">璺熻釜椤圭洰鏁伴噺</div>
<div class="numberInfoValue">
<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="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center" style="margin-left: 3%">
<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="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center" style="margin-left: 3%">
<div class="numberInfoSubTitle testColorBlack">鎴愪氦椤圭洰鏁伴噺</div>
<div class="numberInfoValue">
<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="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center" style="margin-left: 3%">
<div class="numberInfoSubTitle testColorBlack">鎴愪氦椤圭洰閲戦</div>
<div class="numberInfoValue">
<span id="successMoney">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
+ </div>
+ </div>
+ <div class="layui-col-xs12 layui-col-sm6 layui-col-lg2 text-center" style="margin-left: 3%">
+ <div class="numberInfoSubTitle testColorBlack">涓汉椤圭洰搴旀敹娆�</div>
+ <div class="numberInfoValue">
+ <span id="successMoney1">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
</div>
</div>
@@ -248,6 +309,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>
@@ -255,6 +333,7 @@
<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;
@@ -292,8 +371,16 @@
$("#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)
+ $("#planPendingTaskCount").text(res.data.planPendingTaskCount)
+ $("#priOnlinePendingTaskCount").text(res.data.priOnlinePendingTaskCount)
+ $("#priQuotePendingTaskCount").text(res.data.priQuotePendingTaskCount)
+ $("#businessTripPendingTaskCount").text(res.data.businessTripPendingTaskCount)
+ $("#reimburseOnlinePendingTaskCount").text(res.data.reimburseOnlinePendingTaskCount)
+ $("#planPriOnlinePendingTaskCount").text(res.data.planPriOnlinePendingTaskCount)
+ $("#successMoney1").text(res.data.successMoney1)
+ $("#successMoney2").text(res.data.successMoney2)
}
});
@@ -480,6 +567,61 @@
}
});
});
+ $("#openPlanPendingTasks").on("click", () => {
+ layer.open({
+ type: 2,
+ title: '瑙勫垝鐢宠鍗�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../plan/plan.html?status=4',
+ success: function(layero, index){
+
+ }
+ });
+ });
+
+ $("#openPriOnlinePendingTasks").on("click", () => {
+ layer.open({
+ type: 2,
+ title: '鏍镐环浠诲姟',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../priOnline2/priOnline.html?status=4',
+ success: function(layero, index){
+
+ }
+ });
+ });
+
+ $("#openPriQuotePendingTasks").on("click", () => {
+ layer.open({
+ type: 2,
+ title: '鎶ヤ环浠诲姟',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../priQuote/priQuote.html?status=4',
+ success: function(layero, index){
+
+ }
+ });
+ });
+
+ $("#openReimburseOnlinePendingTasks").on("click", () => {
+ layer.open({
+ type: 2,
+ title: '鎶ラ攢浠诲姟',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../reimburseOnline/reimburseOnline.html?status=4',
+ success: function(layero, index){
+
+ }
+ });
+ });
$("#openCompanyPost").on("click", () => {
layer.open({
@@ -496,6 +638,20 @@
});
});
+
+ 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