From 3cd212f29c71413108ab7a6b6285a0f7e1f049c1 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 20 Jan 2025 15:33:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/welcome.css                             |  9 +++++----
 js/welcome/data_datail_pro_list.js          |  3 +++
 js/welcome/welcome_ajax.js                  |  4 ++--
 js/welcome/welcome_echarts.js               | 18 +++++++++---------
 page/car_basic/framework_contract_list.html |  2 +-
 page/welcome/welcome-1.html                 |  4 ++--
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/css/welcome.css b/css/welcome.css
index 680eb2a..3914177 100644
--- a/css/welcome.css
+++ b/css/welcome.css
@@ -207,26 +207,27 @@ body {
     width: 226px !important;
     height: 120px !important;
     align-items: start;
-    justify-content: space-evenly;
+    justify-content: start;
     cursor: pointer;
 }
 
 .data-info {
-    margin: 20px 40px 0 0;
+    margin: 20px 0 0 0;
 }
 
 .data-img {
-    margin: 20px 0 0 0;
+    margin: 20px 10px 0 10px;
 }
 
 .data-detail p {
     letter-spacing: 1px;
     font-size: 14px;
     color: #fff;
+    margin-bottom: 5px;
 }
 
 .data-detail p:nth-child(2) {
-    font-size: 28px;
+    font-size: 22px;
     font-weight: bold;
 }
 
diff --git a/js/welcome/data_datail_pro_list.js b/js/welcome/data_datail_pro_list.js
index 5ce8829..49cffdd 100644
--- a/js/welcome/data_datail_pro_list.js
+++ b/js/welcome/data_datail_pro_list.js
@@ -174,6 +174,9 @@ function initTable() {
           unresize: true,
           align: "center",
           sort:true,
+          templet: function (d) {
+            return '<span>¥ ' + d.money + '</span>'
+          },
         },
         {
           field: "companyName",
diff --git a/js/welcome/welcome_ajax.js b/js/welcome/welcome_ajax.js
index d1166a0..c15dfb8 100644
--- a/js/welcome/welcome_ajax.js
+++ b/js/welcome/welcome_ajax.js
@@ -33,9 +33,9 @@ function getDataPreviewData() {
         $('#noDispatchCarNum').html(obj.noDispatchCarNum);
         $('#craneNum').html(obj.craneNum);
         $('#noDispatchCraneNum').html(obj.noDispatchCraneNum);
-        $('#payMoney').html(obj.payMoney);
+        $('#payMoney').html('¥ ' + obj.payMoney);
         $('#payPlanNum').html(obj.payPlanNum);
-        $('#estimateMoney').html(obj.estimateMoney);
+        $('#estimateMoney').html('¥ ' + obj.estimateMoney);
         $('#estimatePlanNum').html(obj.estimatePlanNum);
     }
 }
diff --git a/js/welcome/welcome_echarts.js b/js/welcome/welcome_echarts.js
index 974488a..24f82bc 100644
--- a/js/welcome/welcome_echarts.js
+++ b/js/welcome/welcome_echarts.js
@@ -18,7 +18,7 @@ function initOneCharts(list) {
     const yName = ''; // y轴名称
     const unit = '辆';
     /* 颜色 */
-    const colorList = ['rgba(57, 126, 240, 1)', 'rgba(250, 173, 20, 1)']; // 主颜色系
+    const colorList = ['#397ef0', '#ff9900']; // 主颜色系
     const areaColorList = [
         {
             type: 'linear',
@@ -29,7 +29,7 @@ function initOneCharts(list) {
             colorStops: [
                 {
                     offset: 0,
-                    color: 'rgba(0, 117, 255, 0.3)' // 0% 处的颜色
+                    color: '#397ef030' // 0% 处的颜色
                 },
                 {
                     offset: 1,
@@ -47,7 +47,7 @@ function initOneCharts(list) {
             colorStops: [
                 {
                     offset: 0,
-                    color: 'rgba(255, 175, 20, 0.3)' // 0% 处的颜色
+                    color: '#ff990030' // 0% 处的颜色
                 },
                 {
                     offset: 1,
@@ -90,7 +90,7 @@ function initOneCharts(list) {
                             },
                             b: {
                                 fontSize: 14,
-                                color: '#ffe58f',
+                                color: '#ff9900',
                                 fontFamily: fontFamily,
                                 padding: [2, 2, 0, 2]
                             }
@@ -112,7 +112,7 @@ function initOneCharts(list) {
                                 },
                                 b: {
                                     fontSize: 14,
-                                    color: '#ffe58f',
+                                    color: '#ff9900',
                                     fontFamily: fontFamily,
                                     padding: [2, 2, 0, 2]
                                 }
@@ -155,7 +155,7 @@ function initOneCharts(list) {
                             },
                             b: {
                                 fontSize: 14,
-                                color: '#ffe58f',
+                                color: '#ff9900',
                                 fontFamily: fontFamily,
                                 padding: [4, 2, 0, 2]
                             }
@@ -177,7 +177,7 @@ function initOneCharts(list) {
                                 },
                                 b: {
                                     fontSize: 14,
-                                    color: '#ffe58f',
+                                    color: '#ff9900',
                                     fontFamily: fontFamily,
                                     padding: [4, 2, 0, 2]
                                 }
@@ -266,7 +266,7 @@ function initOneCharts(list) {
                     rich: {
                         b: {
                             fontSize: 14,
-                            color: '#ffe58f',
+                            color: '#ff9900',
                             fontFamily: fontFamily,
                             padding: [4, 2, 0, 2]
                         }
@@ -282,7 +282,7 @@ function initOneCharts(list) {
                         rich: {
                             b: {
                                 fontSize: 14,
-                                color: '#ffe58f',
+                                color: '#ff9900',
                                 fontFamily: fontFamily,
                                 padding: [4, 2, 0, 2]
                             }
diff --git a/page/car_basic/framework_contract_list.html b/page/car_basic/framework_contract_list.html
index e0ab8e8..5414e51 100644
--- a/page/car_basic/framework_contract_list.html
+++ b/page/car_basic/framework_contract_list.html
@@ -55,7 +55,7 @@
                             <div class="layui-inline">
                                 <div class="layui-input-inline" style="width: 200px;">
                                     <select class="layui-select" id="status">
-                                        <option value="">请选择状态</option>
+                                        <option value="">请选择合同状态</option>
                                         <option value="0">生效</option>
                                         <option value="1">失效</option>
                                     </select>
diff --git a/page/welcome/welcome-1.html b/page/welcome/welcome-1.html
index 9b1839d..13f3208 100644
--- a/page/welcome/welcome-1.html
+++ b/page/welcome/welcome-1.html
@@ -78,7 +78,7 @@
                     <div class="data-img"><img src="../../images/welcome/data_view_5.png" alt=""></div>
                     <div class="data-info">
                         <p>已付款金额</p>
-                        <p id="payMoney">0</p>
+                        <p id="payMoney">¥ 0</p>
                         <p>需求计划<span id="payPlanNum">0</span>条</p>
                     </div>
                 </div>
@@ -86,7 +86,7 @@
                     <div class="data-img"><img src="../../images/welcome/data_view_6.png" alt=""></div>
                     <div class="data-info">
                         <p>待付款金额</p>
-                        <p id="estimateMoney">0</p>
+                        <p id="estimateMoney">¥ 0</p>
                         <p>需求计划<span id="estimatePlanNum">0</span>个</p>
                     </div>
                 </div>