瀏覽代碼

事件管理时间轴

Hwf 9 月之前
父節點
當前提交
c479688b38

+ 0 - 24
src/types/components.d.ts

@@ -16,25 +16,16 @@ declare module 'vue' {
     CompanyMap: typeof import('./../components/Map/company-map.vue')['default']
     DictTag: typeof import('./../components/DictTag/index.vue')['default']
     Editor: typeof import('./../components/Editor/index.vue')['default']
-    ElAnchor: typeof import('element-plus/es')['ElAnchor']
-    ElAnchorLink: typeof import('element-plus/es')['ElAnchorLink']
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     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']
-    ElCollapse: typeof import('element-plus/es')['ElCollapse']
-    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
-    ElContainer: typeof import('element-plus/es')['ElContainer']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
-    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -44,49 +35,34 @@ declare module 'vue' {
     ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
-    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElLink: typeof import('element-plus/es')['ElLink']
-    ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
-    ElProgress: typeof import('element-plus/es')['ElProgress']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSpace: typeof import('element-plus/es')['ElSpace']
     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']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
-    ElText: typeof import('element-plus/es')['ElText']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
-    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     FileUpload: typeof import('./../components/FileUpload/index.vue')['default']
     Hamburger: typeof import('./../components/Hamburger/index.vue')['default']
     HeaderSearch: typeof import('./../components/HeaderSearch/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
-    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
-    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
-    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']

+ 5 - 3
src/views/duty/eventing/CloseEventDialog.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script lang="ts" setup>
-import { closeEvent } from '@/api/duty/eventing';
+import { closeEvent, getEventDetail } from '@/api/duty/eventing';
 
 interface Form {
   eventId: string;
@@ -58,7 +58,6 @@ interface Form {
 interface Props {
   modelValue: boolean;
   eventId: string;
-  data: Form;
 }
 const props = withDefaults(defineProps<Props>(), {
   modelValue: false
@@ -69,7 +68,10 @@ watch(
   () => props.modelValue,
   () => {
     if (props.modelValue) {
-      form.value = props.data;
+      getEventDetail({ eventId: props.eventId }).then((res) => {
+        form.value = res.data;
+        debugger;
+      });
     }
     visible.value = props.modelValue;
   }

+ 1 - 6
src/views/duty/eventing/eventDetails.vue

@@ -120,7 +120,7 @@
         </el-timeline-item>
       </el-timeline>
     </el-dialog>
-    <CloseEventDialog v-model="closeDialogState.show" :data="closeDialogState.form" :eventId="eventId" />
+    <CloseEventDialog v-model="closeDialogState.show" :eventId="eventId" />
   </div>
 </template>
 
@@ -208,11 +208,6 @@ let detailData = ref({
 
 const closeDialogState = reactive({
   show: false,
-  form: {
-    deaths: '',
-    injuries: '',
-    missing: ''
-  }
 });
 
 // 关闭事件

+ 9 - 8
src/views/duty/eventing/index.vue

@@ -186,7 +186,7 @@
         </div>
       </template>
     </el-dialog>
-
+    <CloseEventDialog v-model="closeDialogState.show" :eventId="closeDialogState.eventId" />
     <!-- 地图弹窗 -->
     <company-map v-model:visible="mapDialogVisible" :address="form.address" @confirm="handleMapChange"></company-map>
   </div>
@@ -195,6 +195,7 @@
 <script setup lang="ts">
 import { ref, reactive, toRefs, onMounted } from 'vue';
 import { addEvent, getEvent } from '@/api/duty/eventing';
+import CloseEventDialog from '@/views/duty/eventing/CloseEventDialog.vue';
 
 const proxy = getCurrentInstance()?.proxy;
 const { mm_event_type, mm_event_level, mm_event_state, region } = toRefs<any>(proxy?.useDict('mm_event_type', 'mm_event_level', 'mm_event_state', 'region'));
@@ -350,15 +351,15 @@ const handleDelete = (row) => {
   }
 };
 
+const closeDialogState = reactive({
+  show: false,
+  eventId: ''
+});
+
 // 关闭事件
 const handleClose = (row) => {
-  if (row) {
-    // 关闭逻辑
-    setTimeout(() => {
-      row.eventStatus = '3'; // 已关闭
-      getList();
-    }, 500);
-  }
+  row.eventId = row.eventId;
+  closeDialogState.show = true;
 };
 
 // 查看事件详情