flx冲突

This commit is contained in:
”Rain“ 2024-06-19 22:26:55 +08:00
commit 9a8b432645
5 changed files with 28 additions and 6 deletions

View File

@ -4,8 +4,8 @@ NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用) # 本地环境接口地址(/api/index.ts文件中使用)
# 后端本地 # 后端本地
# VITE_API_URL = 'http://192.168.34.155:19111' # VITE_API_URL = 'http://192.168.34.155:19111'
VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 # VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
# VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程
# VITE_API_URL = 'http://192.168.34.221:28889' # VITE_API_URL = 'http://192.168.34.221:28889'
# VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://121.196.214.246/api'
# VITE_API_URL = 'http://jxj.zhgdyun.com:100' # VITE_API_URL = 'http://jxj.zhgdyun.com:100'

View File

@ -123,7 +123,7 @@ const drawOneEchart = () => {
}, },
series: [ series: [
{ {
name: "Access From", // name: "Access From",
type: "pie", type: "pie",
top: "2%", top: "2%",
radius: ["35%", "60%"], radius: ["35%", "60%"],

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="leftTop"> <div class="leftTop">
<Card title="各企业本周数据统计"> <Card title="各企业本周数据统计">
<el-carousel @change="onChange" style="width: 100%; height: 100%"> <el-carousel @change="onChange" indicator-position="none" style="width: 100%; height: 100%">
<el-carousel-item v-for="item in enterpriseInfo.dataList" :key="item.enterpriseId" style="width: 100%; height: 100%"> <el-carousel-item v-for="item in enterpriseInfo.dataList" :key="item.enterpriseId" style="width: 100%; height: 100%">
<div class="box-content"> <div class="box-content">
<div class="top-content"> <div class="top-content">
@ -231,5 +231,16 @@ onMounted(async () => {
border-radius: 50%; border-radius: 50%;
opacity: 1; opacity: 1;
} }
.el-carousel__arrow--left {
// top: 70px;
left: -8px;
font-size: 15px;
}
.el-carousel__arrow--right {
// top: 70px;
right: -8px;
font-size: 15px;
}
} }
</style> </style>

View File

@ -187,7 +187,7 @@ function drawBar() {
}, },
series: [ series: [
{ {
name: "Access From", // name: "Access From",
type: "pie", type: "pie",
radius: ["35%", "60%"], radius: ["35%", "60%"],
avoidLabelOverlap: false, avoidLabelOverlap: false,

View File

@ -41,7 +41,7 @@
</div> </div>
<div class="enterprise-box"> <div class="enterprise-box">
<Card title="各企业本周数据统计"> <Card title="各企业本周数据统计">
<el-carousel @change="onChange" style="width: 100%; height: 100%"> <el-carousel @change="onChange" indicator-position="none" style="width: 100%; height: 100%">
<el-carousel-item v-for="item in enterpriseInfo.dataList" :key="item.enterpriseId" style="width: 100%; height: 100%"> <el-carousel-item v-for="item in enterpriseInfo.dataList" :key="item.enterpriseId" style="width: 100%; height: 100%">
<div class="enterprise-info"> <div class="enterprise-info">
<div>{{ item.enterpriseName }}</div> <div>{{ item.enterpriseName }}</div>
@ -1133,6 +1133,17 @@ onMounted(async () => {
border-radius: 50%; border-radius: 50%;
opacity: 1; opacity: 1;
} }
.el-carousel__arrow--left {
// top: 70px;
left: -8px;
font-size: 15px;
}
.el-carousel__arrow--right {
// top: 70px;
right: -8px;
font-size: 15px;
}
} }
.scroll { .scroll {