diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 29da7ae..d3fec75 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -36,7 +36,7 @@ transition: opacity 1.5s; } .sidebar-name-logo { - width: 120px; + width: 145px; object-fit: contain; } diff --git a/src/styles/iconfont.css b/src/styles/iconfont.css index 0dae451..20814e9 100644 --- a/src/styles/iconfont.css +++ b/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"; } diff --git a/src/styles/iconfont.ttf b/src/styles/iconfont.ttf index cbc430a..66ff354 100644 Binary files a/src/styles/iconfont.ttf and b/src/styles/iconfont.ttf differ diff --git a/src/styles/iconfont.woff b/src/styles/iconfont.woff index 8e1dda4..9e5199d 100644 Binary files a/src/styles/iconfont.woff and b/src/styles/iconfont.woff differ diff --git a/src/styles/iconfont.woff2 b/src/styles/iconfont.woff2 index a1ce95c..427e704 100644 Binary files a/src/styles/iconfont.woff2 and b/src/styles/iconfont.woff2 differ diff --git a/src/views/component/map.vue b/src/views/component/map.vue index 2153c51..a03776d 100644 --- a/src/views/component/map.vue +++ b/src/views/component/map.vue @@ -805,6 +805,7 @@ $staticsHeight: 60px; &__num { font-weight: 600; line-height: 1.5; + font-size: 22px; } &::after { diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index ffc9509..36c0475 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -3,11 +3,11 @@
- 营业统计 + 经营统计
-
服务金额
+
总计
@@ -16,11 +16,11 @@
{{totaldata.business.nurse_money_total}} - 护工金额 + 房产租赁金额
{{totaldata.business.remain_money_total}} - 留存金额 + 土地租赁金额
@@ -30,26 +30,26 @@
- 人效统计 + 房产统计
-
总服务时长
+
总计
{{totaldata.person_efficiency.server_time_total}} - 分钟 +
{{totaldata.person_efficiency.expect}} - 照护人员数 + 出租
{{totaldata.person_efficiency.act}} - 天数 + 闲置
@@ -58,24 +58,24 @@
- 客户统计 + 土地统计
-
活跃客户
+
总计
- {{totaldata.customer.active}}人 + {{totaldata.customer.active}}
{{totaldata.customer.add}} - 新增 + 出租
{{totaldata.customer.wash}} - 流失 + 闲置
@@ -85,23 +85,23 @@
- 订单统计 + 合同统计
-
服务订单
+
总计
-
{{totaldata.order.server_total}}单 +
{{totaldata.order.server_total}}
{{totaldata.order.cycle_total}} - 周期性订单 + 即将到期
{{totaldata.order.unit_total}} - 单次订单 + 进行中
@@ -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; diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 3e3f399..b6e8df0 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,5 +1,5 @@