This commit is contained in:
lll 2023-11-02 14:45:38 +08:00
parent 5de551a8e3
commit 757c774c6a
1 changed files with 0 additions and 122 deletions

View File

@ -196,17 +196,6 @@
</el-form>
</div>
<div>
<<<<<<< HEAD
<el-dialog title="选择点" :visible.sync="choose_point" width="30%">
<el-tree :data="points" show-checkbox node-key="id" :default-expanded-keys="[1, 2]"
:default-checked-keys="[3, 4, 5, 6]" :props="defaultProps">
</el-tree>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="savePoint"> </el-button>
<el-button @click="choose_point = false"> </el-button>
</span>
</el-dialog>
=======
<div class="con_right">
<el-menu
class="el-menu-demo"
@ -225,7 +214,6 @@
<el-table-column property="mqtt_cjd_tagid" label="TagID">
</el-table-column>
</el-table>
>>>>>>> bc01ac6b0082d031596737d0f308cae975b5f2cb
</div>
</div>
</div>
@ -343,69 +331,7 @@ export default {
label: "数据采集",
children: [
{
<<<<<<< HEAD
id: 1,
label: 'Device1',
children: [
{
id: 3,
label: 'tag0001',
}, {
id: 4,
label: 'tag0002',
},
]
}, {
id: 2,
label: 'Device1',
children: [
{
id: 5,
label: 'tag0003',
}, {
id: 6,
label: 'tag0004',
},
]
},],
choose_point: false,
options1: [{
value: '0',
label: '0'
}, {
value: '1',
label: '1'
}, {
value: '2',
label: '2'
}],
labelPosition: "left",
formLabelWidth: "114px",
input1: 192,
add_passage: false,
rightMenu: "",
dialogVisible: true,
isAdd: false,
datas: [{
label: 'Gateway',
children: [{
label: '数据采集',
children: [{
label: 'I/O点'
},
{
label: '用户点',
},
{
label: '计算点',
},
{
label: '系统点',
},
]
=======
label: "I/O点",
>>>>>>> bc01ac6b0082d031596737d0f308cae975b5f2cb
},
{
label: "用户点",
@ -441,53 +367,6 @@ export default {
mqtt_cjd_sbmc: "Device1",
mqtt_cjd_tagid: "Device1.tag0001",
},
<<<<<<< HEAD
handleSelect(key) {
console.log(key);
if (key == 1 && this.isAdd == false) {
this.choose_point = true;
} else if (key == 1 && this.isAdd == true) {
alert("只能添加一次");
}
},
highlighter(code) {
return highlight(code, languages.js); //returns html
},
closeMenu(ev) {
console.log({ ev });
this.dialogVisible = false;
},
savePoint() {
this.choose_point = false;
this.isAdd = true;
},
},
directives: {
'click-outside': {
bind: function (el, binding, vnode) {
console.log('el', el);
console.log("binding", binding);
el.event = function (event) {
//
if (!(el == event.target || el.contains(event.target))) {
//
//
// vnode.context
if (typeof vnode.context[binding.expression] == 'function') {
vnode.context[binding.expression](event)
}
}
}
//
// trueDOMlistener
document.body.addEventListener('click', el.event, true)
},
unbind: function (el) {
//
document.body.removeEventListener('click', el.event, true)
},
},
=======
],
rules: {
server_ip: [
@ -562,7 +441,6 @@ export default {
//
document.body.removeEventListener("click", el.event, true);
},
>>>>>>> bc01ac6b0082d031596737d0f308cae975b5f2cb
},
},
};