From 6807d295ff234bbfb40a958828e99e503c696c54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com>
Date: Tue, 10 Jun 2025 17:30:56 +0800
Subject: [PATCH] =?UTF-8?q?iccid=E6=94=B9=E4=B8=BA=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E8=B0=83=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index.vue         | 36 +++++++++++++++++-------------------
 src/views/page/realTime.vue |  2 +-
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index 85d0ca66..167d020d 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -325,34 +325,32 @@ getQibenGeticcid(){
   iccid: device.iccidcode,
   deviceName: device.deviceTypeName
 }));
+var iccidList=[]
  var userInfo = localStorage.getItem('userInfo') ? JSON.parse(localStorage.getItem('userInfo')) : { userid: -1 }
  
-  this.api.qibenGeticcid(data).then(res=>{
+  this.api.popupwindow({userId:userInfo.userid}).then(res1=>{
+    data.forEach((el,index)=>{
+        this.api.qibenGeticcid(el).then(res=>{
         if(res.data.code==200){
-            this.$store.state.iccidList=res.data.data
-             
-            this.api.popupwindow({userId:userInfo.userid}).then(res1=>{
-                if(res1.data.data){
-                       res.data.data.forEach((el,index)=>{
-                if(el.expired){
+           iccidList.push(res.data.data)
+               this.$store.state.iccidList=iccidList
+                if(res1.data.data&&res.data.data.expired){
                 setTimeout(() => {
                         this.$notify({
-          title: '提示',
-           dangerouslyUseHTMLString: true,
-          message: `<div><span class="color-red">${el.deviceName}</span>卡号为${el.iccid},物联网卡即将到期，剩余时间<span class="color-red">${el.daysDifference}天</span>，请联系管理员。</div>`,
-          duration:60000,//10s自动关闭
-        });
+                 title: '提示',
+                 dangerouslyUseHTMLString: true,
+                 message: `<div><span class="color-red">${res.data.data.deviceName}</span>卡号为${res.data.data.iccid},物联网卡即将到期，剩余时间<span class="color-red">${res.data.data.daysDifference}天</span>，请联系管理员。</div>`,
+                 duration:60000,//10s自动关闭
+                });
                 }, 10);
                 }
-            })
-                }
-            })
-        
-              
-        }else if(res.data.code==500){
-            this.$store.state.iccidList=res.data.data
         }
   })
+    })
+     
+               
+            }) 
+ 
 },
         //获取设备
         getEqbyid(selTrue) {
diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue
index 638f065f..d3960935 100644
--- a/src/views/page/realTime.vue
+++ b/src/views/page/realTime.vue
@@ -36,7 +36,7 @@
         </div>
         <!-- 控制器/施肥机 -->
         <div class="page-content new-data" v-else :class="deviceName !=1 ? 'control-page' : ''">
-            <div class="page-iccid"><span>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"><span>卡号:{{$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="control-view" v-if="deviceName !=1">
                 <div class="title" @click='weatherModel = true'>气象站:</div>
                 <vue-seamless class="control-list" :data="controlList" :class-option="defaultOption1">