玉溪前端修改

src/config/axios/config.ts

@@ -7,7 +7,7 @@ const config: {
   /**
    * api请求基础路径
    */
-  base_url: import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL,
+  base_url:  `http://${window.location.hostname}:48080` + import.meta.env.VITE_API_URL,
   /**
    * 接口成功返回状态码
    */

src/main.ts

@@ -1,3 +1,6 @@
+// 动态生成 baseUrl 并共享给其他模块
+const baseUrl = `http://${window.location.hostname}:48080`;
+
 // 引入unocss css
 import '@/plugins/unocss'
 

src/views/Home/Index.vue

@@ -257,11 +257,6 @@ const getShortcut = async () => {
       icon: 'ep:pointer',
       url: 'logistics/stock'
     },
-    {
-      name: '实时视频',
-      icon: 'ep:magic-stick',
-      url: 'cameraTree/cameraStreet'
-    },
     {
       name: '巷道管理',
       icon: 'fa-solid:rainbow',
@@ -292,24 +287,6 @@ const laneInventoryLineOptions = ref<EChartsOption>({})
 
 const orderChartOption = ref<EChartsOption>({})
 
-let eventSource: any = null
-const sseUid = ref(`${Date.now()}-${Math.floor(Math.random() * 10000)}`)
-const sse = ()=>{
-   // 创建一个 EventSource 实例，连接到后端的 SSE 路径
-   eventSource = new EventSource('http://192.168.0.10:48080/app-api/sse/createSse?uid=' + sseUid.value );
-
-    // 监听来自后端的消息
-    eventSource.onmessage = (event) => {
-  const data = JSON.parse(event.data);
-  console.log(data);
-  
-};
-
-// 处理错误
-eventSource.onerror = (error) => {
-  console.error('SSE 连接发生错误:', error);
-};
-}
 
 // 盘点饼状图选项
 const stockPieOptions = reactive({
@@ -415,14 +392,12 @@ onMounted(() => {
   CameraApi.getCameraList().then((res) => {
     cameraList.value = res
   })
-  sse()
+ 
 })
 
 onUnmounted(() => {
    // 在组件销毁时关闭 EventSource 连接
-   if (eventSource) {
+   
-      eventSource.close();
-    }
 })
 </script>
 <style scoped>

src/views/Login/SocialLogin.vue

@@ -166,7 +166,7 @@ const loginData = reactive({
   captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false',
   loginForm: {
     username: 'admin',
-    password: 'admin123',
+    password: '',
     captchaVerification: '',
     rememberMe: false
   }

src/views/bpm/model/ModelImportForm.vue

@@ -68,7 +68,7 @@ const formRules = reactive({
 })
 const formRef = ref() // 表单 Ref
 const uploadRef = ref() // 上传 Ref
-const importUrl = import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/bpm/model/import'
+const importUrl = `http://${window.location.hostname}:48080` + import.meta.env.VITE_API_URL + '/bpm/model/import'
 const uploadHeaders = ref() // 上传 Header 头
 const fileList = ref([]) // 文件列表
 

src/views/infra/druid/index.vue

@@ -12,7 +12,7 @@ import * as ConfigApi from '@/api/infra/config'
 defineOptions({ name: 'InfraDruid' })
 
 const loading = ref(true) // 是否加载中
-const url = ref(import.meta.env.VITE_BASE_URL + '/druid/index.html')
+const url = ref(`http://${window.location.hostname}:48080` + '/druid/index.html')
 
 /** 初始化 */
 onMounted(async () => {

src/views/infra/server/index.vue

@@ -11,7 +11,7 @@ import * as ConfigApi from '@/api/infra/config'
 defineOptions({ name: 'InfraAdminServer' })
 
 const loading = ref(true) // 是否加载中
-const src = ref(import.meta.env.VITE_BASE_URL + '/admin/applications')
+const src = ref(`http://${window.location.hostname}:48080` + '/admin/applications')
 
 /** 初始化 */
 onMounted(async () => {

src/views/infra/swagger/index.vue

@@ -11,8 +11,8 @@ import * as ConfigApi from '@/api/infra/config'
 defineOptions({ name: 'InfraSwagger' })
 
 const loading = ref(true) // 是否加载中
-const src = ref(import.meta.env.VITE_BASE_URL + '/doc.html') // Knife4j UI
+const src = ref(`http://${window.location.hostname}:48080` + '/doc.html') // Knife4j UI
-// const src = ref(import.meta.env.VITE_BASE_URL + '/swagger-ui') // Swagger UI
+// const src = ref(`http://${window.location.hostname}:48080` + '/swagger-ui') // Swagger UI
 
 /** 初始化 */
 onMounted(async () => {

src/views/infra/webSocket/index.vue

@@ -79,7 +79,7 @@ defineOptions({ name: 'InfraWebSocket' })
 const message = useMessage() // 消息弹窗
 
 const server = ref(
-  (import.meta.env.VITE_BASE_URL + '/infra/ws').replace('http', 'ws') + '?token=' + getAccessToken()
+  (`http://${window.location.hostname}:48080` + '/infra/ws').replace('http', 'ws') + '?token=' + getAccessToken()
 ) // WebSocket 服务地址
 const getIsOpen = computed(() => status.value === 'OPEN') // WebSocket 连接是否打开
 const getTagColor = computed(() => (getIsOpen.value ? 'success' : 'red')) // WebSocket 连接的展示颜色

src/views/logistics/cameraStreet/index/index.vue

@@ -11,7 +11,7 @@
           highlight-current
           class="camera-tree"
         />
-        <ptz :cameraId="cameraId" />
+        <ptz @childTriggerParent="reVideo" v-if="cameraId" :cameraId="cameraId" />
       </el-col>
       <el-col :span="19">
         <div class="container">
@@ -38,11 +38,12 @@
             @click="clickCameraFun((rowIndex-1)*topNum +colIndex)"
           >
           
-          <div v-if="((rowIndex-1)*topNum +colIndex)==cameraIndex" class="floating-text"><Icon :size="15" icon="ep:circle-close"
+          <div v-if="((rowIndex-1)*topNum +colIndex)==cameraIndex" class="floating-text">
-            /></div>
+            <Icon :size="15" icon="ep:circle-close" @click="deleteCameraFun((rowIndex-1)*topNum +colIndex)"/>
+          </div>
     
             <Camera v-if="getCameraId((rowIndex - 1) * topNum + colIndex)!== 0"
-            :cameraId="getCameraId((rowIndex-1)*topNum +colIndex)" :ptzShow="false" />
+            :cameraId="getCameraId((rowIndex-1)*topNum +colIndex)" :ref="'camera'+((rowIndex-1)*topNum +colIndex)" :ptzShow="false" />
           </el-col>
         </el-row>
       </el-col>
@@ -53,10 +54,9 @@
 <script setup lang="ts">
 import Camera from '@/components/camera/camera.vue'
 
+import { ref } from 'vue';
 import ptz from '@/components/camera/ptzNotFlow.vue'
 import { CameraApi, CameraVO } from '@/api/logistics/camera'
-import { el, ta } from 'element-plus/es/locale'
-import { flatMap } from 'lodash-es'
 /** 相机 列表 */
 defineOptions({ name: 'Camera' })
 
@@ -69,8 +69,22 @@ const topNum = ref(2) // 默认值
 const cameraIndex = ref()
 // 用户是否选择视频
 const clickCamera = ref(false)
+const refs = {};
+// const refs = reactive({});
 const CameraMap = ref<Map<number, number | undefined>>()
-
+const reVideo = async (cameraId: number) => { 
+  if (CameraMap.value) {
+    for (const [index, id] of CameraMap.value.entries()) {
+      if (id === cameraId) {
+        console.log("刷新摄像头 index:", index);
+        const cameraRef = refs[`camera${index}`];
+        if (cameraRef && cameraRef.startVideo) {
+          cameraRef.startVideo();
+        }
+      }
+    }
+  }
+}
 /** 查询列表 */
 const getTree = async () => {
   try {
@@ -80,6 +94,15 @@ const getTree = async () => {
   }
 }
 const selectedNodeId = ref<string | null>(null)
+// 关闭视频
+const deleteCameraFun = (index)=>{
+  console.log("删除摄像头 index:",index );
+  
+  clickCamera.value = true
+  CameraMap.value?.delete(index)
+  cameraIndex.value = index
+  cameraId.value = null
+}
 // 点击视频墙的一部分
 const clickCameraFun = (index)=>{
 
@@ -97,6 +120,7 @@ const handleNodeClick = (data: any) => {
   if (data.id != null) {
     // 如果用户点击了视频节点，则修改该视频节点
     if(clickCamera.value){
+      deleteCameraFun(cameraIndex.value)
       CameraMap.value?.set(cameraIndex.value, data.id)
     }else{
         // 用户未选择视频节点，找到第一个空闲位置设置 cameraId

src/views/logistics/stock/index.vue

@@ -233,7 +233,7 @@ const handleQuery = async () => {
   const data = await StockApi.getStreetList(queryParams)
   saveQueryParamsToCookie()
   getStreetStatus()
-  buttons.value = data.buttons
+  
   rows = ref(data.rows)
   columns =ref(data.columns)
   const page = columns.value/columnMax.value

src/views/mp/components/wx-reply/components/TabImage.vue

@@ -63,7 +63,7 @@ import { getAccessToken } from '@/utils/auth'
 import { Reply } from './types'
 const message = useMessage()
 
-const UPLOAD_URL = import.meta.env.VITE_BASE_URL + '/admin-api/mp/material/upload-temporary'
+const UPLOAD_URL = `http://${window.location.hostname}:48080` + '/admin-api/mp/material/upload-temporary'
 const HEADERS = { Authorization: 'Bearer ' + getAccessToken() } // 设置上传的请求头部
 
 const props = defineProps<{

src/views/mp/components/wx-reply/components/TabMusic.vue

@@ -67,7 +67,7 @@ import { Reply } from './types'
 
 const message = useMessage()
 
-const UPLOAD_URL = import.meta.env.VITE_BASE_URL + '/admin-api/mp/material/upload-temporary'
+const UPLOAD_URL = `http://${window.location.hostname}:48080` + '/admin-api/mp/material/upload-temporary'
 const HEADERS = { Authorization: 'Bearer ' + getAccessToken() } // 设置上传的请求头部
 
 const props = defineProps<{

src/views/mp/components/wx-reply/components/TabVideo.vue

@@ -58,7 +58,7 @@ import { Reply } from './types'
 
 const message = useMessage()
 
-const UPLOAD_URL = import.meta.env.VITE_BASE_URL + '/admin-api/mp/material/upload-temporary'
+const UPLOAD_URL = `http://${window.location.hostname}:48080` + '/admin-api/mp/material/upload-temporary'
 const HEADERS = { Authorization: 'Bearer ' + getAccessToken() }
 
 const props = defineProps<{

src/views/mp/components/wx-reply/components/TabVoice.vue

@@ -61,7 +61,7 @@ import { getAccessToken } from '@/utils/auth'
 import { Reply } from './types'
 const message = useMessage()
 
-const UPLOAD_URL = import.meta.env.VITE_BASE_URL + '/admin-api/mp/material/upload-temporary'
+const UPLOAD_URL = `http://${window.location.hostname}:48080` + '/admin-api/mp/material/upload-temporary'
 const HEADERS = { Authorization: 'Bearer ' + getAccessToken() } // 设置上传的请求头部
 
 const props = defineProps<{

src/views/mp/draft/components/CoverSelect.vue

@@ -67,7 +67,7 @@ import { UploadType, useBeforeUpload } from '@/views/mp/hooks/useUpload'
 import { NewsItem } from './types'
 const message = useMessage()
 
-const UPLOAD_URL = import.meta.env.VITE_BASE_URL + '/admin-api/mp/material/upload-permanent' // 上传永久素材的地址
+const UPLOAD_URL = `http://${window.location.hostname}:48080` + '/admin-api/mp/material/upload-permanent' // 上传永久素材的地址
 const HEADERS = { Authorization: 'Bearer ' + getAccessToken() } // 设置上传的请求头部
 
 const props = defineProps<{

src/views/mp/draft/components/NewsForm.vue

@@ -143,7 +143,7 @@ const props = defineProps<{
 const accountId = inject<number>('accountId')
 
 // ========== 文件上传 ==========
-const UPLOAD_URL = import.meta.env.VITE_BASE_URL + '/admin-api/mp/material/upload-permanent' // 上传永久素材的地址
+const UPLOAD_URL = `http://${window.location.hostname}:48080` + '/admin-api/mp/material/upload-permanent' // 上传永久素材的地址
 const editorConfig = createEditorConfig(UPLOAD_URL, accountId)
 
 // v-model=newsList

src/views/mp/material/components/upload.ts

@@ -3,7 +3,7 @@ import { getAccessToken } from '@/utils/auth'
 import { UploadType, useBeforeUpload } from '@/views/mp/hooks/useUpload'
 
 const HEADERS = { Authorization: 'Bearer ' + getAccessToken() } // 请求头
-const UPLOAD_URL = import.meta.env.VITE_BASE_URL + '/admin-api/mp/material/upload-permanent' // 上传地址
+const UPLOAD_URL = `http://${window.location.hostname}:48080` + '/admin-api/mp/material/upload-permanent' // 上传地址
 
 interface UploadData {
   type: UploadType

src/views/report/jmreport/index.vue

@@ -10,6 +10,6 @@ import { getAccessToken } from '@/utils/auth'
 
 defineOptions({ name: 'JimuReport' })
 
-const BASE_URL = import.meta.env.VITE_BASE_URL
+const BASE_URL = `http://${window.location.hostname}:48080`
 const src = ref(BASE_URL + '/jmreport/list?token=' + getAccessToken())
 </script>

src/views/system/user/UserImportForm.vue

@@ -52,7 +52,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中
 const uploadRef = ref()
 const importUrl =
-  import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/import'
+  `http://${window.location.hostname}:48080` + import.meta.env.VITE_API_URL + '/system/user/import'
 const uploadHeaders = ref() // 上传 Header 头
 const fileList = ref([]) // 文件列表
 const updateSupport = ref(0) // 是否更新已经存在的用户数据