cloud-web-corejs 1.0.54-dev.3 → 1.0.54-dev.4

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,16 @@ export default {
 
     },
     initSystemNoticeInfoDialog() {
+      if (!settingConfig.systemNoticeAutoTip) 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;
           }
         }

package/src/views/user/system_notice/infoDialog.vue

@@ -51,6 +51,9 @@ export default {
     },
     param: {
       default: null
+    },
+    queryParam: {
+      default: null
     }
   },
   created() {
@@ -102,7 +105,8 @@ export default {
         url: url,
         data: {
           publish: true,
-          current: pageNumber
+          current: pageNumber,
+          ...this.queryParam
         },
         success: res => {
           let page = res.objx;
@@ -121,9 +125,11 @@ export default {
             });
             this.currentRow = currentRow;
             this.currentIndex = currentIndex;
+            this.handleRead(this.currentIndex)
           } else {
             this.currentIndex = 0;
             this.currentRow = page.records.length > 0 ? page.records[0] : {};
+            this.handleRead(this.currentIndex)
           }
         }
       });
@@ -132,6 +138,24 @@ export default {
       this.flag = 0;
       this.currentIndex = index;
       this.currentRow = item;
+      this.handleRead(index)
+    },
+    handleRead(index, callback) {
+      let row = this.page.records[index];
+      if (row.readed !== 1) {
+        this.$http({
+          url: USER_PREFIX + `/system_notice/read`,
+          method: `post`,
+          data: {id: row.id},
+          isLoading: true,
+          success: res => {
+            row.readed = 1;
+            callback && callback()
+          }
+        });
+      } else {
+        callback && callback()
+      }
     },
     initAttachfo() {
       let id = this.currentRow && this.currentRow.id ? this.currentRow.id : '';