bonus
/
BigScreenUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:master
Branches Tags
bonus:main
bonus:master
bonus:dev-sjf-2023-12-3-一期大屏
..
compare: bonus:main
Branches Tags
bonus:master
bonus:dev-sjf-2023-12-3-一期大屏
bonus:main

No commits in common. "master" and "main" have entirely different histories.
master ... main

24 changed files with 37661 additions and 14031 deletions
Show Stats Expand all files Collapse all files

6
env/.env.dev vendored
View File

@ -3,11 +3,9 @@ VITE_ENV = 'development'
VITE_BUILD_MODE = 'dev'
# 开发环境接口地址
VITE_API_URL = '/proxy'
VITE_API_URL = '/proxyApi'
# 代理地址
# VITE_proxyTarget = "http://10.40.92.64:8080/zlpt-bigscreen/"
# 代理至 https://test-rental.zhgkxt.com/
VITE_proxyTarget = "https://test-rental.zhgkxt.com/proxy"
VITE_proxyTarget = "http://10.40.92.64:8080/zlpt-bigscreen/"

5
env/.env.production vendored
View File

@ -3,10 +3,7 @@ VITE_ENV = 'production'
VITE_BUILD_MODE = 'prod'
# 线上环境接口地址
# VITE_API_URL = 'https://production.com'
# VITE_API_URL = 'https://test-rental.zhgkxt.com/proxy'
VITE_API_URL = 'https://test-rental.zhgkxt.com/proxy'
# VITE_API_URL = 'http://localhost:8080/proxy'
VITE_API_URL = 'https://production.com'
# 百度地图key
VITE_AK = "cClgLBaLgGUdQDilX9dGvieL"
# 百度地图版本

3
env/.env.sit vendored
View File

@ -3,8 +3,7 @@ VITE_ENV = 'production'
VITE_BUILD_MODE = 'sit'
# 线上环境接口地址
# VITE_API_URL = 'https://testSit.com'
VITE_API_URL = 'https://test-rental.zhgkxt.com/proxy'
VITE_API_URL = 'https://testSit.com'
# 百度地图key
VITE_AK = "cClgLBaLgGUdQDilX9dGvieL"
# 百度地图版本

12
index.html
View File

@ -2,16 +2,16 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<!-- <link rel="icon" href="/favicon.ico"> -->
<link rel="icon" href="/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>机具租赁共享平台</title>
<link rel="icon" href="//test-hzdg-1259451974.cos.ap-guangzhou.myqcloud.com/d133bcbb33438a196a8ccd4eda65934f1742495961134923776354.png" />
<title>Vite App</title>
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/main.ts"></script>
</body>
<script async type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=cClgLBaLgGUdQDilX9dGvieL"></script>
<script src="https://mapopen.bj.bcebos.com/github/BMapGLLib/TrackAnimation/src/TrackAnimation.min.js"></script>
<script src="https://api.map.baidu.com/api?type=webgl&v=2.0&ak=cClgLBaLgGUdQDilX9dGvieL"></script>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=cClgLBaLgGUdQDilX9dGvieL"></script>
<script src="http://mapopen.bj.bcebos.com/github/BMapGLLib/TrackAnimation/src/TrackAnimation.min.js"></script>
<script src="http://api.map.baidu.com/api?type=webgl&v=2.0&ak=cClgLBaLgGUdQDilX9dGvieL"></script>
</html>

2
package.json
View File

@ -7,7 +7,7 @@
"build": "npm run build:pro",
"build:sit": "vite build --mode sit",
"build:uat": "vite build --mode uat",
"build:pro": "vite build --mode production",
"build:pro": "&& vite build --mode production",
"preview": "vite preview",
"build-only": "vite build",
"type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false"

3226
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

BIN
public/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

107
src/components/customCom/equipmentDialog.vue
View File

@ -6,30 +6,24 @@
</div>
<div class="sub_title">
<span class="title_text">{{detailsInfo.maName}}</span>
<!-- <span class="sub_status">({{detailsInfo.maStatus}})</span> -->
<span class="sub_status" v-if="detailsInfo.maStatus === '20'">(待租)</span>
<span class="sub_status" v-else-if="detailsInfo.maStatus === '110'">(在租)</span>
<span class="sub_status" v-else-if="detailsInfo.maStatus === '10'">(自有)</span>
<span class="sub_status">({{detailsInfo.maStatus}})</span>
</div>
<div class="more_info">
<!-- <span style="padding-left: 0;">操作重量：7吨 </span> -->
<!-- <span>
铲斗容量：2立方米
</span> -->
<span v-if="detailsInfo.maStatus === '110'">
租赁方：{{detailsInfo.receiverName || '暂无'}}
<span>
租赁方：{{detailsInfo.needCompany}}
</span>
<span v-if="detailsInfo.maStatus === '110'">
租赁日期：{{ detailsInfo.planStartTime || '暂无' }}
<span>
租赁日期：{{ detailsInfo.planStartTime }}&nbsp;{{ detailsInfo.duration }}
</span>
<span v-if="detailsInfo.maStatus === '110'">租赁时长：{{ detailsInfo.duration }}{{
detailsInfo.leasingMethod === null ? '暂无' : detailsInfo.leasingMethod === 0 ? '天' : '月'
}}</span>
</div>
<div class="time_select">
<el-date-picker v-model="timeRange" size="default" type="datetimerange" :unlink-panels="true"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
<el-button type="primary" style="margin-left: 12px;" size="default" @click="searchByTimeFn">查询</el-button>
<el-date-picker v-model="timeRange" size="media" type="datetimerange"
range-separator="To" start-placeholder="Start date" end-placeholder="End date" />
<el-button type="primary" style="margin-left: 12px;" size="media" @click="searchByTimeFn">查询</el-button>
</div>
<div class="map_line_out">
<mapLine ref="mapLineRef"></mapLine>
@ -46,16 +40,15 @@ import moment from "moment";
const mapLineShow = ref(false)
const mapLineRef = ref()
const timeRange = ref<[Date, Date]>([
moment().subtract(3, 'month').toDate(),
new Date(),
new Date(2022, 11, 10, 10, 10),
new Date(2023, 12, 19, 10, 10),
])
const detailsInfo = reactive({
duration: '',
maName: '',
maStatus: '',
receiverName: '',
planStartTime: '',
leasingMethod: null
needCompany: '',
planStartTime: ''
})
// const shortcuts = [
// {
@ -91,10 +84,11 @@ const initApiBmaDevInfoList = async (maId:any) => {
try {
const res:any = await apiBmaDevInfoList(maId)
console.log("apiBmaDevInfoList", res)
detailsInfo.duration = res.duration
detailsInfo.maName = res.maName
detailsInfo.maStatus = res.maStatus
detailsInfo.receiverName = res.receiverName
detailsInfo.needCompany = res.needCompany
detailsInfo.planStartTime = res.planStartTime
} catch (error) {
@ -112,22 +106,10 @@ const searchByTimeFn=()=>{
// mapLineRef.value.initMapLine(params)
initApiBmCompanyInfoTimeListTime(params)
}
let startLonLat: any = reactive([
{
lon: null,
lat: null,
}
])
const open = (data:any) => {
// console.log("data",data)
if (!data) return
// 从data.value中获取初始经纬度
startLonLat[0].lon = data.value[0]
startLonLat[0].lat = data.value[1]
const open = (maId:any) => {
console.log("maIdmaId",maId)
mapLineShow.value = true
maId = data.name
maId=maId
initApiBmaDevInfoList(maId)
let params={
startTime:moment(timeRange.value[0]).format('YYYY.MM.DD'),
@ -141,46 +123,27 @@ const open = (data:any) => {
})
}
const initApiBmCompanyInfoTimeListTime = async (val: any) => {
try {
const res: any = await apiBmCompanyInfoTimeListTime(val)
// 假数据
// const res = [
// {
// "id": 1,
// "lat": 31.22,
// "lon": 121.48,
// "time": "2022-12-10 10:10:10"
// },
// // {
// // "id": 2,
// // "lat": 29.588885,
// // "lon": 106.621131,
// // "time": "2023-12-19 10:10:10"
// // },
// // {
// // "id": 3,
// // "lat": 39.904989,
// // "lon": 116.405285,
// // "time": "2023-12-19 10:10:10"
// // },
// {
// "id": 4,
// "lat": 31.820587,
// "lon": 117.227219,
// "time": "2023-12-19 10:10:10"
// }
// ]
let startLonLatObj = JSON.parse(JSON.stringify(startLonLat[0]))
try {
const res: any = await apiBmCompanyInfoTimeListTime(val)
console.log("res-apiBmCompanyInfoTimeListTime",res)
// domShow.value = true
// console.log("apiBmCompanyInfoTimeListTime", res)
// res.forEach((ele: any) => {
// linePointList.push(new BMapGL.Point(Number(ele.lon), Number(ele.lat)))
// })
mapLineRef.value.initMapLine(res,val.id)
// nextTick(() => {
// initMap()
// centerPoint = getcenterpoiont(res[0], res[res.length - 1])
// console.log("centerPoint", centerPoint)
// initCustomDot(centerPoint)
// })
res.unshift(startLonLatObj)
} catch (error) {
// console.log("经纬度res-->>>",res)
mapLineRef.value.initMapLine(res, val.id)
} catch (error) {
console.log('err-->>>', error)
}
}
}
defineExpose({

159
src/components/customCom/equipmentLeasing.vue
View File

@ -12,8 +12,7 @@
</div>
<!-- <h1>{{ mapProps.seriesData }}</h1> -->
<div class="right_map_container">
<mapEcharts ref="mapEchartsRef"
:idType="mapProps.idType" :jsonData="mapProps.jsonData"
<mapEcharts v-if="mapProps.seriesData.length > 0" ref="mapEchartsRef" :jsonData="mapProps.jsonData"
:itemStyle="mapProps.itemStyle" :emphasisLabelStyle="mapProps.emphasisLabelStyle"
:emphasisItemStyle="mapProps.emphasisItemStyle" :labelInfo="mapProps.labelInfo"
:rippleEffect="mapProps.rippleEffect" :tooltipProps="mapProps.tooltipProps"
@ -66,7 +65,6 @@ import gdJSON from './mapData/gd.json'
import gzJSON from './mapData/gz.json'
import ynJSON from './mapData/yn.json'
import hnJSON from './mapData/hn.json'
import szJSON from './mapData/sz.json'
import { apiBmCompanyInfoColtdList } from "http/api/echartApi"
const mapEchartsRef = ref()
const equipmentDialogRef = ref()
@ -76,12 +74,7 @@ const navInfo = reactive({
{
text: "全部",
navId: "0",
jsonData: xnallJSON,
},
{
text: "广东电网",
navId: "2",
jsonData: gdJSON
jsonData: xnallJSON
},
{
text: "广西电网",
@ -89,34 +82,37 @@ const navInfo = reactive({
jsonData: gxJSON
},
{
text: "云南电网",
navId: "4",
jsonData: ynJSON
text: "广东电网",
navId: "2",
jsonData: gdJSON
},
{
text: "贵州电网",
navId: "3",
jsonData: gzJSON
},
{
text: "云南电网",
navId: "4",
jsonData: ynJSON
},
{
text: "海南电网",
navId: "5",
jsonData: hnJSON
},
// {
// text: "储能公司",
// navId: "6",
// },
{
text: "储能公司",
navId: "6",
},
{
text: "深圳供电局",
navId: "7",
jsonData: szJSON
navId: "7"
},
// {
// text: "超高压公司",
// navId: "8"
// }
{
text: "超高压公司",
navId: "8"
}
]
})
@ -159,12 +155,14 @@ const mapProps = reactive({
borderColor: "rgba(21, 29, 56,0)"
},
tooltipFormat: (params: any) => {
console.log("params11", params)
const curItem = mapDataByProvice(params.name.slice(0, 2))
console.log("curitemcuritem", curItem)
if (!curItem) {
return ""
}
let fromatStr =
`<div style="background-image: url(${new URL('/src/assets/img/mapHoverBg.png', import.meta.url).href});width:324px;height:225px;background-size:contain;background-repeat:no-repeat;">
`<div style="background:url(${getImg('/src/assets/img/mapHoverBg.png')});width:324px;height:225px;background-size:contain;background-repeat:no-repeat;">
<div style="width: 100px;height: 90px;padding-top:4px;position:relative;">
<div style="position:absolute;left:20px;top:10px;font-weight:bold;color:#fff;">
${params.name}
@ -183,7 +181,7 @@ const mapProps = reactive({
return fromatStr
},
itemColorFormat: (params: any) => {
// console.log("params001", params)
console.log("params001", params)
if (params.value[2] ==2) {
return '#00ff31';
} else if (params.value[2] ==1) {
@ -193,25 +191,21 @@ const mapProps = reactive({
}
},
effectScatterCallBack: (params: any) => {
console.log("equipmentDialogRef999", params)
equipmentDialogRef.value.open(params.data)
console.log("equipmentDialogRef999", params.data.name)
equipmentDialogRef.value.open(params.data.name)
},
// seriesData:[]
seriesData: [
//地图上的点
// { name: 240314000002, value: [112.48461, 23.05196, 1] },
// { name: 240314000003, value: [110.130214, 23.018978, 1] },
// { name: 240314000004, value: [115.261081, 23.139856, 1] },
// { name: 240314000005, value: [107.45, 22.139856, 1] },
// { name: 240314000006, value: [106.7, 26.36, 1] },
// { name: 240314000007, value: [102.33, 24.23, 1] },
// { name: 240314000001, value: [110.33,19.823, 1] }
]
seriesData:[]
// [{ name: '肇庆市', value: [112.48461, 23.05196, 1] },
// { name: '佛山市', value: [110.130214, 23.018978, 1] },
// { name: '广州', value: [115.261081, 23.139856, 1] },
// { name: '南宁', value: [107.45, 22.139856, 1] },
// { name: '贵阳', value: [106.7, 26.36, 1] },
// { name: '昆明', value: [102.33, 24.23, 1] } ,
// { name: '海口', value: [110.33,19.823, 1] }]
})
let listData: any = []
const mapDataByProvice = (provinceName: String) => {
// let listData = [
// // 设备租赁分布图的数据
// {
// name: "广东省",
// selfCount: 123,
@ -235,12 +229,6 @@ const mapDataByProvice = (provinceName: String) => {
// selfCount: 963,
// toCount: 4521,
// inCount: 963
// },
// {
// name: "海南省",
// selfCount: 123,
// toCount: 300,
// inCount: 987
// }
// ]
const curItem: any = listData.find((ele: any) => ele.name.slice(0, 2) == provinceName)
@ -262,57 +250,67 @@ onMounted(() => {
})
const iniTapibmCompanyInfoColtdList = async () => {
//设备租赁分布图 10: 自有, 20: 待租, 110: 在租
//设备租赁分布图
try {
listData = []
let seriresData: any = []
const res: any = await apiBmCompanyInfoColtdList()
// console.log('🚀 ~ iniTapibmCompanyInfoColtdList ~ res:', res);
console.log("apiBmCompanyInfoColtdList", res)
const uniqueInfo: any = {}
res.forEach((ele: any, index: any) => {
let item: any = {}
item.name = ele.companyName
ele.coltdVo.forEach((eleS: any) => {
if (eleS.status === "110") {
item.inCount = eleS.count
eleS.list.forEach((subEle: any) => {
if (!uniqueInfo[subEle.maId]) {
seriresData.push({
name: subEle.maId,
value: [Number(subEle.lon), Number(subEle.lat), 3]
})
uniqueInfo[subEle.maId] = true
}
})
} else if (eleS.status === "20") {
item.toCount = eleS.count
eleS.list.forEach((subEle: any) => {
if (!uniqueInfo[subEle.maId]) {
seriresData.push({
name: subEle.maId,
value: [Number(subEle.lon), Number(subEle.lat), 2]
})
uniqueInfo[subEle.maId] = true
}
})
} else if (eleS.status === "10") {
console.log()
if (eleS.status == "在租") {
item.selfCount = eleS.count
eleS.list.forEach((subEle: any) => {
if (!uniqueInfo[subEle.maId]) {
seriresData.push({
name: subEle.maId,
value: [Number(subEle.lon), Number(subEle.lat), 1]
})
uniqueInfo[subEle.maId] = true
}
})
}
eleS.list.forEach((subEle: any) => {
if (!uniqueInfo[subEle.maId]) {
seriresData.push({
name: subEle.maId,
value: [Number(subEle.lon), Number(subEle.lat),eleS.count,3]
})
uniqueInfo[subEle.maId] = true
}
})
})
item.toCount = ele.coltdVo.forEach((eleS: any) => {
if (eleS.status == "待租") {
item.toCount = ele.count
}
eleS.list.forEach((subEle: any) => {
if (!uniqueInfo[subEle.maId]) {
seriresData.push({
name: subEle.maId,
value: [Number(subEle.lon), Number(subEle.lat),eleS.count,2]
})
uniqueInfo[subEle.maId] = true
}
})
})
item.inCount = ele.coltdVo.forEach((eleS: any) => {
if (eleS.status == "自有") {
item.inCount = ele.count
}
eleS.list.forEach((subEle: any) => {
if (!uniqueInfo[subEle.maId]) {
seriresData.push({
name: subEle.maId,
value: [Number(subEle.lon), Number(subEle.lat),eleS.count,1]
})
uniqueInfo[subEle.maId] = true
}
})
})
console.log("itemitem", item)
listData.push(item)
})
mapProps.seriesData = seriresData
console.log("listData", res, listData, seriresData)
} catch (error) {
console.log(error)
@ -373,7 +371,6 @@ const iniTapibmCompanyInfoColtdList = async () => {
font-size: 14px;
text-align: center;
line-height: 28px;
cursor: pointer;
}
}

54
src/components/customCom/hotProvider.vue
View File

@ -4,7 +4,7 @@
<div class="sub_title" @click="subTab('provider')" :class="{
'activeSub': subActive == 'provider'
}">
热门出租方
热门供应商
</div>
<div class="sub_title" @click="subTab('hotEquipment')" :class="{
'activeSub': subActive == 'hotEquipment'
@ -16,14 +16,11 @@
<div class="provider_item" v-for="(item, index) in providerInfo.list" :key="index">
<div class="provider_item_left">
<div class="pro_item_icon" :class="{ 'inThree': index + 1 <= 3, 'afterThree': index + 1 > 3 }">
<!-- <img :src="`/src/assets/img/index${index + 1 <= 3 ? index + 1 : 4}.png`" alt="" -->
<img v-if="index == 0" src="/src/assets/img/index1.png" alt="">
<img v-else-if="index == 1" src="/src/assets/img/index2.png" alt="">
<img v-else-if="index == 2" src="/src/assets/img/index3.png" alt="">
<img v-else src="/src/assets/img/index4.png" alt="">
<img :src="`/src/assets/img/index${index + 1 <= 3 ? index + 1 : 4}.png`" alt=""
class="pro_item_icon_img">
</div>
<div class="pro_item_title overflow">
{{ item.organizeName }}
{{ item.ownCo }}
</div>
</div>
<div class="device_count">
@ -32,7 +29,7 @@
</div>
</div>
<div class="cloud_words_out" v-else>
<CloudWords :data="data"></CloudWords>
<CloudWords></CloudWords>
</div>
</div>
</template>
@ -41,38 +38,9 @@ import CloudWords from "components/echartsCom/CloudWords.vue"
import { apiMaDevInfoHotList } from "http/api/echartApi"
const data: any = ref([])
const providerInfo: any = reactive({
list: [
// {
// ownCo: "中铁一局",
// count: 1
// },
// {
// ownCo: "中铁二局",
// count: 2
// },
// {
// ownCo: "中铁三局",
// count: 3
// },
// {
// ownCo: "中铁四局",
// count: 4
// },
// {
// ownCo: "中铁五局",
// count: 5
// },
// {
// ownCo: "中铁十一局",
// count: 10
// },
// {
// ownCo: "中铁十一局",
// count: 10
// },
]
list: []
})
const subActive = ref("provider")
@ -87,12 +55,6 @@ const InitApiMaDevInfoHotList = async () => {
const res: any = await apiMaDevInfoHotList()
console.log("apiMaDevInfoHotList", res)
providerInfo.list = res
res[0].itemNames.map((item: any) => {
data.value.push({
name: item,
value: Math.floor(Math.random() * (519 - 199 + 1) + 169)
})
})
} catch (error) {
console.log(error)
}
@ -125,7 +87,7 @@ onBeforeMount(() => {
color: $main-color;
padding-top: 24px;
padding-left: 26px;
cursor: pointer;
}
.activeSub {

1194
src/components/customCom/mapData/sz.json
View File

File diff suppressed because it is too large Load Diff

46356
src/components/customCom/mapData/xnall.json
View File

File diff suppressed because it is too large Load Diff

100
src/components/echartsCom/CloudWords.vue
View File

@ -5,20 +5,10 @@
<script setup lang="ts">
import * as echarts from 'echarts'
import jsonData from "./jsonData/china.json"
import { defineProps } from 'vue'
// 接收父组件传递的参数
const props = defineProps({
data: {
type: Array,
default: () => []
}
})
console.log("props--->", props.data)
let myChart: any = null
const randomData = () => {
let a = Math.random();
var a = Math.random();
if (a > 0 && a <= 0.333)
return 0;
if (a > 0.333 && a <= 0.666)
@ -49,70 +39,42 @@ const colorData = (value: any) => {
}
//110 35 14/18
// let geoCoordMap: any = {
// "挖掘机": [108.99, 36.04],
// "洒水车": [113.53, 44.3],
// "牵引车": [106.21, 27.35],
// "平地机": [95.61, 44.57],
// "应用支撑": [104.58, 39.69],
// "掘地机": [101.39, 47.5],
// "自卸车": [97.53, 31.89],
// "叉车": [112.46, 31.65],
// "开钩机": [92.65, 36.0],
// "数据基础": [122.15, 32.99],
// "其他设备": [123.89, 40.34],
var geoCoordMap: any = {
"挖掘机": [108.99, 36.04],
"洒水车": [113.53, 44.3],
"牵引车": [106.21, 27.35],
"平地机": [95.61, 44.57],
"应用支撑": [104.58, 39.69],
"掘地机": [101.39, 47.5],
"自卸车": [97.53, 31.89],
"叉车": [112.46, 31.65],
"开钩机": [92.65, 36.0],
"数据基础": [122.15, 32.99],
"其他设备": [123.89, 40.34],
// };
};
//0-500
// let data = [
// { name: "挖掘机", value: 501 },
// { name: "洒水车", value: 400 },
// { name: "牵引车", value: 460 },
// { name: "平地机", value: 300 },
// { name: "应用支撑", value: 360 },
// { name: "掘地机", value: 460 },
// { name: "自卸车", value: 330 },
// { name: "叉车", value: 210 },
// { name: "开钩机", value: 200 },
// { name: "数据基础", value: 440 },
// { name: "其他设备", value: 240 },
// ];
// 先过滤name相同的, 然后再截取11个
const data: any = props.data.filter((item: any, index: any, self: any) => {
return self.findIndex((s: any) => s.name === item.name) === index
}).slice(0, 11)
// console.log("data--->", data)
const coordinates = [
[108.99, 36.04],
[113.53, 44.3],
[106.21, 27.35],
[95.61, 44.57],
[104.58, 39.69],
[101.39, 47.5],
[97.53, 31.89],
[112.46, 31.65],
[92.65, 36.0],
[122.15, 32.99],
[123.89, 40.34],
var data = [
{ name: "挖掘机", value: 501 },
{ name: "洒水车", value: 400 },
{ name: "牵引车", value: 460 },
{ name: "平地机", value: 300 },
{ name: "应用支撑", value: 360 },
{ name: "掘地机", value: 460 },
{ name: "自卸车", value: 330 },
{ name: "叉车", value: 210 },
{ name: "开钩机", value: 200 },
{ name: "数据基础", value: 440 },
{ name: "其他设备", value: 240 },
];
const geoCoordMap: any = {}
for (let i = 0; i < data.length; i++) {
geoCoordMap[data[i].name] = coordinates[i]
}
// console.log("geoCoordMap--->", geoCoordMap)
const convertData = function (data: any) {
let res = [];
for (let i = 0; i < data.length; i++) {
let geoCoord = geoCoordMap[data[i].name];
var convertData = function (data: any) {
var res = [];
for (var i = 0; i < data.length; i++) {
var geoCoord = geoCoordMap[data[i].name];
if (geoCoord) {
res.push({
label: {
@ -148,7 +110,7 @@ const option: any = {
min: 0,
max: 500,
inRange: {
color: ['#3773FF', '#FF8F00', '#FB6716']
color: ['#0e2a3f'],
}
},

23
src/components/echartsCom/Pie3dCom.vue
View File

@ -15,7 +15,7 @@ onMounted(() => {
Highcharts.chart('container', options)
})
const options:any = {
const options = {
chart: {
type: 'pie',
backgroundColor: 'rgba(0, 0, 0, 0.32)',
@ -32,7 +32,7 @@ const options:any = {
text: '施工单位自有设备详情',
margin: 50,
style: {
color: "#66E0FF",
color: "#0099FF",
},
align: 'left',
x: 0,
@ -48,27 +48,10 @@ const options:any = {
}
}
},
legend: {
itemStyle: {
color: '#f0f0f0',
},
itemHoverStyle: {
color: '#66E0FF',
},
itemHiddenStyle: {
color: '#999',
},
},
series: [{
name: '设备数量',
data:props.list
}],
accessibility:{
enabled: false
},
credits: {
enabled: false
},
}]
}

2
src/components/echartsCom/barCom.vue
View File

@ -196,7 +196,7 @@ const option = {
},
series: handleSeriesData(),
formatter: function (params: any) {
// console.log("parmas", params)
console.log("parmas", params)
return propsVal.formatCallBack(params)
}
};

23
src/components/echartsCom/mapEcharts.vue
View File

@ -88,15 +88,10 @@ const propsVal: any = defineProps({
},
})
const initEcharts = () => {
// console.log("propsval__>>>", propsVal.idType, propsVal)
const name = propsVal.jsonData.features[0].properties.name
echarts.registerMap(name, propsVal.jsonData)
echarts.registerMap('guangdong', propsVal.jsonData)
nextTick(() => {
const domitem: any = document.getElementById("mapEcharts" + propsVal.idType)
if (echarts.getInstanceByDom(domitem)) {// 销毁之前的echarts实例
echarts.dispose(domitem);
}
const map = echarts.init(domitem, null, {// 初始化echarts实例
const domitem = document.getElementById("mapEcharts" + propsVal.idType)
const map = echarts.init(domitem, null, {
renderer: 'canvas',
})
const option = {
@ -106,14 +101,9 @@ const initEcharts = () => {
trigger: 'item',//触发条件
},
geo: {
map: name,
map: 'guangdong',
zoom: 1,
roam: true,
// 缩放限制
scaleLimit: {
min: 0.5,
max: 99
},
label: propsVal.labelInfo,
// 所有地图的区域颜色
itemStyle: propsVal.itemStyle,
@ -130,7 +120,7 @@ const initEcharts = () => {
},
series: [
{
name,
name: 'Top 5',
type: 'effectScatter',
colorBy: 'series',
effectType: 'ripple',
@ -174,7 +164,8 @@ const chartClickEventListener = (mychart: any) => {
const chagneJSON = (item: any) => {
// propsVal.idType = item.navId
console.log("propsval", propsVal)
propsVal.idType = item.navId
setTimeout(() => {
initEcharts()
})

43
src/components/mapBaidu/mapLine.vue
View File

@ -9,39 +9,41 @@
let map: any = null
let centerPoint: any = null
let domId = ref(0)
let domId = ref("0")
let domShow = ref(false)
let animiationLineList = []
const state = reactive({
let props = defineProps({
lineStyle: {
strokeColor: "#0e83ed",
strokeWeight: 3,
strokeOpacity: 0.6,
type: Object,
default: {
strokeColor: "#0e83ed",
strokeWeight: 4
}
}
})
onMounted(() => {
// console.log("map", "map")
console.log("map", "map")
})
let linePointList: any = []
const initMap = () => {
map = new BMapGL.Map("equipmentIdMap" + domId.value);
map.centerAndZoom(new BMapGL.Point(), 18);
map.centerAndZoom(new BMapGL.Point(116.3944, 39.9063), 18);
console.log("map", map)
map.enableScrollWheelZoom();
setTimeout(() => {
// initCustomDot()
const startIcon = {
imgUrl: new URL('/src/assets/img/mapStart.png', import.meta.url).href,
position: [linePointList[0].lng, linePointList[0].lat],
size: [50, 50]
imgUrl: '/src/assets/img/mapStart.png',
position: [116.3964, 39.9093],
size: [60, 60]
}
const endIcon = {
imgUrl: new URL('/src/assets/img/mapEnd.png', import.meta.url).href,
position: [linePointList[linePointList.length - 1].lng, linePointList[linePointList.length - 1].lat],
size: [50, 50]
imgUrl: '/src/assets/img/mapStart.png',
position: [116.3964, 39.9093],
size: [60, 60]
}
initIcon(startIcon.imgUrl, startIcon.position, startIcon.size)
@ -54,10 +56,10 @@ const initMap = () => {
const initCustomDot = (centerPoint: any) => {
function ComplexCustomOverlay(centerPoint: any) {
function ComplexCustomOverlay(centerPoint) {
}
ComplexCustomOverlay.prototype = new BMapGL.Overlay();
ComplexCustomOverlay.prototype.initialize = function (map: any) {
ComplexCustomOverlay.prototype.initialize = function (map) {
const div = this._div = document.createElement("div");
div.style.position = "absolute";
div.style.width = "30px";
@ -91,12 +93,12 @@ const initCustomDot = (centerPoint: any) => {
const initPolylineAnimation = () => {
var pl = new BMapGL.Polyline(linePointList, state.lineStyle);
var pl = new BMapGL.Polyline(linePointList, props.lineStyle);
// setTimeout('start()', 3000);
const trackAni = new BMapGLLib.TrackAnimation(map, pl, {
overallView: true,
tilt: 30,
duration: 4000,
duration: 2000,
delay: 300,
});
start()
@ -108,8 +110,7 @@ const initPolylineAnimation = () => {
}
const initIcon = (imgUrl: any, position: any, size: any) => {
// var myIcon = new BMapGL.Icon("https://api.map.baidu.com/img/markers.png", new BMapGL.Size(50, 50));
var myIcon = new BMapGL.Icon(imgUrl, new BMapGL.Size(50, 50));
var myIcon = new BMapGL.Icon("https://api.map.baidu.com/img/markers.png", new BMapGL.Size(60, 60));
// 创建Marker标注，使用小车图标
var pt = new BMapGL.Point(...position);
var marker = new BMapGL.Marker(pt, {
@ -142,11 +143,11 @@ const getcenterpoiont = (pointStart: any, pointEnd: any) => {
const pointcenter = new BMapGL.Point(lngcenter, latcenter);
return pointcenter;
}
const initMapLine = (res: any, id: any) => {
domId.value = id
domShow.value = false
linePointList = []
res.forEach((ele: any) => {
linePointList.push(new BMapGL.Point(Number(ele.lon), Number(ele.lat)))
})
@ -155,7 +156,7 @@ const initMapLine = (res: any, id: any) => {
setTimeout(() => {
initMap()
centerPoint = getcenterpoiont(res[0], res[res.length - 1])
console.log("centerPoint", centerPoint)
initCustomDot(centerPoint)
})
})

30
src/http/api/echartApi.ts
View File

@ -2,15 +2,15 @@ import { get, post } from '../index'
// 平台入驻设备总数
export function apiMaDevInfoList() {
return get('item-center/maDevInfo/list', {})
return get('maDevInfo/list', {})
}
// 查询自有以及上架可租设备数量
export function apiMaDevInfoTypeList() {
return get('item-center/maDevInfo/type-list', {})
return get('maDevInfo/type-list', {})
}
// 获取企业所属设备状态为自有的设备数量:
export function apiMaDevInfoCompanyList() {
return get('item-center/maDevInfo/company-list', {})
return get('maDevInfo/company-list', {})
}
// 查询在租以及待租设备数量:
export function apiMaDevInfoMatypeList() {
@ -18,34 +18,34 @@ export function apiMaDevInfoMatypeList() {
}
// 查询今日订单额以及订单数量:
export function apiMaOrderInfoTodayList() {
return get('order/maOrderInfo/today-list', {})
return get('maOrderInfo/today-list', {})
}
// 租赁订单月统计:
export function apiMaOrderInfoList() {
return get('order/maOrderInfo/list', {})
return get('maOrderInfo/list', {})
}
// --
// 获取企业所属对应的机手数量以及机手总人数:
export function apiBmMachinistInfoList() {
return get('item-center/maDevInfo/enterprise-list', {})
return get('bmMachinistInfo/list', {})
}
// 根据企业类型查询对应数量以及总数量:
export function apiBmCompanyInfoTypeList() {
return get('user-service/bmCompanyInfo/type-list', {})
return get('bmCompanyInfo/type-list', {})
}
export function apiMaDevInfoMaList() {
return get('item-center/maDevInfo/ma-list', {})
return get('maDevInfo/ma-list', {})
}
// ======
// 根据求出租信息查询对应的数量:
export function apiMaLeaseInfoInfoTypeList() {
return get('order/maOrderInfo/type-list', {})
return get('maLeaseInfo/type-list', {})
}
// 查询公司对应的热门设备数量:
export function apiMaDevInfoHotList() {
return get('order/maOrderInfo/hot-list', {})
return get('maDevInfo/hot-list', {})
}
@ -53,14 +53,18 @@ export function apiMaDevInfoHotList() {
// ===
// 设备租赁分布图
export function apiBmCompanyInfoColtdList() {
return get('user-service/bmCompanyInfo/coltd-list', {})
return get('bmCompanyInfo/coltd-list', {})
}
// 根据设备id查询设备详情相关信息
export function apiBmaDevInfoList(maId:any) {
return get(`item-center/maDevInfo/ma-list/${maId}`,{})
return get(`maDevInfo/list/${maId}`,{})
}
// 根据时间查询设备历史经纬度
export function apiBmCompanyInfoTimeListTime(params:any) {
const urlStr= `user-service/bmCompanyInfo/time-list/${params.startTime}/${params.endTime}/${params.id}`
const urlStr= `bmCompanyInfo/time-list/${params.startTime}/${params.endTime}/${params.id}`
return get(urlStr,{})
}

31
src/http/index.ts
View File

@ -3,7 +3,6 @@
import axios from 'axios'
import NProgress from 'nprogress'
import { useStore } from 'store/main'
import { ElMessage } from 'element-plus'
const store = useStore()
// const CancelToken = axios.CancelToken
// const source = CancelToken.source()
@ -16,12 +15,8 @@ const service = axios.create({
service.interceptors.request.use(
(config) => {
const jdCloud = JSON.parse(localStorage.getItem('jdcloud')).token || null
if (jdCloud) {
config.headers['Authorization'] = jdCloud
}
return config
config.headers['Authorization'] = store.token
return config
},
(error) => {
return error
@ -30,37 +25,23 @@ service.interceptors.request.use(
// 响应拦截
service.interceptors.response.use(
(res) => {
const code = res.data.code || 200
if (code === 401) {
ElMessage({
showClose: false,
message: '登录状态已过期请重新登录',
type: 'error',
})
window.location.href = 'https://test-rental.zhgkxt.com/mall-view/'
} else {
return res.data
}
return res.data
},
(error) => {
console.log('error-异常', error)
}
)
export function get(url: string, params: any) {
// 拼接查询字符串 ?platformId=20
url += '?platformId=20'
return new Promise((resolve, reject) => {
NProgress.start()
service
.get(url, { params })
.then((res: any) => {
NProgress.done()
// console.log("res-get",res)
if (res.code == '0') {
console.log("res-get",res)
if (res.code == '200') {
resolve(res.data)
} else {
reject(res.data)

6
src/main.ts
View File

@ -2,9 +2,6 @@
import { createApp } from 'vue'
import { createPinia } from 'pinia'
import ElementPlus from 'element-plus';
import 'element-plus/dist/index.css'
import locale from 'element-plus/dist/locale/zh-cn.mjs'
import App from './App.vue'
import router from './router'
@ -14,11 +11,10 @@ import highcharts from 'highcharts';
import highcharts3d from 'highcharts/highcharts-3d';
// 调用3d图表
highcharts3d(highcharts);
const app = createApp(App)
app.use(createPinia())
app.use(router)
app.use(ElementPlus, { locale })
app.mount('#app')

100
src/router/index.ts
View File

@ -1,70 +1,50 @@
import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router'
import { ElMessage } from 'element-plus'
import test from './module/test'
import myInfo from './module/myInfo'
const routes: Array<RouteRecordRaw> = [
{
path: '/echarts',
name: 'echartsScreen',
meta: {
title: '',
icon: '',
},
component: () => import('views/echarts/index.vue'),
}, {
path: '/',
name: 'index',
redirect: "/screen/sharePlatform",
meta: {
title: '',
icon: '',
},
component: () => import('views/Index.vue'),
children: []
},
{
path: '/screen/sharePlatform',
name: 'sharePlatform',
meta: {
title: '',
icon: '',
},
component: () => import('views/screen/sharePlatform.vue'),
},
{
path: '/login',
name: 'login',
meta: {
title: '',
icon: '',
},
component: () => import('views/login/index.vue'),
}
{
path: '/echarts',
name: 'echartsScreen',
meta: {
title: '',
icon: '',
},
component: () => import('views/echarts/index.vue'),
},{
path: '/',
name: 'index',
redirect:"/screen/sharePlatform",
meta: {
title: '',
icon: '',
},
component: () => import('views/Index.vue'),
},
{
path: '/screen/sharePlatform',
name: 'sharePlatform',
meta: {
title: '',
icon: '',
},
component: () => import('views/screen/sharePlatform.vue'),
},
{
path: '/login',
name: 'login',
meta: {
title: '',
icon: '',
},
component: () => import('views/login/index.vue'),
}
]
const router = createRouter({
// 路由模式
history: createWebHashHistory(),
routes
// 路由模式
history: createWebHashHistory(),
routes
})
router.beforeEach((to, from, next) => {
const jdCloud = JSON.parse(localStorage.getItem('jdcloud')).token
// console.log('jdCloud', jdCloud)
if (jdCloud) {
next()
} else {
ElMessage({
showClose: false,
message: '当前未登录，请登录..',
type: 'error',
})
setTimeout(() => {
window.location.href = 'https://test-rental.zhgkxt.com/mall-view/'
}, 1500)
}
})
export default router

2
src/store/main.ts
View File

@ -2,7 +2,7 @@ export const useStore = defineStore('main', {
state: () => {
return {
loadingFlag: false, //loading控制,
token: ''
token: 'eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjVkNjVlMDI1LWVlY2MtNDBiOS1hNGNjLTQ3OTc4ZDQwMzExMiIsInVzZXJuYW1lIjoiYWRtaW4ifQ.npryPWEmJwBaGgfyZ-oQW8oDxDzitAf8v5XUvsokRvu6f1vSOGTer89C9GJ-ER2bZuvO9iAOYCieDV4INVQCvA'
}
},
getters: {},

204
src/views/screen/sharePlatform.vue
View File

@ -6,8 +6,8 @@
<img src="@/assets/img/setting.png" />
</div>
<div class="right_title_more_info">
<!-- <span class="weather">晴转多云 16℃ </span> -->
<span class="time">{{ nowTime }}</span>
<span class="wheather">晴转多云 16℃ </span>
<span class="time">2023.11.16 星期四 09:56:12</span>
</div>
</div>
<div class="count_info_row2">
@ -89,10 +89,10 @@
<div class="self_img">{{ platFormInfo.enterpriseCount }}</div>
<div class="third_title">南网集体企业</div>
</div>
<!-- <div class="self_shelf_count">
<div class="self_shelf_count">
<div class="self_img">{{ platFormInfo.holdingCount }}</div>
<div class="third_title">南网控股企业</div>
</div> -->
</div>
</div>
</div>
<div class="enterprise_device">
@ -108,9 +108,8 @@
<div class="bottom_row_center_bar">
<div class="bottom_row_center_bar_left">
<div class="total_count">
总人数：{{ totalCount || "0" }}
总人数：{{ totalCount }}
</div>
<!-- 机手人数 -->
<barCom v-if="barComProps.xAxisData.length > 0" :domId="1" :title="barComProps.title"
:titleStyle="barComProps.titleStyle" :xAxisData="barComProps.xAxisData"
:yAxisProps="barComProps.yAxisProps" :seriseData="barComProps.seriseData"
@ -120,7 +119,6 @@
:barWidth="barComProps.barWidth" :formatCallBack="barComProps.formatCallBack"></barCom>
</div>
<div class="bottom_row_center_bar_right">
<!-- 租赁订单月统计 -->
<barCom v-if="barComPropsSimple.xAxisData.length > 0" ref="barSimpleRef" :domId="2"
:title="barComPropsSimple.title" :xAxisData="barComPropsSimple.xAxisData"
:titleStyle="barComProps.titleStyle" :yAxisProps="barComPropsSimple.yAxisProps"
@ -161,6 +159,7 @@ import barCom from "../../components/echartsCom/barCom.vue"
import Pie3dCom from "../../components/echartsCom/Pie3dCom.vue"
import hotProvider from "../../components/customCom/hotProvider.vue"
import equipmentLeasing from "../../components/customCom/equipmentLeasing.vue"
import { getImg } from "utils/index"
import {
apiMaDevInfoList, apiMaDevInfoTypeList,
apiMaDevInfoCompanyList, apiMaDevInfoMatypeList,
@ -168,56 +167,44 @@ import {
apiMaLeaseInfoInfoTypeList
} from "http/api/echartApi"
const equipmentCountInfo: any = reactive({
// 平台入驻设备总数
listCount: [
"0", "0", "0", "0"
],
selfCount: 0,
shelfCount: 0
listCount: [],
selfCount: "",
shelfCount: ""
})
const middleCountList = reactive({
list: [
{
icon: new URL("/src/assets/img/money1.png", import.meta.url).href,
count: 0,
icon: getImg("/src/assets/img/money1.png"),
count: "",
title: "今日订单"
},
{
icon: new URL("/src/assets/img/money2.png", import.meta.url).href,
count: 0,
icon: getImg("/src/assets/img/money2.png"),
count: "",
title: "累计金额"
},
{
icon: new URL("/src/assets/img/money3.png", import.meta.url).href,
count: 0,
title: "在租设备"
icon: getImg("/src/assets/img/money3.png"),
count: "",
title: "在用设备"
},
{
icon: new URL("/src/assets/img/money2.png", import.meta.url).href,
count: 0,
icon: getImg("/src/assets/img/money2.png"),
count: "",
title: "待租设备"
}
]
})
const rentWantRent:any=reactive({
// 出租信息
rent:[
"0", "0", "0", "0"
],
// 求租信息
wantRent:[
"0", "0", "0", "0"
]
rent:[],
wantRent:[]
})
const platFormInfo: any = reactive({
// 平台入驻单位
listCount: [
"0", "0", "0", "0"
],
socailCount: "0",
enterpriseCount: "0",
// holdingCount: '0'
listCount: [],
socailCount: "",
enterpriseCount: "",
holdingCount: ''
})
const barComProps = reactive({
@ -226,9 +213,7 @@ const barComProps = reactive({
color: "#0099FF",
paddingTop: 20
},
xAxisData: [
// "机手1","机手2","机手3","机手4","机手5","机手6","机手7","机手8","机手9"
],
xAxisData: [],
yAxisProps: {
type: "value",
splitLine: {//是否显示 y轴横线
@ -236,9 +221,7 @@ const barComProps = reactive({
},
show: false
},
seriseData: [
// 120, 132, 101, 134, 90, 230, 210, 220, 182, 191, 234, 290
],//数据
seriseData: [],//数据
itemStyle: [//柱状图的默认颜色 渐变
{ offset: 0, color: '#91FFBE' },
{ offset: 1, color: '#077FBA' }
@ -342,9 +325,7 @@ const barComPropsHorizontal = reactive({
// boundaryGap: false,
},
yAxisData: [],
seriseData: [
// 120, 132, 101, 134, 90
],//数据
seriseData: [],//数据
itemStyle: [//柱状图的默认颜色 渐变
{ offset: 0, color: '#077FBA' },
{ offset: 1, color: '#91FFBE' }
@ -376,21 +357,14 @@ const barComPropsHorizontal = reactive({
return fromatStr
}
})
const pie3DList: any = reactive({
list: [
// 假数据
// ['Chrome', 1],
// ['Internet Explorer', 2],
// ['Firefox', 3],
// ['Edge', 4],
// ['Safari', 5]
]
const pie3DList = reactive({
list: []
})
onMounted(() => {
iniTapiMaDevInfoList()
iniTapiMaDevInfoTypeList()
iniTapiMaDevInfoCompanyList()
// iniTapiMaDevInfoMatypeList()
iniTapiMaDevInfoMatypeList()
iniTapiMaOrderInfoTodayList()
iniTapiMaOrderInfoList()
// ==
@ -398,7 +372,6 @@ onMounted(() => {
iniTapiBmCompanyInfoTypeLis()
iniTapiMaDevInfoMaList()
InitApiMaLeaseInfoInfoTypeList()
})
@ -419,11 +392,8 @@ const iniTapiMaDevInfoTypeList = async () => {
try {
const res: any = await apiMaDevInfoTypeList()
console.log("apiMaDevInfoTypeList", res)
equipmentCountInfo.selfCount = res.self.count || 0
equipmentCountInfo.shelfCount = res.rent.count || 0
// 查询在租以及待租设备数量
middleCountList.list[2].count = res.use.count || 0
middleCountList.list[3].count = res.rent.count || 0
equipmentCountInfo.selfCount = res.self.count
equipmentCountInfo.shelfCount = res.rent.count
} catch (error) {
console.log(error)
}
@ -442,43 +412,33 @@ const iniTapiMaDevInfoCompanyList = async () => {
]
resultList.push(item)
})
if (resultList.length > 0) {
pie3DList.list = resultList
} else {
pie3DList.list = [
['暂无数据', 0]
]
}
// console.log("pie3DList", pie3DList.list)
pie3DList.list = resultList
} catch (error) {
console.log(error)
pie3DList.list = [
['暂无数据', 0]
]
}
}
// const iniTapiMaDevInfoMatypeList = async () => {
// // 查询在租以及待租设备数量:
// try {
// const res: any = await apiMaDevInfoTypeList()
// console.log("apiMaDevInfoMatypeList", res)
// middleCountList.list[2].count = res.use.count || 0
// middleCountList.list[3].count = res.rent.count || 0
// } catch (error) {
// console.log(error)
// }
const iniTapiMaDevInfoMatypeList = async () => {
// 查询在租以及待租设备数量:
try {
const res: any = await apiMaDevInfoMatypeList()
console.log("apiMaDevInfoMatypeList", res)
middleCountList.list[2].count = res.rent.count
middleCountList.list[3].count = res.use.count
} catch (error) {
console.log(error)
}
// }
}
const iniTapiMaOrderInfoTodayList = async () => {
//查询今日订单额以及订单数量:
try {
const res: any = await apiMaOrderInfoTodayList()
console.log("apiMaOrderInfoTodayList", res)
middleCountList.list[0].count = res.count || 0
middleCountList.list[1].count = res.money || 0
middleCountList.list[0].count = res[0].count
middleCountList.list[1].count = res[0].money
} catch (error) {
console.log('err-->', error)
console.log(error)
}
}
@ -487,7 +447,7 @@ const iniTapiMaOrderInfoList = async () => {
//租赁订单月统计:
try {
const res: any = await apiMaOrderInfoList()
console.log("租赁订单-->", res)
barComPropsSimple.xAxisData = res.map((ele: any) => ele.month)
barComPropsSimple.seriseData = res.map((ele: any) => ele.count)
} catch (error) {
@ -518,7 +478,7 @@ const iniTapiBmCompanyInfoTypeLis = async () => {
platFormInfo.listCount = (res.total + '').padStart(4,'0').split("")
platFormInfo.socailCount = res.social.count
platFormInfo.enterpriseCount = res.grid.count
// platFormInfo.holdingCount = res.corporation.count
platFormInfo.holdingCount = res.corporation.count
} catch (error) {
console.log(error)
@ -532,7 +492,6 @@ const iniTapiMaDevInfoMaList = async () => {
const res: any = await apiMaDevInfoMaList()
console.log("apiMaDevInfoMaList", res)
barComPropsHorizontal.xAxisData = res.map((ele: any) => ele.ownCo)
barComPropsHorizontal.yAxisData = res.map((ele: any) => ele.ownCo)
barComPropsHorizontal.seriseData = res.map((ele: any) => ele.count)
} catch (error) {
@ -554,36 +513,17 @@ const InitApiMaLeaseInfoInfoTypeList= async()=>{
}
}
const nowTime = ref("")
// 实时获取当前时间, 格式为 2023.11.16 星期四 09:56:12
const getCurrentTime = () => {
const date = new Date()
const year = date.getFullYear()
const month = (date.getMonth() + 1 + '').padStart(2, '0')
const day = (date.getDate() + '').padStart(2, '0')
const week = date.getDay()
const weekArr = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']
const hour = (date.getHours() + '').padStart(2, '0')
const minute = (date.getMinutes() + '').padStart(2, '0')
const second = (date.getSeconds() + '').padStart(2, '0')
return `${year}.${month}.${day} ${weekArr[week]} ${hour}:${minute}:${second}`
}
setInterval(() => {
nowTime.value = getCurrentTime()
}, 1000)
onMounted(()=>{
InitApiMaLeaseInfoInfoTypeList()
})
</script>
<style lang="scss" scoped>
.out_echart {
margin: 0 auto;
display: flex;
flex-direction: column;
height: 100%;
min-width: 1920px;
min-height: 1080px;
width: 100vw;
height: 100vh;
background-image: url("../../assets/img/background-bg.png");
background-size: cover;
background-repeat: no-repeat;
@ -594,7 +534,7 @@ setInterval(() => {
width: 100%;
height: 108px;
background-image: url("../../assets/img/top_title.png");
background-size: 100% 109px;
background-size: contain;
background-repeat: no-repeat;
font-size: 40px;
padding-top: 29px;
@ -614,16 +554,12 @@ setInterval(() => {
top: 24px;
color: #42B3FF;
font-size: 16px;
display: flex;
.weather {
.wheather {
padding-right: 34px;
}
.time {
display: flex;
white-space: nowrap;
width: 205px;
}
}
}
@ -639,7 +575,6 @@ setInterval(() => {
height: 252px;
position: relative;
background-color: rgba($color: #011B37, $alpha: 0.6);
margin: 0 auto;
margin-left: 23px;
.sub_title {
@ -718,11 +653,10 @@ setInterval(() => {
.middle_list_com {
height: 100px;
width: 1190px;
width: 1208px;
padding-top: 60px;
display: flex;
justify-content: flex-start;
margin: 0 auto;
margin-left: 28px;
.middle_list_com_item {
@ -803,25 +737,15 @@ setInterval(() => {
}
.more_count {
margin: 30px auto;
display: flex;
justify-content: center;
margin-left: -13px;
.self_shelf_count {
width: 138px;
height: 61px;
width: 100px;
.self_img {
width: 92px;
height: 61px;
background-image: url("../../assets/img/compnay_bg.png");
background-size: cover;
background-repeat: no-repeat;
margin: 0px auto;
line-height: 66px;
text-align: center;
color: #66E0FF;
font-size: 38px;
font-size: 33px;
width: 75px;
height: 50px;
}
}

4
vite.config.ts
View File

@ -79,11 +79,11 @@ export default ({ mode }: any) => {
// port: Number(envInfo.VITE_PORT),
// open: envInfo.VITE_OPEN,
proxy: {
'/proxy': {
'/proxyApi': {
target: envInfo.VITE_proxyTarget,
secure: false,
changeOrigin: true,
rewrite: (path) => path.replace(/^\/proxy/, '/'),
rewrite: (path) => path.replace(/^\/proxyApi/, ''),
configure: (proxy, _options) => {
proxy.on('error', (err, _req, _res) => {
// console.log('proxy error', err)