提交修改内容

src/views/home/Header.vue

@@ -33,7 +33,7 @@
 <!--    </div>-->
     <MiForChange v-if="miForChangeShow"/>
     <water-level v-if="waterDeepShow"/>
-    <Tools v-show="checkTool" @showView="vidoShow=true"  @hiddenView="closeVido"/>
+    <Tools v-show="checkTool" @showView="vidoShow=true"  :shipinRonghe="vidoShow" @hiddenView="closeVido" />
 
     <VideoForHK  v-if="vidoShow" :vidoBackShow="false"  :cameraIndexCode="'89be6c491cf04a6aa3c42669e77d2127'"  ref="childeRef"   @closeVido="closeVidoAll"/>
     <WaterLevelForChars v-if="waterDeepShows"/>
@@ -106,7 +106,6 @@ export default {
   }
   function  closeVidoAll(){
     vidoShow.value=false
-
   }
 
   function showChaogaos()

src/views/home/cpns/VideoForHK.vue

@@ -121,6 +121,11 @@
     // 推送消息
     function cbIntegrationCallBack(oData) {
         console.log(JSON.stringify(oData.responseMsg))
+        if (JSON.stringify(oData.responseMsg) == '{"msg":{"cameraIndexCode":"89be6c491cf04a6aa3c42669e77d2127","result":816,"wndId":1},"type":2}')
+    {
+        onCancelVideo()
+        handleClose()
+    }
     }
 
     const  initCount=ref(0)
@@ -229,7 +234,7 @@
                         layout: layout,         //布局
                         enableHTTPS: enableHTTPS,   //是否启用HTTPS协议
                         encryptedFields: encryptedFields, //加密字段
-                        showToolbar: showToolbar, //是否显示工具栏
+                        showToolbar: vidoBackShow.value?showToolbar:0, //是否显示工具栏
                         showSmart: showSmart,   //是否显示智能信息
                         toolBarButtonIDs: vidoBackShow.value?"2048,2049,4098":'',
                         reconnectDuration: 5,
@@ -319,8 +324,8 @@
             width: 38vw;
             height: 43vh;
             margin: auto;
-            background-color: #ccc;
             /*color: #021434;*/
+            background: #000000;
             z-index: 600;
 
             .vido_footer {

src/views/home/cpns/tools/HuiFangArea.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="huiFangArea" >
+      <div style="margin-top: 10px;">
+          <span style="font-size: 12px">选择回放时间</span>
+      </div>
     <div class="cb-time">
       <div>
           <i class="cbt-icon"></i>
@@ -26,7 +29,7 @@
           />
       </div>
       <div>
-          <span @click="onSub(true)" v-if="subStat==0">确定</span>
+          <span @click="onSub(true)" v-if="subStat==0">开始绘制</span>
           <span @click="onSub(false)" v-else>关闭</span>
       </div>
     </div>
@@ -70,12 +73,12 @@ export default {
   top: 10vh;
   right: 30vh;
   width: 20vh;
-  height: 150px;
+  height: 200px;
   background: url('@/assets/imgs/area/bg.png') no-repeat;
   background-size: 100% 100%;
   .cb-time {
     width: 100%;
-    height: 30%;
+    height: 25%;
     div{
       margin: 0 auto;
       height: 100%;

src/views/home/cpns/tools/Tools.vue

@@ -22,7 +22,7 @@ export default {
 </script>
 
 <script setup>
-  import {onMounted, onBeforeUnmount, ref} from 'vue'
+  import {onMounted, onBeforeUnmount, ref,watch} from 'vue'
 import bus from '@/utils/bus'
 import 'element-plus/es/components/date-picker/style/css'
   import {setBoat} from "@/utils/map/Boat";
@@ -33,6 +33,7 @@ onMounted(() => {
 
 })
 
+  const  props= defineProps(['shipinRonghe'])
 
 onBeforeUnmount(() => {
 })
@@ -53,6 +54,12 @@ onBeforeUnmount(() => {
     ]})
   const emit = defineEmits(['showView','hiddenView'])
 
+  watch(props,(n,o)=>{
+      if (!props.shipinRonghe)
+      {
+          itemForAll.value.data[1].click=false
+      }
+  })
 
     function chlickLi(item) {
         if (item.click)