diff --git a/.history/src/components/AddPolicy_20231108084048.vue b/.history/src/components/AddPolicy_20231108084048.vue new file mode 100644 index 0000000..bf475b9 --- /dev/null +++ b/.history/src/components/AddPolicy_20231108084048.vue @@ -0,0 +1,1080 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . + + + + + + + + . + + + + + + + + . + + + + + + + + . + + + + + + + + + + . + + + + + + + + . + + + + + + + + . + + + + + + + + . + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . + + + + + + + + . + + + + + + + + . + + + + + + + + . + + + + + + + + + + . + + + + + + + + . + + + + + + + + . + + + + + + + + . + + + + + + + + + + + + + + + + + + + + + + + + + + + + 记录日志: + + + + 命令列表 + + 新增命令 + + + + + + {{ scope.$index + 1 }} + + + + + + + + + + + + 编辑 + 删除 + + + + + 保 存 + 取 消 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 保存 + 取 消 + + + + + + + + + diff --git a/.history/src/components/DataAcquire_20231108084056.vue b/.history/src/components/DataAcquire_20231108084056.vue new file mode 100644 index 0000000..43f738e --- /dev/null +++ b/.history/src/components/DataAcquire_20231108084056.vue @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关 + + + + + + + + + + + + diff --git a/src/App.vue b/src/App.vue index 29b56bf..417d38c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -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%; } diff --git a/src/components/AddPolicy.vue b/src/components/AddPolicy.vue index 8a7c924..bf475b9 100644 --- a/src/components/AddPolicy.vue +++ b/src/components/AddPolicy.vue @@ -1,15 +1,34 @@ - - + + - - + + @@ -17,8 +36,16 @@ - - + + @@ -27,7 +54,10 @@ - + . @@ -35,7 +65,10 @@ - + . @@ -43,7 +76,10 @@ - + . @@ -51,7 +87,10 @@ - + . @@ -61,7 +100,10 @@ - + . @@ -69,7 +111,10 @@ - + . @@ -77,7 +122,10 @@ - + . @@ -85,7 +133,10 @@ - + . @@ -95,8 +146,17 @@ - - + + @@ -108,24 +168,46 @@ - - + + - - + + - + - + @@ -139,7 +221,10 @@ - + . @@ -147,7 +232,10 @@ - + . @@ -155,7 +243,10 @@ - + . @@ -163,7 +254,10 @@ - + . @@ -173,7 +267,10 @@ - + . @@ -181,7 +278,10 @@ - + . @@ -189,7 +289,10 @@ - + . @@ -197,7 +300,10 @@ - + . @@ -218,8 +324,16 @@ - - + + @@ -229,11 +343,14 @@ 记录日志: - + " + > 命令列表 @@ -244,7 +361,8 @@ {{ scope.$index + 1 }} - + @@ -255,7 +373,12 @@ - 编辑 + 编辑 删除 @@ -267,14 +390,31 @@ - - + + - + + @@ -282,7 +422,12 @@ - + @@ -301,14 +446,21 @@ - - - + - + @@ -715,7 +867,7 @@ export default { created() { this.GetUserAnswer(); }, - mounted() { }, + mounted() {}, methods: { //保存 @@ -882,7 +1034,7 @@ export default { \ No newline at end of file + diff --git a/src/components/DataAcquisition.vue b/src/components/DataAcquisition.vue index c7c837b..ed5ce8d 100644 --- a/src/components/DataAcquisition.vue +++ b/src/components/DataAcquisition.vue @@ -1,41 +1,85 @@ - - - + + - - + + - - + + - - + + - - + + 请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关 @@ -50,7 +94,7 @@ export default { data() { return { - loading:false, + loading: false, options1: [ { value: "有线区网关1", @@ -119,7 +163,7 @@ export default { }; }, - mounted() { }, + mounted() {}, methods: { saveInfo(formName) { @@ -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; @@ -158,12 +201,12 @@ export default { }, }, async created() { - this.loading=true; + this.loading = true; let res2 = await GetUserAnswer({ mark: "DB-IotLite_yx", user_id: "USER202307301109254198", }); - this.loading=false; + this.loading = false; console.log(res2); let res3 = JSON.parse(res2.data.data.mark_value); // console.log(res3); diff --git a/src/components/DeviceVIew.vue b/src/components/DeviceVIew.vue index 090ea9a..def2218 100644 --- a/src/components/DeviceVIew.vue +++ b/src/components/DeviceVIew.vue @@ -1,380 +1,429 @@ - - - - - - - - - - 新建设备 - - - 删 除 - - - 取 消 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 禁用地址 - - - - - - - - - - - - - - 保 存 - 取 消 - - - - - + + + + + + + + 新建设备 + + + 删 除 + + + 取 消 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 禁用地址 + + + + + + + + + + + + + 保 存 + 取 消 + + + + diff --git a/src/components/GateWay.vue b/src/components/GateWay.vue index 90c0819..2a6d797 100644 --- a/src/components/GateWay.vue +++ b/src/components/GateWay.vue @@ -2,37 +2,72 @@ - + - + - - + + - + - + . - + . - + . - + - + @@ -53,7 +88,11 @@ - + @@ -76,7 +115,11 @@ - + @@ -97,7 +140,11 @@ - + @@ -112,7 +159,11 @@ . - + @@ -120,11 +171,20 @@ - + - 复制 + 复制 @@ -150,7 +210,7 @@ export default { return { disabled: true, // 判断是否保存过 - loading:false, + loading: false, formdata: { ippz_wangkou: "ETH0", ippz_zwym: "2", @@ -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,46 +397,47 @@ export default { type: "success", }); }, + async GetUserAnswer() { + this.loading = true; + let res2 = await GetUserAnswer({ + mark: "DB-IotLite_yx", + user_id: "USER202307301109254198", + }); + this.loading = false; + console.log(res2); + let res3 = JSON.parse(res2.data.data.mark_value); + console.log(res3); + this.ippz_wangkou = res3.ippz_wangkou; + this.ippz_mrwg = res3.ippz_mrwg; + this.ippz_ip = res3.ippz_ip; + this.ippz_zwym = res3.ippz_zwym; + this.ippz_dns_sx = res3.ippz_dns_sx; + this.ippz_dns_by = res3.ippz_dns_by; + this.ippz_mac = this.ippz_mac; + this.ippz_mrwg1 = this.SliceData(this.ippz_mrwg)[0]; + this.ippz_mrwg2 = this.SliceData(this.ippz_mrwg)[1]; + this.ippz_mrwg3 = this.SliceData(this.ippz_mrwg)[2]; + this.ippz_mrwg4 = this.SliceData(this.ippz_mrwg)[3]; + this.ippz_ip1 = this.SliceData(this.ippz_ip)[0]; + this.ippz_ip2 = this.SliceData(this.ippz_ip)[1]; + this.ippz_ip3 = this.SliceData(this.ippz_ip)[2]; + this.ippz_ip4 = this.SliceData(this.ippz_ip)[3]; + this.ippz_zwym1 = this.SliceData(this.ippz_zwym)[0]; + this.ippz_zwym2 = this.SliceData(this.ippz_zwym)[1]; + this.ippz_zwym3 = this.SliceData(this.ippz_zwym)[2]; + this.ippz_zwym4 = this.SliceData(this.ippz_zwym)[3]; + this.ippz_dns_sx1 = this.SliceData(this.ippz_dns_sx)[0]; + this.ippz_dns_sx2 = this.SliceData(this.ippz_dns_sx)[1]; + this.ippz_dns_sx3 = this.SliceData(this.ippz_dns_sx)[2]; + this.ippz_dns_sx4 = this.SliceData(this.ippz_dns_sx)[3]; + this.ippz_dns_by1 = this.SliceData(this.ippz_dns_by)[0]; + this.ippz_dns_by2 = this.SliceData(this.ippz_dns_by)[1]; + this.ippz_dns_by3 = this.SliceData(this.ippz_dns_by)[2]; + this.ippz_dns_by4 = this.SliceData(this.ippz_dns_by)[3]; + }, }, - async created() { - this.loading=true; - let res2 = await GetUserAnswer({ - mark: "DB-IotLite_yx", - user_id: "USER202307301109254198", - }); - this.loading=false; - console.log(res2); - let res3 = JSON.parse(res2.data.data.mark_value); - console.log(res3); - this.ippz_wangkou = res3.ippz_wangkou; - this.ippz_mrwg = res3.ippz_mrwg; - this.ippz_ip = res3.ippz_ip; - this.ippz_zwym = res3.ippz_zwym; - this.ippz_dns_sx = res3.ippz_dns_sx; - this.ippz_dns_by = res3.ippz_dns_by; - this.ippz_mac = this.ippz_mac; - this.ippz_mrwg1 = this.SliceData(this.ippz_mrwg)[0]; - this.ippz_mrwg2 = this.SliceData(this.ippz_mrwg)[1]; - this.ippz_mrwg3 = this.SliceData(this.ippz_mrwg)[2]; - this.ippz_mrwg4 = this.SliceData(this.ippz_mrwg)[3]; - this.ippz_ip1 = this.SliceData(this.ippz_ip)[0]; - this.ippz_ip2 = this.SliceData(this.ippz_ip)[1]; - this.ippz_ip3 = this.SliceData(this.ippz_ip)[2]; - this.ippz_ip4 = this.SliceData(this.ippz_ip)[3]; - this.ippz_zwym1 = this.SliceData(this.ippz_zwym)[0]; - this.ippz_zwym2 = this.SliceData(this.ippz_zwym)[1]; - this.ippz_zwym3 = this.SliceData(this.ippz_zwym)[2]; - this.ippz_zwym4 = this.SliceData(this.ippz_zwym)[3]; - this.ippz_dns_sx1 = this.SliceData(this.ippz_dns_sx)[0]; - this.ippz_dns_sx2 = this.SliceData(this.ippz_dns_sx)[1]; - this.ippz_dns_sx3 = this.SliceData(this.ippz_dns_sx)[2]; - this.ippz_dns_sx4 = this.SliceData(this.ippz_dns_sx)[3]; - this.ippz_dns_by1 = this.SliceData(this.ippz_dns_by)[0]; - this.ippz_dns_by2 = this.SliceData(this.ippz_dns_by)[1]; - this.ippz_dns_by3 = this.SliceData(this.ippz_dns_by)[2]; - this.ippz_dns_by4 = this.SliceData(this.ippz_dns_by)[3]; - }, - mounted() { }, + async created() {}, + mounted() {}, directives: { copy: { bind(el, { value }) { diff --git a/src/components/NetworkManagement.vue b/src/components/NetworkManagement.vue index 1cffdb4..396ca05 100644 --- a/src/components/NetworkManagement.vue +++ b/src/components/NetworkManagement.vue @@ -1,7 +1,5 @@ - -
+ 请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关 +
+ + 请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关
请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关