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

src/views/emergencyCommandMap/RightSection/RenWuGenZongInfo.vue

@@ -64,7 +64,8 @@
         <div class="td">{{ formatDateTime(item.creation_time) }}</div>
         <div class="td">{{ formatDateTime(item.update_time) }}</div>
         <div class="td">
-          <div :class="item.processing_status === '已完成' ? 'success-bg' : item.processing_status === '已完成' ? 'primary-bg' : 'processing-bg'">{{ item.processing_status }}</div></div>
+          <div :class="item.processing_status === '已完成' ? 'success-bg' : 'processing-bg'">{{ item.processing_status }}</div>
+        </div>
         <div class="td">
           <div class="btn" @click="openUpdateDialog(item)">更新</div>
         </div>

src/views/routineCommandMap/RightSection/EventReport/index.vue

@@ -38,7 +38,7 @@
             <i class="start-icon" />
             <div class="gradient-text3">进入指挥</div>
           </div>
-          <div v-else-if="['2', '3'].includes(item.event_status)" class="btn-box" @click="enterCommand(item)">
+          <div v-else-if="['2', '3'].includes(item.event_status)" class="btn-box">
             <i class="record-icon" />
             <div class="gradient-text3">指挥记录</div>
           </div>