Merge remote-tracking branch 'origin/dev' into dev

src/types/components.d.ts

@@ -44,8 +44,6 @@ declare module 'vue' {
     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']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
@@ -99,7 +97,6 @@ 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']
   }
 }

src/views/emergencyCommandMap/LeftSection/Communication.vue

@@ -87,11 +87,11 @@
           <div class="icon1"></div>
           <div class="text">会议号入会</div>
         </div>
-        <div class="btn" @click="handleStartCall">
+        <div class="btn" @click="handleOpenCall">
           <div class="icon2"></div>
           <div class="text">电话呼叫</div>
         </div>
-        <div class="btn" @click="handleStartMeeting">
+        <div class="btn" @click="handleOpenMeeting">
           <div class="icon3"></div>
           <div class="text">发起会议</div>
         </div>
@@ -102,6 +102,19 @@
     
     <IndividualEquipment v-show="activeIndex === 2"></IndividualEquipment>
 
+    <Dialog v-if="showOpenMeeting" custom-show type="xs" height="660px" title="发起会议" @confirm="handleStartMeeting" @close="closeOpenDialog">
+      <el-form ref="form2Ref" :model="openMeetingForm" :rules="rules2">
+        
+        <el-form-item label="账号" label-width="200px" prop="username">
+          <el-input v-model="openMeetingForm.username" class="custom-input2" clearable placeholder="请输入设备账号" />
+        </el-form-item>
+
+        <el-form-item label="密码" label-width="200px" prop="userpass">
+          <el-input v-model="openMeetingForm.userpass" type="password" class="custom-input2" clearable placeholder="请输入设备密码" />
+        </el-form-item>
+      </el-form>
+    </Dialog>
+
     <Dialog v-if="showJoinMeeting" custom-show type="xs" height="760px" title="加入会议" @confirm="handleJoinMeeting" @close="closeDialog">
       <el-form ref="formRef" :model="meetingForm" :rules="rules">
         
@@ -114,10 +127,24 @@
         </el-form-item>
 
         <el-form-item label="密码" label-width="200px" prop="userpass">
-          <el-input v-model="meetingForm.userpass" class="custom-input2" clearable placeholder="请输入设备密码" />
+          <el-input v-model="meetingForm.userpass" type="password" class="custom-input2" clearable placeholder="请输入设备密码" />
         </el-form-item>
       </el-form>
     </Dialog>
+
+    <Dialog v-if="showOpenMeeting" custom-show type="xs" height="660px" title="电话呼叫" @confirm="handleStartCall" @close="closeOpenDialog">
+      <el-form ref="form2Ref" :model="openMeetingForm" :rules="rules2">
+        
+        <el-form-item label="账号" label-width="200px" prop="username">
+          <el-input v-model="openMeetingForm.username" class="custom-input2" clearable placeholder="请输入设备账号" />
+        </el-form-item>
+
+        <el-form-item label="密码" label-width="200px" prop="userpass">
+          <el-input v-model="openMeetingForm.userpass" type="password" class="custom-input2" clearable placeholder="请输入设备密码" />
+        </el-form-item>
+      </el-form>
+    </Dialog>
+
   </div>
 </template>
 
@@ -242,6 +269,7 @@ const rules = reactive({
   username: [{ required: true, message: '会议账号不能为空', trigger: 'blur' }],
   userpass: [{ required: true, message: '会议密码不能为空', trigger: 'blur' }]
 });
+
 // 点击会议号入会
 const showJoinMeetingDialog = () => {
   showJoinMeeting.value = true;
@@ -250,6 +278,27 @@ const closeDialog = () => {
   showJoinMeeting.value = false;
   meetingForm.roomcode = '';
 };
+///////////////////
+let form2Ref = ref();
+let showOpenMeeting = ref(false);
+let openMeetingForm = reactive({
+  username: '',
+  userpass: ''
+});
+const rules2 = reactive({
+  username: [{ required: true, message: '会议账号不能为空', trigger: 'blur' }],
+  userpass: [{ required: true, message: '会议密码不能为空', trigger: 'blur' }]
+});
+const handleOpenMeeting = () => {
+  showOpenMeeting.value = true;
+};
+const closeOpenDialog = () => {
+  showOpenMeeting.value = false;
+};
+const handleOpenCall = () => {
+  showOpenMeeting.value = true;
+};
+
 // 会议号入会
 const handleJoinMeeting = () => {
   formRef.value?.validate((valid) => {
@@ -270,8 +319,9 @@ const handleJoinMeeting = () => {
         // 触发点击事件
         a.click();
 
-        // 保存账号和密码，待加入相关代码
-        // ....
+        // 保存账号和密码
+        localStorage.setItem('meeting_username', meetingForm.username)
+        localStorage.setItem('meeting_userpass', meetingForm.userpass)
       });
       closeDialog();
     }
@@ -280,70 +330,95 @@ const handleJoinMeeting = () => {
 
 // 电话呼叫
 const handleStartCall = () => {
-  let dev_list = [];
-  userList.value.forEach((item) => {
-    if (item.checked && item.mobile != '') {
-      dev_list.push({ id: item.mobile, avtype: 'a' }); // a 音频 v 视频 默认 av
-    }
-  });
-  if (dev_list.length == 0) {
-    proxy?.$modal.msgError('请勾选人员');
-    return false;
-  }
-  const screenWidth = window.screen.width * window.devicePixelRatio;
-  const screenHeight = window.screen.height * window.devicePixelRatio;
-  const data = {
-    userid: 'mmyj0009', // 空表示后台获取当前用户对应融合通信dev_id
-    password: '',
-    windowpos: { 'x': 0, 'y': 0, 'width': screenWidth, 'height': screenHeight, 'top': true },
-    members: {
-      num: dev_list.length + 2, // 配置多少个座位，一般就是邀请人多少个就多少个
-      'dev-list': dev_list
+  form2Ref.value?.validate((valid) => {
+    if (valid) {
+      let dev_list = [];
+      userList.value.forEach((item) => {
+        if (item.checked && item.mobile != '') {
+          dev_list.push({ id: item.mobile, avtype: 'a' }); // a 音频 v 视频 默认 av
+        }
+      });
+      if (dev_list.length == 0) {
+        proxy?.$modal.msgError('请勾选人员');
+        return false;
+      }
+      const screenWidth = window.screen.width * window.devicePixelRatio;
+      const screenHeight = window.screen.height * window.devicePixelRatio;
+      const data = {
+        userid: openMeetingForm.username, // 空表示后台获取当前用户对应融合通信dev_id
+        password: openMeetingForm.userpass,
+        windowpos: { 'x': 0, 'y': 0, 'width': screenWidth, 'height': screenHeight, 'top': true },
+        members: {
+          num: dev_list.length + 2, // 配置多少个座位，一般就是邀请人多少个就多少个
+          'dev-list': dev_list
+        }
+      };
+      getStartMiniParam(data).then((res) => {
+        // 创建一个a标签元素
+        const a = document.createElement('a');
+        // 设置a标签的href属性
+        a.href = res.data;
+        // 触发点击事件
+        a.click();
+
+        // 保存账号和密码
+        localStorage.setItem('meeting_username', openMeetingForm.username)
+        localStorage.setItem('meeting_userpass', openMeetingForm.userpass)
+      });
+      closeOpenDialog();
     }
-  };
-  getStartMiniParam(data).then((res) => {
-    // 创建一个a标签元素
-    const a = document.createElement('a');
-    // 设置a标签的href属性
-    a.href = res.data;
-    // 触发点击事件
-    a.click();
-  });
+  })
 };
 
 // 发起会议
 const handleStartMeeting = () => {
-  let dev_list = [];
-  userList.value.forEach((item) => {
-    if (item.checked && item.mobile != '') {
-      dev_list.push({ id: item.mobile, avtype: 'av' }); // a 音频 v 视频 默认 av
-    }
-  });
-  if (dev_list.length == 0) {
-    proxy?.$modal.msgError('请勾选人员');
-    return false;
-  }
-  const screenWidth = window.screen.width * window.devicePixelRatio;
-  const screenHeight = window.screen.height * window.devicePixelRatio;
-  const data = {
-    'userid': 'mmyj0009', // 空表示后台获取当前用户对应融合通信dev_id
-    'password': '',
-    windowpos: { 'x': 0, 'y': 0, 'width': screenWidth, 'height': screenHeight, 'top': true },
-    members: {
-      num: dev_list.length + 2, // 配置多少个座位，一般就是邀请人多少个就多少个
-      'dev-list': dev_list
+  form2Ref.value?.validate((valid) => {
+    if (valid) {
+      let dev_list = [];
+      userList.value.forEach((item) => {
+        if (item.checked && item.mobile != '') {
+          dev_list.push({ id: item.mobile, avtype: 'av' }); // a 音频 v 视频 默认 av
+        }
+      });
+      if (dev_list.length == 0) {
+        proxy?.$modal.msgError('请勾选人员');
+        return false;
+      }
+      const screenWidth = window.screen.width * window.devicePixelRatio;
+      const screenHeight = window.screen.height * window.devicePixelRatio;
+      const data = {
+        'userid': openMeetingForm.username, // 空表示后台获取当前用户对应融合通信dev_id
+        'password': openMeetingForm.userpass,
+        windowpos: { 'x': 0, 'y': 0, 'width': screenWidth, 'height': screenHeight, 'top': true },
+        members: {
+          num: dev_list.length + 2, // 配置多少个座位，一般就是邀请人多少个就多少个
+          'dev-list': dev_list
+        }
+      };
+      getStartMiniParam(data).then((res) => {
+        // 创建一个a标签元素
+        const a = document.createElement('a');
+        // 设置a标签的href属性
+        a.href = res.data;
+        // 触发点击事件
+        a.click();
+        
+        // 保存账号和密码
+        localStorage.setItem('meeting_username', openMeetingForm.username)
+        localStorage.setItem('meeting_userpass', openMeetingForm.userpass)
+      });
+      closeOpenDialog();
     }
-  };
-  getStartMiniParam(data).then((res) => {
-    // 创建一个a标签元素
-    const a = document.createElement('a');
-    // 设置a标签的href属性
-    a.href = res.data;
-    // 触发点击事件
-    a.click();
-  });
+  })
 };
 onMounted(() => {
+  const meeting_username = localStorage.getItem('meeting_username') || "";
+  const meeting_userpass = localStorage.getItem('meeting_userpass') || "";
+  meetingForm.username = meeting_username;
+  meetingForm.userpass = meeting_userpass;
+  openMeetingForm.username = meeting_username;
+  openMeetingForm.userpass = meeting_userpass;
+
   getTree();
 });
 </script>

src/views/emergencyCommandMap/LeftSection/Drone.vue

@@ -29,7 +29,7 @@ interface QueryParams {
   equipment: string;
 }
 const queryParams = reactive<QueryParams>({
-  equipment: ''
+  equipment: '无人机'
 });
 const getTree = () => {
   getDroneTree(queryParams).then((res) => {

src/views/emergencyCommandMap/LeftSection/IndividualEquipment.vue

@@ -24,13 +24,13 @@
 
 <script setup lang="ts">
 import { Search } from '@element-plus/icons-vue';
-import { getAvconDeptTree } from '@/api/emergencyCommandMap/communication';
+// import { getAvconDeptTree } from '@/api/emergencyCommandMap/communication';
 import { getDroneTree } from '@/api/emergencyCommandMap/Drone';
 interface QueryParams {
   equipment: string;
 }
 const queryParams = reactive<QueryParams>({
-  equipment: ''
+  equipment: '单兵设备'
 });
 
 const treeData = ref([]);

src/views/globalMap/RightMenu/index.vue

@@ -69,6 +69,8 @@
           <Mitigation v-if="menuState.menuData[menuState.activeIndex]?.name === '防灾救援'" @handle-menu="handleMenu" />
           <!--交通视频-->
           <TrafficVideo v-if="menuState.menuData[menuState.activeIndex]?.name === '交通视频'" @handle-menu="handleMenu" />
+          <!--交通局视频-->
+          <tranBureauVideo v-if="menuState.menuData[menuState.activeIndex]?.name === '交通局视频'" @handle-menu="handleMenu" />
           <!--易涝隐患点-->
           <PotentialFloodHazard v-if="menuState.menuData[menuState.activeIndex]?.name === '易涝隐患点'" @handle-menu="handleMenu" />
           <!--通讯保障-->
@@ -111,6 +113,7 @@ import PreventDrowning from './PreventDrowning.vue';
 import Fireproofing from './Fireproofing.vue';
 import ForestDefenseVideo from './ForestDefenseVideo/index.vue';
 import Mitigation from './Mitigation.vue';
+import tranBureauVideo from './tranBureauVideo.vue';
 import PotentialFloodHazard from './PotentialFloodHazard.vue';
 import TowerStatus from './TowerStatus.vue';
 import CommunicationSupport from './CommunicationSupport.vue';

src/views/globalMap/RightMenu/tranBureauVideo.vue

@@ -0,0 +1,198 @@
+<template>
+  <div class="menu-content">
+    <div class="container">
+      <div class="gradient-text title">交通局视频</div>
+      <div class="box-left">
+        <el-input v-model="queryParams.keyword" class="custom-input" placeholder="搜索" @input="initData">
+          <template #prefix>
+            <el-icon class="el-input__icon"><search /></el-icon>
+          </template>
+        </el-input>
+        <div class="btn" @click="handleCancel">取消</div>
+      </div>
+<!--      <div class="gradient-text">视频类型</div>-->
+      <div class="custom-table">
+        <div class="th">
+          <div class="td">
+            <div style="width: 240px">
+              <el-select
+                v-model="queryParams.area"
+                placeholder="所有区县"
+                size="large"
+                class="custom-select2"
+                popper-class="custom-select-popper2"
+                :teleported="false"
+                @change="initData"
+              >
+                <el-option label="所有区县" value="" />
+                <el-option v-for="item in district_type" :key="item.value" :label="item.label" :value="item.label" />
+              </el-select>
+            </div>
+          </div>
+          <div class="td">
+            <div style="width: 240px">
+              <el-select
+                v-model="queryParams.type"
+                placeholder="类型"
+                size="large"
+                class="custom-select2"
+                popper-class="custom-select-popper2"
+                :teleported="false"
+                @change="initData2"
+              >
+                <el-option label="所有类型" value="" />
+                <el-option v-for="item in danger_type" :key="item.value" :label="item.label" :value="item.label" />
+              </el-select>
+            </div>
+          </div>
+          <div class="td">名称</div>
+        </div>
+        <div class="table-content">
+          <div v-for="(item, index) in listData" :key="index" class="tr" @click="handleShowDialog(item)">
+            <div class="td">{{ item.area }}</div>
+            <div class="td">{{ item.type }}</div>
+            <div class="td">{{ item.name }}</div>
+          </div>
+        </div>
+      </div>
+      <Dialog v-if="showDialog" v-model="showDialog" type="md" title="交通局视频" hide-footer>
+        <div style="width: 100%; height: 100%; display: flex; justify-content: center; align-items: center">
+          <HKVideo :dot_data="videoMonitorData" />
+        </div>
+      </Dialog>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { Search } from '@element-plus/icons-vue';
+import { getRescue } from '@/api/globalMap/mitigation';
+import { deepClone } from '@/utils';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { district_type, danger_type } = toRefs<any>(proxy?.useDict('district_type', 'danger_type'));
+const queryParams = reactive({
+  current: 1,
+  size: 10,
+  keyword: '',
+  area: ''
+});
+const total = ref(0);
+
+const listData = ref([]);
+
+let showDialog = ref(false);
+let videoMonitorData = ref({});
+const handleShowDialog = (row) => {
+  showDialog.value = false;
+  nextTick(() => {
+    videoMonitorData.value = row;
+    showDialog.value = true;
+  });
+};
+const initData = () => {
+  let newQueryParams = deepClone(queryParams);
+  newQueryParams.query = {
+    area: queryParams.area,
+    keyword: queryParams.keyword
+  };
+  delete newQueryParams.area;
+  delete newQueryParams.keyword;
+  getRescue(newQueryParams).then((res) => {
+    listData.value = res.rows;
+    total.value = res.total;
+  });
+};
+const initData2 = () => {}
+const handleCancel = () => {
+  queryParams.keyword = '';
+  initData();
+};
+initData();
+</script>
+
+<style lang="scss" scoped>
+.menu-content {
+  width: 1579px;
+  height: 1394px;
+  background: url('@/assets/images/map/rightMenu/content.png') no-repeat;
+  padding: 130px 20px 20px 20px;
+  font-size: 36px;
+  position: relative;
+  color: #ffffff;
+}
+.title {
+  font-size: 60px;
+  position: absolute;
+  top: 30px;
+  left: 160px;
+}
+.custom-table {
+  width: 1499px;
+  .table-content {
+    height: 880px;
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+  .th {
+    width: 1499px;
+    height: 151px;
+    background: url('@/assets/images/map/rightMenu/th.png') no-repeat;
+    display: flex;
+  }
+  .tr {
+
+    height: 139px;
+    background: url('@/assets/images/map/rightMenu/td.png') no-repeat;
+    //margin-left: -23px;
+    display: flex;
+    padding-right: 20px;
+    &:hover {
+      background: url('@/assets/images/map/rightMenu/td_checked.png') no-repeat;
+    }
+  }
+  .td {
+    flex: 1;
+    color: #edfaff;
+    font-size: 38px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    cursor: pointer;
+  }
+  .td-text {
+    /* 设置字体透明 */
+    color: transparent;
+    /* 使用 -webkit-background-clip 属性将背景剪裁至文本形状 */
+    -webkit-background-clip: text;
+    /* 非Webkit内核浏览器需要使用标准前缀 */
+    background-clip: text;
+    font-family: 'YouSheBiaoTiHei';
+    /* 设置线性渐变，从红色渐变到蓝色 */
+    background-image: linear-gradient(to bottom, #ffffff 50%, #3075d3 100%);
+    font-size: 48px;
+  }
+  .text-green {
+    background-image: linear-gradient(to bottom, #ffffff 50%, #40c75f 100%);
+  }
+  .text-danger {
+    background-image: linear-gradient(to bottom, #ffffff 50%, #ff2f3c 100%);
+  }
+}
+.box-left {
+  display: flex;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  .btn {
+    width: 140px;
+    min-width: 140px;
+    height: 56px;
+    background: url('@/assets/images/map/rightMenu/potentialFloodHazard/btn.png') no-repeat;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    cursor: pointer;
+    margin-left: 20px;
+  }
+}
+</style>