Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 764b6777 b0b31198
Hide 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 @@ ...@@ -9,7 +9,11 @@
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="所属管道" prop="pipeCode"> <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 <el-option
v-for="item in pipeList" v-for="item in pipeList"
:key="item.pipeCode" :key="item.pipeCode"
...@@ -75,7 +79,12 @@ ...@@ -75,7 +79,12 @@
<el-col :span="11"> <el-col :span="11">
<el-form-item label="联系电话" prop="phone"> <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-form-item>
</el-col> </el-col>
...@@ -171,7 +180,10 @@ export default { ...@@ -171,7 +180,10 @@ export default {
{ required: true, message: "请输入物联网编号", trigger: "blur" }, { required: true, message: "请输入物联网编号", trigger: "blur" },
], ],
linkman: [{ 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" }], iconUrl: [{ required: true, message: "请上传图片", trigger: "change" }],
installationTime: [ installationTime: [
{ {
...@@ -232,19 +244,19 @@ export default { ...@@ -232,19 +244,19 @@ export default {
this.form.url = ""; this.form.url = "";
this.fileArr = []; this.fileArr = [];
}, },
getPipeInfos(){ getPipeInfos() {
pipeAllInfoList({}).then((response) => { pipeAllInfoList({}).then((response) => {
this.pipeList = response.data; this.pipeList = response.data;
}); });
} },
}, },
watch:{ watch: {
dialogVisible(val){ dialogVisible(val) {
if(val){ if (val) {
this.getPipeInfos(); this.getPipeInfos();
} }
} },
} },
}; };
</script> </script>
......
gassafety-web/src/components/PopWindow/pressureGage.vue
View file @ 96362915
...@@ -2,13 +2,18 @@ ...@@ -2,13 +2,18 @@
<el-dialog <el-dialog
:title="title" :title="title"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:before-close="handleClose"> :before-close="handleClose"
>
<el-row> <el-row>
<el-form ref="form" :model="form" :rules="rules" label-width="135px"> <el-form ref="form" :model="form" :rules="rules" label-width="135px">
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="所属管道" prop="pipeCode"> <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 <el-option
v-for="item in pipeList" v-for="item in pipeList"
:key="item.pipeCode" :key="item.pipeCode"
...@@ -24,13 +29,19 @@ ...@@ -24,13 +29,19 @@
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="设备名称" prop="deviceName"> <el-form-item label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="请输入设备名称" /> <el-input
v-model="form.deviceName"
placeholder="请输入设备名称"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="设备型号" prop="deviceModel"> <el-form-item label="设备型号" prop="deviceModel">
<el-input v-model="form.deviceModel" placeholder="请输入设备型号" /> <el-input
v-model="form.deviceModel"
placeholder="请输入设备型号"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -69,7 +80,12 @@ ...@@ -69,7 +80,12 @@
<el-col :span="11"> <el-col :span="11">
<el-form-item label="联系电话" prop="phone"> <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-form-item>
</el-col> </el-col>
...@@ -157,7 +173,10 @@ export default { ...@@ -157,7 +173,10 @@ export default {
{ required: true, message: "请输入物联网编号", trigger: "blur" }, { required: true, message: "请输入物联网编号", trigger: "blur" },
], ],
linkman: [{ 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" }], iconUrl: [{ required: true, message: "请上传图片", trigger: "change" }],
installationTime: [ installationTime: [
{ {
......
gassafety-web/src/components/PopWindow/regulatorBox.vue
View file @ 96362915
...@@ -2,13 +2,18 @@ ...@@ -2,13 +2,18 @@
<el-dialog <el-dialog
:title="title" :title="title"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:before-close="handleClose"> :before-close="handleClose"
>
<el-row> <el-row>
<el-form ref="form" :model="form" :rules="rules" label-width="135px"> <el-form ref="form" :model="form" :rules="rules" label-width="135px">
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="所属管道" prop="pipeCode"> <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 <el-option
v-for="item in pipeList" v-for="item in pipeList"
:key="item.pipeCode" :key="item.pipeCode"
...@@ -24,13 +29,19 @@ ...@@ -24,13 +29,19 @@
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="设备名称" prop="deviceName"> <el-form-item label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="请输入设备名称" /> <el-input
v-model="form.deviceName"
placeholder="请输入设备名称"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="设备型号" prop="deviceModel"> <el-form-item label="设备型号" prop="deviceModel">
<el-input v-model="form.deviceModel" placeholder="请输入设备型号" /> <el-input
v-model="form.deviceModel"
placeholder="请输入设备型号"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -69,7 +80,12 @@ ...@@ -69,7 +80,12 @@
<el-col :span="11"> <el-col :span="11">
<el-form-item label="联系电话" prop="phone"> <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-form-item>
</el-col> </el-col>
...@@ -118,126 +134,128 @@ ...@@ -118,126 +134,128 @@
</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: "1",
},
dialogVisible: false,
fileList: [],
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" },
{ min: 11, max: 11, message: "长度11个数字", trigger: "blur" },
],
iconUrl: [{ required: true, message: "请上传图片", trigger: "change" }],
installationTime: [
{
// type: "date",
required: true,
message: "请选择日期",
trigger: "change",
},
],
},
};
},
components: {
MyFileUpload,
},
methods: {
show() {
this.dialogVisible = true;
//this.getPipeInfo();
}, },
data () { hide() {
return { this.remove();
form : {
deviceType : "1"
},
dialogVisible : false,
fileList: [],
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: { getFileInfo(res) {
MyFileUpload this.form.iconUrl = res.url;
}, },
methods: { submitForm() {
show () { this.$refs["form"].validate((valid) => {
this.dialogVisible = true; if (valid) {
//this.getPipeInfo(); if (this.form.deviceId != null) {
}, updateDeviceInfo(this.form).then((response) => {
hide () { this.dialogVisible = false;
this.remove() this.map.remove(this.obj);
}, this.gaoMap.addMarker(this.gaoMap.deviceType, this.form);
getFileInfo(res){ this.msgSuccess("修改成功");
this.form.iconUrl = res.url; });
}, } else {
submitForm() { addDeviceInfo(this.form).then((response) => {
this.$refs["form"].validate(valid => { if (response.code == 200) {
if (valid) { this.remove();
if (this.form.deviceId != null) {
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("新增失败");
}
});
}
} }
});
},
listRemove(e) {
this.form.url = "";
this.fileArr = [];
},
handleClose(done) {
done();
},
getPipeInfos(){
pipeAllInfoList({}).then((response) => {
this.pipeList = response.data;
});
}
},
watch:{
dialogVisible(val){
if(val){
this.getPipeInfos();
} }
});
},
listRemove(e) {
this.form.url = "";
this.fileArr = [];
},
handleClose(done) {
done();
},
getPipeInfos() {
pipeAllInfoList({}).then((response) => {
this.pipeList = response.data;
});
},
},
watch: {
dialogVisible(val) {
if (val) {
this.getPipeInfos();
} }
} },
} },
};
</script> </script>
gassafety-web/src/components/PopWindow/valveWell.vue
View file @ 96362915
...@@ -2,13 +2,18 @@ ...@@ -2,13 +2,18 @@
<el-dialog <el-dialog
:title="title" :title="title"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:before-close="handleClose"> :before-close="handleClose"
>
<el-row> <el-row>
<el-form ref="form" :model="form" :rules="rules" label-width="135px"> <el-form ref="form" :model="form" :rules="rules" label-width="135px">
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="所属管道" prop="pipeCode"> <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 <el-option
v-for="item in pipeList" v-for="item in pipeList"
:key="item.pipeCode" :key="item.pipeCode"
...@@ -24,13 +29,19 @@ ...@@ -24,13 +29,19 @@
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="设备名称" prop="deviceName"> <el-form-item label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="请输入设备名称" /> <el-input
v-model="form.deviceName"
placeholder="请输入设备名称"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="设备型号" prop="deviceModel"> <el-form-item label="设备型号" prop="deviceModel">
<el-input v-model="form.deviceModel" placeholder="请输入设备型号" /> <el-input
v-model="form.deviceModel"
placeholder="请输入设备型号"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -68,7 +79,12 @@ ...@@ -68,7 +79,12 @@
<el-col :span="11"> <el-col :span="11">
<el-form-item label="联系电话" prop="phone"> <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-form-item>
</el-col> </el-col>
...@@ -117,125 +133,127 @@ ...@@ -117,125 +133,127 @@
</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: "2",
},
dialogVisible: false,
fileList: [],
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" },
{ min: 11, max: 11, message: "长度11个数字", 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 : "2"
},
dialogVisible : false,
fileList: [],
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: { 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 = [];
},
getPipeInfos(){
pipeAllInfoList({}).then((response) => {
this.pipeList = response.data;
});
}
},
watch:{
dialogVisible(val){
if(val){
this.getPipeInfos();
} }
});
},
handleClose(done) {
done();
},
listRemove(e) {
this.form.url = "";
this.fileArr = [];
},
getPipeInfos() {
pipeAllInfoList({}).then((response) => {
this.pipeList = response.data;
});
},
},
watch: {
dialogVisible(val) {
if (val) {
this.getPipeInfos();
} }
} },
} },
};
</script> </script>
gassafety-web/src/components/PopWindowGis/workerManView.vue
View file @ 96362915
...@@ -131,6 +131,18 @@ export default { ...@@ -131,6 +131,18 @@ export default {
ok() { ok() {
this.$refs.formData.validate((valid) => { this.$refs.formData.validate((valid) => {
if (valid) { if (valid) {
if (
moment(this.formData.beginTime).valueOf() >
moment(this.formData.endTime).valueOf()
) {
this.msgError(
"开始时间不能大于结束时间"
);
this.formData.endTime = "";
return;
}
this.okLoading = true; this.okLoading = true;
this.formData.beginTime = moment(this.formData.beginTime).format( this.formData.beginTime = moment(this.formData.beginTime).format(
"YYYY-MM-DD HH:mm:ss" "YYYY-MM-DD HH:mm:ss"
...@@ -138,6 +150,7 @@ export default { ...@@ -138,6 +150,7 @@ export default {
this.formData.endTime = moment(this.formData.endTime).format( this.formData.endTime = moment(this.formData.endTime).format(
"YYYY-MM-DD HH:mm:ss" "YYYY-MM-DD HH:mm:ss"
); );
console.log(this.formData); console.log(this.formData);
// 找到哪个值班人员 // 找到哪个值班人员
...@@ -176,7 +189,7 @@ export default { ...@@ -176,7 +189,7 @@ export default {
message: res.msg, message: res.msg,
}); });
this.dialogVisible = false; this.dialogVisible = false;
this.gaodeMap.trackBack(target, arr,data) this.gaodeMap.trackBack(target, arr, data);
} }
}); });
} }
......
gassafety-web/src/views/dataMonitoring/deviceAlarm/index.vue
View file @ 96362915
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px"> <div v-if="fromGisMap">
<div
style="width: 5%; height: 45px; margin-left: 20px"
@click="$router.go(-1)"
>
<el-button
size="medium"
type="text"
style="font-size: 18px; color: rgb(7, 63, 112); float: left"
>返回</el-button
>
<div style="float: left; margin-top: 8px; margin-left: 5px">
<img
src="../../../assets/logo/fanhui.png"
style="width: 25px"
alt=""
/>
</div>
</div>
</div>
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="100"
>
<el-form-item label="设备编号" prop="deviceCode"> <el-form-item label="设备编号" prop="deviceCode">
<el-input <el-input
v-model="queryParams.deviceCode" v-model="queryParams.deviceCode"
...@@ -11,7 +38,12 @@ ...@@ -11,7 +38,12 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="报警类型" prop="alarmType"> <el-form-item label="报警类型" prop="alarmType">
<el-select v-model="queryParams.alarmType" placeholder="请选择报警类型" clearable size="small"> <el-select
v-model="queryParams.alarmType"
placeholder="请选择报警类型"
clearable
size="small"
>
<el-option <el-option
v-for="dict in typeOptions" v-for="dict in typeOptions"
:key="dict.dictValue" :key="dict.dictValue"
...@@ -22,32 +54,48 @@ ...@@ -22,32 +54,48 @@
</el-form-item> </el-form-item>
<el-form-item label="报警开始时间" prop="startTime1"> <el-form-item label="报警开始时间" prop="startTime1">
<el-date-picker <el-date-picker
clearable size="small" clearable
size="small"
v-model="queryParams.startTime1" v-model="queryParams.startTime1"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
type="datetime" type="datetime"
placeholder="请选择起始时间" placeholder="请选择起始时间"
align="right"> align="right"
>
</el-date-picker> </el-date-picker>
<font color="#C0C4CC"> 至</font> <font color="#C0C4CC"> 至</font>
</el-form-item> </el-form-item>
<el-form-item label="" prop="endTime1"> <el-form-item label="" prop="endTime1">
<el-date-picker <el-date-picker
clearable size="small" clearable
size="small"
v-model="queryParams.endTime1" v-model="queryParams.endTime1"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
type="datetime" type="datetime"
placeholder="请选择截止时间" placeholder="请选择截止时间"
align="right"> align="right"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="deviceAlarmList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="deviceAlarmList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="设备名称" align="center"> <el-table-column label="设备名称" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -65,27 +113,49 @@ ...@@ -65,27 +113,49 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报警值" align="center" prop="alarmValue" /> <el-table-column label="报警值" align="center" prop="alarmValue" />
<el-table-column label="报警开始时间" align="center" prop="startTime" width="180"> <el-table-column
label="报警开始时间"
align="center"
prop="startTime"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime) }}</span> <span>{{ parseTime(scope.row.startTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报警结束时间" align="center" prop="endTime" width="180"> <el-table-column
label="报警结束时间"
align="center"
prop="endTime"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime) }}</span> <span>{{ parseTime(scope.row.endTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="处理状态" align="center" prop="dealStatus"> <el-table-column label="处理状态" align="center" prop="dealStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.orderId == null || scope.row.orderId == ''">未生成工单</span> <span v-if="scope.row.orderId == null || scope.row.orderId == ''"
<span v-if="(scope.row.dealStatus == null || scope.row.dealStatus == '') >未生成工单</span
&& scope.row.orderId != null && scope.row.orderId != ''">未处理</span> >
<span
v-if="
(scope.row.dealStatus == null || scope.row.dealStatus == '') &&
scope.row.orderId != null &&
scope.row.orderId != ''
"
>未处理</span
>
<span v-if="scope.row.dealStatus == 1">不需处理</span> <span v-if="scope.row.dealStatus == 1">不需处理</span>
<span v-if="scope.row.dealStatus == 2">已处理完成</span> <span v-if="scope.row.dealStatus == 2">已处理完成</span>
<span v-if="scope.row.dealStatus == 3">未处理完成</span> <span v-if="scope.row.dealStatus == 3">未处理完成</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="normal" type="text" icon="el-icon-edit" @click="handleIssue(scope.row)" <el-button size="normal" type="text" icon="el-icon-edit" @click="handleIssue(scope.row)"
v-hasPermi="['workOrder:basicsInfo:add']" v-if="scope.row.orderId == '' || scope.row.orderId == null">生成工单 v-hasPermi="['workOrder:basicsInfo:add']" v-if="scope.row.orderId == '' || scope.row.orderId == null">生成工单
...@@ -102,13 +172,13 @@ ...@@ -102,13 +172,13 @@
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="130px"> <el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-form-item label="报警设备" prop="deviceName"> <el-form-item label="报警设备" prop="deviceName">
<font>{{form.deviceName}}</font> <font>{{ form.deviceName }}</font>
</el-form-item> </el-form-item>
<el-form-item label="报警类型" prop="alarmType"> <el-form-item label="报警类型" prop="alarmType">
<font>{{form.alarmType}}</font> <font>{{ form.alarmType }}</font>
</el-form-item> </el-form-item>
<el-form-item label="报警值" prop="alarmValue"> <el-form-item label="报警值" prop="alarmValue">
<font>{{form.alarmValue}}</font> <font>{{ form.alarmValue }}</font>
</el-form-item> </el-form-item>
<el-form-item label="工单名称" prop="orderName"> <el-form-item label="工单名称" prop="orderName">
<el-input v-model="form.orderName" placeholder="请输入工单名称" /> <el-input v-model="form.orderName" placeholder="请输入工单名称" />
...@@ -120,7 +190,11 @@ ...@@ -120,7 +190,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工单描述" prop="remarks"> <el-form-item label="工单描述" prop="remarks">
<el-input type="textarea" v-model="form.remarks" placeholder="请输入工单描述" /> <el-input
type="textarea"
v-model="form.remarks"
placeholder="请输入工单描述"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -138,10 +212,11 @@ ...@@ -138,10 +212,11 @@
export default { export default {
name: "DeviceAlarm", name: "DeviceAlarm",
components: { components: {},
},
data() { data() {
return { return {
// 判断是从哪里来的，如果是地图里来的，则可以返回
fromGisMap:false,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 导出遮罩层 // 导出遮罩层
...@@ -186,45 +261,57 @@ export default { ...@@ -186,45 +261,57 @@ export default {
alarmType: null, alarmType: null,
startTime1: null, startTime1: null,
endTime1: null, endTime1: null,
dealStatus: null dealStatus: null,
}, },
// 表单参数 // 表单参数
form: { }, form: {},
// 表单校验 // 表单校验
rules: { rules: {
orderName: [ orderName: [
{ required: true, message: "工单名称不能为空", trigger: "blur" } { required: true, message: "工单名称不能为空", trigger: "blur" },
], ],
appointInspector: [ appointInspector: [
{ required: true, message: "请选择巡检人员", trigger: "blur" } { required: true, message: "请选择巡检人员", trigger: "blur" },
], ],
} },
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getDicts("t_alarm_type").then(response => { this.getDicts("t_alarm_type").then((response) => {
this.typeOptions = response.data; this.typeOptions = response.data;
}); });
}, },
beforeRouteEnter: (to, from, next) => {
next((vm) => {
// 如果是从地图里来的
if(from.path=="/enterprise/mapView"){
// console.log(123)
vm.fromGisMap=true;
}else{
vm.fromGisMap=false;
}
});
},
methods: { methods: {
/** 查询报警信息列表 */ /** 查询报警信息列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listDeviceAlarm(this.queryParams).then(response => { listDeviceAlarm(this.queryParams).then((response) => {
this.deviceAlarmList = response.rows; this.deviceAlarmList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
}, },
getInspectorList(){ getInspectorList() {
this.loading = true; this.loading = true;
inspectorList().then(response => { inspectorList().then((response) => {
this.inspector = response.data; this.inspector = response.data;
this.loading = false; this.loading = false;
}); });
}, },
setUserId(val){ setUserId(val) {
this.form.appointInspector = val; this.form.appointInspector = val;
}, },
// 取消按钮 // 取消按钮
...@@ -244,7 +331,7 @@ export default { ...@@ -244,7 +331,7 @@ export default {
allotTime: null, allotTime: null,
actualInspector: null, actualInspector: null,
actualTime: null, actualTime: null,
remarks: null remarks: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -268,8 +355,8 @@ export default { ...@@ -268,8 +355,8 @@ export default {
handleIssue(row) { handleIssue(row) {
this.reset(); this.reset();
this.getInspectorList(); this.getInspectorList();
const alarmId = row.alarmId || this.ids const alarmId = row.alarmId || this.ids;
getDeviceAlarm(alarmId).then(response => { getDeviceAlarm(alarmId).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "填写工单信息"; this.title = "填写工单信息";
...@@ -278,11 +365,11 @@ export default { ...@@ -278,11 +365,11 @@ export default {
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
this.form.resourceId = this.form.alarmId; this.form.resourceId = this.form.alarmId;
this.form.orderType = "3"; this.form.orderType = "3";
addBasicsInfo(this.form).then(response => { addBasicsInfo(this.form).then((response) => {
this.msgSuccess("生成工单成功"); this.msgSuccess("生成工单成功");
this.open = false; this.open = false;
this.getList(); this.getList();
...@@ -299,6 +386,6 @@ export default { ...@@ -299,6 +386,6 @@ export default {
} }
}) //带参跳转 }) //带参跳转
}, },
} },
}; };
</script> </script>
gassafety-web/src/views/enterprise/mapView/index.vue
View file @ 96362915
...@@ -758,7 +758,7 @@ export default { ...@@ -758,7 +758,7 @@ export default {
// 左边的bar // 左边的bar
.leftBar-wrapper { .leftBar-wrapper {
position: fixed; position: fixed;
left: 100px; left: 10px;
top: 150px; top: 150px;
.box { .box {
width: 180px; width: 180px;
...@@ -976,13 +976,13 @@ input[type="radio"] { ...@@ -976,13 +976,13 @@ input[type="radio"] {
.search-input { .search-input {
position: fixed; position: fixed;
top: 100px; top: 100px;
left: 7%; left: 10px;
width: 240px; width: 240px;
} }
.search-but { .search-but {
position: fixed; position: fixed;
top: 100px; top: 100px;
left: 23%; left: 260px;
width: 85px; width: 85px;
color: white; color: white;
background-color: #053b6a; background-color: #053b6a;
...@@ -991,7 +991,7 @@ input[type="radio"] { ...@@ -991,7 +991,7 @@ input[type="radio"] {
.refresh-but { .refresh-but {
position: fixed; position: fixed;
top: 100px; top: 100px;
left: 28%; left: 345px;
width: 85px; width: 85px;
color: white; color: white;
background-color: #053b6a; 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