装置优化

master
fanluyan 2 years ago
parent 7a3d802041
commit 6a9dd3f0e9

@ -0,0 +1,279 @@
<template>
<el-dialog
class="addPhotoDialog"
:title="photoDialogTitle"
:visible.sync="photoDialog"
width="660px"
>
<el-form
label-position="left"
label-width="98px"
ref="formPhotoInfo"
:rules="rules"
:model="formInfo"
>
<el-form-item label="线路" prop="channelVal" required>
<el-select
v-model="formInfo.channelVal"
multiple
placeholder="请选择"
@change="changeChannelId"
>
<el-option
v-for="item in channelOptions"
:key="item.id"
:label="item.channelname"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="杆塔:" prop="towerid" required>
<el-select
v-model="formInfo.towerid"
placeholder="请选择"
@change="changetowerid"
>
<el-option
v-for="item in toweridOptions"
:key="item.id"
:label="item.lineName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="装置ID" prop="cmdid" required>
<el-input v-model="formInfo.cmdid" auto-complete="on"></el-input>
</el-form-item>
<el-form-item label="SIM卡" prop="simCard">
<el-input v-model="formInfo.simCard" auto-complete="on"></el-input>
</el-form-item>
<el-form-item label="通道:" prop="channelVal">
<el-checkbox-group v-model="checkboxGroup1">
<el-checkbox label="备选项1" border></el-checkbox>
<el-checkbox label="备选项2" border></el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="closeDialog(0)"> </el-button>
<el-button type="primary" @click="submitForm()"> </el-button>
</div>
</el-dialog>
</template>
<script>
import {
addTerminalJoggle,
updateTerminalJoggle,
getAllChannelListJoggle,
getAllTowerJoggle,
} from "@/utils/api/index";
export default {
props: {
photoDialog: {
type: Boolean,
},
photoDialogTitle: {
type: String,
default: "新增",
},
formItem: {
type: Object,
default: function () {
return {};
},
},
},
data() {
let validCmid = (rule, value, callback) => {
let reg = /^[0-9A-Za-z]{17}$/;
if (!reg.test(value)) {
callback(new Error("装置id位17位编码"));
} else {
callback();
}
};
return {
checkboxGroup1: [],
page: 1, //
pageSize: 10, //
channelOptions: "",
channelArr: [],
toweridOptions: "",
toweridVal: "",
formInfo: {},
rules: {
cmdid: [
{ required: true, message: "请输入装置ID", trigger: "blur" },
{ validator: validCmid, trigger: "blur" },
],
},
//
formArr: [],
};
},
methods: {
//
submitForm() {
this.$refs.formPhotoInfo.validate((valid) => {
if (valid) {
console.log(this.channelArr);
let formObj = {
bsIdentifier: this.formInfo.bsIdentifier,
bsManufacturer: this.formInfo.bsManufacturer,
bsProductionDate: this.formInfo.bsProductionDate,
cmdid: this.formInfo.cmdid,
displayName: this.formInfo.displayName,
equipName: this.formInfo.equipName,
essentialInfoVersion: this.formInfo.essentialInfoVersion,
hasPan: this.formInfo.hasPan,
latitude: this.formInfo.latitude,
//lineid: this.formInfo.lineid,
longitude: this.formInfo.longitude,
model: this.formInfo.model,
orgId: this.formInfo.orgId,
towerid: this.formInfo.towerid,
};
this.formArr.push(formObj);
console.log(this.formArr);
//
if (this.photoDialogTitle == "新增") {
addTerminalJoggle({ list: this.formArr })
.then((res) => {
console.log(res);
this.$emit("photoDialogClose", 1); //
this.formArr = [];
this.$message.success("添加成功");
})
.catch((err) => {
console.log(err); //
this.$message.error("添加失败");
});
} else if (this.photoDialogTitle == "修改") {
let changeformObj = {
bsIdentifier: this.formInfo.bsIdentifier,
bsManufacturer: this.formInfo.bsManufacturer,
bsProductionDate: this.formInfo.bsProductionDate,
cmdid: this.formInfo.cmdid,
displayName: this.formInfo.displayName,
equipName: this.formInfo.equipName,
essentialInfoVersion: this.formInfo.essentialInfoVersion,
hasPan: this.formInfo.hasPan,
latitude: this.formInfo.latitude,
// lineid: this.formInfo.lineid,
longitude: this.formInfo.longitude,
model: this.formInfo.model,
orgId: this.formInfo.orgId,
towerid: this.formInfo.towerid,
id: this.formInfo.id,
};
updateTerminalJoggle(changeformObj)
.then((res) => {
console.log(res);
this.$emit("photoDialogClose", 1); //
this.$message.success("修改成功");
})
.catch((err) => {
console.log(err); //
this.$message.error("修改失败");
});
}
} else {
console.log("error submit!!");
return false;
}
});
},
//
closeDialog(flag) {
this.$refs.formPhotoInfo.resetFields();
this.formInfo.hasPan = 0;
this.$emit("photoDialogClose", flag);
},
//
getChannel() {
getAllChannelListJoggle()
.then((res) => {
this.channelOptions = res.data.list;
console.log(this.channelOptions);
})
.catch((err) => {
console.log(err);
});
},
//
getTowerid() {
getAllTowerJoggle()
.then((res) => {
this.toweridOptions = res.data.list;
console.log(this.channelOptions);
})
.catch((err) => {
console.log(err);
});
},
//id
changeChannelId(val) {
console.log(val);
this.channelArr = val;
},
//id
changetowerid(val) {
let opt = {};
opt = this.toweridOptions.find((item) => {
return item.lineName;
});
// let channelObj = {};
// channelObj = this.channelOption.find(function (i) {
// return i.value;
// });
console.log(opt.lineName);
//this.toweridVal = val;
},
},
mounted() {
console.log("打印传过来的对象", this.formItem);
console.log("打印传过来的对象", this.formItem.bsIdentifier);
this.formInfo = JSON.parse(JSON.stringify(this.formItem));
},
created() {
this.getChannel();
this.getTowerid();
},
watch: {
formItem: {
handler(newVal, oldVal) {
//
this.$nextTick(() => {
this.formInfo = JSON.parse(JSON.stringify(this.formItem));
});
},
immediate: true,
deep: true,
},
},
};
</script>
<style lang="less">
.addPhotoDialog {
.el-dialog {
.el-form {
//display: flex;
// flex-wrap: wrap;
.el-form-item {
// width: 260px;
// margin-right: 16px;
.el-select {
width: 100%;
}
.el-form-item__label {
padding-right: 0px;
}
}
}
}
}
</style>

@ -2,101 +2,70 @@
<el-dialog <el-dialog
class="addPhotoDialog" class="addPhotoDialog"
:title="photoDialogTitle" :title="photoDialogTitle"
:visible.sync="photoDialog" :visible.sync="isShow"
width="868px" :close-on-click-modal="false"
width="660px"
> >
<el-form <el-form
label-position="left" label-position="left"
label-width="98px" label-width="98px"
ref="formPhotoInfo" ref="formgrapInfo"
:rules="rules" :rules="rules"
:model="formInfo" :model="formInfo"
> >
<el-form-item label="装置ID" prop="cmdid" required> <el-form-item label="线路" prop="lineVal">
<el-input v-model="formInfo.cmdid" auto-complete="on"></el-input> <el-select v-model="formInfo.lineVal" placeholder="请选择">
</el-form-item>
<el-form-item label="SIM卡" prop="simCard">
<el-input v-model="formInfo.simCard" auto-complete="on"></el-input>
</el-form-item>
<el-form-item label="杆塔编号:" prop="towerid" required>
<el-select
v-model="formInfo.towerid"
placeholder="请选择"
@change="changetowerid"
>
<el-option <el-option
v-for="item in toweridOptions" v-for="item in lineOptions"
:key="item.id" :key="item.id"
:label="item.lineName" :label="item.name"
:value="item.id" :value="item.id"
> >
</el-option> </el-option>
</el-select> </el-select>
<!-- <el-input v-model="formInfo.towerid" auto-complete="on"></el-input> -->
</el-form-item> </el-form-item>
<el-form-item label="杆塔:" prop="towerVal">
<!-- <el-form-item label="线路编号:" prop="lineid" required> <el-select v-model="formInfo.towerVal" placeholder="请选择">
<el-input v-model="formInfo.lineid" auto-complete="on"></el-input>
</el-form-item> -->
<el-form-item label="通道:" prop="channelVal" required>
<el-select
v-model="formInfo.channelVal"
multiple
placeholder="请选择"
@change="changeChannelId"
>
<el-option <el-option
v-for="item in channelOptions" v-for="item in toweridOptions"
:key="item.id" :key="item.id"
:label="item.channelname" :label="item.name"
:value="item.id" :value="item.id"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否带云台:" prop="hasPan"> <el-form-item label="装置ID" prop="cmdid" required>
<!-- <el-input v-model="formInfo.hasPan"></el-input> --> <el-input v-model="formInfo.cmdid" auto-complete="on"></el-input>
<el-radio-group v-model="formInfo.hasPan">
<el-radio :label="0"></el-radio>
<el-radio :label="1"></el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
<!-- <el-form-item label="显示名:" prop="displayName" required>
<el-input v-model="formInfo.displayName" auto-complete="on"></el-input>
</el-form-item> -->
<el-form-item label="显示名:" prop="displayName">
<el-input v-model="formInfo.displayName"></el-input>
</el-form-item>
<el-form-item label="装置名称:" prop="equipName"> <el-form-item label="装置名称:" prop="equipName">
<el-input v-model="formInfo.equipName"></el-input> <el-input v-model="formInfo.equipName" auto-complete="on"></el-input>
</el-form-item>
<el-form-item label="装置型号:" prop="model">
<el-input v-model="formInfo.model"></el-input>
</el-form-item>
<!-- <el-form-item label="纬度:" prop="latitude">
<el-input v-model.number="formInfo.latitude"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="SIM卡" prop="simCard">
<el-form-item label="经度:" prop="longitude"> <el-input v-model="formInfo.simCard" auto-complete="on"></el-input>
<el-input v-model.number="formInfo.longitude"></el-input>
</el-form-item> -->
<el-form-item label="原始 ID" prop="orgId">
<el-input v-model="formInfo.orgId"></el-input>
</el-form-item>
<el-form-item label="版本号:" prop="essentialInfoVersion">
<el-input v-model="formInfo.essentialInfoVersion"></el-input>
</el-form-item>
<el-form-item label="出厂编号:" prop="bsIdentifier">
<el-input v-model="formInfo.bsIdentifier"></el-input>
</el-form-item>
<el-form-item label="生产厂家:" prop="bsManufacturer">
<el-input v-model="formInfo.bsManufacturer"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="生产日期:" prop="bsProductionDate"> <el-form-item label="通道(可多选)" prop="channelVal">
<el-input v-model="formInfo.bsProductionDate"></el-input> <el-checkbox-group
v-model="formInfo.channelVal"
v-if="channelOptions.length > 0"
>
<el-checkbox
border
v-for="item in channelOptions"
:key="item.id"
:label="item.id"
:value="item.channelname"
>{{ item.channelname }}</el-checkbox
>
</el-checkbox-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="closeDialog(0)"> </el-button> <el-button @click="isShow = false"> </el-button>
<el-button type="primary" @click="submitForm()"> </el-button> <el-button type="primary" @click="submitForm()"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -106,7 +75,7 @@ import {
addTerminalJoggle, addTerminalJoggle,
updateTerminalJoggle, updateTerminalJoggle,
getAllChannelListJoggle, getAllChannelListJoggle,
getAllTowerJoggle, getSearchInfo,
} from "@/utils/api/index"; } from "@/utils/api/index";
export default { export default {
props: { props: {
@ -117,12 +86,6 @@ export default {
type: String, type: String,
default: "新增", default: "新增",
}, },
formItem: {
type: Object,
default: function () {
return {};
},
},
}, },
data() { data() {
@ -135,121 +98,81 @@ export default {
} }
}; };
return { return {
page: 1, // isShow: false,
pageSize: 10, // formInfo: {
channelOptions: "", // lineVal: "",
channelArr: [], // towerVal: "",
toweridOptions: "", // equipName: "",
toweridVal: "", // cmdid: "",
formInfo: {}, // simCard: "",
// displayName: "",
channelVal: [],
},
channelOptions: [], //
lineOptions: [], //线
toweridOptions: [], //
rules: { rules: {
// displayName: [
// { required: true, message: "", trigger: "blur" },
// ],
cmdid: [ cmdid: [
{ required: true, message: "请输入装置ID", trigger: "blur" }, { required: true, message: "请输入装置ID", trigger: "blur" },
{ validator: validCmid, trigger: "blur" }, { validator: validCmid, trigger: "blur" },
], ],
// lineid: [
// { required: true, message: "线", trigger: "blur" },
// ],
towerid: [
{ required: true, message: "请输入杆塔编号", trigger: "change" },
],
// hasPan: [
// { required: true, message: "", trigger: "change" },
// ],
channelVal: [
{ required: true, message: "请选择通道", trigger: "change" },
],
// equipName: [
// { required: true, message: "", trigger: "blur" },
// ],
// model: [{ required: true, message: "", trigger: "blur" }],
// latitude: [{ required: true, message: "", trigger: "blur" }],
// longitude: [{ required: true, message: "", trigger: "blur" }],
// orgId: [{ required: true, message: " ID", trigger: "blur" }],
// essentialInfoVersion: [
// { required: true, message: "", trigger: "blur" },
// ],
// bsIdentifier: [
// { required: true, message: "", trigger: "blur" },
// ],
// bsManufacturer: [
// { required: true, message: "", trigger: "blur" },
// ],
// bsProductionDate: [
// { required: true, message: "", trigger: "blur" },
// ],
}, },
//
formArr: [],
}; };
}, },
methods: { methods: {
//
getdataform(val) {
console.log(val);
if (val == null) {
return (this.formInfo = {
channelVal: [],
});
}
this.formInfo = val;
},
// //
submitForm() { submitForm() {
this.$refs.formPhotoInfo.validate((valid) => { this.$refs.formgrapInfo.validate((valid) => {
if (valid) { if (valid) {
console.log(this.channelArr); console.log(valid);
let formObj = {
bsIdentifier: this.formInfo.bsIdentifier,
bsManufacturer: this.formInfo.bsManufacturer,
bsProductionDate: this.formInfo.bsProductionDate,
cmdid: this.formInfo.cmdid,
displayName: this.formInfo.displayName,
equipName: this.formInfo.equipName,
essentialInfoVersion: this.formInfo.essentialInfoVersion,
hasPan: this.formInfo.hasPan,
latitude: this.formInfo.latitude,
//lineid: this.formInfo.lineid,
longitude: this.formInfo.longitude,
model: this.formInfo.model,
orgId: this.formInfo.orgId,
towerid: this.formInfo.towerid,
};
this.formArr.push(formObj);
console.log(this.formArr);
//
if (this.photoDialogTitle == "新增") { if (this.photoDialogTitle == "新增") {
addTerminalJoggle({ list: this.formArr }) console.log(this.formInfo);
this.formInfo = {
channelid: this.formInfo.channelVal,
cmdid: this.formInfo.cmdid,
lineid: this.formInfo.lineVal,
equipName: this.formInfo.equipName,
sim: this.formInfo.simCard,
displayName: this.formInfo.cmdid,
towerid: this.formInfo.towerVal,
};
addTerminalJoggle(this.formInfo)
.then((res) => { .then((res) => {
console.log(res); this.isShow = false;
this.$emit("photoDialogClose", 1); //
this.formArr = [];
this.$message.success("添加成功"); this.$message.success("添加成功");
this.$parent.terminalList(); //
}) })
.catch((err) => { .catch((err) => {
console.log(err); // console.log(err); //
this.$message.error("添加失败"); this.$message.error("添加失败");
}); });
} else if (this.photoDialogTitle == "修改") { } else {
let changeformObj = { this.formInfo = {
bsIdentifier: this.formInfo.bsIdentifier, channelid: this.formInfo.channelVal,
bsManufacturer: this.formInfo.bsManufacturer,
bsProductionDate: this.formInfo.bsProductionDate,
cmdid: this.formInfo.cmdid, cmdid: this.formInfo.cmdid,
displayName: this.formInfo.displayName, lineid: this.formInfo.lineVal,
equipName: this.formInfo.equipName, equipName: this.formInfo.equipName,
essentialInfoVersion: this.formInfo.essentialInfoVersion, sim: this.formInfo.simCard,
hasPan: this.formInfo.hasPan, displayName: this.formInfo.cmdid,
latitude: this.formInfo.latitude, towerid: this.formInfo.towerVal,
// lineid: this.formInfo.lineid,
longitude: this.formInfo.longitude,
model: this.formInfo.model,
orgId: this.formInfo.orgId,
towerid: this.formInfo.towerid,
id: this.formInfo.id,
}; };
updateTerminalJoggle(changeformObj) updateTerminalJoggle(this.formInfo)
.then((res) => { .then((res) => {
console.log(res); this.isShow = false;
this.$emit("photoDialogClose", 1); //
this.$message.success("修改成功"); this.$message.success("修改成功");
this.$parent.lineList();
}) })
.catch((err) => { .catch((err) => {
console.log(err); //
this.$message.error("修改失败"); this.$message.error("修改失败");
}); });
} }
@ -259,11 +182,38 @@ export default {
} }
}); });
}, },
//
closeDialog(flag) { //线
this.$refs.formPhotoInfo.resetFields(); getLine() {
this.formInfo.hasPan = 0; getSearchInfo({ type: 2 }).then((res) => {
this.$emit("photoDialogClose", flag); console.log(res);
this.lineOptions = res.data.list;
if (res.data.list.length == 0) {
this.lineOptions = [];
this.formInfo.lineVal = "";
} else {
this.lineOptions = res.data.list;
this.formInfo.lineVal = res.data.list[0].id;
}
// this.dyOptions = res.data.list;
// this.formdata.dyid = res.data.list == [] ? "" : res.data.list[0].id;
this.getTower();
});
},
//
getTower() {
getSearchInfo({ type: 3, id: this.formInfo.lineVal })
.then((res) => {
console.log(res);
if (res.data.list.length == 0) {
this.toweridOptions = [];
this.formInfo.towerVal = "";
} else {
this.toweridOptions = res.data.list;
this.formInfo.towerVal = res.data.list[0].id;
}
})
.catch((err) => {});
}, },
// //
getChannel() { getChannel() {
@ -276,68 +226,38 @@ export default {
console.log(err); console.log(err);
}); });
}, },
// display() {
getTowerid() { this.isShow = true;
getAllTowerJoggle()
.then((res) => {
this.toweridOptions = res.data.list;
console.log(this.channelOptions);
})
.catch((err) => {
console.log(err);
});
},
//id
changeChannelId(val) {
console.log(val);
this.channelArr = val;
}, },
//id hide() {
changetowerid(val) { this.isShow = false;
let opt = {};
opt = this.toweridOptions.find((item) => {
return item.lineName;
});
// let channelObj = {};
// channelObj = this.channelOption.find(function (i) {
// return i.value;
// });
console.log(opt.lineName);
//this.toweridVal = val;
}, },
}, },
mounted() { mounted() {},
console.log("打印传过来的对象", this.formItem);
console.log("打印传过来的对象", this.formItem.bsIdentifier);
this.formInfo = JSON.parse(JSON.stringify(this.formItem));
},
created() { created() {
this.getChannel(); this.getChannel();
this.getTowerid(); this.getLine();
},
watch: {
formItem: {
handler(newVal, oldVal) {
//
this.$nextTick(() => {
this.formInfo = JSON.parse(JSON.stringify(this.formItem));
});
},
immediate: true,
deep: true,
},
}, },
watch: {},
}; };
</script> </script>
<style lang="less"> <style lang="less">
.addPhotoDialog { .addPhotoDialog {
.el-dialog { .el-dialog {
.el-form { .el-form {
display: flex; //display: flex;
flex-wrap: wrap; // flex-wrap: wrap;
.el-form-item { .el-form-item {
width: 260px; // width: 260px;
margin-right: 16px; // margin-right: 16px;
.el-select {
width: 100%;
}
.el-checkbox-group {
.el-checkbox {
margin-right: 12px;
}
}
.el-form-item__label { .el-form-item__label {
padding-right: 0px; padding-right: 0px;
} }

@ -125,10 +125,8 @@
</div> </div>
</div> </div>
<addPhotoDialog <addPhotoDialog
:photoDialog="photoDialog"
:photoDialogTitle="photoDialogTitle" :photoDialogTitle="photoDialogTitle"
@photoDialogClose="photoDialogClose" ref="addPhotoDialogref"
:formItem="formphotoInfo"
></addPhotoDialog> ></addPhotoDialog>
</div> </div>
</template> </template>
@ -151,15 +149,16 @@ export default {
page: 1, // page: 1, //
pageSize: 20, // pageSize: 20, //
total: 0, // total: 0, //
loading: true,
}; };
}, },
methods: { methods: {
//// ////
terminalList(page, pageSize) { terminalList() {
this.loading = true; this.loading = true;
getTerminalJoggle({ getTerminalJoggle({
pageindex: page, pageindex: this.page,
pagesize: pageSize, pagesize: this.pageSize,
}) })
.then((res) => { .then((res) => {
console.log(res); console.log(res);
@ -188,26 +187,33 @@ export default {
} }
return moment(date).format("YYYY-MM-DD HH:mm:ss"); return moment(date).format("YYYY-MM-DD HH:mm:ss");
}, },
//handleAddPhoto //
handleAddPhoto() { handleAddPhoto() {
this.photoDialog = true;
this.photoDialogTitle = "新增"; this.photoDialogTitle = "新增";
this.$refs.addPhotoDialogref.display();
//this.$refs.addlineDialogref.getdataform(null);
}, },
//handleRevisePhoto
//handleResive 线
handleRevisePhoto(data) { handleRevisePhoto(data) {
this.photoDialog = true;
this.photoDialogTitle = "修改"; this.photoDialogTitle = "修改";
this.formphotoInfo = Object.assign({}, data); this.$refs.addPhotoDialogref.display();
}, console.log(data);
// this.$refs.addPhotoDialogref.getdataform(data);
photoDialogClose(flag) {
if (flag) {
//
this.terminalList(this.page, this.pageSize);
}
this.photoDialog = false;
this.formphotoInfo = {};
}, },
// //handleAddPhoto
// handleAddPhoto() {
// this.photoDialog = true;
// this.photoDialogTitle = "";
// },
// //handleRevisePhoto
// handleRevisePhoto(data) {
// this.photoDialog = true;
// this.photoDialogTitle = "";
// this.formphotoInfo = Object.assign({}, data);
// },
// //
handleDelete(data) { handleDelete(data) {
console.log(data); console.log(data);
@ -224,7 +230,7 @@ export default {
// //
deleteTerminalJoggle({ list: this.deleteArr }).then((res) => { deleteTerminalJoggle({ list: this.deleteArr }).then((res) => {
console.log(res); console.log(res);
this.terminalList(this.page, this.pageSize); // this.terminalList(); //
}); });
this.$message({ this.$message({
type: "success", type: "success",
@ -240,14 +246,12 @@ export default {
}, },
// //
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.page = val; this.page = val;
this.terminalList(val, this.pageSize); // this.terminalList(); //
//this.getTableList();
}, },
}, },
created() { created() {
this.terminalList(this.page, this.pageSize); this.terminalList();
}, },
}; };
</script> </script>

@ -82,7 +82,7 @@ export default {
return (this.formdata = {}); return (this.formdata = {});
} }
this.formdata = val; this.formdata = val;
this.$set(this.formdata); //this.$set(this.formdata);
}, },
// //
submitForm() { submitForm() {

Loading…
Cancel
Save