This commit is contained in:
parent
54f3b02dfa
commit
c879000736
|
@ -4,12 +4,23 @@
|
|||
<!-- 设置树形控件 -->
|
||||
<!-- <el-button type="info" plain @click="dialogVisible = true">斥候采集点设置</el-button> -->
|
||||
<div v-show="dialogVisible" class="tree_menu">
|
||||
<el-tree :data="trees" node-key="id" :props="defaultProps" default-expand-all @node-contextmenu="rightClick"
|
||||
@node-click="treeNodeClick" ref="tree">
|
||||
<el-tree
|
||||
:data="trees"
|
||||
node-key="id"
|
||||
:props="defaultProps"
|
||||
default-expand-all
|
||||
@node-contextmenu="rightClick"
|
||||
@node-click="treeNodeClick"
|
||||
ref="tree"
|
||||
>
|
||||
</el-tree>
|
||||
<!-- 树形控件右键组件 -->
|
||||
<div v-show="menuShow" class="tree_rightmenu" :style="{ ...rightMenu }">
|
||||
<el-menu class="el-menu-vertical-demo" @select="selectMenuNode" default-active="#0078FE">
|
||||
<el-menu
|
||||
class="el-menu-vertical-demo"
|
||||
@select="selectMenuNode"
|
||||
default-active="#0078FE"
|
||||
>
|
||||
<el-menu-item id="menuitem" index="1" style="font-size: 12px">
|
||||
<span slot="title">编辑</span>
|
||||
</el-menu-item>
|
||||
|
@ -34,40 +45,63 @@
|
|||
<el-table-column property="cjdpz_tagid" label="TagID">
|
||||
<template slot-scope="scope">
|
||||
<el-select v-model="scope.row.cjdpz_tagid" placeholder="">
|
||||
<el-option v-for="(option, index) in options1" :key="index" :label="option.label"
|
||||
:value="option.value"></el-option>
|
||||
<el-option
|
||||
v-for="(option, index) in options1"
|
||||
:key="index"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column property="cjdpz_mc" label="名称">
|
||||
<template slot-scope="scope">
|
||||
<el-select v-model="scope.row.cjdpz_mc" placeholder="">
|
||||
<el-option v-for="(option, index) in options2" :key="index" :label="option.label"
|
||||
:value="option.value"></el-option>
|
||||
<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="cjdpz_jcqdz" label="地址">
|
||||
<template slot-scope="scope">
|
||||
<el-select v-model="scope.row.cjdpz_dz" 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>
|
||||
<el-table-column property="cjdpz_jcqdz" label="寄存地址(十进制)" width="150px">
|
||||
<el-table-column
|
||||
property="cjdpz_jcqdz"
|
||||
label="寄存地址(十进制)"
|
||||
width="150px"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<!-- <el-select v-model="scope.row.cjdpz_jcqdz" placeholder="1">
|
||||
<el-option v-for="(option,index) in options4" :key="index" :label="option.label" :value="option.value"></el-option>
|
||||
</el-select> -->
|
||||
<el-input v-model="scope.row.cjdpz_jcqdz" placeholder="1-9999"></el-input>
|
||||
<el-input
|
||||
v-model="scope.row.cjdpz_jcqdz"
|
||||
placeholder="1-9999"
|
||||
></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column property="cjdpz_cjsjlx" label="采集数据类型">
|
||||
<template slot-scope="scope">
|
||||
<el-select v-model="scope.row.cjdpz_cjsjlx" placeholder="">
|
||||
<el-option v-for="(option, index) in options5" :key="index" :label="option.label"
|
||||
:value="option.value"></el-option>
|
||||
<el-option
|
||||
v-for="(option, index) in options5"
|
||||
:key="index"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
@ -75,16 +109,24 @@
|
|||
<el-table-column property="cjdpz_dxsx" label="读写属性">
|
||||
<template slot-scope="scope">
|
||||
<el-select v-model="scope.row.cjdpz_dxsx" placeholder="">
|
||||
<el-option v-for="(option, index) in options6" :key="index" :label="option.label"
|
||||
:value="option.value"></el-option>
|
||||
<el-option
|
||||
v-for="(option, index) in options6"
|
||||
:key="index"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column property="cjdpz_scms" label="上传模式">
|
||||
<template slot-scope="scope">
|
||||
<el-select v-model="scope.row.cjdpz_scms" placeholder="">
|
||||
<el-option v-for="(option, index) in options7" :key="index" :label="option.label"
|
||||
:value="option.value"></el-option>
|
||||
<el-option
|
||||
v-for="(option, index) in options7"
|
||||
:key="index"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
@ -98,16 +140,40 @@
|
|||
<!-- 网关信息 -->
|
||||
<div class="gateway">
|
||||
<el-dialog title="新建网关" :visible.sync="outerVisible" width="382px">
|
||||
<el-form :model="tableData[0]" :rules="rulesGate" ref="gateWay" label-width="85px" class="demo-ruleForm">
|
||||
<el-form
|
||||
:model="tableData[0]"
|
||||
:rules="rulesGate"
|
||||
ref="gateWay"
|
||||
label-width="85px"
|
||||
class="demo-ruleForm"
|
||||
>
|
||||
<el-form-item label="网关名称:" prop="wgpz_wgmc">
|
||||
<el-select v-model="tableData[0].wgpz_wgmc" placeholder="请选择" style="width: 200px">
|
||||
<el-option v-for="item in opts1" :key="item.value" :label="item.label" :value="item.value">
|
||||
<el-select
|
||||
v-model="tableData[0].wgpz_wgmc"
|
||||
placeholder="请选择"
|
||||
style="width: 200px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in opts1"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="网关ID:" prop="wgpz_wgid">
|
||||
<el-select v-model="tableData[0].wgpz_wgid" placeholder="请选择" style="width: 200px">
|
||||
<el-option v-for="item in opts2" :key="item.value" :label="item.label" :value="item.value">
|
||||
<el-select
|
||||
v-model="tableData[0].wgpz_wgid"
|
||||
placeholder="请选择"
|
||||
style="width: 200px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in opts2"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
@ -614,7 +680,9 @@ export default {
|
|||
this.rightMenu = { top: e.pageY + "px", left: e.pageX + "px" };
|
||||
document.addEventListener("click", (ev) => {
|
||||
ev.stopImmediatePropagation();
|
||||
if (ev.target !== document.querySelector(".el-menu-item.is-active")) {
|
||||
if (
|
||||
ev.target !== document.querySelector(".el-menu-item.is-active")
|
||||
) {
|
||||
this.foo();
|
||||
}
|
||||
});
|
||||
|
|
|
@ -238,14 +238,45 @@ export default {
|
|||
console.log(JSON.parse(data.data.mark_value));
|
||||
let obj = JSON.parse(data.data.mark_value);
|
||||
if (obj.ippz_ssid) {
|
||||
// this.formData.ippz_ssid = obj.ippz_ssid;
|
||||
// this.formData.ippz_rzfs = obj.ippz_rzfs;
|
||||
// this.formData.ippz_jmfs = obj.ippz_jmfs;
|
||||
// this.formData.ippz_mm = obj.ippz_mm;
|
||||
for (let key in obj) {
|
||||
this.formData[key] = obj[key];
|
||||
}
|
||||
console.log(this.formData);
|
||||
// for (let key in obj) {
|
||||
// this.formData[key] = obj[key];
|
||||
// }
|
||||
// console.log(this.formData);
|
||||
(this.formData.ippz_ssid = obj.ippz_ssid),
|
||||
(this.formData.ippz_rzfs = obj.ippz_rzfs),
|
||||
(this.formData.ippz_jmfs = obj.ippz_jmfs),
|
||||
(this.formData.ippz_mm = obj.ippz_mm),
|
||||
(this.formData.wgpz_wgmc = obj.wgpz_wgmc),
|
||||
(this.formData.wgpz_wgid = obj.wgpz_wgid),
|
||||
(this.formData.sbpz_sbmc = obj.sbpz_sbmc),
|
||||
(this.formData.sbpz_kzqxy = obj.sbpz_kzqxy),
|
||||
(this.formData.sbpz_ip = obj.sbpz_ip),
|
||||
(this.formData.sbpz_port = obj.sbpz_port),
|
||||
(this.formData.sbpz_czdz = obj.sbpz_czdz),
|
||||
(this.formData.sbpz_lxzq = obj.sbpz_lxzq),
|
||||
(this.formData.sbpz_qyhmcj = obj.sbpz_qyhmcj),
|
||||
(this.formData.sbpz_qyplcj = obj.sbpz_qyplcj),
|
||||
(this.formData.sbpz_zdplcjs = obj.sbpz_zdplcjs),
|
||||
(this.formData.sbpz_cjcgsj = obj.sbpz_cjcgsj),
|
||||
(this.formData.sbpz_zqsbonchange = obj.sbpz_zqsbonchange),
|
||||
(this.formData.sbpz_txsjjg = obj.sbpz_txsjjg),
|
||||
(this.formData.sbpz_xqjcqxr = obj.sbpz_xqjcqxr),
|
||||
(this.formData.sbpz_bcjcqxr = obj.sbpz_bcjcqxr),
|
||||
(this.formData.cjdpz_tagid = obj.cjdpz_tagid),
|
||||
(this.formData.cjdpz_mc = obj.cjdpz_mc),
|
||||
(this.formData.cjdpz_sjq = obj.cjdpz_sjq),
|
||||
(this.formData.cjdpz_jcqdz = obj.cjdpz_jcqdz),
|
||||
(this.formData.cjdpz_cjsjlx = obj.cjdpz_cjsjlx),
|
||||
(this.formData.cjdpz_dxsx = obj.cjdpz_dxsx),
|
||||
(this.formData.cjdpz_scms = obj.cjdpz_scms),
|
||||
(this.formData.mqtt_ip = obj.mqtt_ip),
|
||||
(this.formData.mqtt_wgsn = obj.mqtt_wgsn),
|
||||
(this.formData.mqtt_port = obj.mqtt_port),
|
||||
(this.formData.mqtt_keepalive = obj.mqtt_keepalive),
|
||||
(this.formData.mqtt_sssjfbzt = obj.mqtt_sssjfbzt),
|
||||
(this.formData.mqtt_qos = obj.mqtt_qos),
|
||||
(this.formData.mqtt_cjd_sbmc = obj.mqtt_cjd_sbmc),
|
||||
(this.formData.mqtt_cjd_tagid = obj.mqtt_cjd_tagid);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
@ -3,16 +3,40 @@
|
|||
<div>
|
||||
<div class="gateway">
|
||||
<el-dialog title="新建网关" :visible.sync="outerVisible" width="382px">
|
||||
<el-form :model="formData" :rules="rules" ref="formData" label-width="85px" class="demo-ruleForm">
|
||||
<el-form
|
||||
:model="formData"
|
||||
:rules="rules"
|
||||
ref="formData"
|
||||
label-width="85px"
|
||||
class="demo-ruleForm"
|
||||
>
|
||||
<el-form-item label="网关名称:" prop="wgpz_wgmc">
|
||||
<el-select v-model="formData.wgpz_wgmc" placeholder="请选择" style="width: 200px">
|
||||
<el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
|
||||
<el-select
|
||||
v-model="formData.wgpz_wgmc"
|
||||
placeholder="请选择"
|
||||
style="width: 200px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in options1"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="网关ID:" prop="wgpz_wgid">
|
||||
<el-select v-model="formData.wgpz_wgid" placeholder="请选择" style="width: 200px">
|
||||
<el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value">
|
||||
<el-select
|
||||
v-model="formData.wgpz_wgid"
|
||||
placeholder="请选择"
|
||||
style="width: 200px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in options2"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
@ -24,7 +48,12 @@
|
|||
</el-dialog>
|
||||
</div>
|
||||
<div>
|
||||
<el-dialog title="系统提示" :visible.sync="innerVisible" append-to-body width="382px">
|
||||
<el-dialog
|
||||
title="系统提示"
|
||||
:visible.sync="innerVisible"
|
||||
append-to-body
|
||||
width="382px"
|
||||
>
|
||||
<p class="inner_content">
|
||||
请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关
|
||||
</p>
|
||||
|
@ -166,7 +195,7 @@ export default {
|
|||
});
|
||||
},
|
||||
async saveGate() {
|
||||
console.log(this.formData)
|
||||
console.log(this.formData);
|
||||
let res = await SaveUserAnswer({
|
||||
mark: "CHGYWG_yx",
|
||||
user_id: this.user_id,
|
||||
|
@ -206,7 +235,7 @@ export default {
|
|||
// this.isShow = true;
|
||||
console.log(JSON.parse(data.data.mark_value));
|
||||
let obj = JSON.parse(data.data.mark_value);
|
||||
console.log(obj)
|
||||
console.log(obj);
|
||||
this.formData.wgpz_wgid = obj.wgpz_wgid;
|
||||
this.formData.wgpz_wgmc = obj.wgpz_wgmc;
|
||||
this.formData.ippz_wllx = obj.ippz_wllx;
|
||||
|
@ -234,7 +263,7 @@ export default {
|
|||
this.formData.cjdpz_tagid = obj.mqtt_cjd_tagid;
|
||||
this.formData.cjdpz_mc = obj.cjdpz_mc;
|
||||
this.formData.cjdpz_sjq = obj.cjdpz_sjq;
|
||||
this.formData.cjdpz_jcqdz = obj.cjdpz_cjsjlx;
|
||||
this.formData.cjdpz_jcqdz = obj.cjdpz_jcqdz;
|
||||
this.formData.cjdpz_cjsjlx = obj.cjdpz_cjsjlx;
|
||||
this.formData.cjdpz_dxsx = obj.cjdpz_dxsx;
|
||||
this.formData.cjdpz_scms = obj.cjdpz_scms;
|
||||
|
|
|
@ -10,11 +10,25 @@
|
|||
<el-divider></el-divider>
|
||||
<div class="content">
|
||||
<div class="lan">
|
||||
<el-form v-loading="loading" :model="formData" :label-position="labelPosition" :rules="rules" ref="formData">
|
||||
<el-form
|
||||
v-loading="loading"
|
||||
:model="formData"
|
||||
:label-position="labelPosition"
|
||||
:rules="rules"
|
||||
ref="formData"
|
||||
>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="网络类型:" :label-width="formLabelWidth" prop="ippz_wllx">
|
||||
<el-select v-model="formData.ippz_wllx" placeholder="静态IP" style="width: 200px">
|
||||
<el-form-item
|
||||
label="网络类型:"
|
||||
:label-width="formLabelWidth"
|
||||
prop="ippz_wllx"
|
||||
>
|
||||
<el-select
|
||||
v-model="formData.ippz_wllx"
|
||||
placeholder="静态IP"
|
||||
style="width: 200px"
|
||||
>
|
||||
<el-option label="静态IP" value="静态IP"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
@ -22,7 +36,11 @@
|
|||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="IP地址:" :label-width="formLabelWidth" prop="ippz_ip">
|
||||
<el-form-item
|
||||
label="IP地址:"
|
||||
:label-width="formLabelWidth"
|
||||
prop="ippz_ip"
|
||||
>
|
||||
<el-row>
|
||||
<el-col :span="5">
|
||||
<el-input v-model="ippz_ip1"></el-input>
|
||||
|
@ -45,7 +63,11 @@
|
|||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="子网掩码:" :label-width="formLabelWidth" prop="ippz_zwym">
|
||||
<el-form-item
|
||||
label="子网掩码:"
|
||||
:label-width="formLabelWidth"
|
||||
prop="ippz_zwym"
|
||||
>
|
||||
<el-row>
|
||||
<el-col :span="5">
|
||||
<el-input v-model="ippz_zwym1"></el-input>
|
||||
|
@ -114,7 +136,11 @@
|
|||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备用DNS:" :label-width="formLabelWidth" prop="ippz_dns_by">
|
||||
<el-form-item
|
||||
label="备用DNS:"
|
||||
:label-width="formLabelWidth"
|
||||
prop="ippz_dns_by"
|
||||
>
|
||||
<el-row>
|
||||
<el-col :span="5">
|
||||
<el-input v-model="ippz_dns_by1"></el-input>
|
||||
|
@ -269,31 +295,31 @@ export default {
|
|||
this.user_id = window.location.href.split("?")[1];
|
||||
this.GetUserAnswer();
|
||||
},
|
||||
mounted() { },
|
||||
mounted() {},
|
||||
|
||||
methods: {
|
||||
//子网掩码验证
|
||||
validateZwym(rule, value, callback) {
|
||||
if (
|
||||
this.ippz_zwym1 +
|
||||
"." +
|
||||
this.ippz_zwym2 +
|
||||
"." +
|
||||
this.ippz_zwym3 +
|
||||
"." +
|
||||
this.ippz_zwym4 ===
|
||||
"." +
|
||||
this.ippz_zwym2 +
|
||||
"." +
|
||||
this.ippz_zwym3 +
|
||||
"." +
|
||||
this.ippz_zwym4 ===
|
||||
"..."
|
||||
) {
|
||||
callback(new Error("请输入子网掩码"));
|
||||
} else if (
|
||||
!/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(
|
||||
this.ippz_zwym1 +
|
||||
"." +
|
||||
this.ippz_zwym2 +
|
||||
"." +
|
||||
this.ippz_zwym3 +
|
||||
"." +
|
||||
this.ippz_zwym4
|
||||
"." +
|
||||
this.ippz_zwym2 +
|
||||
"." +
|
||||
this.ippz_zwym3 +
|
||||
"." +
|
||||
this.ippz_zwym4
|
||||
)
|
||||
) {
|
||||
callback(new Error("请输入有效的子网掩码"));
|
||||
|
@ -305,24 +331,24 @@ export default {
|
|||
validateIp(rule, value, callback) {
|
||||
if (
|
||||
this.ippz_ip1 +
|
||||
"." +
|
||||
this.ippz_ip2 +
|
||||
"." +
|
||||
this.ippz_ip3 +
|
||||
"." +
|
||||
this.ippz_ip4 ===
|
||||
"." +
|
||||
this.ippz_ip2 +
|
||||
"." +
|
||||
this.ippz_ip3 +
|
||||
"." +
|
||||
this.ippz_ip4 ===
|
||||
"..."
|
||||
) {
|
||||
callback(new Error("请输入IP地址"));
|
||||
} else if (
|
||||
!/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(
|
||||
this.ippz_ip1 +
|
||||
"." +
|
||||
this.ippz_ip2 +
|
||||
"." +
|
||||
this.ippz_ip3 +
|
||||
"." +
|
||||
this.ippz_ip4
|
||||
"." +
|
||||
this.ippz_ip2 +
|
||||
"." +
|
||||
this.ippz_ip3 +
|
||||
"." +
|
||||
this.ippz_ip4
|
||||
)
|
||||
) {
|
||||
callback(new Error("请输入有效的IP地址"));
|
||||
|
@ -334,24 +360,24 @@ export default {
|
|||
validateMrwg(rule, value, callback) {
|
||||
if (
|
||||
this.ippz_wg1 +
|
||||
"." +
|
||||
this.ippz_wg2 +
|
||||
"." +
|
||||
this.ippz_wg3 +
|
||||
"." +
|
||||
this.ippz_wg4 ===
|
||||
"." +
|
||||
this.ippz_wg2 +
|
||||
"." +
|
||||
this.ippz_wg3 +
|
||||
"." +
|
||||
this.ippz_wg4 ===
|
||||
"..."
|
||||
) {
|
||||
callback(new Error("请输入网关地址"));
|
||||
} else if (
|
||||
!/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(
|
||||
this.ippz_wg1 +
|
||||
"." +
|
||||
this.ippz_wg2 +
|
||||
"." +
|
||||
this.ippz_wg3 +
|
||||
"." +
|
||||
this.ippz_wg4
|
||||
"." +
|
||||
this.ippz_wg2 +
|
||||
"." +
|
||||
this.ippz_wg3 +
|
||||
"." +
|
||||
this.ippz_wg4
|
||||
)
|
||||
) {
|
||||
callback(new Error("请输入有效的网关地址"));
|
||||
|
@ -363,24 +389,24 @@ export default {
|
|||
validateDnsBy(rule, value, callback) {
|
||||
if (
|
||||
this.ippz_dns_by1 +
|
||||
"." +
|
||||
this.ippz_dns_by2 +
|
||||
"." +
|
||||
this.ippz_dns_by3 +
|
||||
"." +
|
||||
this.ippz_dns_by4 ===
|
||||
"." +
|
||||
this.ippz_dns_by2 +
|
||||
"." +
|
||||
this.ippz_dns_by3 +
|
||||
"." +
|
||||
this.ippz_dns_by4 ===
|
||||
"..."
|
||||
) {
|
||||
callback(new Error("请输入备用DNS服务器地址"));
|
||||
} else if (
|
||||
!/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(
|
||||
this.ippz_dns_by1 +
|
||||
"." +
|
||||
this.ippz_dns_by2 +
|
||||
"." +
|
||||
this.ippz_dns_by3 +
|
||||
"." +
|
||||
this.ippz_dns_by4
|
||||
"." +
|
||||
this.ippz_dns_by2 +
|
||||
"." +
|
||||
this.ippz_dns_by3 +
|
||||
"." +
|
||||
this.ippz_dns_by4
|
||||
)
|
||||
) {
|
||||
callback(new Error("请输入有效的备用DNS服务器地址"));
|
||||
|
@ -413,15 +439,49 @@ export default {
|
|||
this.isShow = false;
|
||||
let obj = {
|
||||
ippz_wllx: this.formData.ippz_wllx,
|
||||
ippz_ip: this.ippz_ip1 + "." + this.ippz_ip2 + "." + this.ippz_ip3 + "." + this.ippz_ip4,
|
||||
ippz_zwym: this.ippz_zwym1 + "." + this.ippz_zwym2 + "." + this.ippz_zwym3 + "." + this.ippz_zwym4,
|
||||
ippz_wg: this.ippz_wg1 + "." + this.ippz_wg2 + "." + this.ippz_wg3 + "." + this.ippz_wg4,
|
||||
ippz_dns: this.ippz_dns1 + "." + this.ippz_dns2 + "." + this.ippz_dns3 + "." + this.ippz_dns4,
|
||||
ippz_dns_by: this.ippz_dns_by1 + "." + this.ippz_dns_by2 + "." + this.ippz_dns_by3 + "." + this.ippz_dns_by4,
|
||||
ippz_ip:
|
||||
this.ippz_ip1 +
|
||||
"." +
|
||||
this.ippz_ip2 +
|
||||
"." +
|
||||
this.ippz_ip3 +
|
||||
"." +
|
||||
this.ippz_ip4,
|
||||
ippz_zwym:
|
||||
this.ippz_zwym1 +
|
||||
"." +
|
||||
this.ippz_zwym2 +
|
||||
"." +
|
||||
this.ippz_zwym3 +
|
||||
"." +
|
||||
this.ippz_zwym4,
|
||||
ippz_wg:
|
||||
this.ippz_wg1 +
|
||||
"." +
|
||||
this.ippz_wg2 +
|
||||
"." +
|
||||
this.ippz_wg3 +
|
||||
"." +
|
||||
this.ippz_wg4,
|
||||
ippz_dns:
|
||||
this.ippz_dns1 +
|
||||
"." +
|
||||
this.ippz_dns2 +
|
||||
"." +
|
||||
this.ippz_dns3 +
|
||||
"." +
|
||||
this.ippz_dns4,
|
||||
ippz_dns_by:
|
||||
this.ippz_dns_by1 +
|
||||
"." +
|
||||
this.ippz_dns_by2 +
|
||||
"." +
|
||||
this.ippz_dns_by3 +
|
||||
"." +
|
||||
this.ippz_dns_by4,
|
||||
wgpz_wgmc: this.wgpz_wgmc,
|
||||
wgpz_wgid: this.wgpz_wgid,
|
||||
sbpz_sbmc: this.sbpz_sbmc,
|
||||
sbpz_kzqxy: this.sbpz_kzqxy,
|
||||
|
||||
sbpz_ip: this.sbpz_ip,
|
||||
sbpz_port: this.sbpz_port,
|
||||
sbpz_czdz: this.sbpz_czdz,
|
||||
|
@ -434,6 +494,8 @@ export default {
|
|||
sbpz_txsjjg: this.sbpz_txsjjg,
|
||||
sbpz_xqjcqxr: this.sbpz_xqjcqxr,
|
||||
sbpz_bcjcqxr: this.sbpz_bcjcqxr,
|
||||
sbpz_kzqxy: this.sbpz_kzqxy,
|
||||
sbpz_sbmc: this.sbpz_sbmc,
|
||||
|
||||
cjdpz_tagid: this.mqtt_cjd_tagid,
|
||||
cjdpz_mc: this.cjdpz_mc,
|
||||
|
@ -468,7 +530,7 @@ export default {
|
|||
user_id: this.user_id,
|
||||
});
|
||||
this.loading = false;
|
||||
console.log(data);
|
||||
console.log(JSON.parse(data.data.mark_value));
|
||||
if (data.data !== null && data.state) {
|
||||
var obj = JSON.parse(data.data.mark_value);
|
||||
console.log(obj);
|
||||
|
@ -520,7 +582,7 @@ export default {
|
|||
this.sbpz_xqjcqxr = obj.sbpz_xqjcqxr;
|
||||
this.sbpz_bcjcqxr = obj.sbpz_bcjcqxr;
|
||||
|
||||
this.cjdpz_tagid = obj.mqtt_cjd_tagid;
|
||||
this.cjdpz_tagid = obj.cjdpz_tagid;
|
||||
this.cjdpz_mc = obj.cjdpz_mc;
|
||||
this.cjdpz_sjq = obj.cjdpz_sjq;
|
||||
this.cjdpz_jcqdz = obj.cjdpz_cjsjlx;
|
||||
|
@ -532,10 +594,10 @@ export default {
|
|||
this.mqtt_wgsn = obj.mqtt_wgsn;
|
||||
this.mqtt_port = obj.mqtt_port;
|
||||
this.mqtt_keepalive = obj.mqtt_keepalive;
|
||||
this.mqtt_tls = obj.mqtt_tls;
|
||||
this.mqtt_clearsession = obj.mqtt_clearsession;
|
||||
this.mqtt_sssjfbzt = obj.mqtt_sssjfbzt;
|
||||
this.mqtt_qos = obj.mqtt_qos;
|
||||
this.mqtt_tls = obj.mqtt_tls;
|
||||
this.mqtt_clearsession = obj.mqtt_clearsession;
|
||||
|
||||
this.mqtt_cjd_sbmc = obj.mqtt_cjd_sbmc;
|
||||
this.mqtt_cjd_tagid = obj.mqtt_cjd_tagid;
|
||||
|
|
|
@ -52,7 +52,7 @@
|
|||
<div class="chartsDiv">
|
||||
<div class="mainshaftChart">
|
||||
<p>
|
||||
<span>主轴转换监控</span>
|
||||
<span>主轴转速监控</span>
|
||||
</p>
|
||||
<div id="mainshaftChart" v-show="zzgrade && resultObj.YXCHWG"></div>
|
||||
</div>
|
||||
|
@ -116,13 +116,6 @@ export default {
|
|||
};
|
||||
},
|
||||
created() {
|
||||
// this.getClGrade();
|
||||
// this.getJtGrade();
|
||||
// this.getZzGrade();
|
||||
// this.getQxGrade();
|
||||
// this.getYxGrade();
|
||||
// this.getWxGrade();
|
||||
|
||||
// DB网关有线-产量
|
||||
// DB网关无线-急停状态
|
||||
// 斥候网关有线-主轴转速
|
||||
|
@ -131,15 +124,15 @@ export default {
|
|||
// 有线串口 - 负载电流;
|
||||
// 无线串口 - 额定电流;
|
||||
// 这两个只要设备连线和设备配置信息对就展示数据;
|
||||
|
||||
this.user_id = decodeURIComponent(window.location.href)
|
||||
.split("?")[1]
|
||||
.split("|")[0];
|
||||
console.log(this.user_id);
|
||||
// this.user_id = "USER202311150117464304";
|
||||
this.toObj(
|
||||
decodeURIComponent(window.location.href).split("?")[1].split("|")[1]
|
||||
);
|
||||
},
|
||||
// http://localhost:8080/#/cockpit?USER202311150117464304%7CYXDBWG,True%3BYXCHWG,True%3BWXDBWG,True%3BWXCHWG,True%3BSerialServerYX,True%3BSerialServerWX,True%3BYXDBWG,True%3BYXCHWG,True%3BWXDBWG,True%3BWXCHWG,True%3BSerialServerYX,True%3BSerialServerWX,True%3B
|
||||
methods: {
|
||||
//获取三维数据
|
||||
toObj(data) {
|
||||
|
@ -161,8 +154,14 @@ export default {
|
|||
resultObject[key] = value;
|
||||
}
|
||||
}
|
||||
console.log(resultObject);
|
||||
this.resultObj = resultObject;
|
||||
alert(this.resultObj.SerialServerWX);
|
||||
this.getClGrade();
|
||||
this.getJtGrade();
|
||||
this.getZzGrade();
|
||||
this.getQxGrade();
|
||||
this.getYxGrade();
|
||||
this.getWxGrade();
|
||||
},
|
||||
//根据屏幕自适应图表字体
|
||||
fontSize(res) {
|
||||
|
@ -194,6 +193,7 @@ export default {
|
|||
mark: "DB-IotLite_yx",
|
||||
});
|
||||
this.clgrade = data.data;
|
||||
this.getLoadEcharts("productChart", this.productChartOption);
|
||||
},
|
||||
//获取急停状态分数
|
||||
async getJtGrade() {
|
||||
|
@ -202,7 +202,8 @@ export default {
|
|||
mark: "DB-IotLite_wx",
|
||||
});
|
||||
this.jtgrade = data.data;
|
||||
this.jtgrade = true;
|
||||
// this.jtgrade = true;
|
||||
this.getLoadEcharts("two", this.stopChartOption);
|
||||
},
|
||||
//获取主轴转速分数
|
||||
async getZzGrade() {
|
||||
|
@ -211,6 +212,7 @@ export default {
|
|||
mark: "CHGYWG_yx",
|
||||
});
|
||||
this.zzgrade = data.data;
|
||||
this.getLoadEcharts("mainshaftChart", this.mainshaftChartOption);
|
||||
},
|
||||
//获取切削速度分数
|
||||
async getQxGrade() {
|
||||
|
@ -219,6 +221,7 @@ export default {
|
|||
mark: "CHGYWG_wx",
|
||||
});
|
||||
this.qxgrade = data.data;
|
||||
this.getLoadEcharts("one", this.CuttingSpeedChartOption);
|
||||
},
|
||||
//获取有线串口分数
|
||||
async getYxGrade() {
|
||||
|
@ -227,33 +230,23 @@ export default {
|
|||
mark: "CKFWQ_yx",
|
||||
});
|
||||
this.yxgrade = data.data;
|
||||
this.getLoadEcharts("loadChart", this.loadChartChartOption);
|
||||
},
|
||||
//获取无线串口分数
|
||||
async getWxGrade() {
|
||||
let { data } = await getGrade({
|
||||
getWxGrade() {
|
||||
getGrade({
|
||||
user_id: this.user_id,
|
||||
mark: "CKFWQ_wx",
|
||||
}).then((res) => {
|
||||
console.log(res);
|
||||
this.wxgrade = res.data.data;
|
||||
// this.resultObj.SerialServerWX = true;
|
||||
// alert(this.resultObj.SerialServerWX, "11111111");
|
||||
this.getLoadEcharts("ratedChart", this.ratedChartOption);
|
||||
});
|
||||
this.wxgrade = data.data;
|
||||
// this.wxgrade = true;
|
||||
// this.resultObj.SerialServerWX = true;
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.getClGrade();
|
||||
this.getJtGrade();
|
||||
this.getZzGrade();
|
||||
this.getQxGrade();
|
||||
this.getYxGrade();
|
||||
this.getWxGrade();
|
||||
this.$nextTick(() => {
|
||||
this.getLoadEcharts("productChart", this.productChartOption);
|
||||
this.getLoadEcharts("mainshaftChart", this.mainshaftChartOption);
|
||||
this.getLoadEcharts("loadChart", this.loadChartChartOption);
|
||||
this.getLoadEcharts("ratedChart", this.ratedChartOption);
|
||||
this.getLoadEcharts("one", this.CuttingSpeedChartOption);
|
||||
this.getLoadEcharts("two", this.stopChartOption);
|
||||
});
|
||||
//实时更新日期数据
|
||||
this.timer = setInterval(() => {
|
||||
this.time = this.$moment().format("HH:mm:ss");
|
||||
|
|
Loading…
Reference in New Issue