Merge remote-tracking branch 'origin/visu_forest_0_1' into visu_forest_0_1

src/components/TVWall.vue

@@ -346,7 +346,7 @@ export default {
                 // userName: 'system',
                 // userPwd: 'Admin@123',
                 token: '',
-                https: 0
+                https: 1
               })
               this.ws.on('loginState', (res) => {
                 this.isLogin = res

src/components/eventLocation.vue

@@ -559,7 +559,7 @@ export default {
                 userName: newResponse.userName,
                 userPwd: newResponse.userPwd,
                 token: '',
-                https: 0
+                https: 1
               })
               this.ws.on('loginState', (res) => {
                 this.isLogin = res

src/views/eventdetailsdialog.vue

@@ -194,32 +194,32 @@
                                              @click="updateCentereventTEventcatalogueStatus('qs',false)">
                                     签收
                                   </el-button>
-                                  <el-button size="small"
-                                             icon="el-icon-question"
-                                             @click="updateCentereventTEventcatalogueStatus('wb',false)">
-                                    误报
-                                  </el-button>
-                                  <el-button size="small"
-                                             icon="el-icon-warning"
-                                             @click="updateCentereventTEventcatalogueStatus('cf',false)">
-                                    重复
-                                  </el-button>
+                                  <!--<el-button size="small"-->
+                                             <!--icon="el-icon-question"-->
+                                             <!--@click="updateCentereventTEventcatalogueStatus('wb',false)">-->
+                                    <!--误报-->
+                                  <!--</el-button>-->
+                                  <!--<el-button size="small"-->
+                                             <!--icon="el-icon-warning"-->
+                                             <!--@click="updateCentereventTEventcatalogueStatus('cf',false)">-->
+                                    <!--重复-->
+                                  <!--</el-button>-->
                                 </div>
                                 <el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
                                 </el-button>
                               </div>
                               <div class="z-info-btm-input-btn" v-else-if="eventStatusValue=='forest_event_status_2'">
                                 <div>
-                                  <el-button size="small"
-                                             icon="el-icon-question"
-                                             @click="updateCentereventTEventcatalogueStatus('wb',false)">
-                                    误报
-                                  </el-button>
-                                  <el-button size="small"
-                                             icon="el-icon-warning"
-                                             @click="updateCentereventTEventcatalogueStatus('cf',false)">
-                                    重复
-                                  </el-button>
+                                  <!--<el-button size="small"-->
+                                             <!--icon="el-icon-question"-->
+                                             <!--@click="updateCentereventTEventcatalogueStatus('wb',false)">-->
+                                    <!--误报-->
+                                  <!--</el-button>-->
+                                  <!--<el-button size="small"-->
+                                             <!--icon="el-icon-warning"-->
+                                             <!--@click="updateCentereventTEventcatalogueStatus('cf',false)">-->
+                                    <!--重复-->
+                                  <!--</el-button>-->
                                   <el-button size="small"
                                              icon="el-icon-phone" style="text-align:left"
                                              @click="updateCentereventTEventcatalogueStatus('ld',false)">
@@ -2146,7 +2146,7 @@ export default {
                 userName: newResponse.userName,
                 userPwd: newResponse.userPwd,
                 token: '',
-                https: 0
+                https: 1
               })
               this.ws.on('loginState', (res) => {
                 this.isLogin = res

src/views/firespread.vue

@@ -167,32 +167,32 @@
                                              @click="updateCentereventTEventcatalogueStatus('qs',false)">
                                     签收
                                   </el-button>
-                                  <el-button size="small"
-                                             icon="el-icon-question"
-                                             @click="updateCentereventTEventcatalogueStatus('wb',false)">
-                                    误报
-                                  </el-button>
-                                  <el-button size="small"
-                                             icon="el-icon-warning"
-                                             @click="updateCentereventTEventcatalogueStatus('cf',false)">
-                                    重复
-                                  </el-button>
+                                  <!--<el-button size="small"-->
+                                             <!--icon="el-icon-question"-->
+                                             <!--@click="updateCentereventTEventcatalogueStatus('wb',false)">-->
+                                    <!--误报-->
+                                  <!--</el-button>-->
+                                  <!--<el-button size="small"-->
+                                             <!--icon="el-icon-warning"-->
+                                             <!--@click="updateCentereventTEventcatalogueStatus('cf',false)">-->
+                                    <!--重复-->
+                                  <!--</el-button>-->
                                 </div>
                                 <el-button size="small" icon="el-icon-chat-dot-square" @click="sendEventLog()">发送
                                 </el-button>
                               </div>
                               <div class="z-info-btm-input-btn" v-else-if="eventStatusValue=='forest_event_status_2'">
                                 <div>
-                                  <el-button size="small"
-                                             icon="el-icon-question"
-                                             @click="updateCentereventTEventcatalogueStatus('wb',false)">
-                                    误报
-                                  </el-button>
-                                  <el-button size="small"
-                                             icon="el-icon-warning"
-                                             @click="updateCentereventTEventcatalogueStatus('cf',false)">
-                                    重复
-                                  </el-button>
+                                  <!--<el-button size="small"-->
+                                             <!--icon="el-icon-question"-->
+                                             <!--@click="updateCentereventTEventcatalogueStatus('wb',false)">-->
+                                    <!--误报-->
+                                  <!--</el-button>-->
+                                  <!--<el-button size="small"-->
+                                             <!--icon="el-icon-warning"-->
+                                             <!--@click="updateCentereventTEventcatalogueStatus('cf',false)">-->
+                                    <!--重复-->
+                                  <!--</el-button>-->
                                   <el-button size="small"
                                              icon="el-icon-phone" style="text-align:left"
                                              @click="updateCentereventTEventcatalogueStatus('ld',false)">
@@ -2093,7 +2093,7 @@
                   userName: newResponse.userName,
                   userPwd: newResponse.userPwd,
                   token: '',
-                  https: 0
+                  https: 1
                 })
                 this.ws.on('loginState', (res) => {
                   this.isLogin = res

src/views/monitor.vue

@@ -670,7 +670,7 @@ export default {
                 userName: newResponse.userName,
                 userPwd: newResponse.userPwd,
                 token: '',
-                https: 0
+                https: 1
               })
               this.ws.on('loginState', (res) => {
                 this.isLogin = res