Skip to content

G
gassafety
Commit 96362915 authored by 王晓倩's avatar 王晓倩
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 764b6777 b0b31198
Expand all Show whitespace changes
Inline Side-by-side
Showing with 458 additions and 291 deletions
gassafety-web/src/components/PopWindow/flowMeter.vue
View file @ 96362915
......@@ -9,7 +9,11 @@
<el-row>
<el-col :span="11">
<el-form-item label="所属管道" prop="pipeCode">
<el-select v-model="form.pipeCode" placeholder="请选择所属管道" style="width: 100%">
<el-select
v-model="form.pipeCode"
placeholder="请选择所属管道"
style="width: 100%"
>
<el-option
v-for="item in pipeList"
:key="item.pipeCode"
......@@ -75,7 +79,12 @@
<el-col :span="11">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" />
<el-input
type="number"
maxlength="11"
v-model="form.phone"
placeholder="请输入联系电话"
/>
</el-form-item>
</el-col>
......@@ -171,7 +180,10 @@ export default {
{ required: true, message: "请输入物联网编号", trigger: "blur" },
],
linkman: [{ required: true, message: "请输入联系人", trigger: "blur" }],
phone: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
phone: [
{ required: true, message: "请输入联系电话", trigger: "blur" },
{ min: 11, max: 11, message: "长度11个数字", trigger: "blur" },
],
iconUrl: [{ required: true, message: "请上传图片", trigger: "change" }],
installationTime: [
{
......@@ -232,19 +244,19 @@ export default {
this.form.url = "";
this.fileArr = [];
},
getPipeInfos(){
getPipeInfos() {
pipeAllInfoList({}).then((response) => {
this.pipeList = response.data;
});
}
},
watch:{
dialogVisible(val){
if(val){
},
watch: {
dialogVisible(val) {
if (val) {
this.getPipeInfos();
}
}
}
},
},
};
</script>
......
gassafety-web/src/components/PopWindow/pressureGage.vue
View file @ 96362915
......@@ -2,13 +2,18 @@
<el-dialog
:title="title"
:visible.sync="dialogVisible"
:before-close="handleClose">
:before-close="handleClose"
>
<el-row>
<el-form ref="form" :model="form" :rules="rules" label-width="135px">
<el-row>
<el-col :span="11">
<el-form-item label="所属管道" prop="pipeCode">
<el-select v-model="form.pipeCode" placeholder="请选择所属管道" style="width: 100%">
<el-select
v-model="form.pipeCode"
placeholder="请选择所属管道"
style="width: 100%"
>
<el-option
v-for="item in pipeList"
:key="item.pipeCode"
......@@ -24,13 +29,19 @@
<el-row>
<el-col :span="11">
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="请输入设备名称" />
<el-input
v-model="form.deviceName"
placeholder="请输入设备名称"
/>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="设备型号" prop="deviceModel">
<el-input v-model="form.deviceModel" placeholder="请输入设备型号" />
<el-input
v-model="form.deviceModel"
placeholder="请输入设备型号"
/>
</el-form-item>
</el-col>
</el-row>
......@@ -69,7 +80,12 @@
<el-col :span="11">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" />
<el-input
type="number"
maxlength="11"
v-model="form.phone"
placeholder="请输入联系电话"
/>
</el-form-item>
</el-col>
......@@ -157,7 +173,10 @@ export default {
{ required: true, message: "请输入物联网编号", trigger: "blur" },
],
linkman: [{ required: true, message: "请输入联系人", trigger: "blur" }],
phone: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
phone: [
{ required: true, message: "请输入联系电话", trigger: "blur" },
{ min: 11, max: 11, message: "长度11个数字", trigger: "blur" },
],
iconUrl: [{ required: true, message: "请上传图片", trigger: "change" }],
installationTime: [
{
......
gassafety-web/src/components/PopWindow/regulatorBox.vue
View file @ 96362915
......@@ -2,13 +2,18 @@
<el-dialog
:title="title"
:visible.sync="dialogVisible"
:before-close="handleClose">
:before-close="handleClose"
>
<el-row>
<el-form ref="form" :model="form" :rules="rules" label-width="135px">
<el-row>
<el-col :span="11">
<el-form-item label="所属管道" prop="pipeCode">
<el-select v-model="form.pipeCode" placeholder="请选择所属管道" style="width: 100%">
<el-select
v-model="form.pipeCode"
placeholder="请选择所属管道"
style="width: 100%"
>
<el-option
v-for="item in pipeList"
:key="item.pipeCode"
......@@ -24,13 +29,19 @@
<el-row>
<el-col :span="11">
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="请输入设备名称" />
<el-input
v-model="form.deviceName"
placeholder="请输入设备名称"
/>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="设备型号" prop="deviceModel">
<el-input v-model="form.deviceModel" placeholder="请输入设备型号" />
<el-input
v-model="form.deviceModel"
placeholder="请输入设备型号"
/>
</el-form-item>
</el-col>
</el-row>
......@@ -69,7 +80,12 @@
<el-col :span="11">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" />
<el-input
type="number"
maxlength="11"
v-model="form.phone"
placeholder="请输入联系电话"
/>
</el-form-item>
</el-col>
......@@ -118,26 +134,29 @@
</template>
<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";
import { pipeAllInfoList } from "@/api/device/pipe";
import MyFileUpload from "@/components/MyFileUpload";
import { DEVICE_TYPE } from "utils/gaodeMap.js";
export default {
export default {
props: {
title: { type: String }
title: { type: String },
},
data () {
data() {
return {
form : {
deviceType : "1"
form: {
deviceType: "1",
},
dialogVisible : false,
dialogVisible: false,
fileList: [],
map : null,
obj : null,
gaoMap : null,
map: null,
obj: null,
gaoMap: null,
fileArr: [],
pipeList: [],
rules: {
......@@ -157,11 +176,10 @@
iotNo: [
{ required: true, message: "请输入物联网编号", trigger: "blur" },
],
linkman: [
{ required: true, message: "请输入联系人", trigger: "blur" },
],
linkman: [{ required: true, message: "请输入联系人", trigger: "blur" }],
phone: [
{ required: true, message: "请输入联系电话", trigger: "blur" },
{ min: 11, max: 11, message: "长度11个数字", trigger: "blur" },
],
iconUrl: [{ required: true, message: "请上传图片", trigger: "change" }],
installationTime: [
......@@ -173,43 +191,43 @@
},
],
},
}
};
},
components: {
MyFileUpload
MyFileUpload,
},
methods: {
show () {
show() {
this.dialogVisible = true;
//this.getPipeInfo();
},
hide () {
this.remove()
hide() {
this.remove();
},
getFileInfo(res){
getFileInfo(res) {
this.form.iconUrl = res.url;
},
submitForm() {
this.$refs["form"].validate(valid => {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.deviceId != null) {
updateDeviceInfo(this.form).then(response => {
updateDeviceInfo(this.form).then((response) => {
this.dialogVisible = false;
this.map.remove(this.obj);
this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
this.msgSuccess("修改成功");
});
} else {
addDeviceInfo(this.form).then(response => {
if(response.code == 200){
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.addMarker(this.gaoMap.deviceType, this.form);
//this.gaoMap.placeSearch.clear();
this.gaoMap.closeAddMarker();
this.msgSuccess("新增成功");
}else{
} else {
this.msgSuccess("新增失败");
}
});
......@@ -224,20 +242,20 @@
handleClose(done) {
done();
},
getPipeInfos(){
getPipeInfos() {
pipeAllInfoList({}).then((response) => {
this.pipeList = response.data;
});
}
},
watch:{
dialogVisible(val){
if(val){
},
watch: {
dialogVisible(val) {
if (val) {
this.getPipeInfos();
}
}
}
}
},
},
};
</script>
gassafety-web/src/components/PopWindow/valveWell.vue
View file @ 96362915
......@@ -2,13 +2,18 @@
<el-dialog
:title="title"
:visible.sync="dialogVisible"
:before-close="handleClose">
:before-close="handleClose"
>
<el-row>
<el-form ref="form" :model="form" :rules="rules" label-width="135px">
<el-row>
<el-col :span="11">
<el-form-item label="所属管道" prop="pipeCode">
<el-select v-model="form.pipeCode" placeholder="请选择所属管道" style="width: 100%">
<el-select
v-model="form.pipeCode"
placeholder="请选择所属管道"
style="width: 100%"
>
<el-option
v-for="item in pipeList"
:key="item.pipeCode"
......@@ -24,13 +29,19 @@
<el-row>
<el-col :span="11">
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="请输入设备名称" />
<el-input
v-model="form.deviceName"
placeholder="请输入设备名称"
/>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="设备型号" prop="deviceModel">
<el-input v-model="form.deviceModel" placeholder="请输入设备型号" />
<el-input
v-model="form.deviceModel"
placeholder="请输入设备型号"
/>
</el-form-item>
</el-col>
</el-row>
......@@ -68,7 +79,12 @@
<el-col :span="11">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话" />
<el-input
type="number"
maxlength="11"
v-model="form.phone"
placeholder="请输入联系电话"
/>
</el-form-item>
</el-col>
......@@ -117,26 +133,29 @@
</template>
<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";
import { pipeAllInfoList } from "@/api/device/pipe";
import MyFileUpload from "@/components/MyFileUpload";
import { DEVICE_TYPE } from "utils/gaodeMap.js";
export default {
export default {
props: {
title: { type: String }
title: { type: String },
},
data () {
data() {
return {
form : {
deviceType : "2"
form: {
deviceType: "2",
},
dialogVisible : false,
dialogVisible: false,
fileList: [],
map : null,
obj : null,
gaoMap : null,
map: null,
obj: null,
gaoMap: null,
fileArr: [],
pipeList: [],
rules: {
......@@ -156,11 +175,10 @@
iotNo: [
{ required: true, message: "请输入物联网编号", trigger: "blur" },
],
linkman: [
{ required: true, message: "请输入联系人", trigger: "blur" },
],
linkman: [{ required: true, message: "请输入联系人", trigger: "blur" }],
phone: [
{ required: true, message: "请输入联系电话", trigger: "blur" },
{ min: 11, max: 11, message: "长度11个数字", trigger: "blur" },
],
iconUrl: [{ required: true, message: "请上传图片", trigger: "change" }],
installationTime: [
......@@ -172,42 +190,42 @@
},
],
},
}
};
},
components: {
MyFileUpload,
},
methods: {
show () {
show() {
this.dialogVisible = true;
},
hide () {
this.remove()
hide() {
this.remove();
},
getFileInfo(res){
getFileInfo(res) {
this.form.iconUrl = res.url;
},
submitForm() {
this.$refs["form"].validate(valid => {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.deviceId != null) {
updateDeviceInfo(this.form).then(response => {
updateDeviceInfo(this.form).then((response) => {
this.dialogVisible = false;
this.map.remove(this.obj);
this.gaoMap.addMarker(this.gaoMap.deviceType,this.form);
this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
this.msgSuccess("修改成功");
});
} else {
addDeviceInfo(this.form).then(response => {
if(response.code == 200){
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.addMarker(this.gaoMap.deviceType, this.form);
//this.gaoMap.placeSearch.clear();
this.gaoMap.closeAddMarker();
this.msgSuccess("新增成功");
}else{
} else {
this.msgSuccess("新增失败");
}
});
......@@ -222,20 +240,20 @@
this.form.url = "";
this.fileArr = [];
},
getPipeInfos(){
getPipeInfos() {
pipeAllInfoList({}).then((response) => {
this.pipeList = response.data;
});
}
},
watch:{
dialogVisible(val){
if(val){
},
watch: {
dialogVisible(val) {
if (val) {
this.getPipeInfos();
}
}
}
}
},
},
};
</script>
gassafety-web/src/components/PopWindowGis/workerManView.vue
View file @ 96362915
......@@ -131,6 +131,18 @@ export default {
ok() {
this.$refs.formData.validate((valid) => {
if (valid) {
if (
moment(this.formData.beginTime).valueOf() >
moment(this.formData.endTime).valueOf()
) {
this.msgError(
"开始时间不能大于结束时间"
);
this.formData.endTime = "";
return;
}
this.okLoading = true;
this.formData.beginTime = moment(this.formData.beginTime).format(
"YYYY-MM-DD HH:mm:ss"
......@@ -138,6 +150,7 @@ export default {
this.formData.endTime = moment(this.formData.endTime).format(
"YYYY-MM-DD HH:mm:ss"
);
console.log(this.formData);
// 找到哪个值班人员
......@@ -176,7 +189,7 @@ export default {
message: res.msg,
});
this.dialogVisible = false;
this.gaodeMap.trackBack(target, arr,data)
this.gaodeMap.trackBack(target, arr, data);
}
});
}
......
gassafety-web/src/views/enterprise/mapView/index.vue
View file @ 96362915
......@@ -758,7 +758,7 @@ export default {
// 左边的bar
.leftBar-wrapper {
position: fixed;
left: 100px;
left: 10px;
top: 150px;
.box {
width: 180px;
......@@ -976,13 +976,13 @@ input[type="radio"] {
.search-input {
position: fixed;
top: 100px;
left: 7%;
left: 10px;
width: 240px;
}
.search-but {
position: fixed;
top: 100px;
left: 23%;
left: 260px;
width: 85px;
color: white;
background-color: #053b6a;
......@@ -991,7 +991,7 @@ input[type="radio"] {
.refresh-but {
position: fixed;
top: 100px;
left: 28%;
left: 345px;
width: 85px;
color: white;
background-color: #053b6a;
......
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