路网视频、弹窗调整

src/components/Map/data.ts

@@ -60,7 +60,7 @@ export const methodList = {
   '27': getConstructionSitesDetails,
   '28': getEmergencyTransportResourcesDetails,
   '29': getEmergencyDisasterInfoOfficerDetails,
-  '30': getVehicleDetails,
+  // '30': getVehicleDetails,
   '31': getWaterList,
   '32': getVideoDrowning,
   '33': getVideoForestFire,
@@ -100,7 +100,7 @@ export const titleList = {
   '27': '在建工地',
   '28': '运输资源',
   '29': '灾害信息员',
-  '30': '重点车辆信息',
+  '30': '路网视频',
   '31': '江湖河库',
   '32': '防溺水',
   '33': '森林防火',

src/components/Step/index.vue

@@ -48,7 +48,7 @@ const props = defineProps({
       .step-time {
         position: absolute;
         top: 60px;
-        left: 20px;
+        left: 0px;
         font-size: 38px;
         color: #ffffff;
         width: 100%;

src/types/components.d.ts

@@ -21,7 +21,6 @@ declare module 'vue' {
     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']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
@@ -38,34 +37,20 @@ declare module 'vue' {
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElLink: typeof import('element-plus/es')['ElLink']
     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']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
-    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']
-    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']
-    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-    ElTabs: typeof import('element-plus/es')['ElTabs']
     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']
     FooterSection: typeof import('./../components/FooterSection/index.vue')['default']
@@ -76,7 +61,6 @@ declare module 'vue' {
     HikvisionPlayer: typeof import('./../components/HKVideo/hikvision-player.vue')['default']
     HKVideo: typeof import('./../components/HKVideo/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['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']
@@ -92,7 +76,6 @@ declare module 'vue' {
     Pagination: typeof import('./../components/Pagination/index.vue')['default']
     ParentView: typeof import('./../components/ParentView/index.vue')['default']
     PdfView: typeof import('./../components/PdfView/index.vue')['default']
-    PdfViewer: typeof import('./../components/PdfView/PdfViewer.vue')['default']
     QuickZoom: typeof import('./../components/Map/quickZoom.vue')['default']
     Render: typeof import('./../components/BuildCode/render.vue')['default']
     RightTool: typeof import('./../components/Map/rightTool.vue')['default']

src/views/globalMap/data/mapData.ts

@@ -4266,8 +4266,8 @@ export const iconList = {
     size: [60, 60]
   },
   '30': {
-    image: getImageUrl('29_emergencyofficer.png'),
-    imageHover: getImageUrl('29_emergencyofficer_hover.png'),
+    image: getImageUrl('31_lakes_video.png'),
+    imageHover: getImageUrl('31_lakes_video_hover.png'),
     size: [40, 40]
   },
   '31': {

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

@@ -1,5 +1,5 @@
 <template>
-  <Dialog type="xl" :title="title" customShow hide-footer @close="handleClose">
+  <Dialog type="xl" :title="title" class="custom-dialog" customShow hide-footer @close="handleClose">
     <div class="common-header">
 <!--      <div v-if="detailData.del_flag !== '2'" class="common-btn-primary2" @click="handleUpdate">-->
 <!--        <i class="edit-icon" />-->
@@ -84,7 +84,7 @@
     <div class="common-title-box">事件概要</div>
     <div v-if="!!detailData.event_description" class="text-box">{{ detailData.event_description }}</div>
     <div class="common-title-box">事件跟踪</div>
-    <div style="padding: 20px 105px 30px 35px">
+    <div style="padding: 20px 105px 60px 35px">
       <Step :step-data="eventTrackState" style="width: 100%" />
     </div>
     <div class="common-title-box">指挥记录</div>
@@ -128,11 +128,9 @@
     </div>
     <Dialog v-model="showDeleteDialog" class="tip" type="xs" title="提示">确认删除事件吗</Dialog>
   </Dialog>
-  <Dialog type="xs" v-model="dialogTableVisible" title="文件预览" height="1800px">
-    <div>
-      <div style="margin-top: 80px">{{ detailInfo.file_name }}</div>
-      <pdf-viewer v-if="dialogTableVisible" :url="baseUrl + '/file/download/' + detailInfo.url" />
-    </div>
+  <Dialog v-if="dialogTableVisible" type="xs" v-model="dialogTableVisible" title="文件预览" height="1800px">
+    <div style="font-weight: bold; margin-bottom: 30px">{{ detailInfo.file_name }}</div>
+    <pdf-viewer :url="baseUrl + '/file/download/' + detailInfo.url" />
   </Dialog>
 </template>
 
@@ -269,101 +267,103 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-:deep(.dialog-header) {
-  pointer-events: none;
-  .dialog-close {
-    pointer-events: auto;
+.custom-dialog {
+  :deep(.dialog-header) {
+    pointer-events: none;
+    .dialog-close {
+      pointer-events: auto;
+    }
   }
-}
-:deep(.dialog-content) {
-  margin-top: -80px;
-}
-.tip {
   :deep(.dialog-content) {
-    margin-top: 0;
+    margin-top: -80px;
   }
-}
-.common-header {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-}
-.form {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  padding: 0 35px 30px;
-  .form-item {
-    width: calc(25% - 15px);
-    margin-left: 20px;
-    &:nth-child(4n + 1) {
-      margin-left: 0;
+  .tip {
+    :deep(.dialog-content) {
+      margin-top: 0;
     }
-    .text1 {
-      font-size: 38px;
-      color: #8da1be;
-      line-height: 70px;
-    }
-    .text2 {
-      font-size: 38px;
-      line-height: 70px;
-      color: #ffffff;
-      display: flex;
-      align-items: center;
+  }
+  .common-header {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
+  .form {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    padding: 0 35px 30px;
+    .form-item {
+      width: calc(25% - 15px);
+      margin-left: 20px;
+      &:nth-child(4n + 1) {
+        margin-left: 0;
+      }
+      .text1 {
+        font-size: 38px;
+        color: #8da1be;
+        line-height: 70px;
+      }
+      .text2 {
+        font-size: 38px;
+        line-height: 70px;
+        color: #ffffff;
+        display: flex;
+        align-items: center;
+      }
     }
   }
-}
-.common-title-box {
-  margin-bottom: 10px;
-}
-.list {
-  display: flex;
-  .list-item {
+  .common-title-box {
+    margin-bottom: 10px;
+  }
+  .list {
     display: flex;
-    flex-direction: column;
-    align-content: center;
-    justify-content: center;
-    margin-right: 40px;
-    cursor: pointer;
-    position: relative;
-    .img {
-      width: 476px;
-      height: 284px;
-      background: url('@/assets/images/cardBg.png') no-repeat;
-      background-size: 100% 100%;
+    .list-item {
+      display: flex;
+      flex-direction: column;
+      align-content: center;
+      justify-content: center;
+      margin-right: 40px;
       cursor: pointer;
+      position: relative;
+      .img {
+        width: 476px;
+        height: 284px;
+        background: url('@/assets/images/cardBg.png') no-repeat;
+        background-size: 100% 100%;
+        cursor: pointer;
+      }
+      .item-title {
+        position: absolute;
+        left: 50%;
+        bottom: 16px;
+        transform: translateX(-50%);
+        color: #2c81ff;
+      }
+      &:last-child {
+        margin-right: 0;
+      }
     }
-    .item-title {
-      position: absolute;
-      left: 50%;
-      bottom: 16px;
-      transform: translateX(-50%);
-      color: #2c81ff;
-    }
-    &:last-child {
-      margin-right: 0;
+    .list-item2 {
+      margin-right: 40px;
+      cursor: pointer;
+      &:last-child {
+        margin-right: 0;
+      }
     }
   }
-  .list-item2 {
-    margin-right: 40px;
-    cursor: pointer;
-    &:last-child {
-      margin-right: 0;
-    }
+  .info-content {
+    padding: 20px 35px 30px;
   }
-}
-.info-content {
-  padding: 20px 35px 30px;
-}
-.list2 {
-  .list-item {
-    display: flex;
-    align-items: center;
-    color: #2c81ff;
-    cursor: pointer;
-    .icon {
-      margin-left: 10px;
+  .list2 {
+    .list-item {
+      display: flex;
+      align-items: center;
+      color: #2c81ff;
       cursor: pointer;
+      .icon {
+        margin-left: 10px;
+        cursor: pointer;
+      }
     }
   }
 }