pc-master #250

Merged
xiaomeng merged 13 commits from pc-master into portal 2025-06-11 01:58:21 +00:00
2 changed files with 18 additions and 20 deletions
Showing only changes of commit 6807d295ff - Show all commits

View File

@ -325,34 +325,32 @@ getQibenGeticcid(){
iccid: device.iccidcode, iccid: device.iccidcode,
deviceName: device.deviceTypeName deviceName: device.deviceTypeName
})); }));
var iccidList=[]
var userInfo = localStorage.getItem('userInfo') ? JSON.parse(localStorage.getItem('userInfo')) : { userid: -1 } 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){ if(res.data.code==200){
this.$store.state.iccidList=res.data.data iccidList.push(res.data.data)
this.$store.state.iccidList=iccidList
this.api.popupwindow({userId:userInfo.userid}).then(res1=>{ if(res1.data.data&&res.data.data.expired){
if(res1.data.data){
res.data.data.forEach((el,index)=>{
if(el.expired){
setTimeout(() => { setTimeout(() => {
this.$notify({ this.$notify({
title: '提示', title: '提示',
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
message: `<div><span class="color-red">${el.deviceName}</span>卡号为${el.iccid},物联网卡即将到期,剩余时间<span class="color-red">${el.daysDifference}天</span>,请联系管理员。</div>`, 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 duration:60000,//10s
}); });
}, 10); }, 10);
} }
})
}
})
}else if(res.data.code==500){
this.$store.state.iccidList=res.data.data
} }
}) })
})
})
}, },
// //
getEqbyid(selTrue) { getEqbyid(selTrue) {

View File

@ -36,7 +36,7 @@
</div> </div>
<!-- 控制器/施肥机 --> <!-- 控制器/施肥机 -->
<div class="page-content new-data" v-else :class="deviceName !=1 ? 'control-page' : ''"> <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="control-view" v-if="deviceName !=1">
<div class="title" @click='weatherModel = true'>气象站:</div> <div class="title" @click='weatherModel = true'>气象站:</div>
<vue-seamless class="control-list" :data="controlList" :class-option="defaultOption1"> <vue-seamless class="control-list" :data="controlList" :class-option="defaultOption1">