zc

src/App.vue

@@ -65,7 +65,7 @@
           passive: false
         })
       },
-    }
+    },
   }
 </script>
 <style>

src/layout/components/AppMain.vue

@@ -28,6 +28,7 @@ export default {
       return this.$store.state.tagsView.cachedViews
     },
     key() {
+      this.$store.dispatch("getMessageNum", {}).then((res) => {}).catch(() => {});
       return this.$route.path
     }
   },

src/views/basicsModules/login.vue

@@ -392,7 +392,6 @@ export default {
               }
               this.getExploitConfig();
               this.getHomeConfig();
-              this.$store.dispatch("getMessageNum", {}).then((res) => {}).catch(() => {});
               // localStorage.setItem('initPage',res.data.skipHomePage);
               if(res.data.reset_password){
                 this.$confirm('账号当前登录密码为默认密码,是否现在修改?', "提示", {

src/views/basicsModules/message.vue

@@ -16,7 +16,7 @@
           </el-table-column>
           <el-table-column label="消息标题" align="left" prop="title" width="200" show-overflow-tooltip/>
           <el-table-column label="消息内容" align="left" prop="content" show-overflow-tooltip/>
-          <el-table-column label="发送时间" align="left" prop="createTime" width="160" show-overflow-tooltip>
+          <el-table-column label="发送时间" align="left" prop="sendTime" width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{parseTime(scope.row.sendTime,'{y}-{m}-{d} {h}:{i}')}}</span>
             </template>
@@ -48,6 +48,17 @@
         />
       </div>
     </div>
+
+    <el-dialog class="warningConfig-dialog" :title='dialogTitle' width="740px" append-to-body
+               :visible.sync="dialogType" v-if="dialogType" @close="dialogOff()"
+               :close-on-click-modal="false" :close-on-press-escape="false">
+      <div v-html="dialogForm"></div>
+      <div slot="footer" class="dialog-footer dialog-footer-box">
+        <p class="dialog-footer-button-null"></p>
+        <p class="dialog-footer-button-info" @click="dialogOff()">关闭</p>
+        <p class="dialog-footer-button-null"></p>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -73,7 +84,10 @@
         dataList: [],
         //消息类型
         typeList: [],
-        demoTex: '点击查看'
+        //弹窗相关
+        dialogTitle:null,
+        dialogType:false,
+        dialogForm:{},
       }
     },
     created() {
@@ -84,8 +98,15 @@
       this.systemNoticeGetNoticeType()
     },
     methods: {
+      dialogOff(){
+        this.$set(this,'dialogType',false);
+      },
       lockInfo(row){
+        console.log('row',row);
         systemNoticeGetNoticeDetail({noticeId:row.noticeId}).then(response => {
+          this.$set(this,'dialogTitle',row.title);
+          this.$set(this,'dialogForm',row.content);
+          this.$set(this,'dialogType',true);
           this.$store.dispatch("getMessageNum", {}).then((res) => {}).catch(() => {});
         });
       },

src/views/systemManagement/notice/index.vue

@@ -65,7 +65,7 @@
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p"
-                   v-if="scope.row.sendState == 0"
+                   v-if="scope.row.sendState != 1"
                    @click="tableButton(2,scope.row)"
                    v-hasPermiRouter="['system:notice:edit']"
                 >发送</p>