1

src/layout/components/Navbar.vue

@@ -53,8 +53,8 @@
       title="系统公告"
       :center="true"
       align="left"
-      top="8vh"
-      width="800px"
+      top="6vh"
+      width="900px"
       @close="submit"
       :close-on-click-modal="false"
       :visible.sync="showModel"
@@ -114,7 +114,7 @@
                     style="padding-top: 5px"
                     >我已知晓，后续不再提示！</el-checkbox
                   >
-                  <el-button @click="submit" type="primary" plain
+                  <el-button @click="submit" type="primary" plain :size="'mini'"
                     >关闭
                   </el-button>
                 </el-col>
@@ -146,7 +146,7 @@ export default {
       isShow: true,
       statsTime: 0,
       endTime: 0,
-      checked: false,
+      checked: true,
       lastNotice: null, //最后一次提示时间
       parmValue: {
         type: "",
@@ -170,14 +170,11 @@ export default {
       if (code === 0) {
         if (count != 0) {
           this.activeMsg = item;
-          if (this.lastNotice + "" === "null") {
-            this.showModel = true;
+          console.log(this.activeMsg);
+          if (is) {
+            this.typeShow();
           } else {
-            if (is) {
-              this.typeShow();
-            } else {
-              this.showModel = true;
-            }
+            this.showModel = true;
           }
         } else {
           this.$message.warning("暂无系统消息！");
@@ -212,42 +209,50 @@ export default {
       return res;
     },
     typeShow() {
-      const {
-        addtime: laddtime,
-        type: ltype,
-        sys_type: lsys_type,
-      } = this.lastNotice;
-      const { sys_type, addtime } = this.activeMsg;
-      if (laddtime === addtime && lsys_type === sys_type) {
-        if (ltype === "1") {
-          this.showModel = this.is_Tips();
+      let is = this.is_Tips();
+      if (!is) {
+        return;
+      }
+      if (this.lastNotice + "" === "null" && is) {
+        this.showModel = true;
+      } else {
+        const {
+          addtime: laddtime,
+          type: ltype,
+          sys_type: lsys_type,
+        } = this.lastNotice;
+        const { sys_type, addtime } = this.activeMsg;
+
+        if (laddtime === addtime && lsys_type === sys_type) {
+          if (ltype === "1") {
+            this.showModel = false;
+          } else {
+            this.showModel = true;
+          }
         } else {
           this.showModel = true;
         }
-      } else {
-        this.showModel = true;
       }
     },
     is_Tips() {
       let nowtime = new Date().valueOf();
-      console.log(this.lastNotice);
       const { sys_type, addtime } = this.activeMsg;
       let timeV = new Date(addtime).valueOf();
       if (sys_type === "VER") {
         this.statsTime = timeV;
         this.endTime = this.statsTime + 1000 * 60 * 60 * 24 * 7;
         if (nowtime >= this.statsTime && nowtime <= this.endTime) {
-          return false;
-        } else {
           return true;
+        } else {
+          return false;
         }
       } else {
         this.statsTime = 0;
         this.endTime = timeV;
         if (nowtime <= this.endTime) {
-          return false;
-        } else {
           return true;
+        } else {
+          return false;
         }
       }
     },