Compare commits

..

No commits in common. "a14abdf350ed2a4427ca0e212d0699ad5a7d560d" and "7af2033e68ee599cf63a4e5438993759fb1bedd4" have entirely different histories.

18 changed files with 1601 additions and 2261 deletions

5
src/answerObj.js Normal file
View File

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

View File

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

View File

@ -5,15 +5,8 @@
<!-- <div v-click-outside="closeMenu"> --> <!-- <div v-click-outside="closeMenu"> -->
<!-- <el-button type="info" plain @click="dialogVisible = true">斥侯MQTT云</el-button> --> <!-- <el-button type="info" plain @click="dialogVisible = true">斥侯MQTT云</el-button> -->
<div v-show="dialogVisible" class="tree_menu"> <div v-show="dialogVisible" class="tree_menu">
<el-tree <el-tree :data="trees" node-key="id" :props="defaultProps" default-expand-all @node-contextmenu="rightClick"
:data="trees" @node-click="treeNodeClick" ref="tree">
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 }"> <!-- <span class="custom-tree-node" slot-scope="{ node, data }">
<template v-if="data.editing == 1 && flag"> <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>
@ -29,12 +22,7 @@
<div class="con_left"> <div class="con_left">
<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-divider></el-divider>
<el-form <el-form :model="formData" :label-position="labelPosition" :rules="rules" ref="formData">
:model="formData"
:label-position="labelPosition"
:rules="rules"
ref="formData"
>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item> <el-form-item>
@ -44,42 +32,22 @@
</el-row> </el-row>
<el-row class="serveIp"> <el-row class="serveIp">
<el-col :span="24"> <el-col :span="24">
<el-form-item <el-form-item label="服务器IP:" :label-width="formLabelWidth" prop="mqtt_ip">
label="服务器IP:"
:label-width="formLabelWidth"
prop="mqtt_ip"
>
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
<el-input <el-input v-model="mqtt_ip1" style="width: 43px; height: 30px" maxlength="3"></el-input>
v-model="mqtt_ip1"
style="width: 43px; height: 30px"
maxlength="3"
></el-input>
</el-col> </el-col>
<el-col :span="1">. </el-col> <el-col :span="1">. </el-col>
<el-col :span="5"> <el-col :span="5">
<el-input <el-input v-model="mqtt_ip2" style="width: 43px; height: 30px" maxlength="3"></el-input>
v-model="mqtt_ip2"
style="width: 43px; height: 30px"
maxlength="3"
></el-input>
</el-col> </el-col>
<el-col :span="1">.</el-col> <el-col :span="1">.</el-col>
<el-col :span="5"> <el-col :span="5">
<el-input <el-input v-model="mqtt_ip3" style="width: 43px; height: 30px" maxlength="3"></el-input>
v-model="mqtt_ip3"
style="width: 43px; height: 30px"
maxlength="3"
></el-input>
</el-col> </el-col>
<el-col :span="1">.</el-col> <el-col :span="1">.</el-col>
<el-col :span="5"> <el-col :span="5">
<el-input <el-input v-model="mqtt_ip4" style="width: 43px; height: 30px" maxlength="3"></el-input>
v-model="mqtt_ip4"
style="width: 43px; height: 30px"
maxlength="3"
></el-input>
</el-col> </el-col>
</el-row> </el-row>
</el-form-item> </el-form-item>
@ -87,62 +55,31 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item <el-form-item label="网关SN:" :label-width="formLabelWidth" prop="mqtt_wgsn">
label="网关SN:" <el-input v-model="formData.mqtt_wgsn" placeholder="" style="width: 200px; height: 30px"></el-input>
: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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item <el-form-item label="端口:" :label-width="formLabelWidth" prop="mqtt_port">
label="端口:" <el-input v-model="formData.mqtt_port" placeholder="" style="width: 200px; height: 30px"></el-input>
: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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="Keep Alive(s):" :label-width="formLabelWidth" prop="mqtt_keepalive">
label="Keep Alive(s):" <el-input v-model="formData.mqtt_keepalive" placeholder=""
:label-width="formLabelWidth" style="width: 200px; height: 30px"></el-input>
prop="mqtt_keepalive"
>
<el-input
v-model="formData.mqtt_keepalive"
placeholder=""
style="width: 200px; height: 30px"
></el-input>
<div class="infos">2-60000</div> <div class="infos">2-60000</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="实施数据发布主题:" :label-width="formLabelWidth" prop="mqtt_keepalive">
label="实施数据发布主题:" <el-input v-model="formData.mqtt_sssjfbzt" placeholder="" style="width: 200px; height: 30px"></el-input>
: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-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -168,22 +105,9 @@
<el-form-item> <el-form-item>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item label="Qos(MQTT):" :label-width="formLabelWidth" prop="upload_week">
label="Qos(MQTT):" <el-select v-model="formData.mqtt_qos" placeholder="请选择" style="width: 200px">
:label-width="formLabelWidth" <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
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-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -220,9 +144,7 @@
</div> </div>
<div> <div>
<div class="con_right"> <div class="con_right">
<h3 class="mqtt" style="margin-top: 20px; color: white"> <h3 class="mqtt" style="margin-top: 20px; color: white">标准MQTT采集点</h3>
标准MQTT采集点
</h3>
<el-divider></el-divider> <el-divider></el-divider>
<!-- <el-button type="info" plain @click="handleSelect">保存</el-button> --> <!-- <el-button type="info" plain @click="handleSelect">保存</el-button> -->
@ -237,24 +159,16 @@
<el-table-column property="mqtt_cjd_sbmc" label="设备名称"> <el-table-column property="mqtt_cjd_sbmc" label="设备名称">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.mqtt_cjd_sbmc" placeholder=""> <el-select v-model="scope.row.mqtt_cjd_sbmc" placeholder="">
<el-option <el-option v-for="(option, index) in options2" :key="index" :label="option.label"
v-for="(option, index) in options2" :value="option.value"></el-option>
:key="index"
:label="option.label"
:value="option.value"
></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="mqtt_cjd_tagid" label="TagID"> <el-table-column property="mqtt_cjd_tagid" label="TagID">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.mqtt_cjd_tagid" placeholder=""> <el-select v-model="scope.row.mqtt_cjd_tagid" placeholder="">
<el-option <el-option v-for="(option, index) in options3" :key="index" :label="option.label"
v-for="(option, index) in options3" :value="option.value"></el-option>
:key="index"
:label="option.label"
:value="option.value"
></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
@ -265,14 +179,8 @@
<!-- 添加按钮下显示出来的弹框信息 --> <!-- 添加按钮下显示出来的弹框信息 -->
<div> <div>
<el-dialog title="选择点" :visible.sync="choose_point" width="30%"> <el-dialog title="选择点" :visible.sync="choose_point" width="30%">
<el-tree <el-tree :data="points" show-checkbox node-key="id" :default-expanded-keys="[1, 2]"
:data="points" :default-checked-keys="[3, 4, 5, 6]" :props="defaultProps">
show-checkbox
node-key="id"
:default-expanded-keys="[1, 2]"
:default-checked-keys="[3, 4, 5, 6]"
:props="defaultProps"
>
</el-tree> </el-tree>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="savePoint"> </el-button> <el-button type="primary" @click="savePoint"> </el-button>
@ -284,40 +192,16 @@
<!-- 网关信息 --> <!-- 网关信息 -->
<div class="gateway"> <div class="gateway">
<el-dialog title="新建网关" :visible.sync="outerVisible" width="382px"> <el-dialog title="新建网关" :visible.sync="outerVisible" width="382px">
<el-form <el-form :model="gateWay" :rules="rulesGate" ref="gateWay" label-width="85px" class="demo-ruleForm">
:model="gateWay"
:rules="rulesGate"
ref="gateWay"
label-width="85px"
class="demo-ruleForm"
>
<el-form-item label="网关名称:" prop="wgpz_wgmc"> <el-form-item label="网关名称:" prop="wgpz_wgmc">
<el-select <el-select v-model="gateWay.wgpz_wgmc" placeholder="请选择" style="width: 200px">
v-model="gateWay.wgpz_wgmc" <el-option v-for="item in opts1" :key="item.value" :label="item.label" :value="item.value">
placeholder="请选择"
style="width: 200px"
>
<el-option
v-for="item in opts1"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="网关ID:" prop="wgpz_wgid"> <el-form-item label="网关ID:" prop="wgpz_wgid">
<el-select <el-select v-model="gateWay.wgpz_wgid" placeholder="请选择" style="width: 200px">
v-model="gateWay.wgpz_wgid" <el-option v-for="item in opts2" :key="item.value" :label="item.label" :value="item.value">
placeholder="请选择"
style="width: 200px"
>
<el-option
v-for="item in opts2"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -363,37 +247,6 @@ export default {
// mqtt_tls: false, // mqtt_tls: false,
// mqtt_clearsession: false, // mqtt_clearsession: false,
mqtt_qos: "0", 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_ip1: "",
mqtt_ip2: "", mqtt_ip2: "",
@ -639,13 +492,15 @@ export default {
required: true, required: true,
message: "", message: "",
validator: this.validateIp, validator: this.validateIp,
trigger: "blur", trigger: "blur"
}, },
], ],
mqtt_wgsn: [ mqtt_wgsn: [
{ required: true, message: "请输入网关SN", trigger: "blur" }, { required: true, message: "请输入网关SN", trigger: "blur" },
], ],
mqtt_port: [{ required: true, message: "请输入端口", trigger: "blur" }], mqtt_port: [
{ required: true, message: "请输入端口", trigger: "blur" },
],
mqtt_keepalive: [ mqtt_keepalive: [
{ required: true, message: "请输入KeepAlive", trigger: "blur" }, { required: true, message: "请输入KeepAlive", trigger: "blur" },
], ],
@ -703,31 +558,31 @@ export default {
console.log(res); console.log(res);
console.log(JSON.parse(res.data.data.data)); console.log(JSON.parse(res.data.data.data));
this.trees = JSON.parse(res.data.data.data); this.trees = JSON.parse(res.data.data.data);
}); })
}, },
methods: { methods: {
//ip //ip
validateIp(rule, value, callback) { validateIp(rule, value, callback) {
if ( if (
this.mqtt_ip1 + this.mqtt_ip1 +
"." + "." +
this.mqtt_ip2 + this.mqtt_ip2 +
"." + "." +
this.mqtt_ip3 + this.mqtt_ip3 +
"." + "." +
this.mqtt_ip4 === this.mqtt_ip4 ===
"..." "..."
) { ) {
callback(new Error("请输入IP地址")); callback(new Error("请输入IP地址"));
} else if ( } 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( !/^(\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_ip1 +
"." + "." +
this.mqtt_ip2 + this.mqtt_ip2 +
"." + "." +
this.mqtt_ip3 + this.mqtt_ip3 +
"." + "." +
this.mqtt_ip4 this.mqtt_ip4
) )
) { ) {
callback(new Error("请输入有效的IP地址")); callback(new Error("请输入有效的IP地址"));
@ -898,7 +753,7 @@ export default {
user_id: this.user_id, user_id: this.user_id,
data: JSON.stringify(this.trees), data: JSON.stringify(this.trees),
type: "4", type: "4",
}); })
console.log(result); console.log(result);
}, },
// //
@ -984,7 +839,7 @@ export default {
}); });
} }
console.log(res); console.log(res);
}, }
}, },
mounted() { mounted() {
this.GetUserAnswer(); this.GetUserAnswer();
@ -1057,6 +912,7 @@ export default {
padding-right: 348px; padding-right: 348px;
} }
.el-row { .el-row {
height: 54px; height: 54px;
display: flex; display: flex;
@ -1173,3 +1029,4 @@ export default {
margin-left: 20px; margin-left: 20px;
} }
</style> </style>

View File

@ -4,22 +4,11 @@
<!-- 设置树形控件 --> <!-- 设置树形控件 -->
<!-- <el-button type="info" plain @click="dialogVisible = true">斥候采集点设置</el-button> --> <!-- <el-button type="info" plain @click="dialogVisible = true">斥候采集点设置</el-button> -->
<div v-show="dialogVisible" class="tree_menu"> <div v-show="dialogVisible" class="tree_menu">
<el-tree <el-tree :data="trees" node-key="id" :props="defaultProps" default-expand-all @node-contextmenu="rightClick"
:data="trees" @node-click="treeNodeClick" ref="tree">
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 }"> <span class="custom-tree-node" slot-scope="{ node, data }">
<template v-if="data.editing == 1 && flag"> <template v-if="data.editing == 1 && flag">
<el-input <el-input style="width: 260px;" v-model="gateway" @change="changeInput"></el-input>
style="width: 260px"
v-model="gateway"
@change="changeInput"
></el-input>
</template> </template>
<template v-else>{{ data.label }}</template> <template v-else>{{ data.label }}</template>
</span> </span>
@ -38,63 +27,40 @@
<el-table-column property="cjdpz_tagid" label="TagID"> <el-table-column property="cjdpz_tagid" label="TagID">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.cjdpz_tagid" placeholder=""> <el-select v-model="scope.row.cjdpz_tagid" placeholder="">
<el-option <el-option v-for="(option, index) in options1" :key="index" :label="option.label"
v-for="(option, index) in options1" :value="option.value"></el-option>
:key="index"
:label="option.label"
:value="option.value"
></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="cjdpz_mc" label="名称"> <el-table-column property="cjdpz_mc" label="名称">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.cjdpz_mc" placeholder=""> <el-select v-model="scope.row.cjdpz_mc" placeholder="">
<el-option <el-option v-for="(option, index) in options2" :key="index" :label="option.label"
v-for="(option, index) in options2" :value="option.value"></el-option>
:key="index"
:label="option.label"
:value="option.value"
></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="cjdpz_jcqdz" label="地址"> <el-table-column property="cjdpz_jcqdz" label="地址">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.cjdpz_dz" placeholder=""> <el-select v-model="scope.row.cjdpz_dz" placeholder="">
<el-option <el-option v-for="(option, index) in options3" :key="index" :label="option.label"
v-for="(option, index) in options3" :value="option.value"></el-option>
:key="index"
:label="option.label"
:value="option.value"
></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column property="cjdpz_jcqdz" label="寄存地址(十进制)" width="150px">
property="cjdpz_jcqdz"
label="寄存地址(十进制)"
width="150px"
>
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-select v-model="scope.row.cjdpz_jcqdz" placeholder="1"> <!-- <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-option v-for="(option,index) in options4" :key="index" :label="option.label" :value="option.value"></el-option>
</el-select> --> </el-select> -->
<el-input <el-input v-model="scope.row.cjdpz_jcqdz" placeholder="1-9999"></el-input>
v-model="scope.row.cjdpz_jcqdz"
placeholder="1-9999"
></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="cjdpz_cjsjlx" label="采集数据类型"> <el-table-column property="cjdpz_cjsjlx" label="采集数据类型">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.cjdpz_cjsjlx" placeholder=""> <el-select v-model="scope.row.cjdpz_cjsjlx" placeholder="">
<el-option <el-option v-for="(option, index) in options5" :key="index" :label="option.label"
v-for="(option, index) in options5" :value="option.value"></el-option>
:key="index"
:label="option.label"
:value="option.value"
></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
@ -102,24 +68,16 @@
<el-table-column property="cjdpz_dxsx" label="读写属性"> <el-table-column property="cjdpz_dxsx" label="读写属性">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.cjdpz_dxsx" placeholder=""> <el-select v-model="scope.row.cjdpz_dxsx" placeholder="">
<el-option <el-option v-for="(option, index) in options6" :key="index" :label="option.label"
v-for="(option, index) in options6" :value="option.value"></el-option>
:key="index"
:label="option.label"
:value="option.value"
></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="cjdpz_scms" label="上传模式"> <el-table-column property="cjdpz_scms" label="上传模式">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.cjdpz_scms" placeholder=""> <el-select v-model="scope.row.cjdpz_scms" placeholder="">
<el-option <el-option v-for="(option, index) in options7" :key="index" :label="option.label"
v-for="(option, index) in options7" :value="option.value"></el-option>
:key="index"
:label="option.label"
:value="option.value"
></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
@ -133,40 +91,16 @@
<!-- 网关信息 --> <!-- 网关信息 -->
<div class="gateway"> <div class="gateway">
<el-dialog title="新建网关" :visible.sync="outerVisible" width="382px"> <el-dialog title="新建网关" :visible.sync="outerVisible" width="382px">
<el-form <el-form :model="gateWay" :rules="rulesGate" ref="gateWay" label-width="85px" class="demo-ruleForm">
:model="gateWay"
:rules="rulesGate"
ref="gateWay"
label-width="85px"
class="demo-ruleForm"
>
<el-form-item label="网关名称:" prop="wgpz_wgmc"> <el-form-item label="网关名称:" prop="wgpz_wgmc">
<el-select <el-select v-model="gateWay.wgpz_wgmc" placeholder="请选择" style="width: 200px">
v-model="gateWay.wgpz_wgmc" <el-option v-for="item in opts1" :key="item.value" :label="item.label" :value="item.value">
placeholder="请选择"
style="width: 200px"
>
<el-option
v-for="item in opts1"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="网关ID:" prop="wgpz_wgid"> <el-form-item label="网关ID:" prop="wgpz_wgid">
<el-select <el-select v-model="gateWay.wgpz_wgid" placeholder="请选择" style="width: 200px">
v-model="gateWay.wgpz_wgid" <el-option v-for="item in opts2" :key="item.value" :label="item.label" :value="item.value">
placeholder="请选择"
style="width: 200px"
>
<el-option
v-for="item in opts2"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -181,7 +115,7 @@
</template> </template>
<script> <script>
import { SaveUserAnswer, GetUserAnswer, GetTree, SendTree } from "@/api/user"; import { SaveUserAnswer, GetUserAnswer, GetTree, SendTree } from '@/api/user';
export default { export default {
name: "ChiCollection", name: "ChiCollection",
@ -190,332 +124,282 @@ export default {
loading: false, loading: false,
flag: false, flag: false,
gateway: "", gateway: "",
user_id: "", user_id: '',
trees: [], trees: [],
options1: [ options1: [{
{ value: "MachinePamHID909",
value: "MachinePamHID909", label: "MachinePamHID909",
label: "MachinePamHID909", }, {
}, value: "MachinePamHID910",
{ label: "MachinePamHID910",
value: "MachinePamHID910", }, {
label: "MachinePamHID910", value: "MachinePamHID911",
}, label: "MachinePamHID911",
{ }, {
value: "MachinePamHID911", value: "MachinePamHID912",
label: "MachinePamHID911", label: "MachinePamHID912",
}, }, {
{ value: "MachinePamHID913",
value: "MachinePamHID912", label: "MachinePamHID913",
label: "MachinePamHID912", }, {
}, value: "MachinePamHID914",
{ label: "MachinePamHID914",
value: "MachinePamHID913", }, {
label: "MachinePamHID913", value: "MachinePamHID915",
}, label: "MachinePamHID915",
{ }, {
value: "MachinePamHID914", value: "MachinePamHID916",
label: "MachinePamHID914", label: "MachinePamHID916",
}, }, {
{ value: "MachinePamHID917",
value: "MachinePamHID915", label: "MachinePamHID917",
label: "MachinePamHID915", }, {
}, value: "MachinePamHID918",
{ label: "MachinePamHID918",
value: "MachinePamHID916", }, {
label: "MachinePamHID916", value: "MachinePamHID919",
}, label: "MachinePamHID919",
{ }, {
value: "MachinePamHID917", value: "MachinePamHID920",
label: "MachinePamHID917", label: "MachinePamHID920",
}, }, {
{ value: "MachinePamHID921",
value: "MachinePamHID918", label: "MachinePamHID921",
label: "MachinePamHID918", }, {
}, value: "MachinePamHID922",
{ label: "MachinePamHID922",
value: "MachinePamHID919", }, {
label: "MachinePamHID919", value: "MachinePamHID923",
}, label: "MachinePamHID923",
{ }, {
value: "MachinePamHID920", value: "MachinePamHID924",
label: "MachinePamHID920", label: "MachinePamHID924",
}, }, {
{ value: "MachinePamHID925",
value: "MachinePamHID921", label: "MachinePamHID925",
label: "MachinePamHID921", }, {
}, value: "MachinePamHID926",
{ label: "MachinePamHID926",
value: "MachinePamHID922", }, {
label: "MachinePamHID922", value: "MachinePamHID927",
}, label: "MachinePamHID927",
{ }, {
value: "MachinePamHID923", value: "MachinePamHID928",
label: "MachinePamHID923", label: "MachinePamHID928",
}, }, {
{ value: "MachinePamHID929",
value: "MachinePamHID924", label: "MachinePamHID929",
label: "MachinePamHID924", }, {
}, value: "MachinePamHID930",
{ label: "MachinePamHID930",
value: "MachinePamHID925", }, {
label: "MachinePamHID925", value: "MachinePamHID931",
}, label: "MachinePamHID931",
{ }, {
value: "MachinePamHID926", value: "MachinePamHID932",
label: "MachinePamHID926", label: "MachinePamHID932",
}, }, {
{ value: "MachinePamHID933",
value: "MachinePamHID927", label: "MachinePamHID933",
label: "MachinePamHID927", }, {
}, value: "MachinePamHID934",
{ label: "MachinePamHID934",
value: "MachinePamHID928", }, {
label: "MachinePamHID928", value: "MachinePamHID935",
}, label: "MachinePamHID935",
{ }, {
value: "MachinePamHID929", value: "MachinePamHID936",
label: "MachinePamHID929", label: "MachinePamHID936",
}, }, {
{ value: "MachinePamHID937",
value: "MachinePamHID930", label: "MachinePamHID937",
label: "MachinePamHID930", }, {
}, value: "MachinePamHID938",
{ label: "MachinePamHID938",
value: "MachinePamHID931", }],
label: "MachinePamHID931", options2: [{
}, value: "急停状态",
{ label: "急停状态",
value: "MachinePamHID932", }, {
label: "MachinePamHID932", value: "产量",
}, label: "产量",
{ },
value: "MachinePamHID933", {
label: "MachinePamHID933", value: "相对位置X",
}, label: "相对位置X",
{ },
value: "MachinePamHID934", {
label: "MachinePamHID934", value: "相对位置Y",
}, label: "相对位置Y",
{ },
value: "MachinePamHID935", {
label: "MachinePamHID935", value: "相对位置Z",
}, label: "相对位置Z",
{ },
value: "MachinePamHID936", {
label: "MachinePamHID936", value: "实际位置X",
}, label: "实际位置X",
{ },
value: "MachinePamHID937", {
label: "MachinePamHID937", value: "实际位置Y",
}, label: "实际位置Y",
{ },
value: "MachinePamHID938", {
label: "MachinePamHID938", value: "实际位置Z",
}, label: "实际位置Z",
], },
options2: [ {
{ value: "主轴转速",
value: "急停状态", label: "主轴转速",
label: "急停状态", },
}, {
{ value: "当前刀具",
value: "产量", label: "当前刀具",
label: "产量", },
}, {
{ value: "预选刀具",
value: "相对位置X", label: "预选刀具",
label: "相对位置X", },
}, {
{ value: "报警信息",
value: "相对位置Y", label: "报警信息",
label: "相对位置Y", },
}, {
{ value: "驱动单元电流",
value: "相对位置Z", label: "驱动单元电流",
label: "相对位置Z", },
}, {
{ value: "负载电流",
value: "实际位置X", label: "负载电流",
label: "实际位置X", },
}, {
{ value: "额定电流",
value: "实际位置Y", label: "额定电流",
label: "实际位置Y", },
}, {
{ value: "运行时间",
value: "实际位置Z", label: "运行时间",
label: "实际位置Z", },
}, {
{ value: "加工产品用时",
value: "主轴转速", label: "加工产品用时",
label: "主轴转速", },
}, {
{ value: "工作模式",
value: "当前刀具", label: "工作模式",
label: "当前刀具", },
}, {
{ value: "切削速度",
value: "预选刀具", label: "切削速度",
label: "预选刀具", },
}, {
{ value: "任务信息",
value: "报警信息", label: "任务信息",
label: "报警信息", },
}, {
{ value: "使能状态",
value: "驱动单元电流", label: "使能状态",
label: "驱动单元电流", },
}, {
{ value: "系统状态",
value: "负载电流", label: "系统状态",
label: "负载电流", },
}, {
{ value: "执行任务信息",
value: "额定电流", label: "执行任务信息",
label: "额定电流", },
}, {
{ value: "进给倍军",
value: "运行时间", label: "进给倍军",
label: "运行时间", },
}, {
{ value: "轴速度",
value: "加工产品用时", label: "轴速度",
label: "加工产品用时", },
}, {
{ value: "轴角度",
value: "工作模式", label: "轴角度",
label: "工作模式", },
}, {
{ value: "进给速度",
value: "切削速度", label: "进给速度",
label: "切削速度", }],
}, options3: [{
{ value: "0X (Coil Status)",
value: "任务信息", label: "0X (Coil Status)"
label: "任务信息", },
}, {
{ value: "1X (Input Status)",
value: "使能状态", label: "1X (Input Status)"
label: "使能状态", }, {
}, value: "3X (Input Registers)",
{ label: "3X (Input Registers)"
value: "系统状态", },
label: "系统状态", {
}, value: "4X (Holding Register)",
{ label: "4X (Holding Register)"
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: [ options5: [
{ {
value: " BIT位0/1", value: " BIT位0/1",
label: " BIT位0/1", label: " BIT位0/1"
}, },
{ {
value: "WORD16位无符号整数", value: "WORD16位无符号整数",
label: "WORD16位无符号整数", label: "WORD16位无符号整数"
}, }, {
{
value: "INT16位有符号整数", value: "INT16位有符号整数",
label: "INT16位有符号整数", label: "INT16位有符号整数"
}, },
{ {
value: "DWORD32位无符号整数", value: "DWORD32位无符号整数",
label: "DWORD32位无符号整数", label: "DWORD32位无符号整数"
}, },
{ {
value: "DINT32位有符号整数", value: "DINT32位有符号整数",
label: "DINT32位有符号整数", label: "DINT32位有符号整数"
}, }, {
{
value: "FLOAT单精度浮点数", value: "FLOAT单精度浮点数",
label: "FLOAT单精度浮点数", label: "FLOAT单精度浮点数"
}, }, {
{
value: "DOUBLE64位浮点数", value: "DOUBLE64位浮点数",
label: "DOUBLE64位浮点数", label: "DOUBLE64位浮点数"
}, }, {
{
value: "STRING8位字符串", value: "STRING8位字符串",
label: "STRING8位字符串", label: "STRING8位字符串"
}, }, {
{
value: "BCD1616位BCD码", value: "BCD1616位BCD码",
label: "BCD1616位BCD码", label: "BCD1616位BCD码"
}, }, {
{
value: "ULONG64位无符号整数", value: "ULONG64位无符号整数",
label: "ULONG64位无符号整数", label: "ULONG64位无符号整数"
}, }, {
{
value: "LONG64位有符号整数", 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", activeIndex: "1",
value1: 1, value1: 1,
checked: "", checked: "",
@ -526,41 +410,35 @@ export default {
rightMenu: "", rightMenu: "",
dialogVisible: true, dialogVisible: true,
menuShow: false, menuShow: false,
datas: [ datas: [{
label: 'Gateway',
children: [{
label: '数据采集',
children: [{
label: 'I/O点'
},
{
label: '用户点',
},
{
label: '计算点',
},
{
label: '系统点',
},
]
},
{ {
label: "Gateway", label: "上云服务",
children: [ children: [
{ {
label: "数据采集", label: "标准 MQTT"
children: [
{
label: "I/O点",
},
{
label: "用户点",
},
{
label: "计算点",
},
{
label: "系统点",
},
],
}, },
{ {
label: "上云服务", label: "AWS loT"
children: [ }]
{ }]
label: "标准 MQTT", }],
},
{
label: "AWS loT",
},
],
},
],
},
],
defaultProps: { defaultProps: {
children: "children", children: "children",
label: "label", label: "label",
@ -582,48 +460,7 @@ export default {
gateWay: { gateWay: {
wgpz_wgmc: "", wgpz_wgmc: "",
wgpz_wgid: "", 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: { rulesGate: {
wgpz_wgmc: [ wgpz_wgmc: [
@ -707,6 +544,7 @@ export default {
type: "error", type: "error",
}); });
} }
}, },
async GetUserAnswer() { async GetUserAnswer() {
this.loading = true; this.loading = true;
@ -735,7 +573,7 @@ export default {
user_id: this.user_id, user_id: this.user_id,
data: JSON.stringify(this.trees), data: JSON.stringify(this.trees),
type: "3", type: "3",
}); })
console.log(result); console.log(result);
}, },
// //
@ -779,7 +617,7 @@ export default {
}); });
} }
console.log(res); console.log(res);
}, }
}, },
created() { created() {
this.user_id = this.$route.query.user_id; this.user_id = this.$route.query.user_id;
@ -790,9 +628,9 @@ export default {
console.log(res); console.log(res);
console.log(JSON.parse(res.data.data.data)); console.log(JSON.parse(res.data.data.data));
this.trees = JSON.parse(res.data.data.data); this.trees = JSON.parse(res.data.data.data);
}); })
this.GetUserAnswer(); this.GetUserAnswer();
}, }
}; };
</script> </script>

View File

@ -4,15 +4,8 @@
<!-- 设置树形控件 --> <!-- 设置树形控件 -->
<!-- <el-button type="info" plain @click="dialogVisible = true">斥候采集点设置</el-button> --> <!-- <el-button type="info" plain @click="dialogVisible = true">斥候采集点设置</el-button> -->
<div v-show="dialogVisible" class="tree_menu"> <div v-show="dialogVisible" class="tree_menu">
<el-tree <el-tree :data="trees" node-key="id" :props="defaultProps" default-expand-all @node-contextmenu="rightClick"
:data="trees" @node-click="treeNodeClick" ref="tree">
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 }"> <!-- <span class="custom-tree-node" slot-scope="{ node, data }">
<template v-if="data.editing == 1 && flag"> <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>
@ -34,63 +27,40 @@
<el-table-column property="cjdpz_tagid" label="TagID"> <el-table-column property="cjdpz_tagid" label="TagID">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.cjdpz_tagid" placeholder=""> <el-select v-model="scope.row.cjdpz_tagid" placeholder="">
<el-option <el-option v-for="(option, index) in options1" :key="index" :label="option.label"
v-for="(option, index) in options1" :value="option.value"></el-option>
:key="index"
:label="option.label"
:value="option.value"
></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="cjdpz_mc" label="名称"> <el-table-column property="cjdpz_mc" label="名称">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.cjdpz_mc" placeholder=""> <el-select v-model="scope.row.cjdpz_mc" placeholder="">
<el-option <el-option v-for="(option, index) in options2" :key="index" :label="option.label"
v-for="(option, index) in options2" :value="option.value"></el-option>
:key="index"
:label="option.label"
:value="option.value"
></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="cjdpz_jcqdz" label="地址"> <el-table-column property="cjdpz_jcqdz" label="地址">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.cjdpz_dz" placeholder=""> <el-select v-model="scope.row.cjdpz_dz" placeholder="">
<el-option <el-option v-for="(option, index) in options3" :key="index" :label="option.label"
v-for="(option, index) in options3" :value="option.value"></el-option>
:key="index"
:label="option.label"
:value="option.value"
></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column property="cjdpz_jcqdz" label="寄存地址(十进制)" width="150px">
property="cjdpz_jcqdz"
label="寄存地址(十进制)"
width="150px"
>
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-select v-model="scope.row.cjdpz_jcqdz" placeholder="1"> <!-- <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-option v-for="(option,index) in options4" :key="index" :label="option.label" :value="option.value"></el-option>
</el-select> --> </el-select> -->
<el-input <el-input v-model="scope.row.cjdpz_jcqdz" placeholder="1-9999"></el-input>
v-model="scope.row.cjdpz_jcqdz"
placeholder="1-9999"
></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="cjdpz_cjsjlx" label="采集数据类型"> <el-table-column property="cjdpz_cjsjlx" label="采集数据类型">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.cjdpz_cjsjlx" placeholder=""> <el-select v-model="scope.row.cjdpz_cjsjlx" placeholder="">
<el-option <el-option v-for="(option, index) in options5" :key="index" :label="option.label"
v-for="(option, index) in options5" :value="option.value"></el-option>
:key="index"
:label="option.label"
:value="option.value"
></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
@ -98,24 +68,16 @@
<el-table-column property="cjdpz_dxsx" label="读写属性"> <el-table-column property="cjdpz_dxsx" label="读写属性">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.cjdpz_dxsx" placeholder=""> <el-select v-model="scope.row.cjdpz_dxsx" placeholder="">
<el-option <el-option v-for="(option, index) in options6" :key="index" :label="option.label"
v-for="(option, index) in options6" :value="option.value"></el-option>
:key="index"
:label="option.label"
:value="option.value"
></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="cjdpz_scms" label="上传模式"> <el-table-column property="cjdpz_scms" label="上传模式">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.cjdpz_scms" placeholder=""> <el-select v-model="scope.row.cjdpz_scms" placeholder="">
<el-option <el-option v-for="(option, index) in options7" :key="index" :label="option.label"
v-for="(option, index) in options7" :value="option.value"></el-option>
:key="index"
:label="option.label"
:value="option.value"
></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
@ -130,40 +92,16 @@
<!-- 网关信息 --> <!-- 网关信息 -->
<div class="gateway"> <div class="gateway">
<el-dialog title="新建网关" :visible.sync="outerVisible" width="382px"> <el-dialog title="新建网关" :visible.sync="outerVisible" width="382px">
<el-form <el-form :model="gateWay" :rules="rulesGate" ref="gateWay" label-width="85px" class="demo-ruleForm">
:model="gateWay"
:rules="rulesGate"
ref="gateWay"
label-width="85px"
class="demo-ruleForm"
>
<el-form-item label="网关名称:" prop="wgpz_wgmc"> <el-form-item label="网关名称:" prop="wgpz_wgmc">
<el-select <el-select v-model="gateWay.wgpz_wgmc" placeholder="请选择" style="width: 200px">
v-model="gateWay.wgpz_wgmc" <el-option v-for="item in opts1" :key="item.value" :label="item.label" :value="item.value">
placeholder="请选择"
style="width: 200px"
>
<el-option
v-for="item in opts1"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="网关ID:" prop="wgpz_wgid"> <el-form-item label="网关ID:" prop="wgpz_wgid">
<el-select <el-select v-model="gateWay.wgpz_wgid" placeholder="请选择" style="width: 200px">
v-model="gateWay.wgpz_wgid" <el-option v-for="item in opts2" :key="item.value" :label="item.label" :value="item.value">
placeholder="请选择"
style="width: 200px"
>
<el-option
v-for="item in opts2"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -178,7 +116,7 @@
</template> </template>
<script> <script>
import { SaveUserAnswer, GetUserAnswer, GetTree, SendTree } from "@/api/user"; import { SaveUserAnswer, GetUserAnswer, GetTree, SendTree } from '@/api/user';
export default { export default {
name: "ChiCollectionwifi", name: "ChiCollectionwifi",
@ -189,256 +127,219 @@ export default {
flag: false, flag: false,
gateway: "", gateway: "",
trees: [], trees: [],
options1: [ options1: [{
{ value: "MachinePamHID909",
value: "MachinePamHID909", label: "MachinePamHID909",
label: "MachinePamHID909", }, {
}, value: "MachinePamHID910",
{ label: "MachinePamHID910",
value: "MachinePamHID910", }, {
label: "MachinePamHID910", value: "MachinePamHID911",
}, label: "MachinePamHID911",
{ }, {
value: "MachinePamHID911", value: "MachinePamHID912",
label: "MachinePamHID911", label: "MachinePamHID912",
}, }, {
{ value: "MachinePamHID913",
value: "MachinePamHID912", label: "MachinePamHID913",
label: "MachinePamHID912", }, {
}, value: "MachinePamHID914",
{ label: "MachinePamHID914",
value: "MachinePamHID913", }, {
label: "MachinePamHID913", value: "MachinePamHID915",
}, label: "MachinePamHID915",
{ }, {
value: "MachinePamHID914", value: "MachinePamHID916",
label: "MachinePamHID914", label: "MachinePamHID916",
}, }, {
{ value: "MachinePamHID917",
value: "MachinePamHID915", label: "MachinePamHID917",
label: "MachinePamHID915", }, {
}, value: "MachinePamHID918",
{ label: "MachinePamHID918",
value: "MachinePamHID916", }, {
label: "MachinePamHID916", value: "MachinePamHID919",
}, label: "MachinePamHID919",
{ }, {
value: "MachinePamHID917", value: "MachinePamHID920",
label: "MachinePamHID917", label: "MachinePamHID920",
}, }, {
{ value: "MachinePamHID921",
value: "MachinePamHID918", label: "MachinePamHID921",
label: "MachinePamHID918", }, {
}, value: "MachinePamHID922",
{ label: "MachinePamHID922",
value: "MachinePamHID919", }, {
label: "MachinePamHID919", value: "MachinePamHID923",
}, label: "MachinePamHID923",
{ }, {
value: "MachinePamHID920", value: "MachinePamHID924",
label: "MachinePamHID920", label: "MachinePamHID924",
}, }, {
{ value: "MachinePamHID925",
value: "MachinePamHID921", label: "MachinePamHID925",
label: "MachinePamHID921", }, {
}, value: "MachinePamHID926",
{ label: "MachinePamHID926",
value: "MachinePamHID922", }, {
label: "MachinePamHID922", value: "MachinePamHID927",
}, label: "MachinePamHID927",
{ }, {
value: "MachinePamHID923", value: "MachinePamHID928",
label: "MachinePamHID923", label: "MachinePamHID928",
}, }, {
{ value: "MachinePamHID929",
value: "MachinePamHID924", label: "MachinePamHID929",
label: "MachinePamHID924", }, {
}, value: "MachinePamHID930",
{ label: "MachinePamHID930",
value: "MachinePamHID925", }, {
label: "MachinePamHID925", value: "MachinePamHID931",
}, label: "MachinePamHID931",
{ }, {
value: "MachinePamHID926", value: "MachinePamHID932",
label: "MachinePamHID926", label: "MachinePamHID932",
}, }, {
{ value: "MachinePamHID933",
value: "MachinePamHID927", label: "MachinePamHID933",
label: "MachinePamHID927", }, {
}, value: "MachinePamHID934",
{ label: "MachinePamHID934",
value: "MachinePamHID928", }, {
label: "MachinePamHID928", value: "MachinePamHID935",
}, label: "MachinePamHID935",
{ }, {
value: "MachinePamHID929", value: "MachinePamHID936",
label: "MachinePamHID929", label: "MachinePamHID936",
}, }, {
{ value: "MachinePamHID937",
value: "MachinePamHID930", label: "MachinePamHID937",
label: "MachinePamHID930", }, {
}, value: "MachinePamHID938",
{ label: "MachinePamHID938",
value: "MachinePamHID931", }],
label: "MachinePamHID931", options2: [{
}, value: "急停状态",
{ label: "急停状态",
value: "MachinePamHID932", }, {
label: "MachinePamHID932", value: "产量",
}, label: "产量",
{ },
value: "MachinePamHID933", {
label: "MachinePamHID933", value: "相对位置X",
}, label: "相对位置X",
{ },
value: "MachinePamHID934", {
label: "MachinePamHID934", value: "相对位置Y",
}, label: "相对位置Y",
{ },
value: "MachinePamHID935", {
label: "MachinePamHID935", value: "相对位置Z",
}, label: "相对位置Z",
{ },
value: "MachinePamHID936", {
label: "MachinePamHID936", value: "实际位置X",
}, label: "实际位置X",
{ },
value: "MachinePamHID937", {
label: "MachinePamHID937", value: "实际位置Y",
}, label: "实际位置Y",
{ },
value: "MachinePamHID938", {
label: "MachinePamHID938", value: "实际位置Z",
}, label: "实际位置Z",
], },
options2: [ {
{ value: "主轴转速",
value: "急停状态", label: "主轴转速",
label: "急停状态", },
}, {
{ value: "当前刀具",
value: "产量", label: "当前刀具",
label: "产量", },
}, {
{ value: "预选刀具",
value: "相对位置X", label: "预选刀具",
label: "相对位置X", },
}, {
{ value: "报警信息",
value: "相对位置Y", label: "报警信息",
label: "相对位置Y", },
}, {
{ value: "驱动单元电流",
value: "相对位置Z", label: "驱动单元电流",
label: "相对位置Z", },
}, {
{ value: "负载电流",
value: "实际位置X", label: "负载电流",
label: "实际位置X", },
}, {
{ value: "额定电流",
value: "实际位置Y", label: "额定电流",
label: "实际位置Y", },
}, {
{ value: "运行时间",
value: "实际位置Z", label: "运行时间",
label: "实际位置Z", },
}, {
{ value: "加工产品用时",
value: "主轴转速", label: "加工产品用时",
label: "主轴转速", },
}, {
{ value: "工作模式",
value: "当前刀具", label: "工作模式",
label: "当前刀具", },
}, {
{ value: "切削速度",
value: "预选刀具", label: "切削速度",
label: "预选刀具", },
}, {
{ value: "任务信息",
value: "报警信息", label: "任务信息",
label: "报警信息", },
}, {
{ value: "使能状态",
value: "驱动单元电流", label: "使能状态",
label: "驱动单元电流", },
}, {
{ value: "系统状态",
value: "负载电流", label: "系统状态",
label: "负载电流", },
}, {
{ value: "执行任务信息",
value: "额定电流", label: "执行任务信息",
label: "额定电流", },
}, {
{ value: "进给倍军",
value: "运行时间", label: "进给倍军",
label: "运行时间", },
}, {
{ value: "轴速度",
value: "加工产品用时", label: "轴速度",
label: "加工产品用时", },
}, {
{ value: "轴角度",
value: "工作模式", label: "轴角度",
label: "工作模式", },
}, {
{ value: "进给速度",
value: "切削速度", label: "进给速度",
label: "切削速度", }],
}, options3: [{
{ value: "0X (Coil Status)",
value: "任务信息", label: "0X (Coil Status)"
label: "任务信息", },
}, {
{ value: "1X (Input Status)",
value: "使能状态", label: "1X (Input Status)"
label: "使能状态", }, {
}, value: "3X (Input Registers)",
{ label: "3X (Input Registers)"
value: "系统状态", },
label: "系统状态", {
}, value: "4X (Holding Register)",
{ label: "4X (Holding Register)"
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: [ options4: [
{ {
value: "2000H", value: "2000H",
@ -515,8 +416,7 @@ export default {
{ {
value: "2020H", value: "2020H",
label: "2020H", label: "2020H",
}, }, {
{
value: "2021H", value: "2021H",
label: "2021H", label: "2021H",
}, },
@ -547,86 +447,72 @@ export default {
{ {
value: "2030H", value: "2030H",
label: "2030H", label: "2030H",
}, }, {
{
value: "2031H", value: "2031H",
label: "2031H", label: "2031H",
}, }
], ],
options5: [ options5: [
{ {
value: " BIT位0/1", value: " BIT位0/1",
label: " BIT位0/1", label: " BIT位0/1"
}, },
{ {
value: "WORD16位无符号整数", value: "WORD16位无符号整数",
label: "WORD16位无符号整数", label: "WORD16位无符号整数"
}, }, {
{
value: "INT16位有符号整数", value: "INT16位有符号整数",
label: "INT16位有符号整数", label: "INT16位有符号整数"
}, },
{ {
value: "DWORD32位无符号整数", value: "DWORD32位无符号整数",
label: "DWORD32位无符号整数", label: "DWORD32位无符号整数"
}, },
{ {
value: "DINT32位有符号整数", value: "DINT32位有符号整数",
label: "DINT32位有符号整数", label: "DINT32位有符号整数"
}, }, {
{
value: "FLOAT单精度浮点数", value: "FLOAT单精度浮点数",
label: "FLOAT单精度浮点数", label: "FLOAT单精度浮点数"
}, }, {
{
value: "DOUBLE64位浮点数", value: "DOUBLE64位浮点数",
label: "DOUBLE64位浮点数", label: "DOUBLE64位浮点数"
}, }, {
{
value: "STRING8位字符串", value: "STRING8位字符串",
label: "STRING8位字符串", label: "STRING8位字符串"
}, }, {
{
value: "BCD1616位BCD码", value: "BCD1616位BCD码",
label: "BCD1616位BCD码", label: "BCD1616位BCD码"
}, }, {
{
value: "ULONG64位无符号整数", value: "ULONG64位无符号整数",
label: "ULONG64位无符号整数", label: "ULONG64位无符号整数"
}, }, {
{
value: "LONG64位有符号整数", 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", activeIndex: "1",
checked: "", checked: "",
labelPosition: "left", labelPosition: "left",
@ -636,41 +522,35 @@ export default {
rightMenu: "", rightMenu: "",
dialogVisible: true, dialogVisible: true,
menuShow: false, menuShow: false,
datas: [ datas: [{
label: 'Gateway',
children: [{
label: '数据采集',
children: [{
label: 'I/O点'
},
{
label: '用户点',
},
{
label: '计算点',
},
{
label: '系统点',
},
]
},
{ {
label: "Gateway", label: "上云服务",
children: [ children: [
{ {
label: "数据采集", label: "标准 MQTT"
children: [
{
label: "I/O点",
},
{
label: "用户点",
},
{
label: "计算点",
},
{
label: "系统点",
},
],
}, },
{ {
label: "上云服务", label: "AWS loT"
children: [ }]
{ }]
label: "标准 MQTT", }],
},
{
label: "AWS loT",
},
],
},
],
},
],
defaultProps: { defaultProps: {
children: "children", children: "children",
label: "label", label: "label",
@ -692,42 +572,7 @@ export default {
gateWay: { gateWay: {
wgpz_wgmc: "", wgpz_wgmc: "",
wgpz_wgid: "", 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: { rulesGate: {
wgpz_wgmc: [ wgpz_wgmc: [
@ -811,6 +656,7 @@ export default {
type: "error", type: "error",
}); });
} }
}, },
async GetUserAnswer() { async GetUserAnswer() {
this.loading = true; this.loading = true;
@ -839,7 +685,7 @@ export default {
user_id: this.user_id, user_id: this.user_id,
data: JSON.stringify(this.trees), data: JSON.stringify(this.trees),
type: "4", type: "4",
}); })
console.log(result); console.log(result);
}, },
@ -884,7 +730,7 @@ export default {
}); });
} }
console.log(res); console.log(res);
}, }
}, },
created() { created() {
this.user_id = this.$route.query.user_id; this.user_id = this.$route.query.user_id;
@ -895,9 +741,9 @@ export default {
console.log(res); console.log(res);
console.log(JSON.parse(res.data.data.data)); console.log(JSON.parse(res.data.data.data));
this.trees = JSON.parse(res.data.data.data); this.trees = JSON.parse(res.data.data.data);
}); })
this.GetUserAnswer(); this.GetUserAnswer();
}, }
}; };
</script> </script>

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

7
src/validate.js Normal file
View File

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