Commit 9903a482 authored by 冯超鹏's avatar 冯超鹏
parents 13c84791 dd12f5e1
Pipeline #104 failed with stages
...@@ -161,21 +161,23 @@ ...@@ -161,21 +161,23 @@
</el-form> </el-form>
</el-card> </el-card>
</el-drawer> </el-drawer>
<el-drawer title="编辑设备" :visible.sync="drawerup" :direction="directionup" :before-close="handleCloseup"> <el-drawer title="编辑设备" :visible.sync="drawerup" :direction="directionup" :before-close="handleCloseup" custom-class="zl-drawer">
<el-card class="box-card"> <el-card class="box-card">
<el-form ref="updevicedata" :model="updevicedata" label-width="80px"> <el-form ref="updevicedata" :model="updevicedata" label-width="80px">
<el-form-item label="设备编号" label-width="92px"> <el-form-item label="设备编号" label-width="100px">
<el-input v-model="updevicedata.devicenum" :disabled="disabled" style="width: 80%;"></el-input> <el-input v-model="updevicedata.devicenum" :disabled="disabled" style="width: 80%;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="用户名称" label-width="92px"> <el-form-item label="用户名称" label-width="100px">
<el-input v-model="updevicedata.name" :disabled="disabled" style="width: 80%;"></el-input> <el-input v-model="updevicedata.name" :disabled="disabled" style="width: 80%;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="设备名称" label-width="92px"> <el-form-item label="设备名称" label-width="100px">
<el-input v-model="updevicedata.username" style="width: 80%;"></el-input> <el-input v-model="updevicedata.username" style="width: 80%;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="设备坐标" label-width="100px"> <el-form-item label="设备坐标" label-width="100px">
<el-input v-model="updevicedata.devicecoord" style="width: 80%;"></el-input> <el-input v-model="updevicedata.devicecoord" style="width: 50%;"></el-input>
<el-button type="primary" style="left: 18px;z-index: 999;width: 54px;" @click="accuracy"><span style="left: -22px;position: relative;">拾取坐标</span></el-button> <el-button type="primary" @click="drawerMap = true">
拾取坐标
</el-button>
</el-form-item> </el-form-item>
<el-form-item label="设备联系人" label-width="100px"> <el-form-item label="设备联系人" label-width="100px">
<el-input v-model="updevicedata.devicelinkman" style="width: 80%;"></el-input> <el-input v-model="updevicedata.devicelinkman" style="width: 80%;"></el-input>
...@@ -200,6 +202,9 @@ ...@@ -200,6 +202,9 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<el-drawer title="拾取坐标" :visible.sync="drawerMap" :modal="false" :direction="directionMap" :before-close="handleClose" size="70%" :with-header="false">
<div><CoordinateMap @map-confirm="mapConfirmData" @giveLnglat="getLnglat"></CoordinateMap></div>
</el-drawer>
</el-drawer> </el-drawer>
</div> </div>
</div> </div>
...@@ -212,12 +217,15 @@ import waves from '@/directive/waves'; // 水波纹效果 ...@@ -212,12 +217,15 @@ import waves from '@/directive/waves'; // 水波纹效果
import clip from '@/utils/clipboard'; import clip from '@/utils/clipboard';
import checkPermission from '@/utils/permission'; import checkPermission from '@/utils/permission';
import { parseTime } from '@/utils'; import { parseTime } from '@/utils';
import CoordinateMap from '@/components/coordinateMap';
export default { export default {
name: 'Devicetype', name: 'Devicetype',
components: { Pagination }, components: { Pagination, CoordinateMap },
directives: { waves }, directives: { waves },
data() { data() {
return { return {
drawerMap: false,
directionMap: 'rtl',
tableKey: 0, tableKey: 0,
downloadLoading: false, downloadLoading: false,
pvData: [], pvData: [],
...@@ -261,6 +269,18 @@ export default { ...@@ -261,6 +269,18 @@ export default {
}, },
methods: { methods: {
mapConfirmData(text) {
if (text.state === true) {
this.updevicedata.devicecoord = text.location;
this.drawerMap = false;
}
if (text.state === false) {
this.drawerMap = false;
}
},
getLnglat(lnglnt) {
console.log(lnglnt);
},
checkPermission, checkPermission,
getList() { getList() {
deviceTypeList() deviceTypeList()
...@@ -513,4 +533,7 @@ export default { ...@@ -513,4 +533,7 @@ export default {
margin-bottom: 0; margin-bottom: 0;
width: 50%; width: 50%;
} }
.zl-drawer .el-drawer__body {
overflow-y: auto !important;
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment