现场处置视频添加

src/components/legendDialog/WeiXianYinSuDiaolog.vue

@@ -130,7 +130,7 @@ function labelCancel() {
 
 const dialogOptions = ref({
   imgName: '小标题',
-  title: '周边及其他危险因素',
+  title: '周边其他危险因素',
   activeIndex: 0,
   buttons: [
     // { id: 0, title: '病例', active: true },

src/components/legendDialog/YiJiTongJiYaoSuDialog.vue

@@ -20,9 +20,12 @@
       <!-- <el-select v-model="selectSearchObj.do" placeholder="资源类型" popper-class="custom-select" @change="doChange">
         <el-option v-for="item in doOptions" :key="item.value" :label="item.label" :value="item.label" />
       </el-select> -->
-      <el-select v-model="selectSearchObj.range" placeholder="资源类型" popper-class="custom-select" @change="rangeChange">
+      <el-select v-model="selectSearchObj.do" placeholder="资源类型" popper-class="custom-select" @change="doChange">
         <el-option v-for="item in rangeOptions" :key="item.value" :label="item.label" :value="item.label" />
       </el-select>
+        <el-select v-model="selectSearchObj.range" placeholder="距离" popper-class="custom-select" @change="rangeChange">
+        <el-option v-for="item in rangeOptions1" :key="item.value" :label="item.label" :value="item.label" />
+      </el-select>
     </div>
 
     <el-table :data="tableData" class="dialog_table" @row-click="handleRowClick" @row-dblclick="handleRowDblClick" :row-class-name="tableRowClassName">
@@ -97,6 +100,15 @@ const rangeOptions = ref([
   { value: 3, label: '核酸点' },
   { value: 3, label: '检测机构' },
   { value: 3, label: '志愿者' },
+  { value: 3, label: '急救设备' },
+  { value: 3, label: '药剂' },
+  { value: 3, label: '疫苗' },
+])
+
+const rangeOptions1 = ref([
+  { value: 1, label: '3公里' },
+  { value: 2, label: '5公里' },
+  { value: 3, label: '10公里' }
 ])
 
 function doChange(val) {
@@ -176,7 +188,7 @@ const getImgSrc = picName => {
 
 // 关闭弹窗
 const handleClose = () => {
-  dialogStore.yiJiZhuanJiaDialogOpen = false
+  dialogStore.yiJiTongJiYaoSuDialogOpen = false
 }
 
 const clickTimer = ref(null)

src/store/dialog.js

@@ -21,7 +21,7 @@ export const useDialogStore = defineStore('dialog', {
       
       isExpend: false, // 存储绘制点线面面板切换
 
-      weiXianYinSuDialogOpen: false, //周边及其他危险因素
+      weiXianYinSuDialogOpen: false, //周边其他危险因素
       zhoubianziyuanDialogOpen: false,
       yiJiWuZiChuBeiKuDialogOpen: false,
       yiJiWuZiChuBeiKuDetailDiaogOpen: false,

src/store/rightPanel.js

@@ -78,7 +78,7 @@ export const useRightPanelStore = defineStore("rightPanelStore", () => {
     },
     {
       name: "物资装备",
-      img: new URL("@/assets/img/Component 240(2).png", import.meta.url)
+      img: new URL("@/assets/img/应急车辆-值班.png", import.meta.url)
         .href,
       value: false,
       disabled: false
@@ -88,7 +88,7 @@ export const useRightPanelStore = defineStore("rightPanelStore", () => {
   // 应急
   const emergencyList = ref([
     {
-      name: "周边及其他危险因素",
+      name: "周边其他危险因素",
       img: new URL("@/assets/img/yjzb.png", import.meta.url)
         .href,
       value: false,
@@ -108,13 +108,13 @@ export const useRightPanelStore = defineStore("rightPanelStore", () => {
       value: false,
       disabled: false
     },
-    // {
-    //   name: "应急场所",
-    //   img: new URL("@/assets/img/yjzj.png", import.meta.url)
-    //     .href,
-    //   value: false,
-    //   disabled: false
-    // },
+    {
+      name: "安置场所",
+      img: new URL("@/assets/img/yjzj.png", import.meta.url)
+        .href,
+      value: false,
+      disabled: false
+    },
     {
       name: "应急物资储备库",
       img: new URL("@/assets/img/yjcs.png", import.meta.url)
@@ -158,14 +158,14 @@ export const useRightPanelStore = defineStore("rightPanelStore", () => {
     },
 
     {
-      name: "养老机构",
+      name: "联动单位",
       img: new URL("@/assets/img/Component 240(4).png", import.meta.url)
         .href,
       value: false,
       disabled: false
     },
     {
-      name: "托幼机构",
+      name: "单位机构",
       img: new URL("@/assets/img/Component 240(5).png", import.meta.url)
         .href,
       value: false,

src/utils/map/baseMethod.js

@@ -1016,7 +1016,7 @@ export function handleWzzbPoints(bol) {
           }),
       },
       // new URL(`@/assets/img/pinpoint(1).png`, import.meta.url).href,
-      "images/yellow.png"
+      "images/sadian/应急车辆-值班.png"
     )
   } else {
     removeMapLayers("yjwz-points")
@@ -1050,7 +1050,7 @@ export function handleXuexiaoPoints(bol) {
   }
 }
 
-//养老机构
+//联动单位
 export function handleYljgPoints(bol) {
   if (bol) {
     removeMapLayers("yljg-points")
@@ -1077,7 +1077,7 @@ export function handleYljgPoints(bol) {
   }
 }
 
-//托幼机构
+//单位机构
 export function handleTyjgPoints(bol) {
   if (bol) {
     removeMapLayers("tyjg-points")

src/views/right/components/common/RightLegend.vue

@@ -304,13 +304,13 @@ const handleInstitutionLevel = item => {
   if (item.name === '学校') {
     handleXuexiaoPoints(item.value)
   }
-  if (item.name === '养老机构') {
+  if (item.name === '联动单位') {
     handleYljgPoints(item.value)
   }
-  if (item.name === '托幼机构') {
+  if (item.name === '单位机构') {
     handleTyjgPoints(item.value)
   }
-  if (item.name === '医院') {
+  if (item.name === '医疗机构') {
     handleYiyuanPoints(item.value)
   }
   if (item.name === '海关') {
@@ -322,7 +322,7 @@ function handleEmergencyLevel(item) {
   item.value = !item.value
   dialogStore.closeAllDialog()
   switch (item.name) {
-    case '周边及其他危险因素':
+    case '周边其他危险因素':
       dialogStore.weiXianYinSuDialogOpen = item.value
 
       break

src/views/right/components/reportHandle/comp/riskHandleBottom.vue

@@ -81,14 +81,14 @@
       <!-- 一个视频 -->
       <div class="video-box" v-if="videos.length === 1">
         <!-- 用视频地址替换这里内容 -->
-        <video controls :src="paginatedVideos[0]" />
+        <video controls autoplay loop muted playsinline :src="paginatedVideos[0]" />
       </div>
 
       <!-- 多个视频 -->
       <div class="video-box2" v-if="videos.length > 1">
         <div class="video-content" :class="{ 'video-content-height': videos.length > 4 ? true : false }">
           <div v-for="(video, index) in paginatedVideos" :key="index" class="video-box_item">
-            <video controls :src="video" />
+            <video controls autoplay loop muted playsinline :src="video" />
           </div>
         </div>
         <div v-if="videos.length > 4" class="pagination-controls">
@@ -118,6 +118,7 @@ import { YuanLineOption } from '../../../echarts/echartsOption'
 import MyProgress from '../../../../left/modules/common/MyProgress.vue'
 import { useCommonStore } from '@/store/common.js'
 let commonStore = useCommonStore()
+import video1 from '@/assets/video/6b2bd2709c913cc5b843818bfda65844.mp4'
 
 import { handleRiskStatistic, handleXcczPoints } from '@/utils/map/baseMethod.js'
 
@@ -131,7 +132,7 @@ const videos = ref([
   // 'https://www.w3schools.com/html/mov_bbb.mp4',
   // 'https://www.w3schools.com/html/movie.mp4',
   // 'https://www.w3schools.com/html/mov_bbb.mp4'
-  1, 2, 3, 4, 5, 6, 7
+  video1
 ])
 
 const currentPage = ref(1)