From 7f2c968e003a5427430f4264a99a873a2f5f245e Mon Sep 17 00:00:00 2001
From: tx <2622874537@qq.com>
Date: Wed, 21 Aug 2024 18:02:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 4 +-
.env.production | 3 +-
.env.staging | 1 +
src/views/index.vue | 109 +++++++++++++++++++++++++++-----------------
4 files changed, 73 insertions(+), 44 deletions(-)
diff --git a/.env.development b/.env.development
index 22cab23..f256ec4 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,9 @@ VUE_APP_TITLE = 共享电动车管理系统
ENV = 'development'
# 共享电动车管理系统/开发环境
-VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
+# VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
+VUE_APP_BASE_API = 'https://che.chuangtewl.com/prod-api'
+
# VUE_APP_BASE_API = 'http://192.168.2.75:8088'
# 路由懒加载
diff --git a/.env.production b/.env.production
index 28c1c4b..bbd9562 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,8 @@ VUE_APP_TITLE = 共享电动车管理系统
ENV = 'production'
# 共享电动车管理系统/生产环境
-VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
+# VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
+VUE_APP_BASE_API = 'https://che.chuangtewl.com/prod-api'
# 小程序外链跳转设备
VUE_APP_WX_DEVICE_URL = 'weixin://dl/business/?appid=wx4d178f8c80348214&env_version=release'
diff --git a/.env.staging b/.env.staging
index c82e110..8675908 100644
--- a/.env.staging
+++ b/.env.staging
@@ -5,6 +5,7 @@ NODE_ENV = production
# 测试环境配置
ENV = 'staging'
+# VUE_APP_BASE_API = 'https://dche.ccttiot.com/prod-api'
VUE_APP_BASE_API = 'https://che.chuangtewl.com/prod-api'
# 共享电动车管理系统/测试环境
# VUE_APP_BASE_API = 'https://dianche.chuantewulian.cn/stage-api'
diff --git a/src/views/index.vue b/src/views/index.vue
index 2dec907..c450aef 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,6 +1,7 @@
<template>
<div class="page" v-if="userName == 'admin'">
- <div class="info_li">
+ <div class="left">
+ <div class="info_li">
<div class="card1">
<div class="txt">运营商数</div>
<div class="num">{{StatisticsInfo.operatorCount }}</div>
@@ -207,6 +208,10 @@
</div>
</div>
</div>
+ </div>
+ <div class="right">
+ 1
+ </div>
</div>
</template>
@@ -333,9 +338,18 @@ export default {
width: 100%;
// height: 100vh;
display: flex;
- flex-direction: column;
-
- .cont_box {
+
+ flex-wrap: nowrap;
+ flex-direction: row;
+ .right{
+ width: 24%;
+ display: flex;
+ flex-wrap: nowrap;
+ background: #fff;
+ }
+ .left{
+ width: 75%;
+ .cont_box {
width: 100%;
margin-top: 1.33rem;
display: flex;
@@ -392,30 +406,34 @@ export default {
.txt {
font-weight: 500;
- font-size: 1.33rem;
+ font-size: 1rem;
color: #1D252F;
+ z-index: 1;
}
.num {
margin-top: 1.08rem;
margin-bottom: 0.44rem;
font-weight: 500;
- font-size: 2rem;
+ font-size: 1.5rem;
color: #1D252F;
+ z-index: 1;
}
.txt1 {
- font-size: 1.17rem;
+ font-size: 1rem;
color: #1D252F;
line-height: 1.58rem;
+ z-index: 1;
}
img {
position: absolute;
- right: 2.75rem;
+ right: 1.75rem;
top: 1.42rem;
width: 4.5rem;
height: 4.5rem;
+ z-index: 0;
}
}
@@ -452,6 +470,7 @@ export default {
width: 1.33rem;
height: 1.33rem;
margin-right: 0.58rem;
+ z-index: -1;
}
display: flex;
@@ -460,7 +479,7 @@ export default {
align-items: center;
width: 100%;
font-weight: 500;
- font-size: 1.33rem;
+ font-size: 1rem;
color: #757575;
}
@@ -541,44 +560,48 @@ export default {
flex-wrap: nowrap;
// justify-content: space-between;
height: 10.42rem;
+ width: 100%;
+ .card2 {
+ margin-right: 1%;
+ padding: 1.42rem 1.75rem 1.33rem;
+ position: relative;
+ width: 20%;
+ height: 10.42rem;
+ background: #fff;
+ border-radius: 0rem 0rem 0rem 0rem;
- .card2 {
- margin-right: 1%;
- padding: 1.42rem 1.75rem 1.33rem;
- position: relative;
- width: 20%;
- height: 10.42rem;
- background: #fff;
- border-radius: 0rem 0rem 0rem 0rem;
+ .txt, .num, .txt1 {
+ font-weight: 500;
+ position: relative; // 确保文字相对于父容器定位
+ z-index: 10; // 确保文字在图片上方
+ color: #1D252F;
+ }
- .txt {
- font-weight: 500;
- font-size: 1.33rem;
- color: #1D252F;
- }
+ .txt {
+ font-size: 1rem;
+ }
- .num {
- margin-top: 1.08rem;
- margin-bottom: 0.44rem;
- font-weight: 500;
- font-size: 2rem;
- color: #1D252F;
- }
+ .num {
+ margin-top: 1.08rem;
+ margin-bottom: 0.44rem;
+ font-size: 1.5rem;
+ }
- .txt1 {
- font-size: 1.17rem;
- color: #1D252F;
- line-height: 1.58rem;
- }
+ .txt1 {
+ font-size: 1rem;
+ line-height: 1.58rem;
+ }
+
+ img {
+ position: absolute;
+ right: 1.75rem;
+ top: 1.42rem;
+ width: 4.5rem;
+ height: 4.5rem;
+ z-index: 0; // 确保图片在文字下方
+ }
+}
- img {
- position: absolute;
- right: 2.75rem;
- top: 1.42rem;
- width: 4.5rem;
- height: 4.5rem;
- }
- }
.card1 {
margin-right: 1%;
@@ -619,5 +642,7 @@ export default {
}
}
+ }
+
}
</style>