Compare commits

..

2 Commits

Author SHA1 Message Date
lll a14abdf350 Merge branch 'master' of http://git.umayle.com:2023/chengdandan/InternetCompetition 2023-11-13 18:50:38 +08:00
lll c1f47a4040 111 2023-11-13 18:50:22 +08:00
18 changed files with 2259 additions and 1599 deletions

View File

@ -1,5 +0,0 @@
export let answer = {
kqwk: "1",
wkgzfs: "2",
wkms: "3",
};

View File

@ -830,7 +830,7 @@ export default {
let { data } = await SaveUserAnswer({
mark: `${this.$store.state.type}`,
user_id: `${this.$route.query.id}`,
// mark: "GYWZ_yx",
// mark: "GYWZ_wx",
// user_id: "USER202307301109254198",
mark_value: JSON.stringify(obj),
});
@ -849,7 +849,7 @@ export default {
let { data } = await GetUserAnswer({
mark: `${this.$store.state.type}`,
user_id: `${this.$route.query.id}`,
// mark: "GYWZ_yx",
// mark: "GYWZ_wx",
// user_id: "USER202307301109254198",
});
if (data.data && data.state) {
@ -926,7 +926,7 @@ export default {
let { data } = await SaveUserAnswer({
mark: `${this.$store.state.type}`,
user_id: `${this.$route.query.id}`,
// mark: "GYWZ_yx",
// mark: "GYWZ_wx",
// user_id: "USER202307301109254198",
mark_value: JSON.stringify(obj),
});
@ -986,7 +986,7 @@ export default {
let { data } = await SaveUserAnswer({
mark: this.$store.state.type,
user_id: this.$route.query.id,
// mark: "GYWZ_yx",
// mark: "GYWZ_wx",
// user_id: "USER202307301109254198",
mark_value: JSON.stringify(obj),
});

View File

@ -5,8 +5,15 @@
<!-- <div v-click-outside="closeMenu"> -->
<!-- <el-button type="info" plain @click="dialogVisible = true">斥侯MQTT云</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"
>
<!-- <span class="custom-tree-node" slot-scope="{ node, data }">
<template v-if="data.editing == 1 && flag">
<el-input style="width: 260px;" v-model="gateway" @change="changeInput"></el-input>
@ -22,7 +29,12 @@
<div class="con_left">
<h3 class="mqtt" style="margin-top: 20px; color: white">标准 MQTT</h3>
<el-divider></el-divider>
<el-form :model="formData" :label-position="labelPosition" :rules="rules" ref="formData">
<el-form
:model="formData"
:label-position="labelPosition"
:rules="rules"
ref="formData"
>
<el-row>
<el-col :span="24">
<el-form-item>
@ -32,22 +44,42 @@
</el-row>
<el-row class="serveIp">
<el-col :span="24">
<el-form-item label="服务器IP:" :label-width="formLabelWidth" prop="mqtt_ip">
<el-form-item
label="服务器IP:"
:label-width="formLabelWidth"
prop="mqtt_ip"
>
<el-row>
<el-col :span="5">
<el-input v-model="mqtt_ip1" style="width: 43px; height: 30px" maxlength="3"></el-input>
<el-input
v-model="mqtt_ip1"
style="width: 43px; height: 30px"
maxlength="3"
></el-input>
</el-col>
<el-col :span="1">. </el-col>
<el-col :span="5">
<el-input v-model="mqtt_ip2" style="width: 43px; height: 30px" maxlength="3"></el-input>
<el-input
v-model="mqtt_ip2"
style="width: 43px; height: 30px"
maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
<el-col :span="5">
<el-input v-model="mqtt_ip3" style="width: 43px; height: 30px" maxlength="3"></el-input>
<el-input
v-model="mqtt_ip3"
style="width: 43px; height: 30px"
maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
<el-col :span="5">
<el-input v-model="mqtt_ip4" style="width: 43px; height: 30px" maxlength="3"></el-input>
<el-input
v-model="mqtt_ip4"
style="width: 43px; height: 30px"
maxlength="3"
></el-input>
</el-col>
</el-row>
</el-form-item>
@ -55,31 +87,62 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="网关SN:" :label-width="formLabelWidth" prop="mqtt_wgsn">
<el-input v-model="formData.mqtt_wgsn" placeholder="" style="width: 200px; height: 30px"></el-input>
<el-form-item
label="网关SN:"
:label-width="formLabelWidth"
prop="mqtt_wgsn"
>
<el-input
v-model="formData.mqtt_wgsn"
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_port">
<el-input v-model="formData.mqtt_port" placeholder="" style="width: 200px; height: 30px"></el-input>
<el-form-item
label="端口:"
:label-width="formLabelWidth"
prop="mqtt_port"
>
<el-input
v-model="formData.mqtt_port"
placeholder=""
style="width: 200px; height: 30px"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="Keep Alive(s):" :label-width="formLabelWidth" prop="mqtt_keepalive">
<el-input v-model="formData.mqtt_keepalive" placeholder=""
style="width: 200px; height: 30px"></el-input>
<el-form-item
label="Keep Alive(s):"
:label-width="formLabelWidth"
prop="mqtt_keepalive"
>
<el-input
v-model="formData.mqtt_keepalive"
placeholder=""
style="width: 200px; height: 30px"
></el-input>
<div class="infos">2-60000</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="实施数据发布主题:" :label-width="formLabelWidth" prop="mqtt_keepalive">
<el-input v-model="formData.mqtt_sssjfbzt" placeholder="" style="width: 200px; height: 30px"></el-input>
<el-form-item
label="实施数据发布主题:"
:label-width="formLabelWidth"
prop="mqtt_keepalive"
>
<el-input
v-model="formData.mqtt_sssjfbzt"
placeholder=""
style="width: 200px; height: 30px"
></el-input>
</el-form-item>
</el-col>
</el-row>
@ -105,9 +168,22 @@
<el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="Qos(MQTT):" :label-width="formLabelWidth" prop="upload_week">
<el-select v-model="formData.mqtt_qos" placeholder="请选择" style="width: 200px">
<el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
<el-form-item
label="Qos(MQTT):"
:label-width="formLabelWidth"
prop="upload_week"
>
<el-select
v-model="formData.mqtt_qos"
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>
@ -144,7 +220,9 @@
</div>
<div>
<div class="con_right">
<h3 class="mqtt" style="margin-top: 20px; color: white">标准MQTT采集点</h3>
<h3 class="mqtt" style="margin-top: 20px; color: white">
标准MQTT采集点
</h3>
<el-divider></el-divider>
<!-- <el-button type="info" plain @click="handleSelect">保存</el-button> -->
@ -159,16 +237,24 @@
<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-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-option
v-for="(option, index) in options3"
:key="index"
:label="option.label"
:value="option.value"
></el-option>
</el-select>
</template>
</el-table-column>
@ -179,8 +265,14 @@
<!-- 添加按钮下显示出来的弹框信息 -->
<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
: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>
@ -192,16 +284,40 @@
<!-- 网关信息 -->
<div class="gateway">
<el-dialog title="新建网关" :visible.sync="outerVisible" width="382px">
<el-form :model="gateWay" :rules="rulesGate" ref="gateWay" label-width="85px" class="demo-ruleForm">
<el-form
:model="gateWay"
:rules="rulesGate"
ref="gateWay"
label-width="85px"
class="demo-ruleForm"
>
<el-form-item label="网关名称:" prop="wgpz_wgmc">
<el-select v-model="gateWay.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="gateWay.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="gateWay.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="gateWay.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>
@ -247,6 +363,37 @@ export default {
// mqtt_tls: false,
// mqtt_clearsession: false,
mqtt_qos: "0",
ippz_ssid: "",
ippz_rzfs: "", //WPA2-PSK
ippz_jmfs: "", //AES
ippz_mm: "",
wgpz_wgmc: "",
wgpz_wgid: "",
sbpz_sbmc: "",
sbpz_kzqxy: " ",
sbpz_ip: "",
sbpz_port: "",
sbpz_czdz: "",
sbpz_lxzq: "",
sbpz_qyhmcj: "",
sbpz_qyplcj: "",
sbpz_zdplcjs: "",
sbpz_cjcgsj: "",
sbpz_zqsbonchange: "",
sbpz_txsjjg: "",
sbpz_xqjcqxr: "",
sbpz_bcjcqxr: "",
cjdpz_tagid: "",
cjdpz_mc: "",
cjdpz_sjq: "",
cjdpz_jcqdz: "",
cjdpz_cjsjlx: "",
cjdpz_dxsx: "",
cjdpz_scms: "",
},
mqtt_ip1: "",
mqtt_ip2: "",
@ -492,15 +639,13 @@ export default {
required: true,
message: "",
validator: this.validateIp,
trigger: "blur"
trigger: "blur",
},
],
mqtt_wgsn: [
{ required: true, message: "请输入网关SN", trigger: "blur" },
],
mqtt_port: [
{ required: true, message: "请输入端口", trigger: "blur" },
],
mqtt_port: [{ required: true, message: "请输入端口", trigger: "blur" }],
mqtt_keepalive: [
{ required: true, message: "请输入KeepAlive", trigger: "blur" },
],
@ -558,31 +703,31 @@ export default {
console.log(res);
console.log(JSON.parse(res.data.data.data));
this.trees = JSON.parse(res.data.data.data);
})
});
},
methods: {
//ip
validateIp(rule, value, callback) {
if (
this.mqtt_ip1 +
"." +
this.mqtt_ip2 +
"." +
this.mqtt_ip3 +
"." +
this.mqtt_ip4 ===
"." +
this.mqtt_ip2 +
"." +
this.mqtt_ip3 +
"." +
this.mqtt_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.mqtt_ip1 +
"." +
this.mqtt_ip2 +
"." +
this.mqtt_ip3 +
"." +
this.mqtt_ip4
"." +
this.mqtt_ip2 +
"." +
this.mqtt_ip3 +
"." +
this.mqtt_ip4
)
) {
callback(new Error("请输入有效的IP地址"));
@ -753,7 +898,7 @@ export default {
user_id: this.user_id,
data: JSON.stringify(this.trees),
type: "4",
})
});
console.log(result);
},
//
@ -768,7 +913,7 @@ export default {
}
});
},
//
//
async saveGates() {
this.outerVisible = false;
// this.innerVisible = false;
@ -810,7 +955,7 @@ export default {
}
});
},
//
//
async saveGates() {
this.outerVisible = false;
// this.innerVisible = false;
@ -839,7 +984,7 @@ export default {
});
}
console.log(res);
}
},
},
mounted() {
this.GetUserAnswer();
@ -912,7 +1057,6 @@ export default {
padding-right: 348px;
}
.el-row {
height: 54px;
display: flex;
@ -1029,4 +1173,3 @@ export default {
margin-left: 20px;
}
</style>

View File

@ -4,11 +4,22 @@
<!-- 设置树形控件 -->
<!-- <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"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<template v-if="data.editing == 1 && flag">
<el-input style="width: 260px;" v-model="gateway" @change="changeInput"></el-input>
<el-input
style="width: 260px"
v-model="gateway"
@change="changeInput"
></el-input>
</template>
<template v-else>{{ data.label }}</template>
</span>
@ -27,40 +38,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>
@ -68,16 +102,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>
@ -91,16 +133,40 @@
<!-- 网关信息 -->
<div class="gateway">
<el-dialog title="新建网关" :visible.sync="outerVisible" width="382px">
<el-form :model="gateWay" :rules="rulesGate" ref="gateWay" label-width="85px" class="demo-ruleForm">
<el-form
:model="gateWay"
:rules="rulesGate"
ref="gateWay"
label-width="85px"
class="demo-ruleForm"
>
<el-form-item label="网关名称:" prop="wgpz_wgmc">
<el-select v-model="gateWay.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="gateWay.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="gateWay.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="gateWay.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>
@ -115,7 +181,7 @@
</template>
<script>
import { SaveUserAnswer, GetUserAnswer, GetTree, SendTree } from '@/api/user';
import { SaveUserAnswer, GetUserAnswer, GetTree, SendTree } from "@/api/user";
export default {
name: "ChiCollection",
@ -124,282 +190,332 @@ export default {
loading: false,
flag: false,
gateway: "",
user_id: '',
user_id: "",
trees: [],
options1: [{
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",
}],
options2: [{
value: "急停状态",
label: "急停状态",
}, {
value: "产量",
label: "产量",
},
{
value: "相对位置X",
label: "相对位置X",
},
{
value: "相对位置Y",
label: "相对位置Y",
},
{
value: "相对位置Z",
label: "相对位置Z",
},
{
value: "实际位置X",
label: "实际位置X",
},
{
value: "实际位置Y",
label: "实际位置Y",
},
{
value: "实际位置Z",
label: "实际位置Z",
},
{
value: "主轴转速",
label: "主轴转速",
},
{
value: "当前刀具",
label: "当前刀具",
},
{
value: "预选刀具",
label: "预选刀具",
},
{
value: "报警信息",
label: "报警信息",
},
{
value: "驱动单元电流",
label: "驱动单元电流",
},
{
value: "负载电流",
label: "负载电流",
},
{
value: "额定电流",
label: "额定电流",
},
{
value: "运行时间",
label: "运行时间",
},
{
value: "加工产品用时",
label: "加工产品用时",
},
{
value: "工作模式",
label: "工作模式",
},
{
value: "切削速度",
label: "切削速度",
},
{
value: "任务信息",
label: "任务信息",
},
{
value: "使能状态",
label: "使能状态",
},
{
value: "系统状态",
label: "系统状态",
},
{
value: "执行任务信息",
label: "执行任务信息",
},
{
value: "进给倍军",
label: "进给倍军",
},
{
value: "轴速度",
label: "轴速度",
},
{
value: "轴角度",
label: "轴角度",
},
{
value: "进给速度",
label: "进给速度",
}],
options3: [{
value: "0X (Coil Status)",
label: "0X (Coil Status)"
},
{
value: "1X (Input Status)",
label: "1X (Input Status)"
}, {
value: "3X (Input Registers)",
label: "3X (Input Registers)"
},
{
value: "4X (Holding Register)",
label: "4X (Holding Register)"
}],
options1: [
{
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",
},
],
options2: [
{
value: "急停状态",
label: "急停状态",
},
{
value: "产量",
label: "产量",
},
{
value: "相对位置X",
label: "相对位置X",
},
{
value: "相对位置Y",
label: "相对位置Y",
},
{
value: "相对位置Z",
label: "相对位置Z",
},
{
value: "实际位置X",
label: "实际位置X",
},
{
value: "实际位置Y",
label: "实际位置Y",
},
{
value: "实际位置Z",
label: "实际位置Z",
},
{
value: "主轴转速",
label: "主轴转速",
},
{
value: "当前刀具",
label: "当前刀具",
},
{
value: "预选刀具",
label: "预选刀具",
},
{
value: "报警信息",
label: "报警信息",
},
{
value: "驱动单元电流",
label: "驱动单元电流",
},
{
value: "负载电流",
label: "负载电流",
},
{
value: "额定电流",
label: "额定电流",
},
{
value: "运行时间",
label: "运行时间",
},
{
value: "加工产品用时",
label: "加工产品用时",
},
{
value: "工作模式",
label: "工作模式",
},
{
value: "切削速度",
label: "切削速度",
},
{
value: "任务信息",
label: "任务信息",
},
{
value: "使能状态",
label: "使能状态",
},
{
value: "系统状态",
label: "系统状态",
},
{
value: "执行任务信息",
label: "执行任务信息",
},
{
value: "进给倍军",
label: "进给倍军",
},
{
value: "轴速度",
label: "轴速度",
},
{
value: "轴角度",
label: "轴角度",
},
{
value: "进给速度",
label: "进给速度",
},
],
options3: [
{
value: "0X (Coil Status)",
label: "0X (Coil Status)",
},
{
value: "1X (Input Status)",
label: "1X (Input Status)",
},
{
value: "3X (Input Registers)",
label: "3X (Input Registers)",
},
{
value: "4X (Holding Register)",
label: "4X (Holding Register)",
},
],
options5: [
{
value: " BIT位0/1",
label: " BIT位0/1"
label: " BIT位0/1",
},
{
value: "WORD16位无符号整数",
label: "WORD16位无符号整数"
}, {
label: "WORD16位无符号整数",
},
{
value: "INT16位有符号整数",
label: "INT16位有符号整数"
label: "INT16位有符号整数",
},
{
value: "DWORD32位无符号整数",
label: "DWORD32位无符号整数"
label: "DWORD32位无符号整数",
},
{
value: "DINT32位有符号整数",
label: "DINT32位有符号整数"
}, {
label: "DINT32位有符号整数",
},
{
value: "FLOAT单精度浮点数",
label: "FLOAT单精度浮点数"
}, {
label: "FLOAT单精度浮点数",
},
{
value: "DOUBLE64位浮点数",
label: "DOUBLE64位浮点数"
}, {
label: "DOUBLE64位浮点数",
},
{
value: "STRING8位字符串",
label: "STRING8位字符串"
}, {
label: "STRING8位字符串",
},
{
value: "BCD1616位BCD码",
label: "BCD1616位BCD码"
}, {
label: "BCD1616位BCD码",
},
{
value: "ULONG64位无符号整数",
label: "ULONG64位无符号整数"
}, {
label: "ULONG64位无符号整数",
},
{
value: "LONG64位有符号整数",
label: "LONG64位有符号整数"
label: "LONG64位有符号整数",
},
],
options6: [
{
value: "读写",
label: "读写",
},
{
value: "只读",
label: "只读",
},
{
value: "只写",
label: "只写",
},
],
options7: [
{
value: "Periodic",
label: "Periodic",
},
{
value: "Onchange",
label: "Onchange",
},
{
value: "Never",
label: "Never",
},
],
options6: [{
value: "读写",
label: "读写"
},
{
value: "只读",
label: "只读"
}, {
value: "只写",
label: "只写"
}],
options7: [{
value: "Periodic",
label: "Periodic"
},
{
value: "Onchange",
label: "Onchange"
}, {
value: "Never",
label: "Never"
}],
activeIndex: "1",
value1: 1,
checked: "",
@ -410,35 +526,41 @@ export default {
rightMenu: "",
dialogVisible: true,
menuShow: false,
datas: [{
label: 'Gateway',
children: [{
label: '数据采集',
children: [{
label: 'I/O点'
},
{
label: '用户点',
},
{
label: '计算点',
},
{
label: '系统点',
},
]
},
datas: [
{
label: "上云服务",
label: "Gateway",
children: [
{
label: "标准 MQTT"
label: "数据采集",
children: [
{
label: "I/O点",
},
{
label: "用户点",
},
{
label: "计算点",
},
{
label: "系统点",
},
],
},
{
label: "AWS loT"
}]
}]
}],
label: "上云服务",
children: [
{
label: "标准 MQTT",
},
{
label: "AWS loT",
},
],
},
],
},
],
defaultProps: {
children: "children",
label: "label",
@ -460,7 +582,48 @@ export default {
gateWay: {
wgpz_wgmc: "",
wgpz_wgid: "",
wgpz_wglx: "",
ippz_wllx: "",
ippz_ip: "",
ippz_zwym: "",
ippz_wg: "",
ippz_dns: "",
ippz_dns_by: "",
sbpz_sbmc: "",
sbpz_kzqxy: "",
sbpz_ip: "",
sbpz_port: "",
sbpz_czdz: "",
sbpz_lxzq: "",
sbpz_qyhmcj: "",
sbpz_qyplcj: "",
sbpz_zdplcjs: "",
sbpz_cjcgsj: "",
sbpz_zqsbonchange: "",
sbpz_txsjjg: "",
sbpz_xqjcqxr: "",
sbpz_bcjcqxr: "",
cjdpz_tagid: "",
cjdpz_mc: "",
cjdpz_sjq: "",
cjdpz_jcqdz: "",
cjdpz_cjsjlx: "",
cjdpz_dxsx: "",
cjdpz_scms: "",
mqtt_ip: "",
mqtt_wgsn: "",
mqtt_port: "",
mqtt_keepalive: "",
mqtt_tls: "",
mqtt_clearsession: "",
mqtt_sssjfbzt: "",
mqtt_qos: "",
mqtt_cjd_sbmc: "",
mqtt_cjd_tagid: "",
},
rulesGate: {
wgpz_wgmc: [
@ -544,7 +707,6 @@ export default {
type: "error",
});
}
},
async GetUserAnswer() {
this.loading = true;
@ -573,7 +735,7 @@ export default {
user_id: this.user_id,
data: JSON.stringify(this.trees),
type: "3",
})
});
console.log(result);
},
//
@ -588,7 +750,7 @@ export default {
}
});
},
//
//
async saveGates() {
this.outerVisible = false;
// this.innerVisible = false;
@ -617,7 +779,7 @@ export default {
});
}
console.log(res);
}
},
},
created() {
this.user_id = this.$route.query.user_id;
@ -628,9 +790,9 @@ export default {
console.log(res);
console.log(JSON.parse(res.data.data.data));
this.trees = JSON.parse(res.data.data.data);
})
});
this.GetUserAnswer();
}
},
};
</script>

View File

@ -4,8 +4,15 @@
<!-- 设置树形控件 -->
<!-- <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"
>
<!-- <span class="custom-tree-node" slot-scope="{ node, data }">
<template v-if="data.editing == 1 && flag">
<el-input style="width: 260px;" v-model="gateway" @change="changeInput"></el-input>
@ -27,40 +34,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>
@ -68,16 +98,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>
@ -92,16 +130,40 @@
<!-- 网关信息 -->
<div class="gateway">
<el-dialog title="新建网关" :visible.sync="outerVisible" width="382px">
<el-form :model="gateWay" :rules="rulesGate" ref="gateWay" label-width="85px" class="demo-ruleForm">
<el-form
:model="gateWay"
:rules="rulesGate"
ref="gateWay"
label-width="85px"
class="demo-ruleForm"
>
<el-form-item label="网关名称:" prop="wgpz_wgmc">
<el-select v-model="gateWay.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="gateWay.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="gateWay.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="gateWay.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>
@ -116,7 +178,7 @@
</template>
<script>
import { SaveUserAnswer, GetUserAnswer, GetTree, SendTree } from '@/api/user';
import { SaveUserAnswer, GetUserAnswer, GetTree, SendTree } from "@/api/user";
export default {
name: "ChiCollectionwifi",
@ -127,219 +189,256 @@ export default {
flag: false,
gateway: "",
trees: [],
options1: [{
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",
}],
options2: [{
value: "急停状态",
label: "急停状态",
}, {
value: "产量",
label: "产量",
},
{
value: "相对位置X",
label: "相对位置X",
},
{
value: "相对位置Y",
label: "相对位置Y",
},
{
value: "相对位置Z",
label: "相对位置Z",
},
{
value: "实际位置X",
label: "实际位置X",
},
{
value: "实际位置Y",
label: "实际位置Y",
},
{
value: "实际位置Z",
label: "实际位置Z",
},
{
value: "主轴转速",
label: "主轴转速",
},
{
value: "当前刀具",
label: "当前刀具",
},
{
value: "预选刀具",
label: "预选刀具",
},
{
value: "报警信息",
label: "报警信息",
},
{
value: "驱动单元电流",
label: "驱动单元电流",
},
{
value: "负载电流",
label: "负载电流",
},
{
value: "额定电流",
label: "额定电流",
},
{
value: "运行时间",
label: "运行时间",
},
{
value: "加工产品用时",
label: "加工产品用时",
},
{
value: "工作模式",
label: "工作模式",
},
{
value: "切削速度",
label: "切削速度",
},
{
value: "任务信息",
label: "任务信息",
},
{
value: "使能状态",
label: "使能状态",
},
{
value: "系统状态",
label: "系统状态",
},
{
value: "执行任务信息",
label: "执行任务信息",
},
{
value: "进给倍军",
label: "进给倍军",
},
{
value: "轴速度",
label: "轴速度",
},
{
value: "轴角度",
label: "轴角度",
},
{
value: "进给速度",
label: "进给速度",
}],
options3: [{
value: "0X (Coil Status)",
label: "0X (Coil Status)"
},
{
value: "1X (Input Status)",
label: "1X (Input Status)"
}, {
value: "3X (Input Registers)",
label: "3X (Input Registers)"
},
{
value: "4X (Holding Register)",
label: "4X (Holding Register)"
}],
options1: [
{
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",
},
],
options2: [
{
value: "急停状态",
label: "急停状态",
},
{
value: "产量",
label: "产量",
},
{
value: "相对位置X",
label: "相对位置X",
},
{
value: "相对位置Y",
label: "相对位置Y",
},
{
value: "相对位置Z",
label: "相对位置Z",
},
{
value: "实际位置X",
label: "实际位置X",
},
{
value: "实际位置Y",
label: "实际位置Y",
},
{
value: "实际位置Z",
label: "实际位置Z",
},
{
value: "主轴转速",
label: "主轴转速",
},
{
value: "当前刀具",
label: "当前刀具",
},
{
value: "预选刀具",
label: "预选刀具",
},
{
value: "报警信息",
label: "报警信息",
},
{
value: "驱动单元电流",
label: "驱动单元电流",
},
{
value: "负载电流",
label: "负载电流",
},
{
value: "额定电流",
label: "额定电流",
},
{
value: "运行时间",
label: "运行时间",
},
{
value: "加工产品用时",
label: "加工产品用时",
},
{
value: "工作模式",
label: "工作模式",
},
{
value: "切削速度",
label: "切削速度",
},
{
value: "任务信息",
label: "任务信息",
},
{
value: "使能状态",
label: "使能状态",
},
{
value: "系统状态",
label: "系统状态",
},
{
value: "执行任务信息",
label: "执行任务信息",
},
{
value: "进给倍军",
label: "进给倍军",
},
{
value: "轴速度",
label: "轴速度",
},
{
value: "轴角度",
label: "轴角度",
},
{
value: "进给速度",
label: "进给速度",
},
],
options3: [
{
value: "0X (Coil Status)",
label: "0X (Coil Status)",
},
{
value: "1X (Input Status)",
label: "1X (Input Status)",
},
{
value: "3X (Input Registers)",
label: "3X (Input Registers)",
},
{
value: "4X (Holding Register)",
label: "4X (Holding Register)",
},
],
options4: [
{
value: "2000H",
@ -416,7 +515,8 @@ export default {
{
value: "2020H",
label: "2020H",
}, {
},
{
value: "2021H",
label: "2021H",
},
@ -447,72 +547,86 @@ export default {
{
value: "2030H",
label: "2030H",
}, {
},
{
value: "2031H",
label: "2031H",
}
},
],
options5: [
{
value: " BIT位0/1",
label: " BIT位0/1"
label: " BIT位0/1",
},
{
value: "WORD16位无符号整数",
label: "WORD16位无符号整数"
}, {
label: "WORD16位无符号整数",
},
{
value: "INT16位有符号整数",
label: "INT16位有符号整数"
label: "INT16位有符号整数",
},
{
value: "DWORD32位无符号整数",
label: "DWORD32位无符号整数"
label: "DWORD32位无符号整数",
},
{
value: "DINT32位有符号整数",
label: "DINT32位有符号整数"
}, {
label: "DINT32位有符号整数",
},
{
value: "FLOAT单精度浮点数",
label: "FLOAT单精度浮点数"
}, {
label: "FLOAT单精度浮点数",
},
{
value: "DOUBLE64位浮点数",
label: "DOUBLE64位浮点数"
}, {
label: "DOUBLE64位浮点数",
},
{
value: "STRING8位字符串",
label: "STRING8位字符串"
}, {
label: "STRING8位字符串",
},
{
value: "BCD1616位BCD码",
label: "BCD1616位BCD码"
}, {
label: "BCD1616位BCD码",
},
{
value: "ULONG64位无符号整数",
label: "ULONG64位无符号整数"
}, {
label: "ULONG64位无符号整数",
},
{
value: "LONG64位有符号整数",
label: "LONG64位有符号整数"
label: "LONG64位有符号整数",
},
],
options6: [
{
value: "读写",
label: "读写",
},
{
value: "只读",
label: "只读",
},
{
value: "只写",
label: "只写",
},
],
options7: [
{
value: "Periodic",
label: "Periodic",
},
{
value: "Onchange",
label: "Onchange",
},
{
value: "Never",
label: "Never",
},
],
options6: [{
value: "读写",
label: "读写"
},
{
value: "只读",
label: "只读"
}, {
value: "只写",
label: "只写"
}],
options7: [{
value: "Periodic",
label: "Periodic"
},
{
value: "Onchange",
label: "Onchange"
}, {
value: "Never",
label: "Never"
}],
activeIndex: "1",
checked: "",
labelPosition: "left",
@ -522,35 +636,41 @@ export default {
rightMenu: "",
dialogVisible: true,
menuShow: false,
datas: [{
label: 'Gateway',
children: [{
label: '数据采集',
children: [{
label: 'I/O点'
},
{
label: '用户点',
},
{
label: '计算点',
},
{
label: '系统点',
},
]
},
datas: [
{
label: "上云服务",
label: "Gateway",
children: [
{
label: "标准 MQTT"
label: "数据采集",
children: [
{
label: "I/O点",
},
{
label: "用户点",
},
{
label: "计算点",
},
{
label: "系统点",
},
],
},
{
label: "AWS loT"
}]
}]
}],
label: "上云服务",
children: [
{
label: "标准 MQTT",
},
{
label: "AWS loT",
},
],
},
],
},
],
defaultProps: {
children: "children",
label: "label",
@ -572,7 +692,42 @@ export default {
gateWay: {
wgpz_wgmc: "",
wgpz_wgid: "",
wgpz_wglx: "",
ippz_ssid: "",
ippz_rzfs: "", //WPA2-PSK
ippz_jmfs: "", //AES
ippz_mm: "",
sbpz_sbmc: "",
sbpz_kzqxy: " ",
sbpz_ip: "",
sbpz_port: "",
sbpz_czdz: "",
sbpz_lxzq: "",
sbpz_qyhmcj: "",
sbpz_qyplcj: "",
sbpz_zdplcjs: "",
sbpz_cjcgsj: "",
sbpz_zqsbonchange: "",
sbpz_txsjjg: "",
sbpz_xqjcqxr: "",
sbpz_bcjcqxr: "",
cjdpz_tagid: "",
cjdpz_mc: "",
cjdpz_sjq: "",
cjdpz_jcqdz: "",
cjdpz_cjsjlx: "",
cjdpz_dxsx: "",
cjdpz_scms: "",
mqtt_ip: "",
mqtt_wgsn: "",
mqtt_port: "",
mqtt_keepalive: "",
mqtt_sssjfbzt: "",
mqtt_qos: "",
},
rulesGate: {
wgpz_wgmc: [
@ -656,7 +811,6 @@ export default {
type: "error",
});
}
},
async GetUserAnswer() {
this.loading = true;
@ -685,7 +839,7 @@ export default {
user_id: this.user_id,
data: JSON.stringify(this.trees),
type: "4",
})
});
console.log(result);
},
@ -701,7 +855,7 @@ export default {
}
});
},
//
//
async saveGates() {
this.outerVisible = false;
// this.innerVisible = false;
@ -730,7 +884,7 @@ export default {
});
}
console.log(res);
}
},
},
created() {
this.user_id = this.$route.query.user_id;
@ -741,9 +895,9 @@ export default {
console.log(res);
console.log(JSON.parse(res.data.data.data));
this.trees = JSON.parse(res.data.data.data);
})
});
this.GetUserAnswer();
}
},
};
</script>

File diff suppressed because it is too large Load Diff

View File

@ -135,8 +135,8 @@ export default {
],
formData: {
ippz_ssid: "",
ippz_rzfs: "WPA2-PSK", //WPA2-PSK
ippz_jmfs: "AES", //AES
ippz_rzfs: "", //WPA2-PSK
ippz_jmfs: "", //AES
ippz_mm: "",
wgpz_wgmc: "",

View File

@ -1161,4 +1161,8 @@ export default {
.mqtt {
margin-left: 20px;
}
.el-col-24 {
display: flex;
align-items: center;
}
</style>

View File

@ -167,7 +167,6 @@
</template>
<script>
import { SaveUserAnswer, GetUserAnswer } from "@/api/user";
import { isValidPrimaryDNS } from "../validate";
export default {
data() {
return {

View File

@ -55,7 +55,6 @@
</template>
<script>
import { SaveUserAnswer, GetUserAnswer } from "@/api/user";
import { answer } from "../answerObj";
export default {
data() {
return {
@ -80,7 +79,6 @@ export default {
wkmssz_wkms: "",
wxpz_gzms: "",
wxpz_wlmc: "",
wxpz_mac: "",
wxpz_jmms: "",
wxpz_jmsf: "",
wxpz_mm: "",
@ -102,7 +100,7 @@ export default {
async saveDatas() {
let res = await SaveUserAnswer({
mark: "CKFWQ_wx",
user_id: `${this.user_id}`,
user_id: this.user_id,
// user_id: "USER202307301109254198",
mark_value: JSON.stringify(this.ruleForm),
});
@ -123,7 +121,7 @@ export default {
user_id: this.user_id,
// user_id: "USER202307301109254198",
});
if (JSON.parse(res.data.data.mark_value) && res.data.state) {
if (res.data.state) {
var obj = JSON.parse(res.data.data.mark_value);
this.ruleForm.ytwgn_kqwk = obj.ytwgn_kqwk;
this.ruleForm.ytwgn_wkgzfs = obj.ytwgn_wkgzfs;
@ -141,7 +139,6 @@ export default {
this.ruleForm.qtsz_tjzffgn = obj.qtsz_tjzffgn;
this.ruleForm.wxpz_gzms = obj.wxpz_gzms;
this.ruleForm.wxpz_wlmc = obj.wxpz_wlmc;
this.ruleForm.wxpz_mac = obj.wxpz_mac;
this.ruleForm.wxpz_jmms = obj.wxpz_jmms;
this.ruleForm.wxpz_jmsf = obj.wxpz_jmsf;
this.ruleForm.wxpz_mm = obj.wxpz_mm;

View File

@ -301,7 +301,7 @@ export default {
let { data } = await SaveUserAnswer({
mark: this.$store.state.type,
user_id: this.user_id,
// mark: "GYWZ_yx",
// mark: "GYWZ_wx",
// user_id: "USER202307301109254198",
mark_value: JSON.stringify(obj),
});
@ -319,11 +319,11 @@ export default {
var { data } = await GetUserAnswer({
mark: this.$store.state.type,
user_id: this.user_id,
// mark: "GYWZ_yx",
// mark: "GYWZ_wx",
// user_id: "USER202307301109254198",
});
console.log(data);
if (data.data && data.state) {
console.log(data.data.mark_value);
if (data.state) {
let res = JSON.parse(data.data.mark_value);
console.log(res);
this.tableData[0].wlgl_nw_name = res.wlgl_nw_name;

View File

@ -163,14 +163,14 @@ export default {
},
created() {
this.dialogVisible = true;
let str = window.location.href.split("?")[1];
this.user_id = str.split("|")[0];
let type = str.split("|")[1];
if (type == 1) {
this.$store.commit("setType", "GYWZ_yx");
} else {
this.$store.commit("setType", "GYWZ_wx");
}
// let str = window.location.href.split("?")[1];
// this.user_id = str.split("|")[0];
// let type = str.split("|")[1];
// if (type == 1) {
// this.$store.commit("setType", "GYWZ_yx");
// } else {
// this.$store.commit("setType", "GYWZ_wx");
// }
this.GetUserAnswer();
},
methods: {
@ -245,7 +245,7 @@ export default {
let { data } = await SaveUserAnswer({
mark: this.$store.state.type,
user_id: this.user_id,
// mark: "GYWZ_yx",
// mark: "GYWZ_wx",
// user_id: "USER202307301109254198",
mark_value: JSON.stringify(obj),
});
@ -275,9 +275,9 @@ export default {
},
async GetUserAnswer() {
let { data } = await GetUserAnswer({
mark: `${this.$store.state.type}`,
mark: this.$store.state.type,
user_id: this.user_id,
// mark: "GYWZ_yx",
// mark: "GYWZ_wx",
// user_id: "USER202307301109254198",
});
if (data.state && data.data) {
@ -353,9 +353,9 @@ export default {
cmdlist_dz: this.cmdlist_dz,
};
let { data } = await SaveUserAnswer({
mark: `${this.$store.state.type}`,
mark: this.$store.state.type,
user_id: this.user_id,
// mark: "GYWZ_yx",
// mark: "GYWZ_wx",
// user_id: "USER202307301109254198",
mark_value: JSON.stringify(obj),
});

View File

@ -284,7 +284,7 @@ export default {
addPolicy() {
this.$router.push({
name: "addstrategy",
query: { id: this.user_id },
query: { id: "USER202307301109254198" },
});
},
async del(index, a) {
@ -340,7 +340,7 @@ export default {
let { data } = await GetUserAnswer({
mark: this.$store.state.type,
user_id: this.user_id,
// mark: "GYWZ_yx",
// mark: "GYWZ_wx",
// user_id: "USER202307301109254198",
});
this.loading = false;

View File

@ -229,6 +229,7 @@ export default {
}
},
async savePort() {
this.ruleForm.dkpz_snckxtb = Number(this.ruleForm.dkpz_snckxtb);
let { data } = await SaveUserAnswer({
mark: "CKFWQ_yx",
// user_id: "USER202307301109254198",

View File

@ -67,7 +67,6 @@ export default {
ruleForm: {
wxpz_gzms: "STA模式",
wxpz_wlmc: "无线区无限网",
// wxpz_mac: "",
wxpz_jmms: "WPA2PSK",
wxpz_jmsf: "AES",
wxpz_mm: "",
@ -89,7 +88,6 @@ export default {
rules: {
wxpz_gzms: [{ required: true, trigger: "change", message: "必填" }],
wxpz_wlmc: [{ required: true, trigger: "change", message: "必填" }],
// wxpz_mac: [{ trigger: "blur", message: "" }],
wxpz_jmms: [{ required: true, trigger: "blur", message: "必填" }],
wxpz_jmsf: [{ required: true, trigger: "blur", message: "必填" }],
wxpz_mm: [{ required: true, trigger: "blur", message: "必填" }],
@ -124,7 +122,7 @@ export default {
// user_id: "USER202307301109254198",
});
console.log(data);
if (JSON.parse(data.data.mark_value) && data.state) {
if (data.state) {
var obj = JSON.parse(data.data.mark_value);
this.ruleForm.ytwgn_kqwk = obj.ytwgn_kqwk;
this.ruleForm.ytwgn_wkgzfs = obj.ytwgn_wkgzfs;
@ -141,8 +139,8 @@ export default {
this.ruleForm.qtsz_zdyxtb = obj.qtsz_zdyxtb;
this.ruleForm.qtsz_tjzffgn = obj.qtsz_tjzffgn;
this.ruleForm.wxpz_gzms = obj.wxpz_gzms;
1;
this.ruleForm.wxpz_wlmc = obj.wxpz_wlmc;
this.ruleForm.wxpz_mac = obj.wxpz_mac;
this.ruleForm.wxpz_jmms = obj.wxpz_jmms;
this.ruleForm.wxpz_jmsf = obj.wxpz_jmsf;
this.ruleForm.wxpz_mm = obj.wxpz_mm;

View File

@ -141,7 +141,6 @@
</template>
<script>
import { SaveUserAnswer, GetUserAnswer } from "@/api/user";
import { Loading } from "element-ui";
export default {
data() {
return {
@ -166,7 +165,6 @@ export default {
wkmssz_wkms: "",
wxpz_gzms: "",
wxpz_wlmc: "",
wxpz_mac: "",
wxpz_jmms: "",
wxpz_jmsf: "",
wxpz_mm: "",
@ -190,10 +188,9 @@ export default {
//
async saveDatas() {
this.Loading = true;
let res = await SaveUserAnswer({
mark: "CKFWQ_wx",
user_id: `${this.user_id}`,
user_id: this.user_id,
// user_id: "USER202307301109254198",
mark_value: JSON.stringify(this.ruleForm),
});
@ -211,7 +208,7 @@ export default {
async GetUserAnswer() {
let answers = await GetUserAnswer({
mark: "CKFWQ_wx",
user_id: `${this.user_id}`,
user_id: this.user_id,
// user_id: "USER202307301109254198",
});
console.log(answers);
@ -233,7 +230,6 @@ export default {
this.ruleForm.wkmssz_wkms = obj.wkmssz_wkms;
this.ruleForm.wxpz_gzms = obj.wxpz_gzms;
this.ruleForm.wxpz_wlmc = obj.wxpz_wlmc;
this.ruleForm.wxpz_mac = obj.wxpz_mac;
this.ruleForm.wxpz_jmms = obj.wxpz_jmms;
this.ruleForm.wxpz_jmsf = obj.wxpz_jmsf;
this.ruleForm.wxpz_mm = obj.wxpz_mm;

View File

@ -6,8 +6,7 @@ import "element-ui/lib/theme-chalk/index.css";
import store from "./store";
Vue.config.productionTip = false;
import moment from "moment";
import { answer } from "./answerObj";
let answerObj = Vue.observable(answer);
//定义一个全局过滤器实现日期格式化
Vue.filter("datefmt", function (input, fmtstring) {
//当input为时间戳时需转为Number类型
@ -16,7 +15,6 @@ Vue.filter("datefmt", function (input, fmtstring) {
});
Vue.prototype.$moment = moment;
Vue.prototype.$store = store;
Vue.prototype.$answerObj = answerObj;
Vue.use(ElementUI);

View File

@ -1,7 +0,0 @@
// 辅助函数检查主DNS服务器地址是否有效
export let isValidPrimaryDNS = (value) => {
// 在这里可以添加更多的校验逻辑
// 例如检查是否是有效的IP地址或域名
// 这里只提供了一个简单的示例
return /\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/.test(value);
};