Skip to content

G
gassafety
Commit 5ef0a2b9 authored by 纪泽龙's avatar 纪泽龙
Browse files
Options

合并jzl

parent 54bfdc33
Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 134 deletions
gassafety-web/src/components/PopWindow/flowMeter.vue
View file @ 5ef0a2b9
...@@ -3,62 +3,111 @@ ...@@ -3,62 +3,111 @@
:title="title" :title="title"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="80%" width="80%"
:before-close="handleClose"> :before-close="handleClose"
<el-form ref="form" :model="form" :rules="rules" label-width="135px"> >
<el-form-item label="所属管道" prop="pipeCode"> <el-row>
<el-select v-model="form.pipeCode" placeholder="请选择所属管道"> <el-form ref="form" :model="form" :rules="rules" label-width="135px">
<el-option <el-col :span="22">
v-for="item in pipeList" <el-form-item label="所属管道" prop="pipeCode">
:key="item.pipeCode" <el-select v-model="form.pipeCode" placeholder="请选择所属管道">
:label="item.pipeName" <el-option
:value="item.pipeCode"> v-for="item in pipeList"
</el-option> :key="item.pipeCode"
</el-select> :label="item.pipeName"
</el-form-item> :value="item.pipeCode"
<el-form-item label="设备名称" prop="deviceName"> >
<el-input v-model="form.deviceName" placeholder="请输入设备名称" /> </el-option>
</el-form-item> </el-select>
<el-form-item label="所在地址" prop="deviceAddr"> </el-form-item>
<el-input v-model="form.deviceAddr" placeholder="请输入所在地址" /> </el-col>
</el-form-item>
<el-form-item label="设备型号" prop="deviceModel"> <el-col :span="11">
<el-input v-model="form.deviceModel" placeholder="请输入设备型号" /> <el-form-item label="设备名称" prop="deviceName">
</el-form-item> <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
<el-form-item label="经度" prop="longitude"> </el-form-item>
<el-input v-model="form.longitude" placeholder="请输入经度" /> </el-col>
</el-form-item>
<el-form-item label="纬度" prop="latitude"> <el-col :span="11">
<el-input v-model="form.latitude" placeholder="请输入纬度" /> <el-form-item label="设备型号" prop="deviceModel">
</el-form-item> <el-input v-model="form.deviceModel" placeholder="请输入设备型号" />
<el-form-item label="物联网编号" prop="iotNo"> </el-form-item>
<el-input v-model="form.iotNo" placeholder="请输入物联网编号" /> </el-col>
</el-form-item> <el-col :span="11">
<el-form-item label="设备图片上传" prop="iconUrl"> <el-form-item label="所在地址" prop="deviceAddr">
<MyFileUpload <el-input v-model="form.deviceAddr" placeholder="请输入所在地址" />
listType="picture-card" </el-form-item>
@resFun="getFileInfo" </el-col>
@remove="listRemove"
:fileArr="fileArr" <el-col :span="11">
/> <el-form-item label="物联网编号" prop="iotNo">
</el-form-item> <el-input v-model="form.iotNo" placeholder="请输入物联网编号" />
<el-form-item label="联系人" prop="linkman"> </el-form-item>
<el-input v-model="form.linkman" placeholder="请输入联系人" /> </el-col>
</el-form-item>
<el-form-item label="电话" prop="phone"> <el-col :span="22">
<el-input v-model="form.phone" placeholder="请输入电话" /> <el-form-item label="经纬度坐标" prop="">
</el-form-item> <el-card class="box-card">
<el-form-item label="安装时间" prop="installationTime"> <div v-text="`[[${form.longitude},${form.latitude}]]`"></div>
<el-date-picker clearable size="small" </el-card>
v-model="form.installationTime" </el-form-item>
type="datetime" </el-col>
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择安装时间"> <!-- <el-col>
</el-date-picker> <el-form-item label="纬度" prop="latitude">
</el-form-item> <el-input v-model="form.latitude" placeholder="请输入纬度" />
<el-form-item label="备注" prop="remarks"> </el-form-item>
<el-input v-model="form.remarks" placeholder="请输入备注" /> </el-col> -->
</el-form-item>
</el-form> <el-col :span="11">
<el-form-item label="联系人" prop="linkman">
<el-input v-model="form.linkman" placeholder="请输入联系人" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" />
</el-form-item>
</el-col>
<el-col>
<el-form-item label="设备图片上传" prop="iconUrl">
<MyFileUpload
listType="picture-card"
@resFun="getFileInfo"
@remove="listRemove"
:fileArr="fileArr"
/>
<el-input v-show="false" disabled v-model="form.iconUrl"></el-input>
</el-form-item>
</el-col>
<el-col>
<el-form-item label="安装时间" prop="installationTime">
<el-date-picker
clearable
size="small"
v-model="form.installationTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择安装时间"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item label="备注" prop="remarks">
<el-input
type="textarea"
v-model="form.remarks"
placeholder="请输入备注"
/>
</el-form-item>
</el-col>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
...@@ -67,88 +116,124 @@ ...@@ -67,88 +116,124 @@
</template> </template>
<script> <script>
import {
getAllDeviceInfo,
addDeviceInfo,
updateDeviceInfo,
} from "@/api/device/deviceInfo";
import { pipeAllInfoList } from "@/api/device/pipe";
import MyFileUpload from "@/components/MyFileUpload";
import { DEVICE_TYPE } from "utils/gaodeMap.js";
import { getAllDeviceInfo ,addDeviceInfo, updateDeviceInfo } from "@/api/device/deviceInfo"; export default {
import { pipeAllInfoList } from "@/api/device/pipe"; props: {
import MyFileUpload from "@/components/MyFileUpload"; title: { type: String },
import { DEVICE_TYPE } from "utils/gaodeMap.js"; },
data() {
export default { return {
props: { form: {
title: { type: String } deviceType: "3",
},
dialogVisible: false,
fileList: [],
// 表单校验
rules: {},
map: null,
obj: null,
gaoMap: null,
fileArr: [],
pipeList: [],
rules: {
pipeCode: [
{ required: true, message: "请选择所属管道", trigger: "blur" },
// { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
],
deviceName: [
{ required: true, message: "请输入设备名称", trigger: "blur" },
],
deviceModel: [
{ required: true, message: "请输入设备型号", trigger: "blur" },
],
deviceAddr: [
{ required: true, message: "请输入所在地址", trigger: "blur" },
],
iotNo: [
{ required: true, message: "请输入物联网编号", trigger: "blur" },
],
linkman: [
{ required: true, message: "请输入联系人", trigger: "blur" },
],
phone: [
{ required: true, message: "请输入联系电话", trigger: "blur" },
],
iconUrl: [{ required: true, message: "请上传图片", trigger: "change" }],
installationTime: [
{
// type: "date",
required: true,
message: "请选择日期",
trigger: "change",
},
],
},
};
},
components: {
MyFileUpload,
},
methods: {
show() {
this.dialogVisible = true;
}, },
data () { hide() {
return { this.remove();
form : {
deviceType : "3"
},
dialogVisible : false,
fileList: [],
// 表单校验
rules: {
},
map : null,
obj : null,
gaoMap : null,
fileArr: [],
pipeList: []
}
}, },
components: { getFileInfo(res) {
MyFileUpload, this.form.iconUrl = res.url;
}, },
methods: { submitForm() {
show () { this.$refs["form"].validate((valid) => {
this.dialogVisible = true; if (valid) {
}, if (this.form.deviceId != null) {
hide () { updateDeviceInfo(this.form).then((response) => {
this.remove() this.dialogVisible = false;
}, this.map.remove(this.obj);
getFileInfo(res){ this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
this.form.iconUrl = res.url; this.msgSuccess("修改成功");
}, });
submitForm() { } else {
this.$refs["form"].validate(valid => { addDeviceInfo(this.form).then((response) => {
if (valid) { if (response.code == 200) {
if (this.form.deviceId != null) { this.remove();
updateDeviceInfo(this.form).then(response => {
this.dialogVisible = false;
this.map.remove(this.obj); this.map.remove(this.obj);
this.gaoMap.addMarker(this.gaoMap.deviceType,this.form); this.form.deviceId = response.data;
this.msgSuccess("修改成功"); this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
}); this.gaoMap.placeSearch.clear();
} else { this.gaoMap.closeAddMarker();
addDeviceInfo(this.form).then(response => { this.msgSuccess("新增成功");
if(response.code == 200){ } else {
this.remove(); this.msgSuccess("新增失败");
this.map.remove(this.obj); }
this.form.deviceId = response.data; });
this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
this.gaoMap.placeSearch.clear();
this.gaoMap.closeAddMarker();
this.msgSuccess("新增成功");
}else{
this.msgSuccess("新增失败");
}
});
}
} }
}); }
},
handleClose(done) {
done();
},
listRemove(e) {
this.form.url = "";
this.fileArr = [];
}
},
mounted(){
pipeAllInfoList({}).then(response => {
this.pipeList = response.data;
}); });
} },
} handleClose(done) {
done();
},
listRemove(e) {
this.form.url = "";
this.fileArr = [];
},
},
mounted() {
pipeAllInfoList({}).then((response) => {
this.pipeList = response.data;
});
},
};
</script> </script>
gassafety-web/src/utils/gaodeMap.js
View file @ 5ef0a2b9
...@@ -684,14 +684,22 @@ class gaodeMap { ...@@ -684,14 +684,22 @@ class gaodeMap {
}); });
that.markerOverlays.push(e.obj); that.markerOverlays.push(e.obj);
} }
if (e.obj && e.obj.getExtData().type == "newLine") { if (e.obj && e.obj.getExtData().type == "newLine") {
console.log("挂上事件"); console.log("挂上事件");
that.newLineAddEvent(e.obj); that.newLineAddEvent(e.obj);
// 记录这条线 // 记录这条线
that.newLineObj = e.obj; // console.log(e.obj.getPath().length)
// 如果只有一个点，并没有连成线的时候就不close 大于一个点的时候才执行clse
console.log(that.lineType)
if (e.obj.getPath().length > 1) {
that.newLineObj = e.obj;
that.mouseTool.close();
} else {
// that.newLineObj = null;
}
// 关闭 // 关闭
that.mouseTool.close();
// 创建一条新线，然后在点地图的时候删除原来的旧线 // 创建一条新线，然后在点地图的时候删除原来的旧线
// that.createNewLine(); // that.createNewLine();
......
gassafety-web/src/views/enterprise/map/index.vue
View file @ 5ef0a2b9
...@@ -270,6 +270,7 @@ export default { ...@@ -270,6 +270,7 @@ export default {
this.gaoMap.lineType = 1; this.gaoMap.lineType = 1;
} else { } else {
this.gaoMap.lineType = 0; this.gaoMap.lineType = 0;
this.gaoMap.mouseTool.close();
} }
// 关闭当前线条的infowindow // 关闭当前线条的infowindow
this.gaoMap.closeLineInfoWindow(); this.gaoMap.closeLineInfoWindow();
......
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