Skip to content

G
gassafety
Commit d94c26c0 authored by yaqizhang's avatar yaqizhang
Browse files
Options

Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master

parents 2336a58c e32d6d26
Expand all Show whitespace changes
Inline Side-by-side
Showing with 739 additions and 310 deletions
gassafety-system/src/main/java/com/zehong/system/domain/vo/WorkOrderVo.java
View file @ d94c26c0
package com.zehong.system.domain.vo; package com.zehong.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity; import com.zehong.common.core.domain.BaseEntity;
import com.zehong.system.domain.TDeviceInfo; import com.zehong.system.domain.TDeviceInfo;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
...@@ -92,6 +93,15 @@ public class WorkOrderVo extends BaseEntity ...@@ -92,6 +93,15 @@ public class WorkOrderVo extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date feedbackTime; private Date feedbackTime;
/** 图片地址1 */
private String pictureUrl1;
/** 图片地址2 */
private String pictureUrl2;
/** 图片地址3 */
private String pictureUrl3;
/** 处理状态 */ /** 处理状态 */
private String dealStatus; private String dealStatus;
...@@ -291,6 +301,30 @@ public class WorkOrderVo extends BaseEntity ...@@ -291,6 +301,30 @@ public class WorkOrderVo extends BaseEntity
this.feedbackTime = feedbackTime; this.feedbackTime = feedbackTime;
} }
public String getPictureUrl1() {
return pictureUrl1;
}
public void setPictureUrl1(String pictureUrl1) {
this.pictureUrl1 = pictureUrl1;
}
public String getPictureUrl2() {
return pictureUrl2;
}
public void setPictureUrl2(String pictureUrl2) {
this.pictureUrl2 = pictureUrl2;
}
public String getPictureUrl3() {
return pictureUrl3;
}
public void setPictureUrl3(String pictureUrl3) {
this.pictureUrl3 = pictureUrl3;
}
public String getDealStatus() { public String getDealStatus() {
return dealStatus; return dealStatus;
} }
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TWorkOrderServiceImpl.java
View file @ d94c26c0
...@@ -141,6 +141,9 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService ...@@ -141,6 +141,9 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
workOrderVo.setContents(feedback.getContents()); workOrderVo.setContents(feedback.getContents());
workOrderVo.setFeedbackTime(feedback.getFeedbackTime()); workOrderVo.setFeedbackTime(feedback.getFeedbackTime());
workOrderVo.setDealStatus(feedback.getDealStatus()); workOrderVo.setDealStatus(feedback.getDealStatus());
workOrderVo.setPictureUrl1(feedback.getPictureUrl1() != null ? feedback.getPictureUrl1() : null);
workOrderVo.setPictureUrl2(feedback.getPictureUrl2() != null ? feedback.getPictureUrl2() : null);
workOrderVo.setPictureUrl3(feedback.getPictureUrl3() != null ? feedback.getPictureUrl3() : null);
} }
return workOrderVo; return workOrderVo;
......
gassafety-web/src/api/device/pipe.js
View file @ d94c26c0
...@@ -9,6 +9,7 @@ export function listPipe(query) { ...@@ -9,6 +9,7 @@ export function listPipe(query) {
}) })
} }
// 查询管道信息列表 // 查询管道信息列表
export function pipeAllInfoList(query) { export function pipeAllInfoList(query) {
return request({ return request({
...@@ -18,11 +19,15 @@ export function pipeAllInfoList(query) { ...@@ -18,11 +19,15 @@ export function pipeAllInfoList(query) {
}) })
} }
// 查询管道信息详细
export function getPipe(pipeId) {
// getAllDeviceInfo
export function getAllDevice(data) {
return request({ return request({
url: '/device/pipe/' + pipeId, url: '/device/pipe/getAllDeviceInfo',
method: 'get' method: 'post',
data: data
}) })
} }
......
gassafety-web/src/components/PopWindow/flowMeter.vue
View file @ d94c26c0
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
data () { data () {
return { return {
form : { form : {
deviceType : "1" deviceType : "3"
}, },
dialogVisible : false, dialogVisible : false,
fileList: [], fileList: [],
...@@ -106,6 +106,8 @@ ...@@ -106,6 +106,8 @@
if (this.form.deviceId != null) { if (this.form.deviceId != null) {
updateDeviceInfo(this.form).then(response => { updateDeviceInfo(this.form).then(response => {
this.dialogVisible = false; this.dialogVisible = false;
this.map.remove(this.obj);
this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
}); });
} else { } else {
......
gassafety-web/src/components/PopWindow/pipelineView.vue
View file @ d94c26c0
...@@ -4,8 +4,14 @@ ...@@ -4,8 +4,14 @@
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:before-close="handleClose" :before-close="handleClose"
> >
<el-row> <el-row >
<el-form ref="editForm" :model="editForm" label-width="120px" size="mini"> <el-form
:rules="rules"
ref="editForm"
:model="editForm"
label-width="120px"
size="mini"
>
<el-col> <el-col>
<el-form-item v-show="false" label="管道id" prop="pipeId"> <el-form-item v-show="false" label="管道id" prop="pipeId">
<el-input <el-input
...@@ -44,8 +50,8 @@ ...@@ -44,8 +50,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col> <el-col>
<el-form-item label="管道所在地址" prop="iconUrl"> <el-form-item label="管道所在地址" prop="pipeAddr">
<el-input v-model="editForm.iconUrl"></el-input> <el-input v-model="editForm.pipeAddr"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col> <el-col>
...@@ -78,7 +84,7 @@ ...@@ -78,7 +84,7 @@
<!-- select --> <!-- select -->
<el-radio-group v-model="editForm.pipePressure"> <el-radio-group v-model="editForm.pipePressure">
<!-- 1低压，2中压，3次高压，4高压 --> <!-- 1低压，2中压，3次高压，4高压 -->
<el-radio label="1">低押</el-radio> <el-radio label="1">低压</el-radio>
<el-radio label="2">中压</el-radio> <el-radio label="2">中压</el-radio>
<el-radio label="3">次高压</el-radio> <el-radio label="3">次高压</el-radio>
<el-radio label="4">高压</el-radio> <el-radio label="4">高压</el-radio>
...@@ -86,20 +92,21 @@ ...@@ -86,20 +92,21 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col> <el-col>
<el-form-item label="上传图片" prop=""> <el-form-item label="上传图片" prop="iconUrl">
<MyFileUpload <MyFileUpload
listType="picture-card" listType="picture-card"
@resFun="fileFinshed" @resFun="fileFinshed"
@remove="listRemove" @remove="listRemove"
:fileArr="fileArr" :fileArr="fileArr"
/> />
<el-input v-show="false" disabled v-model="editForm.iconUrl"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item v-show="false" label="设备图片路径" prop="iconUrl"> -->
<!-- </el-form-item> -->
</el-col> </el-col>
<el-col> <!-- <el-col>
<el-form-item v-show="false" label="设备图片路径" prop="url">
<el-input disabled v-model="editForm.url"></el-input> </el-col> -->
</el-form-item>
</el-col>
<el-col> <el-col>
<el-form-item label="安装日期" prop="installationTime"> <el-form-item label="安装日期" prop="installationTime">
<el-col :span="11"> <el-col :span="11">
...@@ -141,6 +148,8 @@ ...@@ -141,6 +148,8 @@
<script> <script>
import MyFileUpload from "@/components/MyFileUpload"; import MyFileUpload from "@/components/MyFileUpload";
import { addPipe, updatePipe } from "@/api/device/pipe.js"; import { addPipe, updatePipe } from "@/api/device/pipe.js";
import { getString } from "@/utils/gassafety.js";
import moment from "moment";
export default { export default {
props: { props: {
lineData: { lineData: {
...@@ -170,11 +179,42 @@ export default { ...@@ -170,11 +179,42 @@ export default {
// isShow: false, // isShow: false,
fileArr: [], fileArr: [],
editForm: { editForm: {
pipeName:"",
pipeType: "1", pipeType: "1",
pipePressure: "1", pipePressure: "1",
url: "", iconUrl: "",
}, },
dialogVisible: false, dialogVisible: false,
rules: {
pipeName: [
{ required: true, message: "请输入管道名称", trigger: "blur" },
// { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
],
pipeCode: [
{ required: true, message: "请输入管道编号", trigger: "blur" },
],
pipeLength: [
{ required: true, message: "请输入管道长度", trigger: "blur" },
],
pipeAddr: [
{ required: true, message: "请输入管道所在地址", trigger: "blur" },
],
pipeType: [
{ required: true, message: "请选择管道类型", trigger: "blur" },
],
pipePressure: [
{ required: true, message: "请选择管道压力", trigger: "blur" },
],
iconUrl: [{ required: true, message: "请上传骨片", trigger: "change" }],
installationTime: [
{
// type: "date",
required: true,
message: "请选择日期",
trigger: "change",
},
],
},
}; };
}, },
created() { created() {
...@@ -182,25 +222,33 @@ export default { ...@@ -182,25 +222,33 @@ export default {
if (this.lineData?.pipeId) { if (this.lineData?.pipeId) {
this.editForm = { ...this.lineData }; this.editForm = { ...this.lineData };
} }
this.editForm.coordinates = this.lnglatsArr; this.editForm.coordinates = getString(this.lnglatsArr);
// 如果有图片路径就赋显，如果没有就啥也没有 // 如果有图片路径就赋显，如果没有就啥也没有
this.fileArr = this.editForm.url != "" ? [{ url: this.editForm.url }] : []; this.fileArr = this.lineData.pipeId ? [{ url: this.editForm.iconUrl }] : [];
}, },
methods: { methods: {
mouseup(){
console.log('组件mouseup')
},
ok() { ok() {
// console.log(this.editForm.pipeId); this.$refs.editForm.validate((valid)=>{
// if(this.editForm.pipeId){ if(valid){
// console.log("更改")
// }else{
// console.log("新增")
// }
const data = { ...this.editForm }; const data = { ...this.editForm };
data.installationTime = moment(this.editForm.installationTime).format(
"YYYY-MM-DD HH:mm:ss"
);
console.log("data", data); console.log("data", data);
console.log(this.editForm.pipeId); console.log(this.editForm.pipeId);
this.requeset(this.editForm.pipeId).then((res) => { this.requeset(this.editForm.pipeId, data).then((res) => {
// 改变this指向，传回去target ，传回去data
if (res.code == 200) {
this.dialogVisible = false; this.dialogVisible = false;
this.lineOkCallBack.call(this.gaodeMap, this.target); data.pipeId =data.pipeId ?data.pipeId: res.data;
this.lineOkCallBack.call(this.gaodeMap, this.target, data);
}
}); });
}
})
// console.log(this.gaodeMap,this.target) // console.log(this.gaodeMap,this.target)
}, },
async requeset(id, data) { async requeset(id, data) {
...@@ -222,16 +270,18 @@ export default { ...@@ -222,16 +270,18 @@ export default {
this.$confirm("确认关闭？") this.$confirm("确认关闭？")
.then((_) => { .then((_) => {
done(); done();
}) })
.catch((_) => {}); .catch((_) => {});
}, },
// 图片上传成功 // 图片上传成功
fileFinshed(e) { fileFinshed(e) {
this.editForm.url = e.url; this.editForm.iconUrl = e.url;
}, },
// 图片列表移除 // 图片列表移除
listRemove(e) { listRemove(e) {
this.editForm.url = ""; this.editForm.iconUrl = "";
this.fileArr = []; this.fileArr = [];
}, },
}, },
......
gassafety-web/src/components/PopWindow/pressureGage.vue 0 → 100644
View file @ d94c26c0
<template>
<el-dialog
:title="title"
:visible.sync="dialogVisible"
width="80%"
:before-close="handleClose">
<el-form ref="form" :model="form" :rules="rules" label-width="135px">
<el-form-item label="所属管道" prop="pipeCode">
<el-input v-model="form.pipeCode" placeholder="请输入所属管道" />
</el-form-item>
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="请输入设备名称" />
</el-form-item>
<el-form-item label="所在地址" prop="deviceAddr">
<el-input v-model="form.deviceAddr" placeholder="请输入所在地址" />
</el-form-item>
<el-form-item label="设备型号" prop="deviceModel">
<el-input v-model="form.deviceModel" placeholder="请输入设备型号" />
</el-form-item>
<el-form-item label="经度" prop="longitude">
<el-input v-model="form.longitude" placeholder="请输入经度" />
</el-form-item>
<el-form-item label="纬度" prop="latitude">
<el-input v-model="form.latitude" placeholder="请输入纬度" />
</el-form-item>
<el-form-item label="物联网编号" prop="iotNo">
<el-input v-model="form.iotNo" placeholder="请输入物联网编号" />
</el-form-item>
<el-form-item label="设备图片上传" prop="iconUrl">
<MyFileUpload
listType="picture-card"
@resFun="getFileInfo"
@remove="listRemove"
:fileArr="fileArr"
/>
</el-form-item>
<el-form-item label="联系人" prop="linkman">
<el-input v-model="form.linkman" placeholder="请输入联系人" />
</el-form-item>
<el-form-item label="电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入电话" />
</el-form-item>
<el-form-item label="安装时间" prop="installationTime">
<el-date-picker clearable size="small"
v-model="form.installationTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择安装时间">
</el-date-picker>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" placeholder="请输入备注" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</span>
</el-dialog>
</template>
<script>
import { getAllDeviceInfo ,addDeviceInfo, updateDeviceInfo } from "@/api/device/deviceInfo";
import MyFileUpload from "@/components/MyFileUpload";
import { DEVICE_TYPE } from "utils/gaodeMap.js";
export default {
props: {
title: { type: String }
},
data () {
return {
form : {
deviceType : "4"
},
dialogVisible : false,
fileList: [],
// 表单校验
rules: {
},
map : null,
obj : null,
gaoMap : null,
fileArr: []
}
},
components: {
MyFileUpload,
},
methods: {
show () {
this.dialogVisible = true;
},
hide () {
this.remove()
},
getFileInfo(res){
this.form.iconUrl = res.url;
},
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.deviceId != null) {
updateDeviceInfo(this.form).then(response => {
this.dialogVisible = false;
this.map.remove(this.obj);
this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
this.msgSuccess("修改成功");
});
} else {
addDeviceInfo(this.form).then(response => {
if(response.code == 200){
this.remove();
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 = [];
}
}
}
</script>
gassafety-web/src/components/PopWindow/regulatorBox.vue
View file @ d94c26c0
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
rules: { rules: {
}, },
map : null, map : null,
obj : Object, obj : null,
gaoMap : null, gaoMap : null,
fileArr: [] fileArr: []
} }
...@@ -104,6 +104,8 @@ ...@@ -104,6 +104,8 @@
if (this.form.deviceId != null) { if (this.form.deviceId != null) {
updateDeviceInfo(this.form).then(response => { updateDeviceInfo(this.form).then(response => {
this.dialogVisible = false; this.dialogVisible = false;
this.map.remove(this.obj);
this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
}); });
} else { } else {
...@@ -112,6 +114,7 @@ ...@@ -112,6 +114,7 @@
this.remove(); this.remove();
this.map.remove(this.obj); this.map.remove(this.obj);
this.form.deviceId = response.data; this.form.deviceId = response.data;
console.log(this.gaoMap,"addgaoMap")
this.gaoMap.addMarker(this.gaoMap.deviceType,this.form); this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
this.gaoMap.placeSearch.clear(); this.gaoMap.placeSearch.clear();
this.gaoMap.closeAddMarker(); this.gaoMap.closeAddMarker();
......
gassafety-web/src/components/PopWindow/valveWell.vue
View file @ d94c26c0
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
data () { data () {
return { return {
form : { form : {
deviceType : "1" deviceType : "2"
}, },
dialogVisible : false, dialogVisible : false,
fileList: [], fileList: [],
...@@ -106,6 +106,8 @@ ...@@ -106,6 +106,8 @@
if (this.form.deviceId != null) { if (this.form.deviceId != null) {
updateDeviceInfo(this.form).then(response => { updateDeviceInfo(this.form).then(response => {
this.dialogVisible = false; this.dialogVisible = false;
this.map.remove(this.obj);
this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
}); });
} else { } else {
......
gassafety-web/src/utils/gaodeMap.js
View file @ d94c26c0
This diff is collapsed.
gassafety-web/src/utils/gassafety.js
View file @ d94c26c0
...@@ -3,27 +3,27 @@ ...@@ -3,27 +3,27 @@
* Copyright (c) 2021 gassafety * Copyright (c) 2021 gassafety
*/ */
const baseURL = process.env.VUE_APP_BASE_API const baseURL = process.env.VUE_APP_BASE_API;
// 日期格式化 // 日期格式化
export function parseTime(time, pattern) { export function parseTime(time, pattern) {
if (arguments.length === 0 || !time) { if (arguments.length === 0 || !time) {
return null return null;
} }
const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}' const format = pattern || "{y}-{m}-{d} {h}:{i}:{s}";
let date let date;
if (typeof time === 'object') { if (typeof time === "object") {
date = time date = time;
} else { } else {
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { if (typeof time === "string" && /^[0-9]+$/.test(time)) {
time = parseInt(time) time = parseInt(time);
} else if (typeof time === 'string') { } else if (typeof time === "string") {
time = time.replace(new RegExp(/-/gm), '/'); time = time.replace(new RegExp(/-/gm), "/");
} }
if ((typeof time === 'number') && (time.toString().length === 10)) { if (typeof time === "number" && time.toString().length === 10) {
time = time * 1000 time = time * 1000;
} }
date = new Date(time) date = new Date(time);
} }
const formatObj = { const formatObj = {
y: date.getFullYear(), y: date.getFullYear(),
...@@ -33,17 +33,19 @@ export function parseTime(time, pattern) { ...@@ -33,17 +33,19 @@ export function parseTime(time, pattern) {
i: date.getMinutes(), i: date.getMinutes(),
s: date.getSeconds(), s: date.getSeconds(),
a: date.getDay() a: date.getDay()
} };
const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
let value = formatObj[key] let value = formatObj[key];
// Note: getDay() returns 0 on Sunday // Note: getDay() returns 0 on Sunday
if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] } if (key === "a") {
return ["日", "一", "二", "三", "四", "五", "六"][value];
}
if (result.length > 0 && value < 10) { if (result.length > 0 && value < 10) {
value = '0' + value value = "0" + value;
} }
return value || 0 return value || 0;
}) });
return time_str return time_str;
} }
// 表单重置 // 表单重置
...@@ -57,8 +59,8 @@ export function resetForm(refName) { ...@@ -57,8 +59,8 @@ export function resetForm(refName) {
export function addDateRange(params, dateRange, propName) { export function addDateRange(params, dateRange, propName) {
var search = params; var search = params;
search.params = {}; search.params = {};
if (null != dateRange && '' != dateRange) { if (null != dateRange && "" != dateRange) {
if (typeof (propName) === "undefined") { if (typeof propName === "undefined") {
search.params["beginTime"] = dateRange[0]; search.params["beginTime"] = dateRange[0];
search.params["endTime"] = dateRange[1]; search.params["endTime"] = dateRange[1];
} else { } else {
...@@ -72,13 +74,13 @@ export function addDateRange(params, dateRange, propName) { ...@@ -72,13 +74,13 @@ export function addDateRange(params, dateRange, propName) {
// 回显数据字典 // 回显数据字典
export function selectDictLabel(datas, value) { export function selectDictLabel(datas, value) {
var actions = []; var actions = [];
Object.keys(datas).some((key) => { Object.keys(datas).some(key => {
if (datas[key].dictValue == ('' + value)) { if (datas[key].dictValue == "" + value) {
actions.push(datas[key].dictLabel); actions.push(datas[key].dictLabel);
return true; return true;
} }
}) });
return actions.join(''); return actions.join("");
} }
// 回显数据字典（字符串数组） // 回显数据字典（字符串数组）
...@@ -86,33 +88,40 @@ export function selectDictLabels(datas, value, separator) { ...@@ -86,33 +88,40 @@ export function selectDictLabels(datas, value, separator) {
var actions = []; var actions = [];
var currentSeparator = undefined === separator ? "," : separator; var currentSeparator = undefined === separator ? "," : separator;
var temp = value.split(currentSeparator); var temp = value.split(currentSeparator);
Object.keys(value.split(currentSeparator)).some((val) => { Object.keys(value.split(currentSeparator)).some(val => {
Object.keys(datas).some((key) => { Object.keys(datas).some(key => {
if (datas[key].dictValue == ('' + temp[val])) { if (datas[key].dictValue == "" + temp[val]) {
actions.push(datas[key].dictLabel + currentSeparator); actions.push(datas[key].dictLabel + currentSeparator);
} }
}) });
}) });
return actions.join('').substring(0, actions.join('').length - 1); return actions.join("").substring(0, actions.join("").length - 1);
} }
// 通用下载方法 // 通用下载方法
export function download(fileName) { export function download(fileName) {
window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true; window.location.href =
baseURL +
"/common/download?fileName=" +
encodeURI(fileName) +
"&delete=" +
true;
} }
// 字符串格式化(%s ) // 字符串格式化(%s )
export function sprintf(str) { export function sprintf(str) {
var args = arguments, flag = true, i = 1; var args = arguments,
str = str.replace(/%s/g, function () { flag = true,
i = 1;
str = str.replace(/%s/g, function() {
var arg = args[i++]; var arg = args[i++];
if (typeof arg === 'undefined') { if (typeof arg === "undefined") {
flag = false; flag = false;
return ''; return "";
} }
return arg; return arg;
}); });
return flag ? str : ''; return flag ? str : "";
} }
// 转换字符串，undefined,null等转化为"" // 转换字符串，undefined,null等转化为""
...@@ -132,9 +141,9 @@ export function praseStrEmpty(str) { ...@@ -132,9 +141,9 @@ export function praseStrEmpty(str) {
*/ */
export function handleTree(data, id, parentId, children) { export function handleTree(data, id, parentId, children) {
let config = { let config = {
id: id || 'id', id: id || "id",
parentId: parentId || 'parentId', parentId: parentId || "parentId",
childrenList: children || 'children' childrenList: children || "children"
}; };
var childrenListMap = {}; var childrenListMap = {};
...@@ -173,3 +182,37 @@ export function handleTree(data, id, parentId, children) { ...@@ -173,3 +182,37 @@ export function handleTree(data, id, parentId, children) {
} }
return tree; return tree;
} }
// 二维数组转字符串
export const getString = objarr => {
const typeNO = objarr.length;
let tree = "[";
for (var i = 0; i < typeNO; i++) {
tree += "[";
tree += "'" + objarr[i][0] + "',";
tree += "'" + objarr[i][1] + "'";
tree += "]";
if (i < typeNO - 1) {
tree += ",";
}
}
tree += "]";
return tree;
};
// 二维数组字符串转回数组
export const getArray = str => {
let newArr = str.slice(1, str.length - 1);
newArr = newArr.split("],")
return newArr.map((item, index, own) => {
let str = "",
arr = [];
str = item.replace(/\[/g, "");
str = str.replace(/]/g, "");
arr = str.split(",");
arr = arr.map(item => {
return Number(item);
});
return arr;
});
};
gassafety-web/src/views/enterprise/map/index.vue
View file @ d94c26c0
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<div <div
class="el-btn" class="el-btn"
:class="{ active: targetNum == 1 }" :class="{ active: targetNum == 1 }"
@click="addDevice" @click.stop="addDevice"
> >
<template v-if="iconClass == 'icon-create'"> <template v-if="iconClass == 'icon-create'">
<span class="left"> <span class="left">
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<div <div
class="el-btn" class="el-btn"
:class="{ active: targetNum == 2 }" :class="{ active: targetNum == 2 }"
@click="editDevice" @click.stop="editDevice"
> >
<span class="left"> <span class="left">
<i class="iconfont icon-compile" /> <i class="iconfont icon-compile" />
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<div <div
class="el-btn" class="el-btn"
:class="{ active: targetNum == 3 }" :class="{ active: targetNum == 3 }"
@click="deleteDevice" @click.stop="deleteDevice"
> >
<span class="left"> <span class="left">
<i class="iconfont icon-delete" /> <i class="iconfont icon-delete" />
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<div <div
class="op-btn" class="op-btn"
:class="{ active: item.value == createValue }" :class="{ active: item.value == createValue }"
@click="createChange(item)" @click.stop="createChange($event, item)"
> >
<span class="left"> <span class="left">
<i class="iconfont" :class="item.icon" /> <i class="iconfont" :class="item.icon" />
...@@ -89,8 +89,19 @@ ...@@ -89,8 +89,19 @@
</div> </div>
<!-- <el-select--> <!-- <el-select-->
<el-input v-model="keyWord" placeholder="点击输入" id="tipinput" class="search-input"/> <el-input
<el-button type="red" icon="el-icon-search" class="search-but" @click="search()">搜索</el-button> v-model="keyWord"
placeholder="点击输入"
id="tipinput"
class="search-input"
/>
<el-button
type="red"
icon="el-icon-search"
class="search-but"
@click="search()"
>搜索</el-button
>
<!-- <el-button <!-- <el-button
type="primary" type="primary"
style="position: absolute; top: 100px; left: 75%" style="position: absolute; top: 100px; left: 75%"
...@@ -128,7 +139,7 @@ ...@@ -128,7 +139,7 @@
v-for="item in changeBtnData" v-for="item in changeBtnData"
:key="item.value" :key="item.value"
class="box" class="box"
:class="{ active: leftBarNum.indexOf(item.value)>=0 }" :class="{ active: leftBarNum.indexOf(item.value) >= 0 }"
@click="leftBarChange(item)" @click="leftBarChange(item)"
> >
<div class="left"> <div class="left">
...@@ -143,7 +154,7 @@ ...@@ -143,7 +154,7 @@
</template> </template>
<script> <script>
import gaodeMap from "utils/gaodeMap.js"; import gaodeMap from "utils/gaodeMap.js";
import {pipeAllInfoList} from "@/api/device/pipe.js" import { pipeAllInfoList } from "@/api/device/pipe.js";
import { map, DEVICE_TYPE, mapOperateType } from "utils/gaodeMap.js"; import { map, DEVICE_TYPE, mapOperateType } from "utils/gaodeMap.js";
import { getAllDeviceInfo } from "@/api/device/deviceInfo"; import { getAllDeviceInfo } from "@/api/device/deviceInfo";
export default { export default {
...@@ -168,13 +179,13 @@ export default { ...@@ -168,13 +179,13 @@ export default {
phone: null, phone: null,
installationTime: null, installationTime: null,
inspectionTime: null, inspectionTime: null,
remarks: null remarks: null,
}, },
radio1: "", radio1: "",
// 1新建，2编辑，3删除,点按钮变色 // 1新建，2编辑，3删除,点按钮变色
targetNum: 0, targetNum: 0,
// 左边的bar的active判定 // 左边的bar的active判定
leftBarNum:[1,2,3,4,5], leftBarNum: [1, 2, 3, 4, 5],
// 新建里的值 // 新建里的值
iconClass: "icon-create", iconClass: "icon-create",
...@@ -202,20 +213,19 @@ export default { ...@@ -202,20 +213,19 @@ export default {
label: "流量计", label: "流量计",
}, },
{ {
value: 5, value: 7,
icon: "icon-ylb", icon: "icon-ylb",
label: "压力表", label: "压力表",
}, },
], ],
keyWord:"" keyWord: "",
}; };
}, },
mounted() { mounted() {
let gaoMap = new gaodeMap("石家庄"); let gaoMap = new gaodeMap("石家庄");
pipeAllInfoList().then(res=>{
console.log("管道",res);
})
this.gaoMap = gaoMap; this.gaoMap = gaoMap;
window.addEventListener("click", this.barClose);
let path = [ let path = [
[ [
[114.436698, 38.083306], [114.436698, 38.083306],
...@@ -229,20 +239,20 @@ export default { ...@@ -229,20 +239,20 @@ export default {
[114.530768, 38.00165], [114.530768, 38.00165],
], ],
]; ];
gaoMap.addPolyline(path);
gaoMap.addMouseTool(); gaoMap.addMouseTool();
gaoMap.searchTips("tipinput"); gaoMap.searchTips("tipinput");
this.getDeviceInfo(); this.getDeviceInfo();
this.getPipeList();
}, },
methods: { methods: {
// 左边的Bar修改值 // 左边的Bar修改值
leftBarChange(item){ leftBarChange(item) {
// this.leftBarNum= this.leftBarNum != item.value ? item.value:0; // this.leftBarNum= this.leftBarNum != item.value ? item.value:0;
const index = this.leftBarNum.indexOf(item.value); const index = this.leftBarNum.indexOf(item.value);
if(index>=0){ if (index >= 0) {
this.leftBarNum.splice(index,1) this.leftBarNum.splice(index, 1);
}else{ } else {
this.leftBarNum.push(item.value) this.leftBarNum.push(item.value);
} }
}, },
addDevice() { addDevice() {
...@@ -254,8 +264,8 @@ export default { ...@@ -254,8 +264,8 @@ export default {
this.createReset(); this.createReset();
} }
} }
if(this.targetNum ==1 && this.createValue ==1){ if (this.targetNum == 1 && this.createValue == 1) {
this.gaoMap.lineType=1; this.gaoMap.lineType = 1;
} }
this.deviceType = !this.deviceType; this.deviceType = !this.deviceType;
this.gaoMap.mapOperateType = "add"; this.gaoMap.mapOperateType = "add";
...@@ -263,15 +273,16 @@ export default { ...@@ -263,15 +273,16 @@ export default {
}, },
// 选择新建项目哪个 // 选择新建项目哪个
createChange(item) { createChange(e, item) {
// e.stopPropagation();
this.deviceType = false; this.deviceType = false;
this.iconClass = item.icon; this.iconClass = item.icon;
this.createValue = item.value; this.createValue = item.value;
this.createLabel = item.label; this.createLabel = item.label;
if(this.targetNum==1 && this.createValue==1){ if (this.targetNum == 1 && this.createValue == 1) {
// 0是初始，1是新建 2是编辑 3删除 // 0是初始，1是新建 2是编辑 3删除
this.gaoMap.lineType=1; this.gaoMap.lineType = 1;
this.gaoMap.createNewLine(); this.gaoMap.createNewLine();
}else { }else {
this.gaoMap.draw(this.createValue.toString()); this.gaoMap.draw(this.createValue.toString());
...@@ -285,12 +296,14 @@ export default { ...@@ -285,12 +296,14 @@ export default {
}, },
editDevice() { editDevice() {
this.targetNum = this.targetNum != 2 ? 2 : 0; this.targetNum = this.targetNum != 2 ? 2 : 0;
this.gaoMap.lineType=this.targetNum; this.gaoMap.lineType = this.targetNum;
console.log(this.gaoMap.lineType) console.log(this.gaoMap.lineType);
if(this.targetNum!=2) { if (this.targetNum != 2) {
this.gaoMap.linePolyEditorAllClose(); this.gaoMap.linePolyEditorAllClose();
} }
this.createReset(); this.createReset();
// 如果正在新建线条，则清空
this.gaoMap.newLineReset();
this.deviceType = false; this.deviceType = false;
this.gaoMap.mapOperateType = "edit"; this.gaoMap.mapOperateType = "edit";
this.gaoMap.addMarkerDragg(); this.gaoMap.addMarkerDragg();
...@@ -299,8 +312,9 @@ export default { ...@@ -299,8 +312,9 @@ export default {
}, },
deleteDevice() { deleteDevice() {
this.targetNum = this.targetNum != 3 ? 3 : 0; this.targetNum = this.targetNum != 3 ? 3 : 0;
this.gaoMap.lineType=this.targetNum; this.gaoMap.lineType = this.targetNum;
// 如果正在新建线条，则清空
this.gaoMap.newLineReset();
this.createReset(); this.createReset();
this.deviceType = false; this.deviceType = false;
this.gaoMap.mapOperateType = "delete"; this.gaoMap.mapOperateType = "delete";
...@@ -320,30 +334,61 @@ export default { ...@@ -320,30 +334,61 @@ export default {
this.gaoMap.createNewLine(); this.gaoMap.createNewLine();
} }
}, },
getDeviceInfo(){ getDeviceInfo() {
this.loading = true; this.loading = true;
getAllDeviceInfo(this.queryParams).then(response => { getAllDeviceInfo(this.queryParams).then((response) => {
if(response.code == 200){ if (response.code == 200) {
for(var i = 0;i < response.data.length; i++){ for (var i = 0; i < response.data.length; i++) {
if("1" == response.data[i].deviceType){ if ("1" == response.data[i].deviceType) {
this.gaoMap.addMarker(DEVICE_TYPE.REGEULATORBOX,response.data[i]) this.gaoMap.addMarker(
DEVICE_TYPE.REGEULATORBOX,
response.data[i]
);
}
if ("2" == response.data[i].deviceType) {
this.gaoMap.addMarker(DEVICE_TYPE.VALUEWELL, response.data[i]);
} }
if("2" == response.data[i].deviceType){ if ("3" == response.data[i].deviceType) {
this.gaoMap.addMarker(DEVICE_TYPE.VALUEWELL,response.data[i]) this.gaoMap.addMarker(DEVICE_TYPE.FLOWMETER, response.data[i]);
} }
if("3" == response.data[i].deviceType){ if("4" == response.data[i].deviceType){
this.gaoMap.addMarker(DEVICE_TYPE.FLOWMETER,response.data[i]) this.gaoMap.addMarker(DEVICE_TYPE.PRESSUREGAGE,response.data[i])
} }
} }
} }
this.loading = false; this.loading = false;
}); });
}, },
search(){ getPipeList() {
pipeAllInfoList().then((res) => {
console.log("管道", res);
if (res.code == 200) {
this.gaoMap.addPolyline(res.data);
}
});
},
search() {
this.gaoMap.placeSearch.clear(); this.gaoMap.placeSearch.clear();
this.gaoMap.placeSearch.search(this.keyWord) this.gaoMap.placeSearch.search(this.keyWord);
},
// 新建下拉列表关闭
barClose() {
console.log("window");
this.deviceType = false;
// 如果没有选择的时候点window 则高亮消失
if (this.targetNum == 1 && this.iconClass == "icon-create") {
this.targetNum = 0;
} }
// 辅助新建重新画线
if (!this.gaoMap.lineFlag) return;
this.gaoMap.lineFlag = false;
this.gaoMap.createNewLine();
},
},
beforeDestroy() {
console.log("移除window事件");
window.removeEventListener("click", this.barClose);
}, },
}; };
</script> </script>
...@@ -555,17 +600,19 @@ input[type="radio"] { ...@@ -555,17 +600,19 @@ input[type="radio"] {
width: 4rem; width: 4rem;
margin-right: 1rem; margin-right: 1rem;
} }
.search-input{ .search-input {
position: absolute; position: absolute;
top: 100px; top: 100px;
left: 2%; left: 2%;
width:240px; width: 240px;
} }
.search-but{ .search-but {
position: absolute; position: absolute;
top: 100px; left: 19%; top: 100px;
width:85px;color: white; left: 19%;
background-color: #053B6A; width: 85px;
color: white;
background-color: #053b6a;
} }
</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