cloud-web-corejs 1.0.54-dev.2 → 1.0.54-dev.21

package/src/layout/components/notify_message/unreadDialog.vue

@@ -32,12 +32,13 @@
       </div>
     </el-dialog>
     <systemNoticeInfoDialog v-if="showSystemNoticeInfoDialog" :visiable.sync="showSystemNoticeInfoDialog"
-                            :appendToTop="true"></systemNoticeInfoDialog>
+                            :appendToTop="true" :queryParam="systemNoticeInfoDialogParam"></systemNoticeInfoDialog>
   </div>
 </template>
 
 <script>
 import systemNoticeInfoDialog from "@base/views/user/system_notice/infoDialog.vue";
+import settingConfig from "@/settings";
 
 export default {
   name: 'notifyMessageDialog',
@@ -55,7 +56,8 @@ export default {
       tableDatas: [],
       currentIndex: 0,
       currentRow: {},
-      showSystemNoticeInfoDialog: false
+      showSystemNoticeInfoDialog: false,
+      systemNoticeInfoDialogParam: {}
     };
   },
 
@@ -72,9 +74,9 @@ export default {
             this.checkLine(0, () => {
               this.showDialog = true;
             });
-          }/* else {
+          } else {
             this.initSystemNoticeInfoDialog();
-          } */
+          }
         }
       });
     },
@@ -115,14 +117,18 @@ export default {
 
     },
     initSystemNoticeInfoDialog() {
+      if (!settingConfig.systemNoticeAutoTip) return
+      let userFlag = this.$store.getters.userFlag
+      if (userFlag == 6 || userFlag == 7 || userFlag == 8) return;
       this.$http({
         url: USER_PREFIX + '/system_notice/listPage',
-        data: {publish: true, important: true, size: 1},
+        data: {publish: true, important: true, readed: 0, size: 1},
         method: 'post',
         success: res => {
           this.systemNotices = res.objx && res.objx.records ? res.objx.records : [];
           let rows = res?.objx?.records || []
           if (rows.length > 0) {
+            this.systemNoticeInfoDialogParam = {publish: true, important: true, readed: 0};
             this.showSystemNoticeInfoDialog = true;
           }
         }