Merge branch 'master' of http://123.132.248.154:10000/xujingliang/Fei_Xian_Lin_Ye_Fang_Huo

src/App.vue

@@ -77,7 +77,7 @@ export default {
       }, 5000);
     },
     async setOnmessageMessage(event) {
-      // console.log(event.data, "获得消息");
+      console.log(event.data, "获得消息");
       this.reset();
       // 自定义全局监听事件
       window.dispatchEvent(

src/views/home/index.vue

@@ -1414,8 +1414,8 @@ export default {
   width: 480px;
   height: 360px;
   position: absolute;
-  top: 500px;
-  left: 25px;
+  top: 410px;
+  right:450px;
   z-index: 99;
 }
 

src/views/home/widget/reportlist.vue

@@ -42,12 +42,12 @@
                   item.reportTime
                 }}</span></span
               >
-              &nbsp;&nbsp;&nbsp;
+              <!-- &nbsp;&nbsp;&nbsp;
               <span class="time"
                 >上报人员：<span style="color: #aaa">{{
                   item.reportPerson
                 }}</span></span
-              >
+              > -->
             </p>
             <p class="desc">
               <span

src/views/home/widget/rightclick.vue

@@ -420,7 +420,7 @@ export default {
       }
       this.addfireDetailReqLock = true;
       let param = this.setUpData;
-      param.userName = localStorage.getItem("userName");
+      param.reportPerson = localStorage.getItem("userName");
       postMethodCommon("/FireManagement/AddFireClueInfo", param)
         .then((res) => {
             this.$message({