Ver Fonte

调整事件接报列表、预案管理列表的事件状态和事件类型、预案类型的转换

hmm há 7 meses atrás
pai
commit
199e0dc503

+ 0 - 1
src/components/NearbyVideos/index.vue

@@ -21,7 +21,6 @@
       />
     </div>
   </Dialog>
-
 </template>
 
 <script lang="ts" setup name="NearbyVideos">

+ 4 - 1
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']
@@ -49,6 +51,8 @@ declare module 'vue' {
     ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
     ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
     ElSlider: typeof import('element-plus/es')['ElSlider']
+    ElStep: typeof import('element-plus/es')['ElStep']
+    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
@@ -100,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 {

+ 31 - 4
src/views/routineCommandMap/LeftSection/EventManage.vue

@@ -96,7 +96,7 @@
               </el-form-item>
             </el-col>
             <div class="flex">
-              <div class="common-btn-primary" @click="handleQuery" style="margin-top: -32px">搜索</div>
+              <div class="common-btn-primary" style="margin-top: -32px" @click="handleQuery">搜索</div>
               <div class="common-btn" @click="resetQuery">重置</div>
             </div>
           </el-row>
@@ -118,14 +118,41 @@
       <div v-for="(item, index) in eventList" :key="index" class="tr">
         <div class="td">{{ item.event_id }}</div>
         <div class="td">{{ item.event_title }}</div>
-        <div class="td">{{ item.event_type }}</div>
+<!--        <div class="td">{{ item.event_type }}</div>-->
+        <div v-if="item.event_type === '0' || item.event_type === '1' || item.event_type === '2' || item.event_type === '3'" class="flex">
+          <template v-if="item.event_type === '0'">
+            <div>自然灾害</div>
+          </template>
+          <template v-if="item.event_type === '1'">
+            <div>事故灾害</div>
+          </template>
+          <template v-if="item.event_type === '2'">
+            <div>公共卫生事件</div>
+          </template>
+          <template v-if="item.event_type === '3'">
+            <div>社会安全事件</div>
+          </template>
+        </div>
         <div class="td">{{ item.event_level }}</div>
         <div class="td">{{ item.address }}</div>
-        <div class="td">{{ item.event_status }}</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>已登记</div>
+          </template>
+          <template v-if="item.event_status === '1'">
+            <div>指挥中</div>
+          </template>
+          <template v-if="item.event_status === '2'">
+            <div>指挥结束</div>
+          </template>
+          <template v-if="item.event_status === '3'">
+            <div>已关闭</div>
+          </template>
+        </div>
         <div class="td">{{ item.event_time }}</div>
         <div class="td">
           <div class="common-btn2" @click="enterCommand(item)">进入指挥</div>
-<!--          <div class="common-btn2" style="margin-left: 20px" @click="handleClose(item)">关闭事件</div>-->
+          <!--          <div class="common-btn2" style="margin-left: 20px" @click="handleClose(item)">关闭事件</div>-->
         </div>
       </div>
     </div>

+ 13 - 2
src/views/routineCommandMap/RightSection/planManageDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="localValue" customShow type="xl" title="预案管理列表" hide-footer @close="handleClose">
+  <Dialog v-model="localValue" custom-show type="xl" title="预案管理列表" hide-footer @close="handleClose">
     <transition name="fade">
       <div v-if="isFormVisible" class="mb-[20px]">
         <el-form ref="queryFormRef" :model="planForm" :inline="true">
@@ -79,7 +79,18 @@
       <div v-for="(item, index) in demoList" :key="index" class="tr">
         <div class="td">{{ item.planId }}</div>
         <div class="td">{{ item.planName }}</div>
-        <div class="td">{{ item.planType }}</div>
+        <!--        <div class="td">{{ item.planType }}</div>-->
+        <div v-if="item.planType === '1' || item.planType === '2' || item.planType === '3'" class="flex">
+          <template v-if="item.planType === '1'">
+            <div>总体应急预案</div>
+          </template>
+          <template v-if="item.planType === '2'">
+            <div>专项应急预案</div>
+          </template>
+          <template v-if="item.planType === '3'">
+            <div>部门应急预案</div>
+          </template>
+        </div>
         <div class="td">{{ item.document }}</div>
         <div class="td">{{ item.organizingUnit }}</div>
         <div class="td">{{ item.publishDate }}</div>