落点bug

src/components/vBottomMenu.vue

@@ -201,9 +201,9 @@
               <el-link type="success" v-if="item.eventCode!=null&&item.type ==1" @click="showEventDialog_message(item.eventCode)">
                 查看事件详情
               </el-link>
-              <div class="btm-r-pop-info-btm-btn" v-else>
-                <el-button type="primary"  @click="selectMessageById(item.id)">标记已读
-                </el-button>
+              <div class="btm-r-pop-info-btm-btn" >
+                  <el-button type="primary" @click="selectMessageById(item.id)">标记已读
+                  </el-button>
               </div>
             </div>
           </div>
@@ -436,8 +436,7 @@
                                                  v-for="(itemfile,indexfile) in item.fileVOs">
                                       <el-image :src="itemfile.fileUrl" v-if="itemfile.fileType=='image'"
                                                 :preview-src-list="assetTypeAnImage(item.fileVOs)"
-                                                :z-index="10000"
-                                                style="width:3rem; height:3rem;margin: 2px;" :title="itemfile.fileName">
+                                                style="width:3rem; height:3rem;margin: 2px;" :z-index="10000" :title="itemfile.fileName">
                                       </el-image>
                                       <img v-else-if="itemfile.fileType=='video'"
                                            style="width:3rem; height:3rem;margin: 2px;"
@@ -473,14 +472,14 @@
                     <div class="this-con h-25 no-padding">
                       <div class="z-info-list" style="margin-top: 0;">
                         <div class="z-info-btm-grp">
-                          <!--                          <div class="z-info-btm-grp-top">-->
-                          <!--                            <div class="z-info-btm-grp-left">-->
-                          <!--                              <el-button size="small" icon="el-icon-upload" @click="showEventLogUpload()">上传-->
-                          <!--                              </el-button>-->
-                          <!--                              <el-button size="small" icon="el-icon-download" @click="toImage()">截图上传-->
-                          <!--                              </el-button>-->
-                          <!--                            </div>-->
-                          <!--                          </div>-->
+<!--                          <div class="z-info-btm-grp-top">-->
+<!--                            <div class="z-info-btm-grp-left">-->
+<!--                              <el-button size="small" icon="el-icon-upload" @click="showEventLogUpload()">上传-->
+<!--                              </el-button>-->
+<!--                              <el-button size="small" icon="el-icon-download" @click="toImage()">截图上传-->
+<!--                              </el-button>-->
+<!--                            </div>-->
+<!--                          </div>-->
                           <div class="z-info-btm-input">
                             <el-input type="textarea" v-model="eventLog" :autosize="{ minRows: 7, maxRows: 7}"
                                       placeholder="请输入反馈信息">
@@ -538,12 +537,17 @@
         </el-form-item>
         <el-form-item label="附件" prop="schedulePictures" v-if="eventStatusButton=='sh'">
           <ImageUpload class="sj-upload" ref="ImageUpload" :limit="10" :fileType="['jpg', 'png','jpeg']" :value="uploadAttachList"
+          <ImageUpload ref="ImageUpload" :limit="10" :fileType="['jpg', 'png','jpeg']" :value="uploadAttachList"
                        @input="getUrl"></ImageUpload>
         </el-form-item>
-        <el-button class="sj-icon-btn" icon="el-icon-check" size="mini" type="primary" v-if="eventStatusButton=='sh'"
+        <el-button size="mini" type="primary" v-if="eventStatusButton=='sh'"
+                   class="sj-icon-btn"
+                   icon="el-icon-circle-check"
                    @click="updateCentereventTEventcatalogueStatus('shtg',true)">通过
         </el-button>
-        <el-button class="sj-icon-btn" icon="el-icon-circle-close" size="mini" type="primary" v-if="eventStatusButton=='sh'"
+        <el-button size="mini" type="primary" v-if="eventStatusButton=='sh'"
+                   class="sj-icon-btn"
+                   icon="el-icon-circle-close"
                    @click="updateCentereventTEventcatalogueStatus('shbtg',true)">不通过
         </el-button>
       </el-form>
@@ -919,8 +923,8 @@ export default {
         this.messageList = response.data
         this.messageCount = response.data.length
       })
-      this.initWebSocket('MESSAGE_SOCKET', '/messagePush/', this.websockSid.userId)
-      this.initWebSocket('MESSAGE_SOCKET', '/messageDeptPush/', this.websockSid.deptId)
+        this.initWebSocket('MESSAGE_SOCKET', '/messagePush/', this.websockSid.userId)
+        this.initWebSocket('MESSAGE_SOCKET', '/messageDeptPush/', this.websockSid.deptId)
 
     },
     filterbanNode(value, data) {

src/views/firespread.vue

@@ -2592,7 +2592,7 @@ export default {
                   {
                     markersMap.icon='sj-icon-map-centerdata-slmonitor'
                     markersMap.click='preview'
-                  }else if (res.data[i].workingStatus==1)
+                  }else
                   {
                     markersMap.icon='sj-icon-map-not-centerdata-slmonitor'
                     markersMap.click=''
@@ -2603,7 +2603,7 @@ export default {
                   {
                     markersMap.icon = "camera";
                     markersMap.click='preview'
-                  }else if (res.data[i].workingStatus==1)
+                  }else
                   {
                     markersMap.icon = "camera-not";
                     markersMap.click=''
@@ -2613,7 +2613,7 @@ export default {
                   {
                     markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
                     markersMap.click='preview'
-                  }else if (res.data[i].workingStatus==1)
+                  }else
                   {
                     markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
                     markersMap.click=''
@@ -2625,7 +2625,7 @@ export default {
                   {
                     markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
                     markersMap.click='preview'
-                  }else if (res.data[i].workingStatus==1)
+                  }else
                   {
                     markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
                     markersMap.click=''
@@ -2636,7 +2636,7 @@ export default {
                   if (res.data[i].workingStatus == 0) {
                     markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
                     markersMap.click = 'preview'
-                  } else if (res.data[i].workingStatus == 1) {
+                  } else  {
                     markersMap.icon = 'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera'
                     markersMap.click = ''
                   }