Merge http://39.104.94.153:3000/yf_zy/MingGao_vue

minggao/src/page/commandCenter/realTime.vue

@@ -886,13 +886,13 @@ export default {
           console.log("WebSocket:已关闭");
           console.log(event);
           console.log(that.timeoutnum);
-          if (that.timeoutnum !== null) {
+          // if (that.timeoutnum !== null) {
             setTimeout(() => {
               that.websock.close(); // 先关闭
               clearTimeout(that.timeoutObj); //清除时间
               that.reconnect(); // 重连
             }, 5000);
-          }
+          // }
         };
       }
     },

minggao/src/page/home/index.vue

@@ -20,11 +20,11 @@
         <p>{{ headline }}</p>
       </div>
       <div class="index_out" style="display: flex">
-        <div
+        <!-- <div
           class="iconfont icon-erweima"
           style="margin-right: 15px; font-size: 22px; color: #666666"
           @click="QRcode"
-        ></div>
+        ></div> -->
         <el-dropdown trigger="click" @command="quit">
           <span class="el-dropdown-link" style="cursor: pointer">
             <span>{{ username }}</span>
@@ -147,7 +147,7 @@
         >
       </span>
     </el-dialog>
-    <el-dialog title="扫描下载智网监测" :visible.sync="QRtf" width="300px">
+    <el-dialog title="扫描下载智网监测APP" :visible.sync="QRtf" width="300px">
       <div class="qrcode" ref="qrCodeUrl" style="margin: 0 auto"></div>
     </el-dialog>
   </div>