This commit is contained in:
lll 2023-11-09 20:47:24 +08:00
parent f5ee084ffc
commit 077248470c
13 changed files with 1488 additions and 1084 deletions

View File

@ -935,8 +935,8 @@ export default {
//
var json = JSON.parse(sessionStorage.getItem("GYWZ_yx"));
let { data } = await SaveUserAnswer({
mark: "GYWZ_yx",
user_id: "USER202307301114011710",
mark: `${this.$store.state.type}`,
user_id: `${this.$route.query.id}`,
mark_value: JSON.stringify({ ...json, ...obj }),
});
if (data.state) {
@ -951,9 +951,10 @@ export default {
//
async GetUserAnswer() {
let { data } = await GetUserAnswer({
mark: "GYWZ_yx",
user_id: "USER202307301114011710",
mark: `${this.$store.state.type}`,
user_id: `${this.$route.query.id}`,
});
if (data.data && data.state) {
let res = JSON.parse(data.data.mark_value);
if (res.clgl_ckip) {
this.ruleForm1.clgl_ckip1 = res.clgl_ckip.split(".")[0];
@ -994,6 +995,7 @@ export default {
},
];
}
}
},
//-
saveMl() {
@ -1018,8 +1020,8 @@ export default {
//
var json = JSON.parse(sessionStorage.getItem("GYWZ_yx"));
let { data } = await SaveUserAnswer({
mark: "GYWZ_yx",
user_id: "USER202307301114011710",
mark: `${this.$store.state.type}`,
user_id: `${this.$route.query.id}`,
mark_value: JSON.stringify({ ...json, ...obj }),
});
if (data.state) {
@ -1044,8 +1046,8 @@ export default {
obj.cmdlist_dz = "";
localStorage.setItem("GYWZ_yx", JSON.stringify(obj));
let { data } = await SaveUserAnswer({
mark: "GYWZ_yx",
user_id: "USER202307301114011710",
mark: `${this.$store.state.type}`,
user_id: `${this.$route.query.id}`,
mark_value: JSON.stringify(obj),
});
if (data.state) {

View File

@ -4,15 +4,30 @@
<!-- <div v-click-outside="closeMenu"> -->
<!-- <el-button type="info" plain @click="dialogVisible = !dialogVisible">MQTT云</el-button> -->
<div v-show="dialogVisible" class="tree_menu">
<el-tree :data="trees" node-key="id" :props="defaultProps" default-expand-all @node-click="treeNodeClick"
ref="tree">
<el-tree
:data="trees"
node-key="id"
:props="defaultProps"
default-expand-all
@node-click="treeNodeClick"
ref="tree"
>
<!-- :render-content="renderContent" -->
<span class="custom-tree-node" slot-scope="{ node, data }">
<template v-if="data.editing == 1">
<el-button type="mini" v-if="flag" style="right: 50px; top: 0; position: absolute; border: none"
@click.stop="done">完成</el-button>
<el-button type="mini" style="right: 0; top: 0; position: absolute; border: none"
@click.stop="edit">编辑</el-button>
<el-button
type="mini"
v-if="flag"
style="right: 50px; top: 0; position: absolute; border: none"
@click.stop="done"
>完成</el-button
>
<el-button
type="mini"
style="right: 0; top: 0; position: absolute; border: none"
@click.stop="edit"
>编辑</el-button
>
<span v-if="!flag">{{ data.label }}</span>
<el-input v-else style="width: 150px" v-model="gateway"></el-input>
</template>
@ -28,7 +43,12 @@
MQTT Client
</h3>
<el-divider></el-divider>
<el-form :model="formData" :label-position="labelPosition" :rules="rules" ref="ruleForm">
<el-form
:model="formData"
:label-position="labelPosition"
:rules="rules"
ref="ruleForm"
>
<el-row>
<el-col :span="24">
<el-form-item>
@ -38,30 +58,50 @@
</el-row>
<el-row>
<el-col :span="12">
<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-form-item prop="mqtt_ip1">
<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-form-item>
</el-col>
<el-col :span="1">. </el-col>
<el-col :span="5">
<el-form-item prop="mqtt_ip2">
<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-form-item>
</el-col>
<el-col :span="1">.</el-col>
<el-col :span="5">
<el-form-item prop="mqtt_ip3">
<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-form-item>
</el-col>
<el-col :span="1">.</el-col>
<el-col :span="5">
<el-form-item prop="mqtt_ip4">
<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-form-item>
</el-col>
</el-row>
@ -70,29 +110,63 @@
</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="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-divider></el-divider>
<el-row class="theme">
<el-col :span="12">
<el-form-item label="实时数据发布的主题" style="display: block" label-width="168px" prop="mqtt_sssjfbzt">
<el-form-item
label="实时数据发布的主题"
style="display: block"
label-width="168px"
prop="mqtt_sssjfbzt"
>
<el-row>
<el-col :span="15">
<el-input v-model="formData.mqtt_sssjfbzt" placeholder="" style="width: 200px"></el-input>
<el-input
v-model="formData.mqtt_sssjfbzt"
placeholder=""
style="width: 200px"
></el-input>
</el-col>
<el-col :span="9">
<el-select v-model="formData.mqtt_qos" placeholder="请选择" style="width: 99px">
<el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
<el-select
v-model="formData.mqtt_qos"
placeholder="请选择"
style="width: 99px"
>
<el-option
v-for="item in options1"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-col>
@ -107,19 +181,39 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="上传模式:" :label-width="formLabelWidth" prop="mqtt_scms">
<el-input v-model="formData.mqtt_scms" placeholder="" style="width: 200px; height: 30px"></el-input>
<el-form-item
label="上传模式:"
:label-width="formLabelWidth"
prop="mqtt_scms"
>
<el-input
v-model="formData.mqtt_scms"
placeholder=""
style="width: 200px; height: 30px"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="上传周期(s):" label-width="108px" prop="mqtt_sczq">
<el-input v-model="formData.mqtt_sczq" placeholder="" style="width: 200px; height: 30px"></el-input>
<el-form-item
label="上传周期(s):"
label-width="108px"
prop="mqtt_sczq"
>
<el-input
v-model="formData.mqtt_sczq"
placeholder=""
style="width: 200px; height: 30px"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="数据过滤:" :label-width="formLabelWidth" prop="mqtt_sjgl">
<el-form-item
label="数据过滤:"
:label-width="formLabelWidth"
prop="mqtt_sjgl"
>
<el-checkbox-group v-model="formData.mqtt_sjgl">
<el-checkbox label="值改变"></el-checkbox>
<el-checkbox label="采集成功"></el-checkbox>
@ -148,16 +242,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>
@ -168,8 +270,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>
@ -492,6 +600,9 @@ export default {
this.getTree();
let that = this;
window.getParameter = that.getParameter;
this.loading = true;
this.GetUserAnswer();
this.loading = false;
},
methods: {
//
@ -623,16 +734,16 @@ export default {
user_id: "USER202307301114011710",
data: JSON.stringify(this.trees),
type: "1",
})
});
console.log(result);
},
async getTree() {
console.log("12341")
let res = await GetTree({ user_id: "USER202307301114011710", type: "1", })
console.log("12341");
let res = await GetTree({ user_id: "USER202307301114011710", type: "1" });
console.log(res);
console.log(JSON.parse(res.data.data.data));
this.trees = JSON.parse(res.data.data.data);
}
},
},
directives: {
"click-outside": {
@ -660,11 +771,6 @@ export default {
},
},
},
created() {
this.loading = true;
this.GetUserAnswer();
this.loading = false;
},
};
</script>

View File

@ -252,7 +252,7 @@ export default {
async GetUserAnswer() {
let { data } = await GetUserAnswer({
mark: "YDPZYM_wgpz",
user_id: "USER202307301114011710",
user_id: `${this.user_id}`,
});
console.log(data.data);
if (data.data && data.state) {
@ -263,7 +263,7 @@ export default {
async SaveUserAnswer() {
let { data } = await SaveUserAnswer({
mark: "YDPZYM_wgpz",
user_id: "USER202307301114011710",
user_id: `${this.user_id}`,
mark_value: JSON.stringify(this.wgpz),
});
if (data.state) {

View File

@ -266,7 +266,7 @@ export default {
async GetUserAnswer() {
let { data } = await GetUserAnswer({
mark: "YDPZYM_wgwh",
user_id: "USER202307301114011710",
user_id: `${this.user_id}`,
});
console.log(data);
if (data.data && data.state) {
@ -329,7 +329,7 @@ export default {
async SaveUserAnswer() {
let { data } = await SaveUserAnswer({
mark: "YDPZYM_wgwh",
user_id: "USER202307301114011710",
user_id: `${this.user_id}`,
mark_value: JSON.stringify(this.tableData),
});
if (data.state) {

View File

@ -1,11 +1,22 @@
<!-- ip设置页面 -->
<template>
<div>
<el-dialog title="IP配置" :visible.sync="dialogVisible" width="30%" v-loading="loading">
<el-dialog
title="IP配置"
:visible.sync="dialogVisible"
width="30%"
v-loading="loading"
>
<p class="txt">本页面涉及排错请检查修改默认值</p>
<div class="ip_setting">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="140px" class="demo-ruleForm"
:label-position="labelPosition">
<el-form
:model="ruleForm"
:rules="rules"
ref="ruleForm"
label-width="140px"
class="demo-ruleForm"
:label-position="labelPosition"
>
<el-row>
<el-col :span="24">
<el-form-item label="IP获取方式" prop="ippz_ip_hqfs">
@ -19,7 +30,10 @@
<el-row>
<el-col :span="24">
<el-form-item label="DNS获取方式" prop="ippz_dns_hqfs">
<el-select v-model="ruleForm.ippz_dns_hqfs" style="width: 200px">
<el-select
v-model="ruleForm.ippz_dns_hqfs"
style="width: 200px"
>
<el-option label="自动获取" value="自动获取"></el-option>
<el-option label="手动设定" value="手动设定"></el-option>
</el-select>
@ -295,7 +309,7 @@ export default {
datas = { ...JSON.parse(datas), ...this.ruleForm };
let res = await SaveUserAnswer({
mark: "CKFWQ_yx",
user_id: "USER202307301114011710",
user_id: `${this.user_id}`,
mark_value: JSON.stringify(datas),
});
console.log(res);
@ -312,7 +326,7 @@ export default {
async GetUserAnswer() {
let answers = await GetUserAnswer({
mark: "CKFWQ_yx",
user_id: "USER202307301114011710",
user_id: `${this.user_id}`,
});
console.log(answers.data);
if (answers.data.data && answers.data.state) {

View File

@ -87,7 +87,7 @@ export default {
let datas = JSON.parse(sessionStorage.getItem("CKFWQ_wx"));
let res = await SaveUserAnswer({
mark: "CKFWQ_wx",
user_id: "USER202307301114011710",
user_id: `${this.user_id}`,
mark_value: JSON.stringify(datas),
});
console.log(res);
@ -111,11 +111,11 @@ export default {
this.loading = true;
let res = await GetUserAnswer({
mark: "CKFWQ_wx",
user_id: "USER202307301114011710",
user_id: `${this.user_id}`,
});
var obj = JSON.parse(res.data.data.mark_value);
console.log(obj);
if (res.data.data && res.data.state) {
var obj = JSON.parse(res.data.data.mark_value);
this.ruleForm.kqwk = obj.kqwk;
this.ruleForm.wkgzfs = obj.wkgzfs;
this.ruleForm.wkms = obj.wkms;

View File

@ -246,8 +246,8 @@ export default {
this.wlgl_ww_zwym4,
};
let { data } = await SaveUserAnswer({
mark: "GYWZ_yx",
user_id: "USER202307301114011710",
mark: `${this.$store.state.type}`,
user_id: `${this.user_id}`,
mark_value: JSON.stringify(obj),
});
if (data.state) {
@ -262,8 +262,8 @@ export default {
//
async GetUserAnswer() {
var { data } = await GetUserAnswer({
mark: "GYWZ_yx",
user_id: "USER202307301114011710",
mark: `${this.$store.state.type}`,
user_id: `${this.user_id}`,
});
console.log(data);
if (data.data && data.state) {

View File

@ -146,8 +146,8 @@ export default {
ip: this.ip1 + "." + this.ip2 + "." + this.ip3 + "." + this.ip4,
});
let { data } = await SaveUserAnswer({
mark: "GYWZ_yx",
user_id: "USER202307301114011710",
mark: `${this.$store.state.type}`,
user_id: `${this.user_id}`,
mark_value: JSON.stringify({ ...json, ...{ dxgl: this.dxgl } }),
});
console.log(data.data);
@ -164,8 +164,8 @@ export default {
},
async GetUserAnswer() {
let { data } = await GetUserAnswer({
mark: "GYWZ_yx",
user_id: "USER202307301114011710",
mark: `${this.$store.state.type}`,
user_id: `${this.user_id}`,
});
if (data.state && data.data) {
console.log(JSON.parse(data.data.mark_value).dxgl);
@ -179,8 +179,8 @@ export default {
this.dxgl.splice(index, 1);
var json = JSON.parse(sessionStorage.getItem("GYWZ_yx"));
let { data } = await SaveUserAnswer({
mark: "GYWZ_yx",
user_id: "USER202307301114011710",
mark: `${this.$store.state.type}`,
user_id: `${this.user_id}`,
mark_value: JSON.stringify({ ...json, ...{ dxgl: this.dxgl } }),
});
console.log(data.data);

View File

@ -292,12 +292,12 @@ export default {
this.user_id = data;
},
addPolicy() {
this.$router.push("/addstrategy");
this.$router.push({ name: "addstrategy", query: { id: this.user_id } });
},
async del(index, a) {
let { data } = await SaveUserAnswer({
mark: "GYWZ_yx",
user_id: "USER202307301114011710",
mark: `${this.$store.state.type}`,
user_id: `${this.user_id}`,
mark_value: JSON.stringify(localStorage.getItem("GYWZ_yx")),
});
if (data.state) {
@ -333,8 +333,8 @@ export default {
async GetUserAnswer() {
this.loading = true;
let { data } = await GetUserAnswer({
mark: "GYWZ_yx",
user_id: "USER202307301114011710",
mark: `${this.$store.state.type}`,
user_id: `${this.user_id}`,
});
this.loading = false;
if (data.data && data.state) {

View File

@ -206,7 +206,7 @@ export default {
async GetUserAnswer() {
let { data } = await GetUserAnswer({
mark: "CKFWQ_yx",
user_id: "USER202307301114011710",
user_id: `${this.user_id}`,
});
if (data.data) {
let obj = JSON.parse(data.data.mark_value);
@ -227,7 +227,7 @@ export default {
datas = { ...JSON.parse(datas), ...this.ruleForm };
SaveUserAnswer({
mark: "CKFWQ_yx",
user_id: "USER202307301114011710",
user_id: `${this.user_id}`,
mark_value: JSON.stringify(datas),
}).then((res) => {
console.log(res);

File diff suppressed because it is too large Load Diff

View File

@ -102,10 +102,9 @@ export default {
let datas = JSON.parse(sessionStorage.getItem("CKFWQ_wx"));
let res = await SaveUserAnswer({
mark: "CKFWQ_wx",
user_id: "USER202307301114011710",
user_id: `${this.user_id}`,
mark_value: JSON.stringify(datas),
});
console.log(this.ruleForm, "存");
if (res.status == 200) {
sessionStorage.setItem(
"CKFWQ_wx",
@ -123,7 +122,7 @@ export default {
async GetUserAnswer() {
let { data } = await GetUserAnswer({
mark: "CKFWQ_wx",
user_id: "USER202307301114011710",
user_id: `${this.user_id}`,
});
console.log(obj);
if (data.data && data.state) {

View File

@ -192,7 +192,7 @@ export default {
datas = { ...JSON.parse(datas), ...this.ruleForm };
let res = await SaveUserAnswer({
mark: "CKFWQ_wx",
user_id: "USER202307301114011710",
user_id: `${this.user_id}`,
mark_value: JSON.stringify(datas),
});
console.log(res);
@ -212,7 +212,7 @@ export default {
this.loading = true;
let answers = await GetUserAnswer({
mark: "CKFWQ_wx",
user_id: "USER202307301114011710",
user_id: `${this.user_id}`,
});
let obj = JSON.parse(answers.data.data.mark_value);
console.log(answers);