Yangwl
/
xy_tyrems
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并冲突

Browse Source
master
夜笙歌 2 years ago
parent e45982c29b
commit 7d77a60897
2 changed files with 26 additions and 48 deletions
Show Stats Download Patch File Download Diff File

64
ruoyi-ui/src/views/basecar/car/index.vue
Unescape Escape View File

@ -33,10 +33,10 @@
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
icon="Edit"
plain
type="success"
@click="handleUpdate"
v-hasPermi="['basecar:car:edit']"
>{{ t('option.edit') }}
@ -44,22 +44,22 @@
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
v-hasPermi="['basecar:car:remove']"
:disabled="multiple"
icon="Delete"
plain
type="danger"
@click="handleDelete"
v-hasPermi="['basecar:car:remove']"
>{{ t('option.remove') }}
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
v-hasPermi="['basecar:car:export']"
icon="Download"
plain
type="warning"
@click="handleExport"
v-hasPermi="['basecar:car:export']"
>{{ t('option.export') }}
</el-button>
</el-col>
@ -68,45 +68,14 @@
<!-- 表格主体-->
<el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" fixed/>
<!-- <el-table-column :label="t('baseCar.car.companyCode')" align="center" prop="companyCode" width="150"/>-->
<!-- <el-table-column :label="t('baseCar.car.carQueueId')" align="center" prop="carQueueId" width="150"/>-->
<!-- <el-table-column :label="t('baseCar.car.carTypeId')" align="center" prop="carTypeId" :width="locale ? 150:170"/>-->
<el-table-column align="center" fixed type="selection" width="55"/>
<el-table-column :label="t('baseCar.car.carLicense')" align="center" prop="carLicense" width="150"/>
<el-table-column label="所属车队" align="center" prop="carLicense" width="150"/>
<el-table-column label="所属车型" align="center" prop="carLicense" width="150"/>
<el-table-column align="center" label="所属车队" prop="carQueueId" />
<el-table-column align="center" label="所属车型" prop="carTypeId" />
<el-table-column :label="t('baseCar.car.deviceId')" align="center" prop="deviceId" width="150"/>
<el-table-column :label="t('baseCar.car.deviceBindTime')" align="center" prop="deviceBindTime"/>
<el-table-column :label="t('baseCar.car.deviceBindTime')" align="center" prop="deviceBindTime" width="150"/>
<el-table-column :label="t('common.createTime')" align="center" prop="createTime" width="160"/>
<el-table-column :label="t('common.createBy')" align="center" prop="createBy" width="150"/>
<!-- <el-table-column :label="t('baseCar.car.carLicenseIn')" align="center" prop="carLicenseIn"-->
<!-- :width="locale ? 150:170"/>-->
<!-- <el-table-column :label="t('baseCar.car.carLicenseParent')" align="center" prop="carLicenseParent"-->
<!-- :width="locale ? 150:170"/>-->
<!-- <el-table-column :label="t('baseCar.car.carIdParent')" align="center" prop="carIdParent" width="150"/>-->
<!-- <el-table-column :label="t('baseCar.car.userId')" align="center" prop="userId" width="150"/>-->
<!-- <el-table-column :label="t('baseCar.car.userName')" align="center" prop="userName" width="150"/>-->
<!-- :width="locale ? 150:170"/>-->
<!-- <el-table-column :label="t('baseCar.car.firstChangeDate')" align="center" prop="firstChangeDate"-->
<!-- :width="locale ? 150:170"/>-->
<!-- <el-table-column :label="t('baseCar.car.trailerNum')" align="center" prop="trailerNum" width="150"/>-->
<!-- <el-table-column :label="t('baseCar.car.isHandDevice')" align="center" prop="isHandDevice"-->
<!-- :width="locale ? 150:310"/>-->
<!-- <el-table-column :label="t('baseCar.car.isHasDevice')" align="center" prop="isHasDevice"-->
<!-- :width="locale ? 150:260"/>-->
<!-- <el-table-column :label="t('baseCar.car.longitude')" align="center" prop="longitude" width="150"/>-->
<!-- <el-table-column :label="t('baseCar.car.latitude')" align="center" prop="latitude" width="150"/>-->
<!-- <el-table-column :label="t('baseCar.car.tiresTotal')" align="center" prop="tiresTotal" width="150"/>-->
<!-- <el-table-column :label="t('common.isRemove')" align="center" prop="isDelete" width="150"/>-->
<!-- <el-table-column :label="t('common.creatorId')" align="center" prop="createId" width="150"/>-->
<!-- <el-table-column :label="t('common.creatorName')" align="center" prop="createName" width="150"/>-->
<!-- <el-table-column :label="t('common.editTime')" align="center" prop="modifyTime" width="150"/>-->
<!-- <el-table-column :label="t('common.editID')" align="center" prop="modifyId" width="150"/>-->
<!-- <el-table-column :label="t('common.editBy')" align="center" prop="modifyBy" width="150"/>-->
<el-table-column :label="t('option.option')" align="center" class-name="small-padding fixed-width" fixed="right"
width="160">
<template #default="scope">
@ -124,9 +93,9 @@
<!-- 分页-->
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.pageNum"
:total="total"
@pagination="getList"
/>
@ -319,6 +288,7 @@ function handleBang(row){
/** 提交按钮 */
function submitForm() {
console.log(form)
proxy.$refs["postRef"].validate(valid => {
if (valid) {
if (form.value.id != undefined) {

10
ruoyi-ui/src/views/realTimeMonitoring/vehicleMonitoring/index.vue
Unescape Escape View File

@ -129,13 +129,21 @@ const setMarker = async () => {
}
const setLine = async () => {
let path = [[116.478935, 39.997761], [103.85094, 35.987496], [106.205794, 38.458831], [108.983569, 34.285675], [111.761777, 40.875595]]
let polyline = new AMap.Polyline({
path: [[116.478935, 39.997761], [103.85094, 35.987496], [106.205794, 38.458831], [108.983569, 34.285675], [111.761777, 40.875595]],
path:path,
showDir: true,
strokeColor: '#77DDFF', // 线颜色--浅蓝色
strokeWeight: 6, // 线宽
lineJoin: 'round', // 折线拐点的绘制样式
})
let distance = Math.round(AMap.GeometryUtil.distanceOfLine(path));
let text = new AMap.Text({
position: new AMap.LngLat(path[path.length-1][0],path[path.length-1][1]),
text: '路径长' + distance + '米',
offset: new AMap.Pixel(0, 0)
})
map.add(text);
map.add(polyline);
}

Write Preview
Loading…
Cancel
Save