front/src/views/home/components/searchResultList.vue

@@ -571,14 +571,10 @@ export default {
       _applyList = jcss.concat(_applyList)
       localStorage.setItem('applyList', JSON.stringify(_applyList))
       // 融合服务
+      localStorage.setItem('integrationServicesItemInfo', JSON.stringify(item))
       router.push({
         path: '/apply',
-          query: {
-            integrationServicesId: item.id,
-          },
       })
-
-       
     }
 
     mybus.on('chongzhi', (typeObj) => {

front/src/views/home/infrastructurePage.vue

@@ -494,7 +494,7 @@
           <template #bodyCell="{ column, record }">
             <template v-if="column.dataIndex === 'operation'">
               <a
-                v-if="isXiHaiAn"
+                v-if="isXiHaiAn || true"
                 @click="
                   openVideo(
                     record.channelCode ||
@@ -1730,14 +1730,13 @@
         status: 1,
         name: mapSearchParam.value.cameraName
       }
-      // todo-临时放开
-      // if (
-      //   params.regionId === '70be8c5b664f4bcf869d82f2e8335051' &&
-      //   !params.name &&
-      //   !params.longitude
-      // ) {
-      //   params.status = ''
-      // }
+      if (
+        params.regionId === '70be8c5b664f4bcf869d82f2e8335051' &&
+        !params.name &&
+        !params.longitude
+      ) {
+        params.status = ''
+      }
       let paramsFather = ''
       let i = 1
       for (var key in params) {

front/src/views/personalCenter/components/AbilityApplication.vue

@@ -168,6 +168,7 @@
                   <a-button
                     v-if="item.approveStatus === '通过'"
                     @click.stop="switchFunction(item)"
+                    class="DownloadAttachment2"
                   >
                     查看详情
                   </a-button>
@@ -185,14 +186,6 @@
                   <span class="channelName">{{ val.channelName }}</span>
                   <span class="type">基础设施</span>
                 </div>
-                <a-button
-                    type="primary"
-                    v-if="item.approveStatus === '通过' && whoShow1.itShowXiHaiAn"
-                    @click.stop="openVideo(val)"
-                  >
-                  视频预览
-                </a-button>
-
               </div>
               <div class="ability-bottom">
                 <div class="dec2">位置：{{ val.nodeName }}</div>
@@ -215,23 +208,6 @@
         </div>
       </div>
     </div>
-
-     <!-- 单个预览弹窗 -->
-     <a-modal
-        wrapClassName="single-preview-modal"
-        v-model:visible="visible"
-        title="视频预览"
-        :width="960"
-        destroyOnClose
-      >
-        <template #footer></template>
-        <div style="width: 100%; display: flex; justify-content: center">
-          <div style="width: 100%; height: 100%">
-            <vue3VideoPlay v-bind="options"/>
-          </div>
-        </div>
-      </a-modal>
-
   </div>
 </template>
 <script setup>
@@ -240,44 +216,11 @@
   import { message } from 'ant-design-vue'
   import { endProcess, getApplyForm } from '@/api/personalCenter.js'
   import { useRouter } from 'vue-router'
-  import {
-    getStreamByChannelCode,
-  } from '@/api/videoSurveillance'
   const router = useRouter()
   const backUrl = ref(window.SITE_CONFIG.apiURL + '/')
   const props = defineProps({
     refObj: { type: Object, default: null },
   })
-  const whoShow1 = ref(whoShow)
-  let visible = ref(false)
-  const options = reactive({
-    width: '912px', //播放器宽度
-    height: '513px', //播放器高度
-    color: '#409eff', //主题色
-    title: '', //视频名称
-    src: '', //视频源
-    type: 'm3u8', // 视频源类型
-    muted: false, //静音
-    webFullScreen: false,
-    speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
-    autoPlay: true, //自动播放
-    loop: false, //循环播放
-    mirror: false, //镜像画面
-    ligthOff: false, //关灯模式
-    volume: 0.3, //默认音量大小
-    control: true, //是否显示控制
-    controlBtns: [
-      'audioTrack',
-      'quality',
-      'speedRate',
-      'volume',
-      'setting',
-      'pip',
-      'pageFullScreen',
-      'fullScreen',
-    ], //显示所有按钮,
-  })
-
   const dept = reactive({})
   // eslint-disable-next-line no-undef
   if (infrastructure) {
@@ -436,25 +379,6 @@
       }
     }
   }
-  
-  // 视频预览
-  const openVideo = (item) => {
-    console.log('打开视频', item)
-    const param = {
-      key: item.cameraId,
-    }
-    getStreamByChannelCode(param).then((res) => {
-      console.log('视频预览------------>', res);
-      console.log(res)
-      visible.value = true
-      options.src = res.data.data || ''
-    }).catch(err => {
-      message.error(err)
-    })
-    // 视频测试--勿删
-    // visible.value = true
-    // options.src = 'http://playertest.longtailvideo.com/adaptive/bipbop/gear4/prog_index.m3u8'
-  }
 </script>
 <style lang="less" scoped>
   .title {
@@ -652,19 +576,4 @@
       }
     }
   }
-
-  .single-preview-modal {
-    .ant-modal-header {
-      background: url(~@/assets/home/video-background.png) no-repeat;
-      background-size: cover;
-    }
-    .ant-modal-title {
-      font-size: 0.16rem;
-      font-weight: 500;
-      color: #ffffff;
-    }
-    .anticon {
-      color: #ffffff;
-    }
-  }
 </style>