From c6dc262ac463ca1d6c3ce4f9791438291f3f936f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com>
Date: Tue, 1 Jul 2025 10:24:16 +0800
Subject: [PATCH] 1

---
 src/i18n/lang/en.js             |  2 ++
 src/i18n/lang/zh.js             |  2 ++
 src/views/page/largeScreen.vue  | 11 ++++++++++-
 src/views/page/largeScreen1.vue | 11 ++++++++++-
 src/views/page/largeScreen2.vue |  2 +-
 src/views/page/largeScreen3.vue |  2 +-
 src/views/page/realTime.vue     |  4 +++-
 7 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js
index a81b7ac9..1f2d61a9 100644
--- a/src/i18n/lang/en.js
+++ b/src/i18n/lang/en.js
@@ -225,6 +225,8 @@ module.exports = {
   },
 
   realTime: {
+    due:'Due',
+    Expiration:'Expiration Date',
     target: 'Target',
     average: 'Avg',
     title: 'Real-time Data',
diff --git a/src/i18n/lang/zh.js b/src/i18n/lang/zh.js
index 29c27309..dbff58f3 100644
--- a/src/i18n/lang/zh.js
+++ b/src/i18n/lang/zh.js
@@ -232,6 +232,8 @@ module.exports = {
   },
   // 实时页面
   realTime: {
+    due:'即将到期',
+    Expiration:'到期时间',
     target: '目标',
     average: '平均',
     title: '实时数据',
diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue
index 3fae4d82..4352ebc3 100644
--- a/src/views/page/largeScreen.vue
+++ b/src/views/page/largeScreen.vue
@@ -3,7 +3,7 @@
     <div class="park" v-if="limitUserId == 2" @click="handlerOther">{{ other_show ? '后退' : '园区简介' }}</div>
     <div class="other" v-show="other_show"></div>
     <div class="kuang">
-      <div class="title"> {{ limitUserId == 9 ? '甘井设施农业大数据云平台' : '温室智慧云数据统计' }}</div>
+      <div class="title"> {{getName()}}</div>
       <!-- <div class="auto_play">
         <span :class="autoPlay ? '' : 'act'" @click="autoPlay1">手动播放</span>
         <span :class="autoPlay ? 'act' : ''" @click="autoPlay2">自动播放</span>
@@ -740,6 +740,15 @@ export default {
   }
   },
   methods: {
+    getName(){
+      if(this.limitUserId==9){
+        return  '甘井设施农业大数据云平台'
+      }else if(this.limitUserId==13){
+        return  '上海前卫柑桔大数据平台'
+      }else{
+        return '温室智慧云数据统计'
+      }
+    },
       // id9的甘井设施农业大数据云平台
       timeInit() {
             const start = new Date()
diff --git a/src/views/page/largeScreen1.vue b/src/views/page/largeScreen1.vue
index d68424cf..340e72fa 100644
--- a/src/views/page/largeScreen1.vue
+++ b/src/views/page/largeScreen1.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="about">
     <div class="kuang">
-      <div class="title"> {{ limitUserId == 9 ? '甘井设施农业大数据云平台' : '温室智慧云数据统计' }}</div>
+      <div class="title"> {{getName()}}</div>
 
       <div class="yuan" @click="toBack">
         <img src="../../assets/img/small.png" alt="" />
@@ -907,6 +907,15 @@ export default {
     clearInterval(this.timer2) && this.timer2;
   },
   methods: {
+     getName(){
+      if(this.limitUserId==9){
+        return  '甘井设施农业大数据云平台'
+      }else if(this.limitUserId==13){
+        return  '上海前卫柑桔大数据平台'
+      }else{
+        return '温室智慧云数据统计'
+      }
+    },
     // 根据用户id查询对应的设备大数据信息
     dataInit(userid) {
       this.api.Bigdata_getAllControl(userid).then((res) => {
diff --git a/src/views/page/largeScreen2.vue b/src/views/page/largeScreen2.vue
index 8bdf43c7..a7e8686d 100644
--- a/src/views/page/largeScreen2.vue
+++ b/src/views/page/largeScreen2.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="about">
     <div class="kuang">
-      <div class="title">温室智慧云数据统计</div>
+      <div class="title">上海前卫柑桔大数据平台</div>
       <div class="calendar">
         <img src="../../assets/img/calendar.png" alt="" />
         <span>{{ getNowTime() }}</span>
diff --git a/src/views/page/largeScreen3.vue b/src/views/page/largeScreen3.vue
index 4bc6fbf8..648a3ded 100644
--- a/src/views/page/largeScreen3.vue
+++ b/src/views/page/largeScreen3.vue
@@ -2,7 +2,7 @@
   <div class="home largeScreen3">
     
     <div class="kuang">
-      <div class="title">温室智慧云数据统计</div>
+      <div class="title">上海前卫柑桔大数据平台</div>
   
       <div class="calendar" v-if="time">
         <img src="../../assets/img/calendar.png" alt="" />
diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue
index 272b3853..cb47def2 100644
--- a/src/views/page/realTime.vue
+++ b/src/views/page/realTime.vue
@@ -36,7 +36,9 @@
         </div>
         <!-- 控制器/施肥机 -->
         <div class="page-content new-data" v-else :class="deviceName !=1 ? 'control-page' : ''">
-            <div class="page-iccid" v-if="validateIccid($store.state.equipmentList[indexs - 1].iccidcode)"><span>{{$t('realTime.iccid')}}:{{$store.state.equipmentList[indexs - 1].iccidcode?$store.state.equipmentList[indexs - 1].iccidcode:''}}</span>&nbsp;&nbsp;&nbsp;<span>到期时间: </span><span :class="getPackageTimeColor()?'color-red':''">{{getPackageTime()}}<span v-if="getPackageTimeColor()">(即将到期)</span></span> </div>
+            <div class="page-iccid" v-if="validateIccid($store.state.equipmentList[indexs - 1].iccidcode)"><span>{{$t('realTime.iccid')}}:{{$store.state.equipmentList[indexs - 1].iccidcode?$store.state.equipmentList[indexs - 1].iccidcode:''}}</span>&nbsp;&nbsp;&nbsp;
+            <span v-if="getPackageTimeColor()">{{$t('realTime.Expiration')}}: </span>
+            <span v-if="getPackageTimeColor()" :class="getPackageTimeColor()?'color-red':''">{{getPackageTime()}}<span v-if="getPackageTimeColor()">({{$t('realTime.due')}})</span></span> </div>
             <div class="control-view" v-if="deviceName !=1">
                 <div class="title" @click='weatherModel = true'>{{$t('index.weatherStation')}}:</div>
                 <vue-seamless class="control-list" :data="controlList" :class-option="defaultOption1">