Merge branch 'master' of http://git.umayle.com:2023/chengdandan/InternetCompetition
This commit is contained in:
unknown
commit
596e151a0e
|
|
@ -154,7 +154,6 @@
|
||||||
<el-switch v-model="formData.mqtt_retained"></el-switch>
|
<el-switch v-model="formData.mqtt_retained"></el-switch>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col> -->
|
</el-col> -->
|
||||||
<<<<<<< HEAD
|
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
|
|
@ -209,53 +208,10 @@
|
||||||
<div class="con_right">
|
<div class="con_right">
|
||||||
<el-button type="info" plain @click="handleSelect">保存</el-button>
|
<el-button type="info" plain @click="handleSelect">保存</el-button>
|
||||||
<!-- <el-menu class="el-menu-demo" mode="horizontal" @select="handleSelect">
|
<!-- <el-menu class="el-menu-demo" mode="horizontal" @select="handleSelect">
|
||||||
=======
|
|
||||||
</el-row>
|
|
||||||
<el-row>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item label="上传模式:" :label-width="formLabelWidth" prop="mqtt_scms">
|
|
||||||
<!-- <el-input v-model="formData.mqtt_scms" placeholder=""
|
|
||||||
style="width: 200px;height:30px"></el-input> -->
|
|
||||||
<el-select v-model="formData.mqtt_scms" placeholder="">
|
|
||||||
<el-option v-for="(option, index) in options2" :key="index" :label="option.label"
|
|
||||||
:value="option.value"></el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item label="上传周期(s):" label-width="108px" prop="mqtt_sczq">
|
|
||||||
<el-input v-model="formData.mqtt_sczq" placeholder=""
|
|
||||||
style="width: 200px;height:30px"></el-input>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
<el-row>
|
|
||||||
<el-col :span="24">
|
|
||||||
<el-form-item label="数据过滤:" :label-width="formLabelWidth" prop="mqtt_sjgl">
|
|
||||||
<el-checkbox-group v-model="formData.mqtt_sjgl">
|
|
||||||
<el-checkbox label="值改变"></el-checkbox>
|
|
||||||
<el-checkbox label="采集成功"></el-checkbox>
|
|
||||||
<el-checkbox label="时间戳改变"></el-checkbox>
|
|
||||||
</el-checkbox-group>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
<div class="con_left_footer">
|
|
||||||
<el-button type="primary" @click="saveClone">保 存</el-button>
|
|
||||||
<el-button @click="add_passage = false">取 消</el-button>
|
|
||||||
</div>
|
|
||||||
</el-form>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<div class="con_right">
|
|
||||||
<el-button type="info" plain @click="handleSelect">保存</el-button>
|
|
||||||
<!-- <el-menu class="el-menu-demo" mode="horizontal" @select="handleSelect">
|
|
||||||
>>>>>>> 42cfd39927acf79f394e3a60cae81f6a32163f26
|
|
||||||
<el-menu-item index="1">添加</el-menu-item>
|
<el-menu-item index="1">添加</el-menu-item>
|
||||||
<el-menu-item index="2">保存</el-menu-item>
|
<el-menu-item index="2">保存</el-menu-item>
|
||||||
<el-menu-item index="3">删除</el-menu-item>
|
<el-menu-item index="3">删除</el-menu-item>
|
||||||
</el-menu> -->
|
</el-menu> -->
|
||||||
<<<<<<< HEAD
|
|
||||||
</div>
|
</div>
|
||||||
<el-table ref="singleTable" :data="tableData" style="width: 100%">
|
<el-table ref="singleTable" :data="tableData" style="width: 100%">
|
||||||
<el-table-column type="index"> </el-table-column>
|
<el-table-column type="index"> </el-table-column>
|
||||||
|
|
@ -284,42 +240,6 @@
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
=======
|
|
||||||
</div>
|
|
||||||
<el-table ref="singleTable" :data="tableData" style="width: 100%">
|
|
||||||
<el-table-column type="index"> </el-table-column>
|
|
||||||
<el-table-column property="mqtt_cjd_sbmc" label="设备名称">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<el-select v-model="scope.row.mqtt_cjd_sbmc" placeholder="">
|
|
||||||
<el-option v-for="(option, index) in options3" :key="index" :label="option.label"
|
|
||||||
:value="option.value"></el-option>
|
|
||||||
</el-select>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column property="mqtt_cjd_tagid" label="TagID">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<el-select v-model="scope.row.mqtt_cjd_tagid" placeholder="">
|
|
||||||
<el-option v-for="(option, index) in options4" :key="index" :label="option.label"
|
|
||||||
:value="option.value"></el-option>
|
|
||||||
</el-select>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- 添加按钮下显示出来的弹框信息 -->
|
|
||||||
<div>
|
|
||||||
<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>
|
|
||||||
>>>>>>> 42cfd39927acf79f394e3a60cae81f6a32163f26
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -154,7 +154,6 @@
|
||||||
<el-switch v-model="formData.mqtt_retained"></el-switch>
|
<el-switch v-model="formData.mqtt_retained"></el-switch>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col> -->
|
</el-col> -->
|
||||||
<<<<<<< HEAD
|
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
|
|
@ -209,53 +208,10 @@
|
||||||
<div class="con_right">
|
<div class="con_right">
|
||||||
<el-button type="info" plain @click="handleSelect">保存</el-button>
|
<el-button type="info" plain @click="handleSelect">保存</el-button>
|
||||||
<!-- <el-menu class="el-menu-demo" mode="horizontal" @select="handleSelect">
|
<!-- <el-menu class="el-menu-demo" mode="horizontal" @select="handleSelect">
|
||||||
=======
|
|
||||||
</el-row>
|
|
||||||
<el-row>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item label="上传模式:" :label-width="formLabelWidth" prop="mqtt_scms">
|
|
||||||
<!-- <el-input v-model="formData.mqtt_scms" placeholder=""
|
|
||||||
style="width: 200px;height:30px"></el-input> -->
|
|
||||||
<el-select v-model="formData.mqtt_scms" placeholder="">
|
|
||||||
<el-option v-for="(option, index) in options2" :key="index" :label="option.label"
|
|
||||||
:value="option.value"></el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item label="上传周期(s):" label-width="108px" prop="mqtt_sczq">
|
|
||||||
<el-input v-model="formData.mqtt_sczq" placeholder=""
|
|
||||||
style="width: 200px;height:30px"></el-input>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
<el-row>
|
|
||||||
<el-col :span="24">
|
|
||||||
<el-form-item label="数据过滤:" :label-width="formLabelWidth" prop="mqtt_sjgl">
|
|
||||||
<el-checkbox-group v-model="formData.mqtt_sjgl">
|
|
||||||
<el-checkbox label="值改变"></el-checkbox>
|
|
||||||
<el-checkbox label="采集成功"></el-checkbox>
|
|
||||||
<el-checkbox label="时间戳改变"></el-checkbox>
|
|
||||||
</el-checkbox-group>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
<div class="con_left_footer">
|
|
||||||
<el-button type="primary" @click="saveClone">保 存</el-button>
|
|
||||||
<el-button @click="add_passage = false">取 消</el-button>
|
|
||||||
</div>
|
|
||||||
</el-form>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<div class="con_right">
|
|
||||||
<el-button type="info" plain @click="handleSelect">保存</el-button>
|
|
||||||
<!-- <el-menu class="el-menu-demo" mode="horizontal" @select="handleSelect">
|
|
||||||
>>>>>>> 42cfd39927acf79f394e3a60cae81f6a32163f26
|
|
||||||
<el-menu-item index="1">添加</el-menu-item>
|
<el-menu-item index="1">添加</el-menu-item>
|
||||||
<el-menu-item index="2">保存</el-menu-item>
|
<el-menu-item index="2">保存</el-menu-item>
|
||||||
<el-menu-item index="3">删除</el-menu-item>
|
<el-menu-item index="3">删除</el-menu-item>
|
||||||
</el-menu> -->
|
</el-menu> -->
|
||||||
<<<<<<< HEAD
|
|
||||||
</div>
|
</div>
|
||||||
<el-table ref="singleTable" :data="tableData" style="width: 100%">
|
<el-table ref="singleTable" :data="tableData" style="width: 100%">
|
||||||
<el-table-column type="index"> </el-table-column>
|
<el-table-column type="index"> </el-table-column>
|
||||||
|
|
@ -284,43 +240,6 @@
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
=======
|
|
||||||
</div>
|
|
||||||
<el-table ref="singleTable" :data="tableData" style="width: 100%">
|
|
||||||
<el-table-column type="index"> </el-table-column>
|
|
||||||
<el-table-column property="mqtt_cjd_sbmc" label="设备名称">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<el-select v-model="scope.row.mqtt_cjd_sbmc" placeholder="">
|
|
||||||
<el-option v-for="(option, index) in options2" :key="index" :label="option.label"
|
|
||||||
:value="option.value">
|
|
||||||
</el-option>
|
|
||||||
</el-select>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column property="mqtt_cjd_tagid" label="TagID">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<el-select v-model="scope.row.mqtt_cjd_tagid" placeholder="">
|
|
||||||
<el-option v-for="(option, index) in options3" :key="index" :label="option.label"
|
|
||||||
:value="option.value"></el-option>
|
|
||||||
</el-select>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- 添加按钮下显示出来的弹框信息 -->
|
|
||||||
<div>
|
|
||||||
<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>
|
|
||||||
>>>>>>> 42cfd39927acf79f394e3a60cae81f6a32163f26
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -469,7 +388,6 @@ export default {
|
||||||
label: "Alink",
|
label: "Alink",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
label: "Tlink",
|
label: "Tlink",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -479,171 +397,6 @@ export default {
|
||||||
label: "Ulink",
|
label: "Ulink",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
=======
|
|
||||||
label: "IOT",
|
|
||||||
children: [
|
|
||||||
{
|
|
||||||
label: "Mqtt Client"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Alink"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Tlink"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "loTDDC"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Ulink"
|
|
||||||
},
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}],
|
|
||||||
defaultProps: {
|
|
||||||
children: 'children',
|
|
||||||
label: 'label'
|
|
||||||
},
|
|
||||||
// 右边添加设备的字段
|
|
||||||
options3: [
|
|
||||||
{
|
|
||||||
label: "有线区精雕1",
|
|
||||||
value: "有线区精雕1",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "无线区精雕1",
|
|
||||||
value: "无线区精雕1",
|
|
||||||
}
|
|
||||||
],
|
|
||||||
options4: [{
|
|
||||||
value: "MachinePamHID909",
|
|
||||||
label: "MachinePamHID909",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID910",
|
|
||||||
label: "MachinePamHID910",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID911",
|
|
||||||
label: "MachinePamHID911",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID912",
|
|
||||||
label: "MachinePamHID912",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID913",
|
|
||||||
label: "MachinePamHID913",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID914",
|
|
||||||
label: "MachinePamHID914",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID915",
|
|
||||||
label: "MachinePamHID915",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID916",
|
|
||||||
label: "MachinePamHID916",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID917",
|
|
||||||
label: "MachinePamHID917",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID918",
|
|
||||||
label: "MachinePamHID918",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID919",
|
|
||||||
label: "MachinePamHID919",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID920",
|
|
||||||
label: "MachinePamHID920",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID921",
|
|
||||||
label: "MachinePamHID921",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID922",
|
|
||||||
label: "MachinePamHID922",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID923",
|
|
||||||
label: "MachinePamHID923",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID924",
|
|
||||||
label: "MachinePamHID924",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID925",
|
|
||||||
label: "MachinePamHID925",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID926",
|
|
||||||
label: "MachinePamHID926",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID927",
|
|
||||||
label: "MachinePamHID927",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID928",
|
|
||||||
label: "MachinePamHID928",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID929",
|
|
||||||
label: "MachinePamHID929",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID930",
|
|
||||||
label: "MachinePamHID930",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID931",
|
|
||||||
label: "MachinePamHID931",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID932",
|
|
||||||
label: "MachinePamHID932",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID933",
|
|
||||||
label: "MachinePamHID933",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID934",
|
|
||||||
label: "MachinePamHID934",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID935",
|
|
||||||
label: "MachinePamHID935",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID936",
|
|
||||||
label: "MachinePamHID936",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID937",
|
|
||||||
label: "MachinePamHID937",
|
|
||||||
}, {
|
|
||||||
value: "MachinePamHID938",
|
|
||||||
label: "MachinePamHID938",
|
|
||||||
}],
|
|
||||||
tableData: [
|
|
||||||
{
|
|
||||||
mqtt_cjd_sbmc: "无线区精雕1",
|
|
||||||
mqtt_cjd_tagid: "MachinePamHID909",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
// 校验
|
|
||||||
rules: {
|
|
||||||
mqtt_ip: [
|
|
||||||
{ required: true, message: '', trigger: 'blur' },
|
|
||||||
// { required: true, message: '请输入服务器IP', trigger: 'blur' },
|
|
||||||
],
|
|
||||||
mqtt_port: [
|
|
||||||
{ required: true, message: '', trigger: 'blur' },
|
|
||||||
// { required: true, message: '请输入端口', trigger: 'blur' },
|
|
||||||
],
|
|
||||||
mqtt_wgsn: [
|
|
||||||
{ required: true, message: '', trigger: 'blur' },
|
|
||||||
// { required: true, message: '请输入网关ID', trigger: 'blur' },
|
|
||||||
],
|
|
||||||
mqtt_sssjfbzt: [
|
|
||||||
{ required: true, message: '', trigger: 'blur' },
|
|
||||||
// { required: true, message: '请输入主题', trigger: 'blur' },
|
|
||||||
],
|
|
||||||
mqtt_scms: [
|
|
||||||
{ required: true, message: '', trigger: 'blur' },
|
|
||||||
// { required: true, message: '请输入上传模式', trigger: 'blur' },
|
|
||||||
],
|
|
||||||
mqtt_sczq: [
|
|
||||||
{ required: true, message: '', trigger: 'blur' },
|
|
||||||
// { required: true, message: '请输入上传周期', trigger: 'blur' },
|
|
||||||
],
|
|
||||||
mqtt_sjgl: [
|
|
||||||
{ required: true, message: '', trigger: 'blur' },
|
|
||||||
// { required: true, message: '请输入数据过滤', trigger: 'blur' },
|
|
||||||
],
|
|
||||||
>>>>>>> 42cfd39927acf79f394e3a60cae81f6a32163f26
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue