From b6a8ddacf15659e9513df46f4aa98acbb1425d97 Mon Sep 17 00:00:00 2001 From: luoshiwen <1140456899@qq.com> Date: Wed, 25 Dec 2024 08:57:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ChiClone.vue | 7 +- src/components/ChiClonewifi.vue | 7 +- src/components/ChiDevice.vue | 25 ++----- src/components/ChiGate.vue | 2 +- src/components/ChiGateway.vue | 8 ++- src/components/ChiWireld.vue | 4 +- src/components/CloneWifi.vue | 6 +- src/components/CollectionView.vue | 52 +++----------- src/components/CollectionWifi.vue | 8 ++- src/components/SerialPort.vue | 4 ++ src/language/en.js | 115 ++++++++++++++++-------------- src/language/index.js | 2 +- src/language/zh.js | 13 +++- src/main.js | 11 ++- 14 files changed, 131 insertions(+), 133 deletions(-) diff --git a/src/components/ChiClone.vue b/src/components/ChiClone.vue index 60f77cb..a0618bd 100644 --- a/src/components/ChiClone.vue +++ b/src/components/ChiClone.vue @@ -697,7 +697,7 @@ export default { // }, async saveClone() { var obj = { - // mqtt_qiyong: String(Number(this.formData.mqtt_qiyong)), + mqtt_qiyong: String(Number(this.mqtt_qiyong)), mqtt_ip: this.mqtt_ip1 + "." + @@ -715,6 +715,7 @@ export default { mqtt_cjd_tagid: this.tableData[0].mqtt_cjd_tagid, }; let datas = { ...this.formData, ...obj }; + console.log(this.formData,'xxxxxxxxxx'); let res = await SaveUserAnswer({ mark: "CHGYWG_yx", user_id: this.user_id, @@ -752,7 +753,7 @@ export default { // console.log(JSON.parse(data.data.mark_value)); let obj = JSON.parse(data.data.mark_value); if (obj.mqtt_ip) { - // this.formData.mqtt_qiyong = Boolean(Number(obj.mqtt_qiyong)); + this.mqtt_qiyong = Boolean(Number(obj.mqtt_qiyong)); // console.log(obj.mqtt_qiyong); // console.log(this.formData.mqtt_qiyong); this.mqtt_ip1 = obj.mqtt_ip.split(".")[0]; @@ -810,7 +811,7 @@ export default { // console.log(JSON.parse(data.data.mark_value)); let obj = JSON.parse(res.data.data.r3); if (obj.mqtt_ip) { - // this.formData.mqtt_qiyong = Boolean(Number(obj.mqtt_qiyong)); + this.mqtt_qiyong = Boolean(Number(obj.mqtt_qiyong)); // console.log(obj.mqtt_qiyong); // console.log(this.formData.mqtt_qiyong); this.mqtt_ip1 = obj.mqtt_ip.split(".")[0]; diff --git a/src/components/ChiClonewifi.vue b/src/components/ChiClonewifi.vue index cdcc12d..08cf436 100644 --- a/src/components/ChiClonewifi.vue +++ b/src/components/ChiClonewifi.vue @@ -360,7 +360,6 @@ export default { // mqtt_tls: false, // mqtt_clearsession: false, mqtt_qos: "0", - ippz_ssid: "", ippz_rzfs: "", //答案：WPA2-PSK ippz_jmfs: "", //答案：AES @@ -670,7 +669,7 @@ export default { // }, async saveClone() { var obj = { - mqtt_qiyong: String(Number(this.formData.mqtt_qiyong)), + mqtt_qiyong: this.mqtt_qiyong?'1':'0', mqtt_ip: this.mqtt_ip1 + "." + @@ -730,6 +729,7 @@ export default { } let obj = JSON.parse(data.data.mark_value); if (obj.mqtt_ip) { + this.mqtt_qiyong = obj.mqtt_qiyong==='1'; this.formData.mqtt_ip = obj.mqtt_ip; this.mqtt_ip1 = obj.mqtt_ip.split(".")[0]; this.mqtt_ip2 = obj.mqtt_ip.split(".")[1]; @@ -781,6 +781,7 @@ export default { } let obj = JSON.parse(res.data.data.r3); if (obj.mqtt_ip) { + this.mqtt_qiyong = obj.mqtt_qiyong==='1'; this.formData.mqtt_ip = obj.mqtt_ip; this.mqtt_ip1 = obj.mqtt_ip.split(".")[0]; this.mqtt_ip2 = obj.mqtt_ip.split(".")[1]; @@ -824,7 +825,7 @@ export default { this.tableData[0].mqtt_cjd_tagid = obj.cjdpz_tagid; }) } - + console.log(this.formData,'手机壳i'); }, async sendTree() { let result = await SendTree({ diff --git a/src/components/ChiDevice.vue b/src/components/ChiDevice.vue index 08b1766..7dca859 100644 --- a/src/components/ChiDevice.vue +++ b/src/components/ChiDevice.vue @@ -461,22 +461,7 @@ export default { sbpz_ip3: "", sbpz_ip4: "", firstlabel: "", - options1: [ - { - value: "有线区精雕2", - label: "有线区精雕2", - }, - { - value: "无线区精雕2", - label: "无线区精雕2", - }, - ], - options2: [ - { - value: "05", - label: "05", - }, - ], + options1: this.$t('reconnoitreConfiguration.options1'), options3: [ { value: "06", @@ -988,9 +973,11 @@ export default { user_id: this.user_id, type: "3", }); - console.log(res); - console.log(JSON.parse(res.data.data.data)); - this.trees = JSON.parse(res.data.data.data); + if(this.$i18n.locale==='zh'){ + this.trees = JSON.parse(res.data.data.r2); + }else{ + this.trees = JSON.parse(res.data.data.data); + } }, //网关配置的信息 async submitGate() { diff --git a/src/components/ChiGate.vue b/src/components/ChiGate.vue index 0abcd61..2b7522e 100644 --- a/src/components/ChiGate.vue +++ b/src/components/ChiGate.vue @@ -404,7 +404,7 @@ export default { } } /deep/ .zhContent{ - margin: 62px; + margin: 30px; } /deep/ .footer { diff --git a/src/components/ChiGateway.vue b/src/components/ChiGateway.vue index b978111..1e9b791 100644 --- a/src/components/ChiGateway.vue +++ b/src/components/ChiGateway.vue @@ -170,9 +170,11 @@ export default { user_id: this.user_id, type: "3", }); - console.log(res); - console.log(JSON.parse(res.data.data.data)); - this.trees = JSON.parse(res.data.data.data); + if(this.$i18n.locale==='zh'){ + this.trees = JSON.parse(res.data.data.r2); + }else{ + this.trees = JSON.parse(res.data.data.data); + } }, // 登陆时进行校验 submitForm() { diff --git a/src/components/ChiWireld.vue b/src/components/ChiWireld.vue index 338e8ba..0587000 100644 --- a/src/components/ChiWireld.vue +++ b/src/components/ChiWireld.vue @@ -15,8 +15,8 @@ - - + + diff --git a/src/components/CloneWifi.vue b/src/components/CloneWifi.vue index 94628bd..7b7be6b 100644 --- a/src/components/CloneWifi.vue +++ b/src/components/CloneWifi.vue @@ -871,7 +871,11 @@ export default { let res = await GetTree({ user_id: this.user_id, type: "2" }); // console.log(res); // console.log(JSON.parse(res.data.data.data)); - this.trees = JSON.parse(res.data.data.data); + if(this.$i18n.locale==='zh'){ + this.trees = JSON.parse(res.data.data.r2); + }else{ + this.trees = JSON.parse(res.data.data.data); + } }, //网关信息配置 diff --git a/src/components/CollectionView.vue b/src/components/CollectionView.vue index 3bc3d77..407c558 100644 --- a/src/components/CollectionView.vue +++ b/src/components/CollectionView.vue @@ -802,25 +802,16 @@ export default { // }, rulesGate: { wgpz_wgmc: [ - { required: true, message: "请选择网关名称", trigger: "blur" }, + { required: true, message: this.$t('dbcollectiongate.rules.wgpz_wgmc'), trigger: "blur" }, ], wgpz_wgid: [ - { required: true, message: "请选择网关id", trigger: "blur" }, + { required: true, message: this.$t('dbcollectiongate.rules.wgpz_wgid'), trigger: "blur" }, ], wgpz_wglx: [ - { required: true, message: "请选择网关类型", trigger: "blur" }, + { required: true, message: this.$t('dbcollectiongate.rules.wgpz_wglx'), trigger: "blur" }, ], }, - opts1: [ - { - value: "有线区网关1", - label: "有线区网关1", - }, - { - value: "无线区网关1", - label: "无线区网关1", - }, - ], + opts1: this.$t('dbcollectiongate.options1'), opts2: [ { value: "LAN-BOX1", @@ -831,32 +822,7 @@ export default { label: "WLAN-BOX1", }, ], - opts3: [ - { - value: "loT Lite网关", - label: "loT Lite网关", - }, - { - value: "MODBUS网关", - label: "MODBUS网关", - }, - { - value: "BACNET网关", - label: "BACNET网关", - }, - { - value: "OPC UA网关", - label: "OPC UA网关", - }, - { - value: "OPC DA网关", - label: "OPC DA网关", - }, - { - value: "loT网关", - label: "loT网关", - }, - ], + opts3: this.$t('dbcollectiongate.options3'), }; }, methods: { @@ -1342,11 +1308,11 @@ export default { }); console.log(res); console.log(JSON.parse(res.data.data.data)); - // if(this.$i18n.locale==='zh'){ - // this.trees = JSON.parse(res.data.data.r2); - // }else{ + if(this.$i18n.locale==='zh'){ + this.trees = JSON.parse(res.data.data.r2); + }else{ this.trees = JSON.parse(res.data.data.data); - // } + } }, diff --git a/src/components/CollectionWifi.vue b/src/components/CollectionWifi.vue index 5b9c9fb..f9450e7 100644 --- a/src/components/CollectionWifi.vue +++ b/src/components/CollectionWifi.vue @@ -1156,9 +1156,11 @@ export default { // user_id: "USER202307301114011710", type: "2", }); - console.log(res); - console.log(JSON.parse(res.data.data.data)); - this.trees = JSON.parse(res.data.data.data); + if(this.$i18n.locale==='zh'){ + this.trees = JSON.parse(res.data.data.r2); + }else{ + this.trees = JSON.parse(res.data.data.data); + } }, //网关信息配置 diff --git a/src/components/SerialPort.vue b/src/components/SerialPort.vue index 2156ed1..0665560 100644 --- a/src/components/SerialPort.vue +++ b/src/components/SerialPort.vue @@ -1329,7 +1329,11 @@ export default { }).then((res) => { console.log(res); console.log(JSON.parse(res.data.data.data)); + if(this.$i18n.locale==='zh'){ + this.trees = JSON.parse(res.data.data.r2); + }else{ this.trees = JSON.parse(res.data.data.data); + } }); } this.GetUserAnswer(); diff --git a/src/language/en.js b/src/language/en.js index 8798368..3b84463 100644 --- a/src/language/en.js +++ b/src/language/en.js @@ -32,6 +32,7 @@ export default { copy: '复制',//拷贝 networkType: '网络类型',//网络类型 gateWay: '网关:',//网关 + staticIP: '静态IP',//静态IP // 校验 rules: { ippz_wllx: '请输入网络类型',//请输入网络类型 @@ -62,20 +63,20 @@ export default { encryptionMethod: '加密方式:',//加密方式 certificationMethod: '认证方式:',//认证方式- clientSSID: '客户端SSID:',//客户端SSID - rules:{ + rules: { ippz_zwym: '请输入子网掩码', //请输入子网掩码 - ippz_zwym1:'请输入有效子网掩码',//请输入有效子网掩码 - ippz_ip:'请输入IP地址',//请输入IP地址 - ippz_ip1:'请输入有效IP地址',//请输入有效IP地址 + ippz_zwym1: '请输入有效子网掩码',//请输入有效子网掩码 + ippz_ip: '请输入IP地址',//请输入IP地址 + ippz_ip1: '请输入有效IP地址',//请输入有效IP地址 ippz_mrwg: '请输入的网关地址',//请输入的网关地址 ippz_mrwg1: '请输入有效的网关地址',//请输入有效的网关地址 - ippz_dns_sx:'请输入的主DNS服务器地址',//请输入的主DNS服务器地址 - ippz_dns_sx1:'请输入有效的主DNS服务器地址',//请输入有效的主DNS服务器地址 + ippz_dns_sx: '请输入的主DNS服务器地址',//请输入的主DNS服务器地址 + ippz_dns_sx1: '请输入有效的主DNS服务器地址',//请输入有效的主DNS服务器地址 ippz_dns_by: '请输入备用的服务器地址',//请输入备用的服务器地址 ippz_dns_by1: '请输入有效的备用的服务器地址', - ippz_mac:"请输入mac地址",//请输入mac地址 - ippz_wifi_ssid:"请输入SSID", //请输入SSID - ippz_wifi_mm:"请输入密码",//请输入密码 + ippz_mac: "请输入mac地址",//请输入mac地址 + ippz_wifi_ssid: "请输入SSID", //请输入SSID + ippz_wifi_mm: "请输入密码",//请输入密码 } }, //DB/斥候-有线无线网关配置 @@ -207,7 +208,7 @@ export default { deviceID: '设备ID:',//设备ID deviceName: '设备名称:',//设备名称 MACAddress: 'MAC地址:',//MAC地址 - deviceAddress:'设备地址:',//设备地址 + deviceAddress: '设备地址:',//设备地址 disableDevice: '禁用地址',//禁用地址 addressSelection: '基地址选择',//基地址选择 options1: [ @@ -230,13 +231,13 @@ export default { label: "无线区精雕1", }, ], - + // 校验 rules: { sbpz_sbid: '请输入设备ID',//请输入设备ID sbpz_sbmc: '请输入设备名称',//请输入设备名称 sbpz_mac: '请输入MAC地址',//请输入设备地址 - sbpz_sbdz:'请输入设备地址' + sbpz_sbdz: '请输入设备地址' } }, // DB-数据采集 @@ -249,7 +250,7 @@ export default { byteOrder: '字节序',//字节序 readWrite: '读写属性',//读写属性 Multiplier: '倍率',//倍率 - uploadMode:'上传模式',//上传模式 + uploadMode: '上传模式',//上传模式 options7: [ { value: "读写",//读写 @@ -324,7 +325,17 @@ export default { sbpz_cjcgsj: "请输入采集超过时间",//请输入采集超过时间 sbpz_zqsbonchange: "周期上报Onchange数据",//周期上报Onchange数据 sbpz_txsjjg: "请输入通讯时间间隔",//请输入通讯时间间隔 - } + }, + options1: [ + { + value: "有线区精雕2", + label: "有线区精雕2", + }, + { + value: "无线区精雕2", + label: "无线区精雕2", + }, + ] }, // 斥候网关mqtt chmqtt: { @@ -336,13 +347,13 @@ export default { realTimePublish: '实施数据发布主题:',//实施数据发布主题 deviceName: '设备名称',//设备名称 release: '信息发布',//信息发布 - rules:{ - mqtt_ip:'请输入IP地址',//请输入IP地址 - mqtt_ip1:'请输入有效IP地址',//请输入有效IP地址 - mqtt_wgsn:"请输入网关SN",//请输入网关SN - mqtt_port:"请输入端口",//请输入端口 - mqtt_keepalive:"请输入KeepAlive",//请输入KeepAlive - mqtt_publishing:"请输入主题",//请输入主题 + rules: { + mqtt_ip: '请输入IP地址',//请输入IP地址 + mqtt_ip1: '请输入有效IP地址',//请输入有效IP地址 + mqtt_wgsn: "请输入网关SN",//请输入网关SN + mqtt_port: "请输入端口",//请输入端口 + mqtt_keepalive: "请输入KeepAlive",//请输入KeepAlive + mqtt_publishing: "请输入主题",//请输入主题 // mqtt_qos:"Please enter Gateway SN number",//请输入上传周期 } }, @@ -430,9 +441,9 @@ export default { encryptionMode: '加密方式:',//加密方式 encryptionAlgorithm: '加密算法:',//加密算法 password: '密码:',//密码 - mode:'模式',//模式 - Wireless:'无线区无线网',//无线区无线网 - WirelessName:'无线网名称',//无线网名称 + mode: '模式',//模式 + Wireless: '无线区无线网',//无线区无线网 + WirelessName: '无线网名称',//无线网名称 }, //工业网闸配置-网络管理 networkmanagement: { @@ -474,34 +485,34 @@ export default { Operation: '操作',//操作 }, - //工业网闸配置-策略管理-添加策略 - addstrategy:{ - title:'添加策略:',//添加策略 - name:'名称:',//名称 - protocol:'协议:',//协议 - workingMode:'工作模式:',//工作模式 - undefinedCommand:'未定义命令:',//未定义命令 - sourceObject:'源对象',//源对象 - sourcePort:'源端口',//源端口 - targetObject:'目的对象',//目的对象 - targetPort:'目的端口:',//目的端口 - entranceGateway:'入口网关',//入口网关 - entranceNetworkCard:'入口网卡',//入口网卡 - entranceIP:'入口IP',//入口IP - exportGateway:'出口网关',//出口网关 - exportNetworkCard:'出口网卡',//出口网卡 - exportIP:'出口IP',//出口IP - recordLogs:'记录日志',//记录日志 - commandList:'命令列表',//命令列表 - createCommand:'新增命令',//新增命令 - num:'序号',//序号 - command:'命令(功能码)',//命令(功能码) - startingAddress:'起始地址',//起始地址 - addressLength:'地址长度',//地址长度 - description:'描述',//描述 - action:'动作',//动作 - Operation:'操作',//操作 - deviceID:'设备ID',//设备ID + //工业网闸配置-策略管理-添加策略 + addstrategy: { + title: '添加策略:',//添加策略 + name: '名称:',//名称 + protocol: '协议:',//协议 + workingMode: '工作模式:',//工作模式 + undefinedCommand: '未定义命令:',//未定义命令 + sourceObject: '源对象',//源对象 + sourcePort: '源端口',//源端口 + targetObject: '目的对象',//目的对象 + targetPort: '目的端口:',//目的端口 + entranceGateway: '入口网关',//入口网关 + entranceNetworkCard: '入口网卡',//入口网卡 + entranceIP: '入口IP',//入口IP + exportGateway: '出口网关',//出口网关 + exportNetworkCard: '出口网卡',//出口网卡 + exportIP: '出口IP',//出口IP + recordLogs: '记录日志',//记录日志 + commandList: '命令列表',//命令列表 + createCommand: '新增命令',//新增命令 + num: '序号',//序号 + command: '命令(功能码)',//命令(功能码) + startingAddress: '起始地址',//起始地址 + addressLength: '地址长度',//地址长度 + description: '描述',//描述 + action: '动作',//动作 + Operation: '操作',//操作 + deviceID: '设备ID',//设备ID }, //网络优化-网关配置 ntconfig: { diff --git a/src/language/index.js b/src/language/index.js index 9c20640..dc888e7 100644 --- a/src/language/index.js +++ b/src/language/index.js @@ -7,7 +7,7 @@ Vue.use(VueI18n) //注册i18n实例并引入语言文件 const i18n = new VueI18n({ - locale: 'en', // 语言标识（缓存里面没有就用中文） + locale: 'zh', // 语言标识（缓存里面没有就用中文） fallbackLocale:'en' , //没有英文的时候默认中文语言 messages: { zh, diff --git a/src/language/zh.js b/src/language/zh.js index 4b94cea..d3338e0 100644 --- a/src/language/zh.js +++ b/src/language/zh.js @@ -33,6 +33,7 @@ export default{ DNS:'DNS',//DNS networkType:'Network type:',//网络类型 gateWay:'Gateway:',//网关 + staticIP:'Static IP',//静态IP // 校验 rules: { ippz_wllx: 'Please enter the network type',//请输入网络类型 @@ -42,7 +43,17 @@ export default{ ippz_zwym1: 'Please enter a valid subnet mask', ippz_dns_by: 'Please enter a alternative DNS server address',//请输入备用的DNS服务器地址 ippz_dns_by1: 'Please enter a valid alternative DNS server address' - } + }, + options1: [ + { + value: "Wired area precision carving equipment 2",//有线区精雕 + label: "Wired area precision carving equipment 2", + }, + { + value: "Wireless area precision carving equipment 2",//无线区精雕 + label: "Wireless area precision carving equipment 2", + }, + ] }, //DB/斥候-ip配置无线网关 wirelessgatewayip: { diff --git a/src/main.js b/src/main.js index f3bdc01..64590c4 100644 --- a/src/main.js +++ b/src/main.js @@ -20,7 +20,16 @@ Vue.prototype.$moment = moment; Vue.prototype.$store = store; Vue.use(ElementUI); - +// 切换中英文方法 +function switchLanguage(string){ + if(string=='zh'){ + i18n.locale = 'zh' + }else{ + i18n.locale = 'en' + } +} +window.updateLanguage = switchLanguage +// updateLanguage() new Vue({ router, i18n,