Pre Merge pull request !45 from 山海紫穹/dev260107_2

修复预置位列表展示和设备列表表格操作列宽度
fix: 添加80端口映射，否则无法播放推送的流
2026-06-29 13:37:49 +08:00 · 2026-06-24 01:58:24 +00:00 · 2026-06-24 09:58:04 +08:00 · 2026-01-07 07:51:54 +08:00
3 changed files with 3 additions and 2 deletions
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@ -59,7 +59,7 @@ services:
    networks:
      - media-net
    ports:
-     #- "6080:80/tcp"     # [播流]HTTP  安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址
+     - "80:80/tcp"     # [播流]HTTP  安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址
     #- "4443:443/tcp"     # [播流]HTTPS 安全考虑-非测试阶段需要注释掉，改为由nginx代理播流地址
      - "${MediaRtmp:-10935}:${MediaRtmp:-10935}/tcp"   # [收流]RTMP  
      - "${MediaRtmp:-10935}:${MediaRtmp:-10935}/udp"   # [收流]RTMP  
--- a/web/src/views/device/common/ptzPresetConfig.vue
+++ b/web/src/views/device/common/ptzPresetConfig.vue
@ -21,6 +21,7 @@
      border
      stripe
      max-height="100%"
+      height="100%"
      style="flex: 1"
    >
      <el-table-column prop="presetId" label="序号" align="center" />
--- a/web/src/views/device/list.vue
+++ b/web/src/views/device/list.vue
@ -132,7 +132,7 @@
          </el-button>
        </template>
      </el-table-column>
-      <el-table-column label="操作" min-width="240" fixed="right">
+      <el-table-column label="操作" min-width="260" fixed="right">
        <template v-slot:default="scope">
          <el-button
            type="text"
Author	SHA1	Message	Date
山海紫穹	c32ee462eb	Pre Merge pull request !45 from 山海紫穹/dev260107_2	2026-06-24 01:58:24 +00:00
lin	cf5bcb6349	修复预置位列表展示和设备列表表格操作列宽度	2026-06-24 09:58:04 +08:00
紫穹	8e32f17e6e	fix: 添加80端口映射，否则无法播放推送的流	2026-01-07 07:51:54 +08:00