交通局视频调整

src/api/globalMap/spatialAnalysis.ts

@@ -416,3 +416,16 @@ export const getVideoTraffic = (id: string) => {
     }
   });
 };
+
+// 交通局视频
+export const getPointInfoTransportationVideo = (id: string) => {
+  return request({
+    url: '/api/gateway/v2/get_point_info_transportation_video',
+    method: 'post',
+    data: {
+      query: {
+        id: id
+      }
+    }
+  });
+};

src/components/Map/data.ts

@@ -27,8 +27,8 @@ import {
   getWaterList,
   getVideoDrowning,
   getVideoForestFire,
-  getVideoDisasterPrevention, getVideoTraffic
-} from "@/api/globalMap/spatialAnalysis";
+  getVideoDisasterPrevention, getVideoTraffic, getVideoTraffic2, getPointInfoTransportationVideo
+} from '@/api/globalMap/spatialAnalysis';
 import { getRescueTeamsInfo } from '@/api/globalMap/rescueTeam';
 
 export const methodList = {
@@ -66,7 +66,8 @@ export const methodList = {
   '33': getVideoForestFire,
   '34': getVideoDisasterPrevention,
   '35': getVideoTraffic,
-  '41': getRescueTeamsInfo
+  '41': getRescueTeamsInfo,
+  '42': getPointInfoTransportationVideo
 };
 export const titleList = {
   '1': '专家信息',
@@ -104,5 +105,6 @@ export const titleList = {
   '33': '森林防火',
   '34': '防灾救援',
   '35': '交通视频',
-  '41': '救援队伍'
+  '41': '救援队伍',
+  '42': '交通局视频'
 };

src/types/components.d.ts

@@ -21,6 +21,7 @@ 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']
@@ -37,20 +38,34 @@ 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']
@@ -61,6 +76,7 @@ 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']
@@ -97,6 +113,10 @@ declare module 'vue' {
     VideoContainer2: typeof import('./../components/HKVideo/video-container2.vue')['default']
     VideoTagEdit: typeof import('./../components/VideoTagEdit/index.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 {
+    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
+  }
 }

src/views/globalMap/RightMenu/Mitigation.vue

@@ -38,7 +38,7 @@
           </div>
         </div>
       </div>
-      <Dialog v-if="showDialog" v-model="showDialog" type="md" title="防灾救援" hide-footer>
+      <Dialog v-if="showDialog" v-model="showDialog" type="md" draggable title="防灾救援" hide-footer>
         <div style="width: 100%; height: 100%; display: flex; justify-content: center; align-items: center">
           <HKVideo :dot_data="videoMonitorData" />
         </div>

src/views/globalMap/RightMenu/TyphoonVideo.vue

@@ -40,7 +40,7 @@
       </div>
       <div class="table-content">
         <div v-for="(item, index) in dataList" :key="item.id" class="tr">
-          <div class="td">{{ item.record_time }}</div>
+          <div class="td">{{ parseTime(item.record_time) }}</div>
           <div class="td">{{ item.longitude }},{{ item.latitude }}</div>
           <div class="td">{{ item.record_address }}</div>
           <div class="td">

src/views/globalMap/RightMenu/tranBureauVideo.vue

@@ -3,7 +3,7 @@
     <div class="container">
       <div class="gradient-text title">交通局视频</div>
       <div class="box-left">
-        <el-input v-model="queryParams.keyword" class="custom-input" placeholder="搜索" @input="initData2">
+        <el-input v-model="queryParams.name" class="custom-input" placeholder="搜索" @input="initData2">
           <template #prefix>
             <el-icon class="el-input__icon"><search /></el-icon>
           </template>
@@ -65,7 +65,7 @@
           </div>
         </div>
       </div>
-      <Dialog v-if="showDialog" v-model="showDialog" type="md" title="交通局视频" hide-footer>
+      <Dialog v-if="showDialog" v-model="showDialog" type="md" draggable title="交通局视频" hide-footer>
         <div style="width: 100%; height: 100%; display: flex; justify-content: center; align-items: center">
           <HKVideo :dot_data="videoMonitorData" />
         </div>
@@ -85,7 +85,7 @@ const { district_type, danger_type } = toRefs<any>(proxy?.useDict('district_type
 const queryParams = reactive({
   page: 1,
   pageSize: 10,
-  keyword: '',
+  name: '',
   area: '',
   video_type: ''
 });
@@ -116,7 +116,7 @@ const initData2 = () => {
   });
 };
 const handleCancel = () => {
-  queryParams.keyword = '';
+  queryParams.name = '';
   initData2();
 };
 initData2();

src/views/globalMap/data/mapData.ts

@@ -4314,6 +4314,11 @@ export const iconList = {
     image: getImageUrl('41_rescue_team.png'),
     imageHover: getImageUrl('41_rescue_team_hover.png'),
     size: [55, 60]
+  },
+  '42': {
+    image: getImageUrl('31_lakes_video.png'),
+    imageHover: getImageUrl('31_lakes_video_hover.png'),
+    size: [40, 40]
   }
 };
 
@@ -4967,5 +4972,13 @@ export const pointDetailTemplate = {
     description: '描述',
     longitude: '经度',
     latitude: '纬度'
+  },
+  '42': {
+    name: '名称',
+    area: '所属区县',
+    video_type_label: '类型',
+    status: '状态',
+    longitude: '经度',
+    latitude: '纬度'
   }
 };

src/views/globalMap/index.vue

@@ -170,7 +170,8 @@ const clickMenu = (item, dataList) => {
         '防溺水',
         '森林防火',
         '防灾救援',
-        '救援队伍'
+        '救援队伍',
+        '交通局视频'
       ].includes(item.name)
     ) {
       rightMenuRef.value.updateMenu(checked, item);