safecheck-client 3.0.33-53 → 3.0.33-55

package/src/components/rongcheng/PhoneUpUserinfo.vue

@@ -1054,12 +1054,23 @@
         //临近超期
 
         const advent_time = (this.$appdata.getSingleValue('设备超期提醒') || 7) * 1000 * 60 * 60 * 24
-        let advent = this.model.filter(item => (new Date(item.f_expire_date).getTime() - new Date().getTime()) >=0 && (new Date(item.f_expire_date).getTime() - new Date().getTime()) <= advent_time ).map(item => item.f_devices_type).join(',')
-
+        const nowTime = new Date().getTime()
+        const adventTimeLimit = nowTime + advent_time
+        const advent = this.model
+          .filter(item => {
+            const expireTime = new Date(item.f_expire_date).getTime()
+            return expireTime >= nowTime && expireTime <= adventTimeLimit
+          })
+          .map(item => {
+            const expireTime = new Date(item.f_expire_date).getTime()
+            const daysLeft = Math.round((expireTime - nowTime) / (1000 * 60 * 60 * 24))
+            return `${item.f_devices_type}设备还有${daysLeft >= 0 ? daysLeft : 0}天超期`
+          })
+          .join(',')
         if (overdue && advent) {
-          this.$showMessage(`${overdue}设备已过期，${advent}设备临近超期`)
+          this.$showMessage(`${overdue}设备已过期，${advent}`)
         } else if (advent) {
-          this.$showMessage(`${advent}设备临近超期`)
+          this.$showMessage(`${advent}`)
         } else if (overdue) {
           this.$showMessage(`${overdue}设备已过期`)
         }