From 85a75db053fd926cbb3d89a0119a248d8c9d4fa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Wed, 9 Jul 2025 10:22:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/page/realTime.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index cbe0554b..72c65f6f 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -1676,7 +1676,8 @@ export default { getPermissionStatus() { var store = this.$store.state var TargetValue = { - deviceId: store.equipmentList[this.indexs - 1].deviceId + deviceId: store.equipmentList[this.indexs - 1].deviceId, + enName:getLanguage() } this.api.getPermissionStatus(TargetValue).then(res => { if (res.data.code == 200) { @@ -1755,7 +1756,8 @@ export default { getStatus() { var store = this.$store.state var TargetValue = { - deviceId: store.equipmentList[this.indexs - 1].deviceId + deviceId: store.equipmentList[this.indexs - 1].deviceId, + enName:getLanguage() } this.api.getControlGetState(TargetValue).then(res => { if (res.data.code == 200) { From cbc7a88e330ded72f9a9345803ae7d75d4e03d4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Fri, 11 Jul 2025 17:43:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/en.js | 62 +++++++++++++++++++++++++++++++ src/i18n/lang/zh.js | 62 +++++++++++++++++++++++++++++++ src/store/index.js | 6 +-- src/views/page/largeScreen.vue | 12 +++++- src/views/page/largeScreen1.vue | 12 +++++- src/views/page/largeScreen2.vue | 12 +++++- src/views/page/largeScreen3.vue | 13 +++++-- src/views/page/realTime.vue | 25 ++++++++++--- src/views/page/sensorSet-con.vue | 11 +++++- src/views/page/sensorSet-soil.vue | 14 +++++-- src/views/page/sensorSet.vue | 11 +++++- src/views/page/status.vue | 10 ++++- vue.config.js | 4 +- 13 files changed, 229 insertions(+), 25 deletions(-) diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js index eae52c3a..3e4dd08c 100644 --- a/src/i18n/lang/en.js +++ b/src/i18n/lang/en.js @@ -16,6 +16,67 @@ module.exports = { { name: 'Greater than or equal (>=)', value: 3 }, { name: 'Less than or equal (<=)', value: 4 } ], + types: { + 0: '无意义的传感器', + 1: '空气温度', + 2: '空气湿度', + 3: '光亮度', + 4: '二氧化碳', + 5: '土壤温度', + 6: '土壤湿度', + 7: '水温', + 8: '水肥PH', + 9: '水肥EC', + 10: '压差', + 11: '风速', + 12: '风向', + 13: '雨雪信号', + 14: '降雨量', + 15: '光合有效辐射', + 16: '太阳总辐射', + 17: '流量', + 18: '大气压强', + 19: '土壤PH', + 20: '土壤EC', + 21: '叶面温度', + 22: '叶面湿度', + 23: '果实直径', + 24: '茎秆直径', + 25: '流速', + 26: '瞬时流量', + 27: '当日流量', + 28: '累计流量', + 29: '无线气象站电池电压', + 30: '无线气象站无线信号强度', + 31: '无线气象站信噪比（SNR）', + 32: 'PM1.0', + 33: 'PM2.5', + 34: 'PM10', + 35: '紫外辐射', + 36: '蒸发量', + 37: '负氧离子', + 38: '露点温度', + 39: '一氧化碳', + 40: '氨氮', + 41: '土壤氮含量', + 42: '土壤磷含量', + 43: '土壤钾含量', + 44: '管道压力', + 45: '水位', + 46: '氨气', + 47: '浊度', + 48: '氧气', + 49: '土壤张力', + 50: '铜（CU）', + 51: '镉（CD）', + 52: '铅（PB）', + 53: '噪声', + 54: '溶解氧', + 55: '虫数量', + 56: '无线传感器电池电压', + 57: '无线传感器无线信号强度', + 58: '无线传感器信噪比（SNR）' + }, message: { delete: 'Delete successfully.', add: 'Added successfully', @@ -227,6 +288,7 @@ module.exports = { }, realTime: { + Expired:'Expired', due:'Due', Expiration:'Expiration Date', target: 'Target', diff --git a/src/i18n/lang/zh.js b/src/i18n/lang/zh.js index a87cd9b7..13811b69 100644 --- a/src/i18n/lang/zh.js +++ b/src/i18n/lang/zh.js @@ -18,6 +18,67 @@ module.exports = { { name: '大于等于(>=)', value: 3 }, { name: '小于等于(<=)', value: 4 } ], + types: { + 0: '无意义的传感器', + 1: '空气温度', + 2: '空气湿度', + 3: '光亮度', + 4: '二氧化碳', + 5: '土壤温度', + 6: '土壤湿度', + 7: '水温', + 8: '水肥PH', + 9: '水肥EC', + 10: '压差', + 11: '风速', + 12: '风向', + 13: '雨雪信号', + 14: '降雨量', + 15: '光合有效辐射', + 16: '太阳总辐射', + 17: '流量', + 18: '大气压强', + 19: '土壤PH', + 20: '土壤EC', + 21: '叶面温度', + 22: '叶面湿度', + 23: '果实直径', + 24: '茎秆直径', + 25: '流速', + 26: '瞬时流量', + 27: '当日流量', + 28: '累计流量', + 29: '无线气象站电池电压', + 30: '无线气象站无线信号强度', + 31: '无线气象站信噪比（SNR）', + 32: 'PM1.0', + 33: 'PM2.5', + 34: 'PM10', + 35: '紫外辐射', + 36: '蒸发量', + 37: '负氧离子', + 38: '露点温度', + 39: '一氧化碳', + 40: '氨氮', + 41: '土壤氮含量', + 42: '土壤磷含量', + 43: '土壤钾含量', + 44: '管道压力', + 45: '水位', + 46: '氨气', + 47: '浊度', + 48: '氧气', + 49: '土壤张力', + 50: '铜（CU）', + 51: '镉（CD）', + 52: '铅（PB）', + 53: '噪声', + 54: '溶解氧', + 55: '虫数量', + 56: '无线传感器电池电压', + 57: '无线传感器无线信号强度', + 58: '无线传感器信噪比（SNR）' + }, // 各个input的placeholder placeholder: { @@ -234,6 +295,7 @@ module.exports = { }, // 实时页面 realTime: { + Expired:'已过期', due:'即将到期', Expiration:'到期时间', target: '目标', diff --git a/src/store/index.js b/src/store/index.js index 11dcc33b..1b5479c0 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -20,8 +20,8 @@ export default new Vuex.Store({ //label是名称 //value是code码 //countType计算类型 0是原数据 1是原数据-400 2是原数据/10 3是(原数据-400) / 10 4是(原数据-1000)/10 - typeList: [ - { label: '无意义的传感器', value: 0, countType: 0,unit:'' }, + typeList:[ + { label: '无意义的传感器', value: 0, countType: 0,unit:'' }, { label: '空气温度', value: 1, countType: 3,unit:'℃' }, { label: '空气湿度', value: 2, countType: 2,unit:'%' }, { label: '光亮度', value: 3, countType: 2,unit:'Klux' }, @@ -80,7 +80,7 @@ export default new Vuex.Store({ { label: '无线传感器电池电压', value: 56, countType: 2,unit:'V' }, { label: '无线传感器无线信号强度', value: 57, countType: 1,unit:'dBm' }, { label: '无线传感器信噪比（SNR）', value: 58, countType: 1,unit:'dB' }, - ] + ], }, getters: { }, diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue index 9445de9b..6adab1d4 100644 --- a/src/views/page/largeScreen.vue +++ b/src/views/page/largeScreen.vue @@ -582,6 +582,14 @@ export default { waitTime: 1000, // 单步运动停止的时间(默认值1000ms) }; }, + typeList() { + return this.$store.state.typeList.map(item => { + return { + ...item, + label: this.$t(`types.${item.value}`) // 假设你为每个value创建了对应的翻译key + } + }) + } }, data() { return { @@ -1052,7 +1060,7 @@ export default { if (res.data.code == 200) { this.list = []; var store = this.$store.state; - var list = store.typeList; + var list = this.typeList; res.data.data.forEach((el, index) => { list.forEach((el1, index1) => { if (el.formula == el1.value) { @@ -1224,7 +1232,7 @@ export default { getTypeList(val) { var store = this.$store.state; let typeList1 = []; - typeList1 = store.typeList.filter((item) => { + typeList1 = this.typeList.filter((item) => { return item.value == val; }); return typeList1[0].unit; diff --git a/src/views/page/largeScreen1.vue b/src/views/page/largeScreen1.vue index 5d0fffd0..8aabc1be 100644 --- a/src/views/page/largeScreen1.vue +++ b/src/views/page/largeScreen1.vue @@ -876,7 +876,6 @@ export default { time: "", //当前时间 - typeList: this.$store.state.typeList, limitUserId: "", popContentList1: [], @@ -898,9 +897,18 @@ export default { this.login(); this.getTime(); - this.typeList=this.$store.state.typeList }, + computed: { + typeList() { + return this.$store.state.typeList.map(item => { + return { + ...item, + label: this.$t(`types.${item.value}`) // 假设你为每个value创建了对应的翻译key + } + }) + } +}, beforeDestroy() { clearInterval(this.timer2) && this.timer2; }, diff --git a/src/views/page/largeScreen2.vue b/src/views/page/largeScreen2.vue index 3cd098b5..caaf9b5a 100644 --- a/src/views/page/largeScreen2.vue +++ b/src/views/page/largeScreen2.vue @@ -54,7 +54,6 @@ export default { components: { largeNav }, data() { return { - typeList: [], limitUserId: 13, time: {}, videoList: [], @@ -63,11 +62,20 @@ export default { currentPage: 1, }; }, + computed: { + typeList() { + return this.$store.state.typeList.map(item => { + return { + ...item, + label: this.$t(`types.${item.value}`) // 假设你为每个value创建了对应的翻译key + } + }) + } +}, mounted() { // this.login(); this.getTime(); - this.typeList = this.$store.state.typeList; this.list1 = [ { cameraid: "FT5712546", channelid: 1, name:'二期 3#温室西面内部', player: null }, { cameraid: "FT5712546", channelid: 2, name:'二期 1#温室东面内部', player: null }, diff --git a/src/views/page/largeScreen3.vue b/src/views/page/largeScreen3.vue index fbd42213..ac160812 100644 --- a/src/views/page/largeScreen3.vue +++ b/src/views/page/largeScreen3.vue @@ -183,7 +183,14 @@ export default { waitTime: 1000, // 单步运动停止的时间(默认值1000ms) }; }, - + typeList() { + return this.$store.state.typeList.map(item => { + return { + ...item, + label: this.$t(`types.${item.value}`) // 假设你为每个value创建了对应的翻译key + } + }) +}, }, data() { return { @@ -536,7 +543,7 @@ export default { if (res.data.code == 200) { this.list = []; var store = this.$store.state; - var list = store.typeList; + var list = this.typeList; res.data.data.forEach((el, index) => { list.forEach((el1, index1) => { if (el.formula == el1.value) { @@ -708,7 +715,7 @@ export default { getTypeList(val) { var store = this.$store.state; let typeList1 = []; - typeList1 = store.typeList.filter((item) => { + typeList1 = this.typeList.filter((item) => { return item.value == val; }); return typeList1[0].unit; diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index 72c65f6f..872dbdec 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -38,7 +38,7 @@
{{$t('realTime.iccid')}}:{{$store.state.equipmentList[indexs - 1].iccidcode?$store.state.equipmentList[indexs - 1].iccidcode:''}}    {{$t('realTime.Expiration')}}: - {{getPackageTime()}}({{$t('realTime.due')}})
+ {{getPackageTime()}}({{getTimeTips()}})
{{$t('index.weatherStation')}}:
@@ -693,7 +693,15 @@ export default { }, typeSelList1(){ return this.$t('comparisonOperators') - } + }, + typeList() { + return this.$store.state.typeList.map(item => { + return { + ...item, + label: this.$t(`types.${item.value}`) // 假设你为每个value创建了对应的翻译key + } + }) + } }, data() { return { @@ -803,6 +811,13 @@ export default { this.$bus.$off('refreshTime') }, methods: { + getTimeTips(){ + var item= this.$store.state.iccidList.find(item=>item?.iccid==this.$store.state.equipmentList[this.indexs - 1].iccidcode) + const currentDate = new Date() + const packageDate = new Date(item.packageTime) + + return currentDate > packageDate ? this.$t('realTime.Expired') : this.$t('realTime.due') + }, getPackageTime(){ var item= this.$store.state.iccidList.find(item=> item?.iccid==this.$store.state.equipmentList[this.indexs - 1].iccidcode) @@ -1212,7 +1227,7 @@ export default { this.typeSelList=[] } }) - var list = store.typeList + var list = this.typeList if (this.deviceName == 1) { this.api.postRtdata(params).then((res) => { if (res.data.code == 200) { @@ -1579,7 +1594,7 @@ export default { getControlRtDatastation(params){ var store = this.$store.state - var list = store.typeList + var list = this.typeList this.api.getControlRtDatastation(params).then(res => { this.controlList = [] if (res.data.code == 200) { @@ -1608,7 +1623,7 @@ export default { getFi_rtdata(params){ var store = this.$store.state - var list = store.typeList + var list = this.typeList this.api.getFi_rtdata(params).then(res=>{ if (res.data.code == 200) { this.inputData = res.data.data; diff --git a/src/views/page/sensorSet-con.vue b/src/views/page/sensorSet-con.vue index 4f82c260..2919a350 100644 --- a/src/views/page/sensorSet-con.vue +++ b/src/views/page/sensorSet-con.vue @@ -252,7 +252,6 @@ export default { openList2: [],//当前有效的传感器 openList3: [],//当前有效的传感器 openTypeList: [],//八个通道输入信号的类型 - typeList: this.$store.state.typeList, loading:null, model: false, @@ -267,6 +266,16 @@ export default { this.dataInit(); }, }, + computed: { + typeList() { + return this.$store.state.typeList.map(item => { + return { + ...item, + label: this.$t(`types.${item.value}`) // 假设你为每个value创建了对应的翻译key + } + }) + } +}, mounted() { this.dataInit() diff --git a/src/views/page/sensorSet-soil.vue b/src/views/page/sensorSet-soil.vue index d8f12fcb..2abe2249 100644 --- a/src/views/page/sensorSet-soil.vue +++ b/src/views/page/sensorSet-soil.vue @@ -161,7 +161,6 @@ export default { inputDataNew: [], sensorType: '',//当前传感器类型 openList: [],//当前有效的传感器 - typeList: this.$store.state.typeList, loading: null, list1: '', list2: '', @@ -185,6 +184,16 @@ export default { this.numberList.push(10206 + (i * 5)) } }, + computed: { + typeList() { + return this.$store.state.typeList.map(item => { + return { + ...item, + label: this.$t(`types.${item.value}`) // 假设你为每个value创建了对应的翻译key + } + }) + } +}, mounted() { this.loading = this.$loading({ lock: true, @@ -310,10 +319,9 @@ export default { }, getSensorType() { - var text='无意义的传感器' + var text=this.$t('types.meaningless') this.typeList.forEach((el, index) => { if (el.value == this.inputData[this.numberList[this.active]]) { - console.log(el.label,this.numberList[this.active],this.inputData[this.numberList[this.active]],111); text = el.label } }) diff --git a/src/views/page/sensorSet.vue b/src/views/page/sensorSet.vue index ce752380..2d52d120 100644 --- a/src/views/page/sensorSet.vue +++ b/src/views/page/sensorSet.vue @@ -102,10 +102,19 @@ export default { inputDataNew:[], sensorType:'',//当前传感器类型 openList: [],//当前有效的传感器 - typeList:this.$store.state.typeList, loading:null, } }, + computed: { + typeList() { + return this.$store.state.typeList.map(item => { + return { + ...item, + label: this.$t(`types.${item.value}`) // 假设你为每个value创建了对应的翻译key + } + }) + } +}, watch:{ 'active'(newVal,oldVal){ this.getSensorType() diff --git a/src/views/page/status.vue b/src/views/page/status.vue index 558db6a7..65296030 100644 --- a/src/views/page/status.vue +++ b/src/views/page/status.vue @@ -290,6 +290,14 @@ export default { ] return data }, + typeList() { + return this.$store.state.typeList.map(item => { + return { + ...item, + label: this.$t(`types.${item.value}`) // 假设你为每个value创建了对应的翻译key + } + }) + } }, //清除监听 beforeDestroy() { @@ -341,7 +349,7 @@ export default { return num.toFixed(2) }, getTypeData(dataCode, typeCode) { - var typeList = this.$store.state.typeList + var typeList = this.typeList var countType = 0 typeList.forEach((el, index) => { diff --git a/vue.config.js b/vue.config.js index 5ced73b8..6cfc47b0 100644 --- a/vue.config.js +++ b/vue.config.js @@ -44,9 +44,9 @@ module.exports = { }, proxy: { "/api": { - target: 'https://api.lihe-control.com', //地址 + // target: 'https://api.lihe-control.com', //地址 // target: 'http://jiaxingtest.a1.luyouxia.net:21114', //地址 - // target: 'http://jiaxingtest.e1.luyouxia.top:19159', //地址 + target: 'http://jiaxingtest.e1.luyouxia.top:19159', //地址 // target: 'http://jiaxingtest.a1.luyouxia.net:25762', //地址 changeOrigin: true, pathRewrite: { From c59851e02e8648e0fe4c2a42fe2fff89f5100853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Fri, 11 Jul 2025 17:46:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vue.config.js b/vue.config.js index 6cfc47b0..5ced73b8 100644 --- a/vue.config.js +++ b/vue.config.js @@ -44,9 +44,9 @@ module.exports = { }, proxy: { "/api": { - // target: 'https://api.lihe-control.com', //地址 + target: 'https://api.lihe-control.com', //地址 // target: 'http://jiaxingtest.a1.luyouxia.net:21114', //地址 - target: 'http://jiaxingtest.e1.luyouxia.top:19159', //地址 + // target: 'http://jiaxingtest.e1.luyouxia.top:19159', //地址 // target: 'http://jiaxingtest.a1.luyouxia.net:25762', //地址 changeOrigin: true, pathRewrite: {