feat 用户和角色权限配置

feat 用户权限bug修改
feat 固件版本更换, 删除逻辑修正
2026-06-29 16:38:54 +08:00 · 2026-06-29 16:38:10 +08:00 · 2026-06-29 11:56:02 +08:00 · 2026-06-26 15:04:51 +08:00 · 2026-06-26 14:59:03 +08:00 · 2026-06-26 14:54:55 +08:00
7 changed files with 49 additions and 75 deletions
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -5,6 +5,10 @@
    "ComputedRef": true,
    "DirectiveBinding": true,
    "EffectScope": true,
+    "ElLoading": true,
+    "ElMessage": true,
+    "ElMessageBox": true,
+    "ElNotification": true,
    "ExtractDefaultPropTypes": true,
    "ExtractPropTypes": true,
    "ExtractPublicPropTypes": true,
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -46,7 +46,7 @@
              v-model:visible="popoverVisible"
            >
              <template #reference>
-                <el-badge :value="infoData" :max="999">
+                <el-badge :value="infoData" :max="9999">
                  <div class="right-menu-item hover-effect" @click="goToWarningList">
                    <el-icon><BellFilled /></el-icon>
                  </div>
--- a/src/utils/video.ts
+++ b/src/utils/video.ts
@@ -1,5 +1,7 @@
 import Hls from 'hls.js';
+import { log } from 'node:console';
 let hlsInstance: Hls | null = null;
+// let hlsRetryCount = 0;

 export const initHls = (monitorVideoUrl, monitorVideoRef) => {
  const url = monitorVideoUrl.value;
@@ -17,7 +19,16 @@ export const initHls = (monitorVideoUrl, monitorVideoRef) => {
  }

  if (Hls.isSupported()) {
-    const hls = new Hls();
+    const hls = new Hls({
+      // ★ ZLM 注册流需要时间，配置自动重试
+      manifestLoadingMaxRetry: 5, // m3u8 加载最多重试20次
+      manifestLoadingRetryDelay: 500, // 每次重试间隔500ms
+      manifestLoadingTimeOut: 5000, // m3u8 请求超时5秒
+      levelLoadingMaxRetry: 2, // ts 分片加载最多重试20次
+      levelLoadingRetryDelay: 500,
+      lowLatencyMode: false, // 关掉低延迟模式，更稳定
+      startLevel: -1 // 自动选择码率
+    });
    hls.loadSource(url);
    hls.attachMedia(video);
    hls.on(Hls.Events.MANIFEST_PARSED, () => {
@@ -25,6 +36,8 @@ export const initHls = (monitorVideoUrl, monitorVideoRef) => {
      try {
        video.play().catch(() => {});
      } catch (e) {}
+      // 加载成功，重置重试计数
+      // hlsRetryCount = 0;
    });
    hlsInstance = hls;
  } else if (video.canPlayType('application/vnd.apple.mpegurl')) {
@@ -56,7 +69,9 @@ export const destroyHls = (monitorVideoRef) => {
      video.removeAttribute('src');
      // 对某些浏览器，需要调用 load() 来重置 media element
      if (typeof video.load === 'function') video.load();
-    } catch (e) {}
+    } catch (e) {
+      console.log('Error in destroyHls:', e);
+    }
  }
 };

--- a/src/views/WarningList/list.vue
+++ b/src/views/WarningList/list.vue
@@ -51,7 +51,7 @@
        <el-table-column label="所属设备" align="center" prop="deviceName" min-width="120" show-overflow-tooltip />
        <el-table-column label="报警区域" align="center" prop="monitoringArea" min-width="120" show-overflow-tooltip />
        <!-- pay content  -->
-        <el-table-column label="报警图片" align="center" prop="alarmImage" min-width="120">
+        <!-- <el-table-column label="报警图片" align="center" prop="alarmImage" min-width="120">
          <template #default="scope">
            <el-image
              v-if="scope.row.alarmImage"
@@ -63,7 +63,7 @@
            />
            <span v-else>暂无图片</span>
          </template>
-        </el-table-column>
+        </el-table-column> -->
        <el-table-column label="处理状态" align="center" prop="status" width="100">
          <template #default="scope">
            <el-tag v-if="scope.row.status === 0" type="warning">未处理</el-tag>
--- a/src/views/equipmentList/list.vue
+++ b/src/views/equipmentList/list.vue
@@ -81,7 +81,7 @@
          </template>
        </el-table-column>
        <el-table-column label="设备型号" align="center" prop="model" />
-        <el-table-column label="固件版本" align="center" prop="id" />
+        <el-table-column label="固件版本" align="center" prop="version" />
        <el-table-column label="是否绘制区域" align="center" prop="isDrawArea">
          <template #default="scope">
            <el-tag v-if="scope.row.isDrawArea === 1 || scope.row.isDrawArea === '1'">是</el-tag>
@@ -101,7 +101,7 @@
              @click="handleActivate(scope.row)"
              >唤醒设备</el-button
            >
-            <el-button type="primary" @click="handleDelete(scope.row)">删除</el-button>
+            <el-button :disabled="scope.row.status !== 2 && scope.row.status !== '2'" type="primary" @click="handleDelete(scope.row)">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -134,6 +134,7 @@
        <div class="flex w-full items-center justify-between gap-2 min-w-0 pr-8">
          <span class="truncate">{{ videoName }}-{{ monitoringArea }}监控</span>
          <div>
+            <el-button type="primary" class="shrink-0" @click="handleRefresh">刷新</el-button>
            <el-button v-if="!seeSee" type="primary" class="shrink-0" @click="drawImage()">绘制区域</el-button>
            <el-button v-if="seeSee" type="primary" class="shrink-0" @click="clearImage()">清空区域</el-button>
            <el-button v-if="seeSee" type="primary" class="shrink-0" @click="saveImage()">保存区域</el-button>
@@ -158,7 +159,7 @@ import { EquipmentList, DeviceInfoForm, AlarmAreaData } from '@/api/equipmentLis
 import { listDemo, getDemo, delDemo, addDemo, updateDemo } from '@/api/demo/demo';
 import { DemoVO, DemoQuery, DemoForm } from '@/api/demo/demo/types';
 import { log } from 'node:console';
-import Hls from 'hls.js';
+import { initHls, destroyHls } from '@/utils/video';
 import { nextTick } from 'vue';
 import { useVideosStore } from '@/store/modules/video';

@@ -190,68 +191,9 @@ const dialog1 = reactive<DialogOption>({

 const monitorVideoUrl = ref('');
 const monitorVideoRef = ref<HTMLVideoElement>();
-let hlsInstance: Hls | null = null;
 let visibilityHandler: (() => void) | null = null;
 const monitoringArea = ref<string>('');

-const initHls = () => {
-  const url = monitorVideoUrl.value;
-  const video = monitorVideoRef.value;
-  if (!url || !video) return;
-
-  // 销毁已有实例
-  if (hlsInstance) {
-    try {
-      hlsInstance.destroy();
-    } catch (e) {
-      // ignore
-    }
-    hlsInstance = null;
-  }
-
-  if (Hls.isSupported()) {
-    const hls = new Hls();
-    hls.loadSource(url);
-    hls.attachMedia(video);
-    hls.on(Hls.Events.MANIFEST_PARSED, () => {
-      // 自动播放（若浏览器允许）
-      try {
-        video.play().catch(() => {});
-      } catch (e) {}
-    });
-    hlsInstance = hls;
-  } else if (video.canPlayType('application/vnd.apple.mpegurl')) {
-    // Safari/原生支持 HLS
-    video.src = url;
-    video.addEventListener('loadedmetadata', () => {
-      try {
-        video.play().catch(() => {});
-      } catch (e) {}
-    });
-  } else {
-    proxy?.$modal.msgWarning('当前浏览器不支持 HLS 播放');
-  }
-};
-
-const destroyHls = () => {
-  try {
-    if (hlsInstance) {
-      hlsInstance.destroy();
-      hlsInstance = null;
-    }
-  } catch (e) {}
-  const video = monitorVideoRef.value;
-  if (video) {
-    // 清理原生 src，避免残留
-    try {
-      video.pause();
-      video.removeAttribute('src');
-      // 对某些浏览器，需要调用 load() 来重置 media element
-      if (typeof video.load === 'function') video.load();
-    } catch (e) {}
-  }
-};
-
 type MonitorPoint = { x: number; y: number };
 const monitorDrawCollecting = ref(false);
 const monitorDrawPoints = ref<MonitorPoint[]>([]);
@@ -419,7 +361,7 @@ const handleSee = async (row?: any) => {
  dialog1.visible = true;
  dialog1.title = '修改设备';

-  destroyHls();
+  destroyHls(monitorVideoRef);
  monitorVideoUrl.value = '';
  await videosStore.getVideos(row.id);
  monitorVideoUrl.value = videosStore.hisUrl || '';
@@ -432,7 +374,7 @@ const handleSee = async (row?: any) => {

  // 等待 DOM 更新后初始化 Hls
  await nextTick();
-  initHls();
+  initHls(monitorVideoUrl, monitorVideoRef);
  // 等待视频加载完成后初始化 ResizeObserver，以便能正确获取视频尺寸
  initVideoResizeObserver();

@@ -565,7 +507,7 @@ const cleanupVisibilityChange = () => {

 const handleMonitorDialogClose = (done: () => void) => {
  // 卸载 Hls 与清理 video
-  destroyHls();
+  destroyHls(monitorVideoRef);
  monitorVideoUrl.value = '';
  destroyVideoResizeObserver();
  resetMonitorDraw();
@@ -710,7 +652,7 @@ const saveImage = async () => {

 const handleMonitorDialogOpen = () => {
  // 初始化 Hls 与 video
-  initHls();
+  initHls(monitorVideoUrl, monitorVideoRef);
  initVideoResizeObserver();
  monitorDrawCollecting.value = false;
  monitorDrawPoints.value = [];
@@ -747,6 +689,19 @@ watch(
    videoName.value = newValue === 1 ? '绘制区域' : '实时监控';
  }
 );
+
+/** 刷新按钮操作 */
+const handleRefresh = async () => {
+  if (!form.value.id) return;
+  destroyHls(monitorVideoRef);
+  monitorVideoUrl.value = '';
+  await videosStore.getVideos(form.value.id);
+  monitorVideoUrl.value = videosStore.hisUrl || '';
+  if (monitorVideoUrl.value) {
+    await nextTick();
+    initHls(monitorVideoUrl, monitorVideoRef);
+  }
+};
 </script>

 <style scoped lang="scss">
--- a/src/views/systemList/role/role.vue
+++ b/src/views/systemList/role/role.vue
@@ -20,7 +20,7 @@
      <template #header>
        <el-row :gutter="10" class="flex justify-end mb8">
          <el-col :span="1.5">
-            <el-button v-hasPermi="['system:role:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
          </el-col>
          <!-- <el-col :span="1.5">
            <el-button v-hasPermi="['system:role:edit']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">修改</el-button>
--- a/src/views/systemList/user/user.vue
+++ b/src/views/systemList/user/user.vue
@@ -62,7 +62,7 @@
          <template #header>
            <el-row :gutter="10" class="flex justify-end mb8">
              <el-col :span="1.5">
-                <el-button v-has-permi="['system:user:add']" type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
+                <el-button type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
              </el-col>
              <!-- <el-col :span="1.5">
                <el-button v-has-permi="['system:user:edit']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">
@@ -123,10 +123,10 @@
            <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
              <template #default="scope">
                <!-- <el-tooltip v-if="scope.row.userId !== 1" content="修改" placement="top"> -->
-                <el-button v-hasPermi="['system:user:edit']" type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
+                <el-button type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
                <!-- </el-tooltip>
                <el-tooltip v-if="scope.row.userId !== 1" content="删除" placement="top"> -->
-                <el-button v-hasPermi="['system:user:remove']" type="primary" @click="handleDelete(scope.row)">删除</el-button>
+                <el-button type="primary" @click="handleDelete(scope.row)">删除</el-button>
                <!-- </el-tooltip> -->

                <!-- <el-tooltip v-if="scope.row.userId !== 1" content="重置密码" placement="top">
Author	SHA1	Message	Date
Ironsp	5ef955f1fc	feat 用户和角色权限配置	2026-06-29 16:38:54 +08:00
Ironsp	0859fc76cd	feat 用户权限bug修改	2026-06-29 16:38:10 +08:00
Ironsp	67fe72411c	feat 固件版本更换, 删除逻辑修正	2026-06-29 11:56:02 +08:00
Ironsp	e05d3a49da	feat 优化报警图片	2026-06-26 15:04:51 +08:00
Ironsp	a860697ba2	feat 优化ts分片加载最多重试	2026-06-26 14:59:03 +08:00
Ironsp	6e15e28f38	feat 添加刷新功能	2026-06-26 14:54:55 +08:00
wangzzpeng	92c5cf293b	Merge remote-tracking branch 'origin/main'	2026-06-26 14:14:00 +08:00
wangzzpeng	ec47c164b0	删除错误自动恢复	2026-06-26 14:13:39 +08:00
Ironsp	8bd41d6758	feat 关闭src, 切断视频流	2026-06-26 14:04:41 +08:00
Ironsp	f92baab6f7	feat hls加载,断网多次加载m3u8	2026-06-26 11:56:48 +08:00
Ironsp	a27b0ac7f2	feat hls错误自动修复	2026-06-26 11:07:29 +08:00
Ironsp	4083da42d8	feat 优化Badge	2026-06-25 08:29:00 +08:00