路网视频、弹窗调整

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,
@@ -99,7 +99,7 @@ export const titleList = {
   '27': '在建工地',
   '28': '运输资源',
   '29': '灾害信息员',
-  '30': '重点车辆信息',
+  '30': '路网视频',
   '31': '江湖河库',
   '32': '防溺水',
   '33': '森林防火',

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/knowledge/HiddenStandards/PdfViewer.vue

@@ -140,7 +140,7 @@ onMounted(() => {
   display: flex;
   justify-content: center;
   position: relative;
-  height: 100%;
+  //height: 100%;
 
   .page-tool {
     position: fixed;

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" />-->
@@ -146,11 +146,9 @@
     </div>
     <Dialog v-model="showDeleteDialog" class="tip" type="xs" title="提示">确认删除事件吗</Dialog>
   </Dialog>
-  <Dialog type="s" v-if="dialogTableVisible" v-model="dialogTableVisible" title="文件预览" height="1800px">
-    <div>
-      <div style="margin-top: 40px">{{ detailInfo.file_name }}</div>
-      <pdf-viewer :url="baseUrl + '/file/download/' + detailInfo.url" />
-    </div>
+  <Dialog v-if="dialogTableVisible" v-model="dialogTableVisible" title="文件预览" height="1800px">
+    <div style="font-size: 18px;font-weight: bold;margin-bottom: 10px;">{{ detailInfo.file_name }}</div>
+    <pdf-viewer :url="baseUrl + '/file/download/' + detailInfo.url" />
   </Dialog>
 </template>
 
@@ -287,106 +285,108 @@ 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: -20px;
-}
-.tip {
   :deep(.dialog-content) {
-    margin-top: 0;
+    margin-top: -20px;
   }
-}
-.common-header {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-}
-.form {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  padding: 0 15px 10px;
-  .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: 14px;
-      color: #8da1be;
-      line-height: 30px;
-    }
-    .text2 {
-      font-size: 14px;
-      line-height: 30px;
-      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 15px 10px;
+    .form-item {
+      width: calc(25% - 15px);
+      margin-left: 20px;
+      &:nth-child(4n + 1) {
+        margin-left: 0;
+      }
+      .text1 {
+        font-size: 14px;
+        color: #8da1be;
+        line-height: 30px;
+      }
+      .text2 {
+        font-size: 14px;
+        line-height: 30px;
+        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: 20px;
-    cursor: pointer;
-    position: relative;
-    .img {
-      width: 251px;
-      height: 150px;
-      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: 20px;
       cursor: pointer;
+      position: relative;
+      .img {
+        width: 251px;
+        height: 150px;
+        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;
+      }
     }
   }
-}
-.scroll-box {
-  height: 600px;
-  overflow-y: auto;
+  .scroll-box {
+    height: 600px;
+    overflow-y: auto;
+  }
 }
 </style>