装备配置率配置问题修改
This commit is contained in:
parent
d8296ab418
commit
b0ce123801
|
|
@ -8,12 +8,12 @@
|
||||||
@close="handleCloseDialog"
|
@close="handleCloseDialog"
|
||||||
destroy-on-close
|
destroy-on-close
|
||||||
>
|
>
|
||||||
<el-row :gutter="24" class="map-container">
|
<el-row :gutter="24" class="map-container">
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<!-- 百度地图容器 -->
|
<!-- 百度地图容器 -->
|
||||||
<div id="container" style="height: 550px; background-color: #f5f5f5"></div>
|
<div id="container" style="height: 550px; background-color: #f5f5f5"></div>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -38,8 +38,8 @@ export default {
|
||||||
return {
|
return {
|
||||||
map: null,
|
map: null,
|
||||||
trackAni: null,
|
trackAni: null,
|
||||||
calLon: 116.404, // 默认北京经度
|
calLon: 116.404, // 默认北京经度(兜底值)
|
||||||
calLat: 39.915, // 默认北京纬度
|
calLat: 39.915, // 默认北京纬度(兜底值)
|
||||||
requestParams: {
|
requestParams: {
|
||||||
beginTime: moment().subtract(1, 'days').format('YYYY-MM-DD HH:mm:ss'),
|
beginTime: moment().subtract(1, 'days').format('YYYY-MM-DD HH:mm:ss'),
|
||||||
endTime: moment().format('YYYY-MM-DD HH:mm:ss'),
|
endTime: moment().format('YYYY-MM-DD HH:mm:ss'),
|
||||||
|
|
@ -66,7 +66,8 @@ export default {
|
||||||
async initPage() {
|
async initPage() {
|
||||||
this.initMap();
|
this.initMap();
|
||||||
},
|
},
|
||||||
/** 初始化百度地图(增加双重校验) */
|
|
||||||
|
/** 初始化百度地图(增加双重校验 + 中心点兜底) */
|
||||||
initMap() {
|
initMap() {
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
// 校验1:百度地图SDK是否加载成功
|
// 校验1:百度地图SDK是否加载成功
|
||||||
|
|
@ -78,10 +79,24 @@ export default {
|
||||||
const container = document.getElementById('container');
|
const container = document.getElementById('container');
|
||||||
if (!container) return;
|
if (!container) return;
|
||||||
|
|
||||||
|
// ---------- 核心改造:地图中心点兜底逻辑 ----------
|
||||||
|
let targetLon = this.calLon; // 初始化经度为兜底值
|
||||||
|
let targetLat = this.calLat; // 初始化纬度为兜底值
|
||||||
|
// 仅当address非空时,才尝试解析经纬度
|
||||||
|
if (this.address && this.address.trim() !== '') {
|
||||||
|
const [lon, lat] = this.address.split(',');
|
||||||
|
// 校验:解析后的经纬度必须是有效数字(排除空、字符串、NaN等情况)
|
||||||
|
if (lon && lat && !isNaN(Number(lon)) && !isNaN(Number(lat))) {
|
||||||
|
targetLon = Number(lon);
|
||||||
|
targetLat = Number(lat);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// ---------------------------------------------------
|
||||||
|
|
||||||
// 创建地图实例
|
// 创建地图实例
|
||||||
this.map = new window.BMapGL.Map(container);
|
this.map = new window.BMapGL.Map(container);
|
||||||
// 设备实际位置中心点
|
// 设备实际位置中心点(解析成功用实际值,失败用兜底值)
|
||||||
const centerPoint = new window.BMapGL.Point(this.address.split(',')[0], this.address.split(',')[1]);
|
const centerPoint = new window.BMapGL.Point(targetLon, targetLat);
|
||||||
// 初始化地图:中心点 + 缩放级别
|
// 初始化地图:中心点 + 缩放级别
|
||||||
this.map.centerAndZoom(centerPoint, 15);
|
this.map.centerAndZoom(centerPoint, 15);
|
||||||
// 启用滚轮缩放
|
// 启用滚轮缩放
|
||||||
|
|
@ -89,7 +104,7 @@ export default {
|
||||||
// 地图视角设置
|
// 地图视角设置
|
||||||
this.map.setHeading(64.5);
|
this.map.setHeading(64.5);
|
||||||
this.map.setTilt(73);
|
this.map.setTilt(73);
|
||||||
// 添加设备位置标记
|
// 添加设备位置标记(跟随兜底中心点)
|
||||||
const marker = new window.BMapGL.Marker(centerPoint);
|
const marker = new window.BMapGL.Marker(centerPoint);
|
||||||
this.map.addOverlay(marker);
|
this.map.addOverlay(marker);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -162,7 +162,7 @@
|
||||||
<el-table-column align="center" prop="returnTime" label="归还时间" />
|
<el-table-column align="center" prop="returnTime" label="归还时间" />
|
||||||
<el-table-column align="center" prop="actualNumber" label="实际使用台班数(天)" width="160" />
|
<el-table-column align="center" prop="actualNumber" label="实际使用台班数(天)" width="160" />
|
||||||
<el-table-column align="center" prop="rentalAmount" label="租赁金额(元)" />
|
<el-table-column align="center" prop="rentalAmount" label="租赁金额(元)" />
|
||||||
<el-table-column align="center" prop="fileList" label="装备图">
|
<el-table-column align="center" prop="fileList" label="租赁单据">
|
||||||
<template v-slot="{ row }">
|
<template v-slot="{ row }">
|
||||||
<span
|
<span
|
||||||
v-if="row.fileList && row.fileList.trim() !== ''"
|
v-if="row.fileList && row.fileList.trim() !== ''"
|
||||||
|
|
@ -341,7 +341,7 @@
|
||||||
<!-- 图片一类的处理 -->
|
<!-- 图片一类的处理 -->
|
||||||
<el-row :gutter="20">
|
<el-row :gutter="20">
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item style="font-weight: bold" label="装备图" prop="fileList">
|
<el-form-item style="font-weight: bold" label="租赁单据" prop="fileList">
|
||||||
<ImageUpload
|
<ImageUpload
|
||||||
v-model="addOrEditForm.fileList"
|
v-model="addOrEditForm.fileList"
|
||||||
:value="addOrEditForm.fileList"
|
:value="addOrEditForm.fileList"
|
||||||
|
|
|
||||||
|
|
@ -10,9 +10,9 @@
|
||||||
style="margin-bottom: 20px"
|
style="margin-bottom: 20px"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="head-container">
|
<div class="head-container" style="height:78.5vh;overflow: auto;background-color:#FFFFFF;padding: 10px">
|
||||||
<el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
|
<el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
|
||||||
:filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
|
:filter-node-method="filterNode" ref="tree" node-key="id" highlight-current
|
||||||
@node-click="handleNodeClick"
|
@node-click="handleNodeClick"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue