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

src/types/components.d.ts

@@ -23,6 +23,8 @@ declare module 'vue' {
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
+    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
@@ -102,7 +104,6 @@ declare module 'vue' {
     VideoContainer: typeof import('./../components/HKVideo/video-container.vue')['default']
     VideoContainer2: typeof import('./../components/HKVideo/video-container2.vue')['default']
     YMap: typeof import('./../components/Map/YMap.vue')['default']
-    YMapold: typeof import('./../components/Map/YMapold.vue')['default']
     YztMap: typeof import('./../components/Map/YztMap/index.vue')['default']
   }
   export interface ComponentCustomProperties {

src/views/routineCommandMap/LeftSection/index.vue

@@ -58,8 +58,22 @@
               <dict-tag :options="mm_event_state" :value="item.event_status" />
             </td>
             <td class="td">
-              <div v-if="item.event_status === '0' || item.event_status === '1'" class="flex">
-                <div @click="enterCommand(item)">进入指挥</div>
+              <div
+                v-if="item.event_status === '0' || item.event_status === '1' || item.event_status === '2' || item.event_status === '3'"
+                class="flex"
+              >
+                <template v-if="item.event_status === '0'">
+                  <div @click="enterCommand(item)">开始指挥</div>
+                </template>
+                <template v-if="item.event_status === '1'">
+                  <div @click="enterCommand(item)">进入指挥</div>
+                </template>
+                <template v-if="item.event_status === '2'">
+                  <div>指挥记录</div>
+                </template>
+                <template v-if="item.event_status === '3'">
+                  <div>已关闭</div>
+                </template>
               </div>
             </td>
           </tr>
@@ -170,7 +184,7 @@ const eventManageState = reactive({
     { label: '事件状态', key: 'event_status' },
     { label: '操作', key: 'operate' }
   ],
-  showListDialog: false,
+  showListDialog: false
   // showDetailDialog: false,
 });
 // 显示事件管理列表弹窗