Merge branch 'master' of http://git.picaiba.com/g7hoo/chenzhou

src/components/SettingDialog.vue

@@ -42,11 +42,11 @@ function handleConfirm() {
                 <span>px</span>
             </div>
             <div class="form-item selector">
-                <div class="opt opt1">
+                <!-- <div class="opt opt1">
                     <input type="checkbox" id="fullscreen" name="fullscreen" :class="[settings.fullscreen ? 'checked' : '']"
                         v-model="settings.fullscreen" />
                     <label for="fullscreen">全屏显示</label>
-                </div>
+                </div> -->
                 <div class="opt opt2">
                     <input type="checkbox" id="status" name="status" :class="[settings.eqStatus ? 'checked' : '']"
                         v-model="settings.eqStatus" />

src/utils/useWebsocket.js

@@ -7,7 +7,7 @@ export default function useWebsocket(store, path, excludePaths = []) {
 }
 
 // const url = "ws://192.168.1.101:8082/QbMonitoring/websocket";
-const url = "ws://192.168.0.33:8082/QbMonitoring/websocket";
+const url = "ws://192.168.0.254:8082/QbMonitoring/websocket";
 function connectPath(store, path) {
   new Client(
     {