up

src/layout/components/Sidebar/Logo.vue

@@ -36,7 +36,7 @@
     transition: opacity 1.5s;
   }
   .sidebar-name-logo {
-    width: 120px;
+    width: 145px;
     object-fit: contain;
   }
 

src/styles/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4177958 */
-  src: url('iconfont.woff2?t=1692580947552') format('woff2'),
-       url('iconfont.woff?t=1692580947552') format('woff'),
-       url('iconfont.ttf?t=1692580947552') format('truetype');
+  src: url('iconfont.woff2?t=1693291418015') format('woff2'),
+       url('iconfont.woff?t=1693291418015') format('woff'),
+       url('iconfont.ttf?t=1693291418015') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,186 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-bangongguanli:before {
+  content: "\e602";
+}
+
+.icon-caiwuguanli:before {
+  content: "\e603";
+}
+
+.icon-banshidating:before {
+  content: "\e605";
+}
+
+.icon-gongchengguanli:before {
+  content: "\e607";
+}
+
+.icon-caiwuguanli1:before {
+  content: "\e60a";
+}
+
+.icon-gongchengguanli1:before {
+  content: "\e60b";
+}
+
+.icon-jihuaguanli:before {
+  content: "\e60c";
+}
+
+.icon-jingyingguanli1:before {
+  content: "\e60d";
+}
+
+.icon-renwuzhongxin:before {
+  content: "\e60e";
+}
+
+.icon-renshiguanli:before {
+  content: "\e60f";
+}
+
+.icon-jihuaguanli1:before {
+  content: "\e610";
+}
+
+.icon-qiyemenhu:before {
+  content: "\e611";
+}
+
+.icon-tudangguanli:before {
+  content: "\e612";
+}
+
+.icon-renwuzhongxin1:before {
+  content: "\e613";
+}
+
+.icon-tudangguanli1:before {
+  content: "\e615";
+}
+
+.icon-shejishengchan:before {
+  content: "\e616";
+}
+
+.icon-tongjichaxun:before {
+  content: "\e617";
+}
+
+.icon-zhishizhongxin:before {
+  content: "\e618";
+}
+
+.icon-jingyingguanli2:before {
+  content: "\e619";
+}
+
+.icon-banshidating1:before {
+  content: "\e61a";
+}
+
+.icon-zhishizhongxin1:before {
+  content: "\e61b";
+}
+
+.icon-shejishengchan1:before {
+  content: "\e61c";
+}
+
+.icon-qiyemenhu1:before {
+  content: "\e61d";
+}
+
+.icon-bumenchuruguanli:before {
+  content: "\e74d";
+}
+
+.icon-danganguanli:before {
+  content: "\e74f";
+}
+
+.icon-churuguanli:before {
+  content: "\e750";
+}
+
+.icon-erweimaxungeng:before {
+  content: "\e751";
+}
+
+.icon-lajiguanli-3:before {
+  content: "\e752";
+}
+
+.icon-neibugongwuyongche:before {
+  content: "\e754";
+}
+
+.icon-peixunguanli-1:before {
+  content: "\e755";
+}
+
+.icon-wenshidujiance:before {
+  content: "\e757";
+}
+
+.icon-wenyinguanli:before {
+  content: "\e758";
+}
+
+.icon-wenjuantiaocha-1:before {
+  content: "\e759";
+}
+
+.icon-yinzhangguanli:before {
+  content: "\e75a";
+}
+
+.icon-yingsuguanli:before {
+  content: "\e75b";
+}
+
+.icon-zichanguanli:before {
+  content: "\e75c";
+}
+
+.icon-a-bianzu5:before {
+  content: "\e75d";
+}
+
+.icon-gongzuotai:before {
+  content: "\e75e";
+}
+
+.icon-shujufenxi:before {
+  content: "\e75f";
+}
+
+.icon-hetongguanli:before {
+  content: "\e760";
+}
+
+.icon-shizhongshihouguanli:before {
+  content: "\e761";
+}
+
+.icon-tuichu:before {
+  content: "\e762";
+}
+
+.icon-xiangmuzonglan:before {
+  content: "\e763";
+}
+
+.icon-zaitanxiangmuku:before {
+  content: "\e764";
+}
+
+.icon-xitongshezhi:before {
+  content: "\e765";
+}
+
 .icon-ditu:before {
   content: "\e608";
 }

src/views/component/map.vue

@@ -805,6 +805,7 @@ $staticsHeight: 60px;
     &__num {
       font-weight: 600;
       line-height: 1.5;
+      font-size: 22px;
     }
 
     &::after {

src/views/dashboard/components/PanelGroup.vue

@@ -3,11 +3,11 @@
     <div class="boxlist">
       <div class="box box1">
         <div class="boxtitle">
-          <span>营业统计</span>
+          <span>经营统计</span>
           <i class="el-icon-data-line statIcon"></i>
         </div>
         <div class="bline"></div>
-        <div class="boxcontentsubtitle">服务金额</div>
+        <div class="boxcontentsubtitle">总计</div>
         <div class="boxcontent">
           <div class="boxcontentitem">
             <div class="boxcontentitem-big">
@@ -16,11 +16,11 @@
             <div style="display: flex;justify-content: space-around;">
               <div class="boxcontentitem-small">
                 <span>{{totaldata.business.nurse_money_total}}</span>
-                <span>护工金额</span>
+                <span>房产租赁金额</span>
               </div>
               <div class="boxcontentitem-small">
                 <span>{{totaldata.business.remain_money_total}}</span>
-                <span>留存金额</span>
+                <span>土地租赁金额</span>
               </div>
             </div>
           </div>
@@ -30,26 +30,26 @@
       <div class="box box2">
         <div class="boxtitle">
 
-          <span>人效统计</span>
+          <span>房产统计</span>
           <i class="el-icon-user statIcon"></i>
         </div>
         <div class="bline"></div>
-        <div class="boxcontentsubtitle">总服务时长</div>
+        <div class="boxcontentsubtitle">总计</div>
         <div class="boxcontent">
           <div class="boxcontentitem">
             <div class="boxcontentitem-big">
               {{totaldata.person_efficiency.server_time_total}}
-              分钟
+
             </div>
             <div style="display: flex;justify-content: space-around;">
               <div class="boxcontentitem-small">
 
                 <span>{{totaldata.person_efficiency.expect}}</span>
-                <span> 照护人员数</span>
+                <span>出租</span>
               </div>
               <div class="boxcontentitem-small">
                 <span>{{totaldata.person_efficiency.act}} </span>
-                <span>天数</span>
+                <span>闲置</span>
               </div>
             </div>
           </div>
@@ -58,24 +58,24 @@
 
       <div class="box box3">
         <div class="boxtitle">
-          <span>客户统计</span>
+          <span>土地统计</span>
           <i class="el-icon-s-custom statIcon"></i>
         </div>
         <div class="bline"></div>
-        <div class="boxcontentsubtitle">活跃客户</div>
+        <div class="boxcontentsubtitle">总计</div>
         <div class="boxcontent">
           <div class="boxcontentitem">
             <div class="boxcontentitem-big">
-              {{totaldata.customer.active}}人
+              {{totaldata.customer.active}}
             </div>
             <div style="display: flex;justify-content: space-around;">
               <div class="boxcontentitem-small">
                 <span>{{totaldata.customer.add}}</span>
-                <span>新增</span>
+                <span>出租</span>
               </div>
               <div class="boxcontentitem-small">
                 <span>{{totaldata.customer.wash}}</span>
-                <span>流失</span>
+                <span>闲置</span>
               </div>
             </div>
           </div>
@@ -85,23 +85,23 @@
       <div class="box box4">
         <div class="boxtitle">
 
-          <span>订单统计</span>
+          <span>合同统计</span>
           <i class="el-icon-document statIcon"></i>
         </div>
         <div class="bline"></div>
-        <div class="boxcontentsubtitle">服务订单</div>
+        <div class="boxcontentsubtitle">总计</div>
         <div class="boxcontent">
           <div class="boxcontentitem">
-            <div class="boxcontentitem-big">{{totaldata.order.server_total}}单
+            <div class="boxcontentitem-big">{{totaldata.order.server_total}}
             </div>
             <div style="display: flex;justify-content: space-around;">
               <div class="boxcontentitem-small">
                 <span>{{totaldata.order.cycle_total}}</span>
-                <span>周期性订单</span>
+                <span>即将到期</span>
               </div>
               <div class="boxcontentitem-small">
                 <span>{{totaldata.order.unit_total}}</span>
-                <span>单次订单</span>
+                <span>进行中</span>
               </div>
             </div>
           </div>
@@ -271,11 +271,11 @@
   }
 
   .box1 {
-    background: linear-gradient(134deg, #D1AC7B, #DFC69C);
+    background: linear-gradient(134deg, #019239, #64db92);
 
     .boxcline {
       width: 100%;
-      background: #DFC69C;
+      background: #64db92;
       height: 0.125rem;
       margin-top: 1.25rem;
       margin-bottom: 1.25rem;
@@ -290,11 +290,11 @@
   }
 
   .box2 {
-    background: linear-gradient(134deg, #9193BC, #B7B9D4);
+    background: linear-gradient(134deg, #4486c4, #8bb1d5);
 
     .boxcline {
       width: 100%;
-      background: #B7B9D4;
+      background: #8bb1d5;
       height: 0.125rem;
       margin-top: 1.25rem;
       margin-bottom: 1.25rem;

src/views/dashboard/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div >
 
     <div class="statistics">
       <panel-group :totaldata="list" />
@@ -26,7 +26,27 @@
         line: '',
         business_data: [],
         collect_data: [],
-        list: {},
+        list: {
+          "business": {
+            "server_money_total": 0,
+            "nurse_money_total": 0,
+            "remain_money_total": 0
+          },
+          "person_efficiency": {
+            "server_time_total": "0",
+            "expect": 0,
+            "act": 0
+          },
+          "customer": {
+            "active": 0,
+            "add": 0,
+            "wash": 0
+          },
+          "order": {
+            "server_total": 0,
+            "cycle_total": 0,
+            "unit_total": 0
+          }},
         customerArr: [],
         orderArr: [],
         chartData: {},
@@ -191,6 +211,9 @@
 </script>
 
 <style lang="scss" scoped>
+  .app-main{
+    background-color: #fff !important;
+  }
   .statistics {
     display: flex;