This commit is contained in:
lll 2023-11-07 21:12:51 +08:00
parent 3fc4a042ff
commit 02a3f7d75e
9 changed files with 1417 additions and 1093 deletions

View File

@ -12,6 +12,16 @@ export default {
data() {
return {
grade: 0,
DB_IotLite_yx: [],
CHGYWG_yx: [],
CHGYWG_wx: [],
DB_IotLite_wx: [],
CKFWQ_yx: [],
CKFWQ_wx: [],
GYWZ_yx: [],
GYWZ_wx: [],
YDPZYM_wgpz: [],
YDPZYM_wgwh: [],
};
},
created() {
@ -25,7 +35,36 @@ export default {
let arr = [];
arr = data.data;
arr.forEach((item) => {
item.answer = JSON.parse(item.answer);
if (item.mark == "DB-IotLite_yx") {
this.DB_IotLite_yx = JSON.parse(item.answer);
}
if (item.mark == "CHGYWG_yx") {
this.CHGYWG_yx = JSON.parse(item.answer);
}
if (item.mark == "CHGYWG_wx") {
this.CHGYWG_wx = JSON.parse(item.answer);
}
if (item.mark == "DB_IotLite_wx") {
this.DB_IotLite_wx = JSON.parse(item.answer);
}
if (item.mark == "CKFWQ_yx") {
this.CKFWQ_yx = JSON.parse(item.answer);
}
if (item.mark == "CKFWQ_wx") {
this.CKFWQ_wx = JSON.parse(item.answer);
}
if (item.mark == "GYWZ_yx") {
this.GYWZ_yx = JSON.parse(item.answer);
}
if (item.mark == "GYWZ_wx") {
this.GYWZ_wx = JSON.parse(item.answer);
}
if (item.mark == "YDPZYM_wgpz") {
this.YDPZYM_wgpz = JSON.parse(item.answer);
}
if (item.mark == "YDPZYM_wgwh") {
this.YDPZYM_wgwh = JSON.parse(item.answer);
}
});
},
// console.log(arr);
@ -216,7 +255,7 @@ export default {
}
.el-dialog__body {
color: #FFFFFF !important;
color: #ffffff !important;
background-image: url(./assets/image/bg.png);
background-size: 100% 100%;
}
@ -267,11 +306,11 @@ export default {
color: white;
}
.el-button {
width: 80px;
height: 30px;
line-height: 0.5 !important;
}
// .el-button {
// width: 80px;
// height: 30px;
// line-height: 0.5 !important;
// }
/* .el-tree-node__content:hover {
background-image: url(./assets/image/bg.png);

View File

@ -1,20 +1,29 @@
<template>
<div>
<div>
<<<<<<< HEAD <el-dialog title="添加策略" :visible.sync="dialogVisible1" :before-close="handleClose" width="82%">
<el-form :model="ruleForm1" :rules="rules1" ref="ruleForm1" label-width="150px" class="demo-ruleForm1"
:label-position="labelPosition">
=======
<el-dialog title="添加策略" :visible.sync="dialogVisible1" width="82%">
<el-form :model="ruleForm1" :rules="rules1" ref="ruleForm1" label-width="150px" class="demo-ruleForm1"
:label-position="labelPosition">
>>>>>>> 672924494cb6b7ae4219dd1930897a14261627bc
<el-form
:model="ruleForm1"
:rules="rules1"
ref="ruleForm1"
label-width="150px"
class="demo-ruleForm1"
:label-position="labelPosition"
>
<el-row :justify="center">
<el-col :span="6">
<el-form-item label="名称:" prop="clgl_name">
<el-col :span="19">
<el-select v-model="ruleForm1.clgl_name" placeholder="选择对象">
<el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
<el-select
v-model="ruleForm1.clgl_name"
placeholder="选择对象"
>
<el-option
v-for="item in options1"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-col>
@ -22,8 +31,16 @@
<el-form-item label="源对象:" prop="clgl_ydx" style="color: red">
<el-col :span="19">
<el-select v-model="ruleForm1.clgl_ydx" placeholder="选择对象">
<el-option v-for="item in options4" :key="item.value" :label="item.label" :value="item.value">
<el-select
v-model="ruleForm1.clgl_ydx"
placeholder="选择对象"
>
<el-option
v-for="item in options4"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-col>
@ -32,7 +49,10 @@
<el-col :span="3">
<el-form-item label="入口网关:" prop="clgl_rkwg1">
<el-col :span="5">
<el-input v-model="ruleForm1.clgl_rkwg1" :maxlength="3"></el-input>
<el-input
v-model="ruleForm1.clgl_rkwg1"
:maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
</el-form-item>
@ -40,7 +60,10 @@
<el-col :span="3">
<el-form-item label="" prop="clgl_rkwg2">
<el-col :span="5">
<el-input v-model="ruleForm1.clgl_rkwg2" :maxlength="3"></el-input>
<el-input
v-model="ruleForm1.clgl_rkwg2"
:maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
</el-form-item>
@ -48,7 +71,10 @@
<el-col :span="3">
<el-form-item label="" prop="clgl_rkwg3">
<el-col :span="5">
<el-input v-model="ruleForm1.clgl_rkwg3" :maxlength="3"></el-input>
<el-input
v-model="ruleForm1.clgl_rkwg3"
:maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
</el-form-item>
@ -56,7 +82,10 @@
<el-col :span="3">
<el-form-item label="" prop="clgl_rkwg4">
<el-col :span="5">
<el-input v-model="ruleForm1.clgl_rkwg4" :maxlength="3"></el-input>
<el-input
v-model="ruleForm1.clgl_rkwg4"
:maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
</el-form-item>
@ -66,7 +95,10 @@
<el-col :span="3">
<el-form-item label="出口网关:" prop="clgl_ckwg1">
<el-col :span="5">
<el-input v-model="ruleForm1.clgl_ckwg1" :maxlength="3"></el-input>
<el-input
v-model="ruleForm1.clgl_ckwg1"
:maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
</el-form-item>
@ -74,7 +106,10 @@
<el-col :span="3">
<el-form-item label="" prop="clgl_ckwg2">
<el-col :span="5">
<el-input v-model="ruleForm1.clgl_ckwg2" :maxlength="3"></el-input>
<el-input
v-model="ruleForm1.clgl_ckwg2"
:maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
</el-form-item>
@ -82,7 +117,10 @@
<el-col :span="3">
<el-form-item label="" prop="clgl_ckwg3">
<el-col :span="5">
<el-input v-model="ruleForm1.clgl_ckwg3" :maxlength="3"></el-input>
<el-input
v-model="ruleForm1.clgl_ckwg3"
:maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
</el-form-item>
@ -90,7 +128,10 @@
<el-col :span="3">
<el-form-item label="" prop="clgl_ckwg4">
<el-col :span="5">
<el-input v-model="ruleForm1.clgl_ckwg4" :maxlength="3"></el-input>
<el-input
v-model="ruleForm1.clgl_ckwg4"
:maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
</el-form-item>
@ -100,8 +141,17 @@
<el-col :span="6">
<el-form-item label="协议:" prop="clgl_xy">
<el-col :span="19">
<el-select v-model="ruleForm1.clgl_xy" multiple placeholder="请选择">
<el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value">
<el-select
v-model="ruleForm1.clgl_xy"
multiple
placeholder="请选择"
>
<el-option
v-for="item in options2"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-col>
@ -113,24 +163,46 @@
</el-form-item>
<el-form-item label="入口网卡:" prop="clgl_rkwk">
<el-col :span="19">
<el-select v-model="ruleForm1.clgl_rkwk" placeholder="选择配置的内网网卡">
<el-option v-for="item in options8" :key="item.value" :label="item.label" :value="item.value">
<el-select
v-model="ruleForm1.clgl_rkwk"
placeholder="选择配置的内网网卡"
>
<el-option
v-for="item in options8"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-col>
</el-form-item>
<el-form-item label="出口网卡:" prop="clgl_ckwk">
<el-col :span="19">
<el-select v-model="ruleForm1.clgl_ckwk" placeholder="选择配置的外网网卡">
<el-option v-for="item in options9" :key="item.value" :label="item.label" :value="item.value">
<el-select
v-model="ruleForm1.clgl_ckwk"
placeholder="选择配置的外网网卡"
>
<el-option
v-for="item in options9"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select> </el-col></el-form-item>
</el-select> </el-col
></el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="工作模式:" prop="clgl_gzms">
<el-col :span="19">
<el-select v-model="ruleForm1.clgl_gzms" placeholder="请选择">
<el-option v-for="item in options3" :key="item.value" :label="item.label" :value="item.value">
<el-option
v-for="item in options3"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-col>
@ -144,7 +216,10 @@
<el-col :span="3">
<el-form-item label="入口IP:" prop="clgl_rkip1">
<el-col :span="5">
<el-input v-model="ruleForm1.clgl_rkip1" :maxlength="3"></el-input>
<el-input
v-model="ruleForm1.clgl_rkip1"
:maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
</el-form-item>
@ -152,7 +227,10 @@
<el-col :span="3">
<el-form-item label="" prop="clgl_rkip2">
<el-col :span="5">
<el-input v-model="ruleForm1.clgl_rkip2" :maxlength="3"></el-input>
<el-input
v-model="ruleForm1.clgl_rkip2"
:maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
</el-form-item>
@ -160,7 +238,10 @@
<el-col :span="3">
<el-form-item label="" prop="clgl_rkip3">
<el-col :span="5">
<el-input v-model="ruleForm1.clgl_rkip3" :maxlength="3"></el-input>
<el-input
v-model="ruleForm1.clgl_rkip3"
:maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
</el-form-item>
@ -168,7 +249,10 @@
<el-col :span="3">
<el-form-item label="" prop="clgl_rkip4">
<el-col :span="5">
<el-input v-model="ruleForm1.clgl_rkip4" :maxlength="3"></el-input>
<el-input
v-model="ruleForm1.clgl_rkip4"
:maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
</el-form-item>
@ -178,7 +262,10 @@
<el-col :span="3">
<el-form-item label="出口IP:" prop="clgl_ckip1">
<el-col :span="5">
<el-input v-model="ruleForm1.clgl_ckip1" :maxlength="3"></el-input>
<el-input
v-model="ruleForm1.clgl_ckip1"
:maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
</el-form-item>
@ -186,7 +273,10 @@
<el-col :span="3">
<el-form-item label="" prop="clgl_ckip2">
<el-col :span="5">
<el-input v-model="ruleForm1.clgl_ckip2" :maxlength="3"></el-input>
<el-input
v-model="ruleForm1.clgl_ckip2"
:maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
</el-form-item>
@ -194,7 +284,10 @@
<el-col :span="3">
<el-form-item label="" prop="clgl_ckip3">
<el-col :span="5">
<el-input v-model="ruleForm1.clgl_ckip3" :maxlength="3"></el-input>
<el-input
v-model="ruleForm1.clgl_ckip3"
:maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
</el-form-item>
@ -202,7 +295,10 @@
<el-col :span="3">
<el-form-item label="" prop="clgl_ckip4">
<el-col :span="5">
<el-input v-model="ruleForm1.clgl_ckip4" :maxlength="3"></el-input>
<el-input
v-model="ruleForm1.clgl_ckip4"
:maxlength="3"
></el-input>
</el-col>
<el-col :span="1">.</el-col>
</el-form-item>
@ -223,8 +319,16 @@
</el-form-item>
<el-form-item label="未定义命令:" prop="clgl_wdyml">
<el-col :span="19">
<el-select v-model="ruleForm1.clgl_wdyml" placeholder="请选择">
<el-option v-for="item in options5" :key="item.value" :label="item.label" :value="item.value">
<el-select
v-model="ruleForm1.clgl_wdyml"
placeholder="请选择"
>
<el-option
v-for="item in options5"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-col>
@ -234,11 +338,14 @@
</el-form>
<span style="color: #fff">记录日志</span>
<el-switch style="margin-left: 6%" v-model="switchvalue"> </el-switch>
<div class="title" style="
<div
class="title"
style="
display: flex;
justify-content: space-between;
margin-top: 10px;
">
"
>
<h3 style="margin-top: 10px; margin-bottom: 3px; color: #fff4">
命令列表
</h3>
@ -249,7 +356,8 @@
<el-table-column label="序号">
<template slot-scope="scope">
{{ scope.$index + 1 }}
</template></el-table-column>
</template></el-table-column
>
<el-table-column prop="cmdlist_ml" label="命令(功能码)">
</el-table-column>
<el-table-column prop="cmdlist_qsdz" label="起始地址">
@ -260,7 +368,12 @@
<el-table-column prop="cmdlist_dz" label="动作"> </el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
<el-button
@click="handleClick(scope.row)"
type="text"
size="small"
>编辑</el-button
>
<el-button type="text" size="small">删除</el-button>
</template>
</el-table-column>
@ -272,12 +385,30 @@
</el-dialog>
</div>
<div>
<el-dialog title="新增命令" :visible.sync="flag" width="30%" :before-close="handleClose">
<el-form center :model="ruleForm2" :rules="rules2" ref="ruleForm2" label-width="150px" class="demo-ruleForm2"
:label-position="labelPosition">
<el-dialog
title="新增命令"
:visible.sync="flag"
width="30%"
:before-close="handleClose"
>
<el-form
center
:model="ruleForm2"
:rules="rules2"
ref="ruleForm2"
label-width="150px"
class="demo-ruleForm2"
:label-position="labelPosition"
>
<el-form-item label="命令:" prop="cmdlist_ml">
<el-col :span="6">
<el-select v-model="ruleForm2.cmdlist_ml" style="width: 200px">
<el-option
v-for="item in options6"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-col>
@ -286,7 +417,12 @@
<el-form-item label="设备ID:" prop="cmdlist_sbid" style="color: red">
<el-col :span="6">
<el-select v-model="ruleForm2.cmdlist_sbid" style="width: 200px">
<el-option v-for="item in options7" :key="item.value" :label="item.label" :value="item.value">
<el-option
v-for="item in options7"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-col>
@ -305,12 +441,21 @@
</el-form-item>
<el-form-item label="描述:" prop="cmdlist_ms">
<el-col :span="6">
<el-input v-model="ruleForm2.cmdlist_ms" style="width: 200px"></el-input></el-col>
<el-input
v-model="ruleForm2.cmdlist_ms"
style="width: 200px"
></el-input
></el-col>
</el-form-item>
<el-form-item label="动作:" prop="cmdlist_dz">
<el-col :span="6">
<el-select v-model="ruleForm2.cmdlist_dz" style="width: 200px">
<el-option v-for="item in options5" :key="item.value" :label="item.label" :value="item.value">
<el-option
v-for="item in options5"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-col>
@ -904,6 +1049,7 @@ export default {
line-height: 62px;
height: 20px;
text-align: center;
color: transparent;
}
.el-col-5 {

View File

@ -11,11 +11,24 @@
<el-divider></el-divider>
<div class="content">
<div class="lan">
<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 label="网络类型:" :label-width="formLabelWidth" prop="type">
<el-select v-model="formData.ippz_wllx" placeholder="静态IP" style="width: 200px;">
<el-form-item
label="网络类型:"
:label-width="formLabelWidth"
prop="type"
>
<el-select
v-model="formData.ippz_wllx"
placeholder="静态IP"
style="width: 200px"
>
<el-option label="静态IP" value="静态IP"></el-option>
</el-select>
</el-form-item>
@ -23,13 +36,16 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="IP地址:" :label-width="formLabelWidth" prop="ip">
<el-form-item
label="IP地址:"
:label-width="formLabelWidth"
prop="ip"
>
<el-row>
<el-col :span="5">
<el-input v-model="ippz_ip1"></el-input>
</el-col>
<el-col :span="1">.
</el-col>
<el-col :span="1">. </el-col>
<el-col :span="5">
<el-input v-model="ippz_ip2"></el-input>
</el-col>
@ -70,13 +86,16 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="网关:" :label-width="formLabelWidth" prop="ip">
<el-form-item
label="网关:"
:label-width="formLabelWidth"
prop="ip"
>
<el-row>
<el-col :span="5">
<el-input v-model="ippz_mrwg1"></el-input>
</el-col>
<el-col :span="1">.
</el-col>
<el-col :span="1">. </el-col>
<el-col :span="5">
<el-input v-model="ippz_mrwg2"></el-input>
</el-col>
@ -99,8 +118,7 @@
<el-col :span="5">
<el-input v-model="ippz_dns_sx1"></el-input>
</el-col>
<el-col :span="1">.
</el-col>
<el-col :span="1">. </el-col>
<el-col :span="5">
<el-input v-model="ippz_dns_sx2"></el-input>
</el-col>
@ -116,7 +134,6 @@
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div class="footer">
@ -124,16 +141,14 @@
<el-button @click="isShow = false"> </el-button>
</div>
</div>
</div>
</div>
</template>
<script>
import { SaveUserAnswer } from '@/api/user';
import { SaveUserAnswer, GetUserAnswer } from "@/api/user";
export default {
name: 'TestChiGate',
name: "TestChiGate",
data() {
return {
@ -172,15 +187,9 @@ export default {
count: 0,
isShow: true,
rules: {
ip: [
{ required: true, message: '请输入IP地址', trigger: 'blur' },
],
mask: [
{ required: true, message: '请输入子网掩码', trigger: 'blur' },
],
type: [
{ required: true, message: '请输入网络类型', trigger: 'blur' },
],
ip: [{ required: true, message: "请输入IP地址", trigger: "blur" }],
mask: [{ required: true, message: "请输入子网掩码", trigger: "blur" }],
type: [{ required: true, message: "请输入网络类型", trigger: "blur" }],
// client_id: [
// { required: true, message: 'SSID', trigger: 'blur' },
// ],
@ -190,10 +199,10 @@ export default {
},
};
},
mounted() {
created() {
this.GetUserAnswer();
},
mounted() {},
methods: {
Merge(value, value1, value2, value3, value4) {
@ -252,6 +261,34 @@ export default {
console.log(res);
sessionStorage.setItem("answer2", JSON.stringify(this.formData));
},
//
async GetUserAnswer() {
let { data } = await GetUserAnswer({
mark: "CHGYWG_yx",
user_id: "USER202307301109254198",
});
console.log(JSON.parse(data.data.mark_value));
let obj = JSON.parse(data.data.mark_value);
this.formData.ippz_wllx = obj.ippz_wllx;
if (obj.ippz_ip) {
this.ippz_ip1 = obj.ippz_ip.split(".")[0];
this.ippz_ip2 = obj.ippz_ip.split(".")[1];
this.ippz_ip3 = obj.ippz_ip.split(".")[2];
this.ippz_ip4 = obj.ippz_ip.split(".")[3];
this.ippz_zwym1 = obj.ippz_zwym.split(".")[0];
this.ippz_zwym2 = obj.ippz_zwym.split(".")[1];
this.ippz_zwym3 = obj.ippz_zwym.split(".")[2];
this.ippz_zwym4 = obj.ippz_zwym.split(".")[3];
this.ippz_mrwg1 = obj.ippz_mrwg.split(".")[0];
this.ippz_mrwg2 = obj.ippz_mrwg.split(".")[1];
this.ippz_mrwg3 = obj.ippz_mrwg.split(".")[2];
this.ippz_mrwg4 = obj.ippz_mrwg.split(".")[3];
this.ippz_dns_sx1 = obj.ippz_dns_sx.split(".")[0];
this.ippz_dns_sx2 = obj.ippz_dns_sx.split(".")[1];
this.ippz_dns_sx3 = obj.ippz_dns_sx.split(".")[2];
this.ippz_dns_sx4 = obj.ippz_dns_sx.split(".")[3];
}
},
},
};
</script>
@ -326,7 +363,7 @@ export default {
}
.el-col-24 {
padding-right: 32px
padding-right: 32px;
}
}
}
@ -343,7 +380,5 @@ export default {
line-height: 0.5;
}
}
}
</style>

View File

@ -178,51 +178,6 @@ export default {
sessionStorage.setItem("answer", JSON.stringify(this.formdata));
this.$router.replace("/channelconfig");
},
<<<<<<< HEAD
mounted() {
},
methods: {
async innerConfirm() {
this.outerVisible = false;
this.innerVisible = false;
let datas = sessionStorage.getItem("answer1");
console.log(JSON.parse(datas));
this.formdata = { ...JSON.parse(datas), ...this.formdata };
console.log(this.formdata);
let res = await SaveUserAnswer({
mark: "DB-IotLite_wx",
user_id: "USER202307301109254198",
mark_value: JSON.stringify(this.formdata),
});
console.log(res);
console.log(JSON.parse(res.data.data.mark_value));
sessionStorage.setItem("answer1", JSON.stringify(this.formdata));
// let res2 = await GetUserAnswer({
// mark: "DB-IotLite_wx",
// user_id: "USER202307301109254198",
// });
// console.log(res2);
this.$router.replace("/dbcollectserial");
},
},
async created() {
let res2 = await GetUserAnswer({
mark: "DB-IotLite_wx",
user_id: "USER202307301109254198",
});
console.log(res2);
let res3 = JSON.parse(res2.data.data.mark_value);
console.log(res3);
console.log(res3.wgpz_wgid);
this.formdata.wgpz_wgid = res3.wgpz_wgid;
console.log(this.formdata.wgpz_wgid);
this.formdata.wgpz_wgmc = res3.wgpz_wgmc;
this.formdata.wgpz_wglx = res3.wgpz_wglx;
}
=======
},
async created() {
let res2 = await GetUserAnswer({
@ -238,7 +193,6 @@ export default {
this.formdata.wgpz_wgmc = res3.wgpz_wgmc;
this.formdata.wgpz_wglx = res3.wgpz_wglx;
},
>>>>>>> 672924494cb6b7ae4219dd1930897a14261627bc
};
</script>

View File

@ -1,41 +1,85 @@
<template>
<div>
<!-- <div class="data_acquire">
<el-button type="info" plain @click="outerVisible = true">数据采集设备</el-button>
</div> -->
<div>
<el-dialog title="新建网关" :visible.sync="outerVisible" width="382px" v-loading="loading">
<el-form :model="formdata" :rules="rules" ref="formdata" label-width="85px" class="demo-ruleForm">
<el-dialog
title="新建网关"
:visible.sync="outerVisible"
width="382px"
v-loading="loading"
>
<el-form
:model="formdata"
:rules="rules"
ref="formdata"
label-width="85px"
class="demo-ruleForm"
>
<el-form-item label="网关名称:" prop="wgpz_wgmc">
<el-select v-model="formdata.wgpz_wgmc" placeholder="有线区网关1" style="width: 200px">
<el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
<el-select
v-model="formdata.wgpz_wgmc"
placeholder="有线区网关1"
style="width: 200px"
>
<el-option
v-for="item in options1"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="网关ID:" prop="wgpz_wgid">
<el-select v-model="formdata.wgpz_wgid" placeholder="LAN-BOX1" style="width: 200px">
<el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value">
<el-select
v-model="formdata.wgpz_wgid"
placeholder="LAN-BOX1"
style="width: 200px"
>
<el-option
v-for="item in options2"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="网关类型:" prop="wgpz_wglx">
<el-select v-model="formdata.wgpz_wglx" placeholder="lot Life 网关" style="width: 200px">
<el-option v-for="item in options3" :key="item.value" :label="item.label" :value="item.value">
<el-select
v-model="formdata.wgpz_wglx"
placeholder="lot Life 网关"
style="width: 200px"
>
<el-option
v-for="item in options3"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-form>
<el-dialog width="382px" title="系统提示" :visible.sync="innerVisible" append-to-body>
<el-dialog
width="382px"
title="系统提示"
:visible.sync="innerVisible"
append-to-body
>
<p class="inner_content" style="color: #fff !important">
请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关
</p>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="innerConfirm('formdata')">确定</el-button>
<el-button type="primary" @click="innerConfirm('formdata')"
>确定</el-button
>
<el-button @click="innerVisible = false"> </el-button>
</div>
</el-dialog>
<div slot="footer" class="dialog-footer-outer">
<el-button type="primary" @click="saveInfo('formdata')">保存</el-button>
<el-button type="primary" @click="saveInfo('formdata')"
>保存</el-button
>
<el-button @click="outerVisible = false"> </el-button>
</div>
</el-dialog>
@ -128,11 +172,10 @@ export default {
// alert('submit!');
this.innerVisible = true;
} else {
console.log('error submit!!');
console.log("error submit!!");
return false;
}
});
},
async innerConfirm() {
this.outerVisible = false;

View File

@ -2,20 +2,27 @@
<template>
<div>
<div class="tree_menu" v-show="dialogVisible">
<el-tree :data="datas" :props="defaultProps" @node-contextmenu="rightClick" default-expand-all
@node-click="treeNodeClick"></el-tree>
<el-tree
:data="datas"
:props="defaultProps"
@node-contextmenu="rightClick"
default-expand-all
@node-click="treeNodeClick"
></el-tree>
<!-- 树形控件右键组件 -->
<div v-show="menuShow" class="tree_rightmenu" :style="{ ...rightMenu }">
<el-menu class="el-menu-vertical-demo" @select="selectMenuNode" default-active="#0078FE">
<el-menu-item id="menuitem" index="1" style="font-size: 12px;">
<el-menu
class="el-menu-vertical-demo"
@select="selectMenuNode"
default-active="#0078FE"
>
<el-menu-item id="menuitem" index="1" style="font-size: 12px">
<span slot="title">新建设备</span>
</el-menu-item>
<el-menu-item index="2" style="font-size: 12px;">
<el-menu-item index="2" style="font-size: 12px">
<span slot="title"> </span>
</el-menu-item>
<el-menu-item index="3" style="font-size: 12px;">
<el-menu-item index="3" style="font-size: 12px">
<span slot="title"> </span>
</el-menu-item>
</el-menu>
@ -25,13 +32,30 @@
<!-- 网口设备 -->
<div class="pas_params">
<el-dialog title="设备属性" :visible.sync="add_passage" width="382px">
<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 label="设备ID:" :label-width="formLabelWidth" prop="sbpz_sbid">
<el-select v-model="formdata.sbpz_sbid" placeholder="" style="width: 200px;height:30px">
<el-option v-for="(item, index) in options1" :key="index" :label="item.label"
:value="item.value">
<el-form-item
label="设备ID:"
:label-width="formLabelWidth"
prop="sbpz_sbid"
>
<el-select
v-model="formdata.sbpz_sbid"
placeholder=""
style="width: 200px; height: 30px"
>
<el-option
v-for="(item, index) in options1"
:key="index"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
@ -39,10 +63,22 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="设备名称:" :label-width="formLabelWidth" prop="sbpz_sbmc">
<el-select v-model="formdata.sbpz_sbmc" placeholder="" style="width: 200px;height:30px">
<el-option v-for="(item, index) in options2" :key="index" :label="item.label"
:value="item.value">
<el-form-item
label="设备名称:"
:label-width="formLabelWidth"
prop="sbpz_sbmc"
>
<el-select
v-model="formdata.sbpz_sbmc"
placeholder=""
style="width: 200px; height: 30px"
>
<el-option
v-for="(item, index) in options2"
:key="index"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
@ -50,9 +86,16 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="MAC地址:" :label-width="formLabelWidth" prop="sbpz_sbdz">
<el-input v-model="formdata.sbpz_sbdz" placeholder=""
style="width: 200px;height:30px"></el-input>
<el-form-item
label="MAC地址:"
:label-width="formLabelWidth"
prop="sbpz_sbdz"
>
<el-input
v-model="formdata.sbpz_sbdz"
placeholder=""
style="width: 200px; height: 30px"
></el-input>
</el-form-item>
</el-col>
</el-row>
@ -67,19 +110,16 @@
<el-row>
<el-col :span="24">
<el-form-item label="基地址选择:">
<el-switch v-model="formdata.sbpz_jdzxz">
</el-switch>
<el-switch v-model="formdata.sbpz_jdzxz"> </el-switch>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click=saveDevice> </el-button>
<el-button type="primary" @click="saveDevice"> </el-button>
<el-button @click="add_passage = false"> </el-button>
</span>
</el-dialog>
</div>
</div>
</template>
@ -106,37 +146,46 @@ export default {
rightMenu: "",
dialogVisible: true,
menuShow: false,
options1: [{
options1: [
{
value: "有线区加工设备1",
label: "有线区加工设备1"
}, {
label: "有线区加工设备1",
},
{
value: "无线区加工设备1",
label: "无线区加工设备1"
}],
options2: [{
label: "无线区加工设备1",
},
],
options2: [
{
value: "有线区精雕1",
label: "有线区精雕1",
}, {
},
{
value: "无线区精雕1",
label: "无线区精雕1",
}],
datas: [{
label: 'Gateway',
children: [{
label: '数据采集',
children: [{
label: 'I/O点'
},
],
datas: [
{
label: "Gateway",
children: [
{
label: "数据采集",
children: [
{
label: "I/O点",
},
{
label: '用户点',
label: "用户点",
},
{
label: '计算点',
label: "计算点",
},
{
label: '系统点',
label: "系统点",
},
]
],
},
{
label: "用户点",

View File

@ -2,37 +2,72 @@
<template>
<div>
<!-- <div> <el-button type="info" plain @click="dialogFormVisible = true">IP设置</el-button></div> -->
<el-dialog title="IP设置" :visible.sync="dialogFormVisible" :append-to-body="true" width="894px" v-loading="loading">
<el-dialog
title="IP设置"
:visible.sync="dialogFormVisible"
:append-to-body="true"
width="894px"
v-loading="loading"
>
<div class="form_content">
<el-form :model="formdata" :label-position="labelPosition" label-width="80px" :rules="rules_ippz_wirle"
ref="formdata">
<el-form
:model="formdata"
:label-position="labelPosition"
label-width="80px"
:rules="rules_ippz_wirle"
ref="formdata"
>
<div class="wired">
<el-row>
<el-col :span="12">
<el-form-item label="网口:" :label-width="formLabelWidth" prop="ippz_wangkou">
<el-select v-model="formdata.ippz_wangkou" placeholder="ETHO" style="width: 200px; height: 30px">
<el-form-item
label="网口:"
:label-width="formLabelWidth"
prop="ippz_wangkou"
>
<el-select
v-model="formdata.ippz_wangkou"
placeholder="ETHO"
style="width: 200px; height: 30px"
>
<el-option label="ETH0" value="ETH0"></el-option>
<el-option label="ETH1" value="ETH1"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="默认网关:" :label-width="formLabelWidth" prop="ippz_mrwg">
<el-form-item
label="默认网关:"
:label-width="formLabelWidth"
prop="ippz_mrwg"
>
<el-row>
<el-col :span="5"><el-input v-model="ippz_mrwg1" maxlength="3"></el-input></el-col>
<el-col :span="5"
><el-input v-model="ippz_mrwg1" maxlength="3"></el-input
></el-col>
<el-col :span="1">.</el-col>
<el-col :span="5"><el-input v-model="ippz_mrwg2" maxlength="3"></el-input></el-col>
<el-col :span="5"
><el-input v-model="ippz_mrwg2" maxlength="3"></el-input
></el-col>
<el-col :span="1">.</el-col>
<el-col :span="5"><el-input v-model="ippz_mrwg3" maxlength="3"></el-input></el-col>
<el-col :span="5"
><el-input v-model="ippz_mrwg3" maxlength="3"></el-input
></el-col>
<el-col :span="1">.</el-col>
<el-col :span="5"><el-input v-model="ippz_mrwg4" maxlength="3"></el-input></el-col>
<el-col :span="5"
><el-input v-model="ippz_mrwg4" maxlength="3"></el-input
></el-col>
</el-row>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="子网掩码:" :label-width="formLabelWidth" prop="ippz_zwym">
<el-form-item
label="子网掩码:"
:label-width="formLabelWidth"
prop="ippz_zwym"
>
<el-row>
<el-col :span="5">
<el-input v-model="ippz_zwym1" maxlength="3"></el-input>
@ -53,7 +88,11 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="IP地址:" :label-width="formLabelWidth" prop="ippz_ip">
<el-form-item
label="IP地址:"
:label-width="formLabelWidth"
prop="ippz_ip"
>
<el-row>
<el-col :span="5">
<el-input v-model="ippz_ip1" maxlength="3"></el-input>
@ -76,7 +115,11 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="首选DNS:" :label-width="formLabelWidth" prop="ippz_dns_sx">
<el-form-item
label="首选DNS:"
:label-width="formLabelWidth"
prop="ippz_dns_sx"
>
<el-row>
<el-col :span="5">
<el-input v-model="ippz_dns_sx1" maxlength="3"></el-input>
@ -97,7 +140,11 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备选DNS:" :label-width="formLabelWidth" prop="ippz_dns_by">
<el-form-item
label="备选DNS:"
:label-width="formLabelWidth"
prop="ippz_dns_by"
>
<el-row>
<el-col :span="5">
<el-input v-model="ippz_dns_by1" maxlength="3"></el-input>
@ -112,7 +159,11 @@
</el-col>
<el-col :span="1">.</el-col>
<el-col :span="5">
<el-input v-model="ippz_dns_by4" maxlength="3" type="number"></el-input>
<el-input
v-model="ippz_dns_by4"
maxlength="3"
type="number"
></el-input>
</el-col>
</el-row>
</el-form-item>
@ -120,11 +171,20 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="MAC地址:" :label-width="formLabelWidth" prop="ippz_mac">
<el-form-item
label="MAC地址:"
:label-width="formLabelWidth"
prop="ippz_mac"
>
<el-row>
<el-col :span="24" class="mac">
<el-input style="width: 200px; height: 30px" v-model="formdata.ippz_mac"></el-input><el-button
v-copy="ippz_mac" @click="CopyText">复制</el-button>
<el-input
style="width: 200px; height: 30px"
v-model="formdata.ippz_mac"
></el-input
><el-button v-copy="ippz_mac" @click="CopyText"
>复制</el-button
>
</el-col>
</el-row>
</el-form-item>
@ -201,28 +261,28 @@ export default {
{ required: true, message: "请输入网口", trigger: "change" },
],
ippz_zwym: [
{ required: true, message: '请输入子网掩码', trigger: 'blur' },
{ type: 'number', message: '子网掩码必须为数字值' }
{ required: true, message: "请输入子网掩码", trigger: "blur" },
{ type: "number", message: "子网掩码必须为数字值" },
],
ippz_ip: [
{ required: true, message: '请输入IP地址', trigger: 'blur' },
{ type: 'number', message: '子网掩码必须为数字值' }
{ required: true, message: "请输入IP地址", trigger: "blur" },
{ type: "number", message: "子网掩码必须为数字值" },
],
ippz_ip: [{ required: true, message: "请输入IP地址", trigger: "blur" }],
ippz_mrwg: [
{ required: true, message: '请输入默认网关', trigger: 'blur' },
{ type: 'number', message: '默认网关必须为数字值' }
{ required: true, message: "请输入默认网关", trigger: "blur" },
{ type: "number", message: "默认网关必须为数字值" },
],
ippz_dns_sx: [
{ required: true, message: '请输入首选DNS', trigger: 'blur' },
{ type: 'number', message: '首选DNS必须为数字值' }
{ required: true, message: "请输入首选DNS", trigger: "blur" },
{ type: "number", message: "首选DNS必须为数字值" },
],
ippz_dns_by: [
{ required: true, message: '请输入备选DNS', trigger: 'blur' },
{ type: 'number', message: '备选DNS必须为数字值' }
{ required: true, message: "请输入备选DNS", trigger: "blur" },
{ type: "number", message: "备选DNS必须为数字值" },
],
ippz_mac: [
{ required: true, message: '请输入MAC地址', trigger: 'blur' },
{ required: true, message: "请输入MAC地址", trigger: "blur" },
],
},
};
@ -278,7 +338,6 @@ export default {
// ,
async saveAll() {
this.dialogFormVisible = false;
this.isSaveAnswer = true;
this.formdata.ippz_wangkou = this.ippz_wangkou;
@ -338,8 +397,7 @@ export default {
type: "success",
});
},
},
async created() {
async GetUserAnswer() {
this.loading = true;
let res2 = await GetUserAnswer({
mark: "DB-IotLite_yx",
@ -377,6 +435,8 @@ export default {
this.ippz_dns_by3 = this.SliceData(this.ippz_dns_by)[2];
this.ippz_dns_by4 = this.SliceData(this.ippz_dns_by)[3];
},
},
async created() {},
mounted() {},
directives: {
copy: {

View File

@ -1,7 +1,5 @@
<template>
<div>
<!-- <el-button @click="dialogVisible = true">网络管理</el-button> -->
<el-dialog
title="网络管理"
:visible.sync="dialogVisible"

View File

@ -197,35 +197,35 @@ export default {
};
</script>
<style scoped lang="less">
/deep/ .ip_address {
.el-input__inner {
height: 30px;
text-align: center;
padding: 0;
}
// /deep/ .ip_address {
// .el-input__inner {
// height: 30px;
// text-align: center;
// padding: 0;
// }
.el-row {
display: flex;
align-items: flex-end;
// .el-row {
// display: flex;
// align-items: flex-end;
.el-col-1 {
padding: 0px 2px;
color: black;
text-align: left;
line-height: 32px;
height: 20px;
}
// .el-col-1 {
// padding: 0px 2px;
// color: black;
// text-align: left;
// line-height: 32px;
// height: 20px;
// }
.el-col-5 {
width: 43px;
height: 30px;
}
// .el-col-5 {
// width: 43px;
// height: 30px;
// }
.el-col-24 {
padding-right: 152px;
}
}
}
// .el-col-24 {
// padding-right: 152px;
// }
// }
// }
.el-table--enable-row-hover .el-table__body tr:hover > td {
background-color: transparent !important;
}