Merge branch 'master' of http://git.umayle.com:2023/chengdandan/InternetCompetition
This commit is contained in:
commit
8e265ebb5d
|
@ -66,8 +66,12 @@
|
|||
<el-table-column property="cjdpz_sjq" label="数据区">
|
||||
<template slot-scope="scope">
|
||||
<el-select v-model="scope.row.cjdpz_sjq" placeholder="">
|
||||
<el-option v-for="(option, index) in options3" :key="index" :label="option.label"
|
||||
:value="option.value"></el-option>
|
||||
<el-option
|
||||
v-for="(option, index) in options3"
|
||||
:key="index"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
@ -1095,7 +1099,7 @@ export default {
|
|||
this.outerVisible = true;
|
||||
this.GetUserAnswer();
|
||||
}
|
||||
if (node.level == 3 && data.label==this.tableData[0].sbpz_sbmc) {
|
||||
if (node.level == 3 && data.label == this.tableData[0].sbpz_sbmc) {
|
||||
this.menuShow = false;
|
||||
this.menuShow = true;
|
||||
this.nodekey = data.id;
|
||||
|
@ -1125,14 +1129,16 @@ export default {
|
|||
// console.log(JSON.parse(data.data.mark_value));
|
||||
if (data.data && data.state) {
|
||||
let obj = JSON.parse(data.data.mark_value);
|
||||
console.log(obj, "编辑按钮的显现")
|
||||
console.log(obj, "编辑按钮的显现");
|
||||
if (obj.sbpz_ip) {
|
||||
this.sbpz_ip1 = obj.sbpz_ip.split(".")[0];
|
||||
this.sbpz_ip2 = obj.sbpz_ip.split(".")[1];
|
||||
this.sbpz_ip3 = obj.sbpz_ip.split(".")[2];
|
||||
this.sbpz_ip4 = obj.sbpz_ip.split(".")[3];
|
||||
this.tableData[0].sbpz_ip = obj.sbpz_ip;
|
||||
this.tableData[0].sbpz_zqsbonchange = Boolean(Number(obj.sbpz_zqsbonchange));
|
||||
this.tableData[0].sbpz_zqsbonchange = Boolean(
|
||||
Number(obj.sbpz_zqsbonchange)
|
||||
);
|
||||
this.tableData[0].sbpz_qyhmcj = Boolean(Number(obj.sbpz_qyhmcj));
|
||||
this.tableData[0].sbpz_qyplcj = Boolean(Number(obj.sbpz_qyplcj));
|
||||
}
|
||||
|
@ -1177,7 +1183,6 @@ export default {
|
|||
this.tableData[0].mqtt_cjd_sbmc = obj.mqtt_cjd_sbmc;
|
||||
this.tableData[0].mqtt_cjd_tagid = obj.mqtt_cjd_tagid;
|
||||
}
|
||||
|
||||
} else if (index == 2) {
|
||||
this.menuShow = false;
|
||||
}
|
||||
|
@ -1507,17 +1512,16 @@ export default {
|
|||
created() {
|
||||
this.user_id = this.$route.query.user_id;
|
||||
this.GetUserAnswer();
|
||||
if(this.user_id!="undefined"){
|
||||
if (this.user_id != "undefined") {
|
||||
GetTree({
|
||||
user_id: this.user_id,
|
||||
type: "3",
|
||||
}).then((res) => {
|
||||
console.log(res);
|
||||
console.log(JSON.parse(res.data.data.data));
|
||||
this.trees = JSON.parse(res.data.data.data);
|
||||
});
|
||||
user_id: this.user_id,
|
||||
type: "3",
|
||||
}).then((res) => {
|
||||
console.log(res);
|
||||
console.log(JSON.parse(res.data.data.data));
|
||||
this.trees = JSON.parse(res.data.data.data);
|
||||
});
|
||||
}
|
||||
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
Loading…
Reference in New Issue