feat 优化标签

2026-06-24 16:05:42 +08:00
17 changed files with 116 additions and 308 deletions
--- a/.env.development
+++ b/.env.development
@@ -35,6 +35,4 @@ VITE_APP_WEBSOCKET = false
 # sse 开关
 VITE_APP_SSE = true

-# http://192.168.0.214:8089
-# VITE_BASE_API = "http://47.104.208.94:8089"
-VITE_BASE_API = "http://192.168.0.214:8089"
+VITE_BASE_API = "http://47.104.208.94:8089"
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 可视化电子围栏管理系统11111
+VITE_APP_TITLE = 可视化电子围栏管理系统
 VITE_APP_LOGO_TITLE = RuoYi-Vue-Plus

 # 生产环境配置
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -1,25 +0,0 @@
-# RTK — Token-Optimized CLI
-
-**rtk** is a CLI proxy that filters and compresses command outputs, saving 60-90% tokens.
-
-## Rule
-
-Always prefix shell commands with `rtk`:
-
-```bash
-# Instead of:              Use:
-git status                 rtk git status
-git log -10                rtk git log -10
-cargo test                 rtk cargo test
-docker ps                  rtk docker ps
-kubectl get pods           rtk kubectl pods
-```
-
-## Meta commands (use directly)
-
-```bash
-rtk gain              # Token savings dashboard
-rtk gain --history    # Per-command savings history
-rtk discover          # Find missed rtk opportunities
-rtk proxy <cmd>       # Run raw (no filtering) but track usage
-```
--- a/.github/hooks/rtk-rewrite.json
+++ b/.github/hooks/rtk-rewrite.json
@@ -1,12 +0,0 @@
-{
-  "hooks": {
-    "PreToolUse": [
-      {
-        "type": "command",
-        "command": "rtk hook copilot",
-        "cwd": ".",
-        "timeout": 5
-      }
-    ]
-  }
-}
--- a/src/api/video/index.ts
+++ b/src/api/video/index.ts
@@ -22,8 +22,8 @@ export const listDemo = (deviceId?: string | number) => {
 */
 export const addDemo = (data: any) => {
  return request({
-    url: `/haikang/isup/stream/live/stop?id=${data}`,
-    method: 'get'
-    // params: data
+    url: '/haikang/isup/stream/live/stop',
+    method: 'get',
+    params: data
  });
 };
--- 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="9999">
+                <el-badge :value="infoData" :max="999">
                  <div class="right-menu-item hover-effect" @click="goToWarningList">
                    <el-icon><BellFilled /></el-icon>
                  </div>
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -2,11 +2,11 @@
  <div class="sidebar-logo-container" :class="{ collapse: collapse }">
    <transition :enter-active-class="proxy?.animate.logoAnimate.enter" mode="out-in">
      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="showLogoImage" :src="logoUrl" class="sidebar-logo" />
+        <img v-if="logo" :src="logoUrl" class="sidebar-logo" />
        <h1 v-else class="sidebar-title">{{ logoName }}</h1>
      </router-link>
      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="showLogoImage" :src="logoUrl" class="sidebar-logo" />
+        <img v-if="logo" :src="logoUrl" class="sidebar-logo" />
        <h1 class="sidebar-title">{{ logoName }}</h1>
      </router-link>
    </transition>
@@ -15,9 +15,11 @@

 <script setup lang="ts">
 import variables from '@/assets/styles/variables.module.scss';
+import logo from '@/assets/logo/logo.png';
 import { useSettingsStore } from '@/store/modules/settings';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 import { NavTypeEnum } from '@/enums/NavTypeEnum';
+import { getDemo } from '@/api/systemList/index';

 defineProps({
  collapse: {
@@ -26,15 +28,13 @@ defineProps({
  }
 });

+const title = import.meta.env.VITE_APP_LOGO_TITLE;
 const settingsStore = useSettingsStore();
 const sideTheme = computed(() => settingsStore.sideTheme);
-const logoUrl = computed(() => settingsStore.appLogoUrl || '');
-const logoName = computed(() => settingsStore.appTitle || import.meta.env.VITE_APP_LOGO_TITLE || 'RuoYi-Vue-Plus');
-const showLogoImage = computed(() => Boolean(logoUrl.value));

 // 获取Logo背景色
 const getLogoBackground = computed(() => {
-  if (settingsStore.dark) {
+  if (settingsStore.isDark) {
    return 'var(--sidebar-bg)';
  }
  if (settingsStore.navType == NavTypeEnum.TOP) {
@@ -45,7 +45,7 @@ const getLogoBackground = computed(() => {

 // 获取Logo文字颜色
 const getLogoTextColor = computed(() => {
-  if (settingsStore.dark) {
+  if (settingsStore.isDark) {
    return 'var(--sidebar-text)';
  }
  if (settingsStore.navType == NavTypeEnum.TOP) {
@@ -53,6 +53,18 @@ const getLogoTextColor = computed(() => {
  }
  return sideTheme.value === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor;
 });
+
+// 获取Logo图片
+const logoUrl = ref();
+const logoName = ref();
+onMounted(() => {
+  getDemo().then((res) => {
+    console.log('系统11111111111', res);
+
+    logoName.value = res.data.name;
+    logoUrl.value = res.data.url;
+  });
+});
 </script>

 <style lang="scss" scoped>
--- a/src/layout/components/notice/index.vue
+++ b/src/layout/components/notice/index.vue
@@ -53,7 +53,6 @@ import { initHls, destroyHls } from '@/utils/video';
 import { onBeforeRouteLeave } from 'vue-router';
 import { useWarningListStore } from '@/store/modules/warnningList';
 import type { WarningListResult } from '@/api/WarningList/types';
-import { addDemo } from '@/api/video/index';

 const { proxy } = getCurrentInstance() as ComponentInternalInstance;

@@ -110,9 +109,7 @@ const parseNoticeItem = (notice: any) => {
 };

 //查看画面
-const currentDeviceId = ref<string | number>();
 const handleSee = async (row: any) => {
-  currentDeviceId.value = row?.deviceId;
  const videoId = row?.deviceId;
  console.log('查看画面', row, 'deviceId', videoId);
  if (!videoId) {
@@ -130,13 +127,6 @@ const handleSee = async (row: any) => {
 };

 const handleMonitorDialogClose = async (done: () => void) => {
-  try {
-    addDemo(currentDeviceId.value as string).then(() => {
-      console.log('关闭视频111111');
-    });
-  } catch (error) {
-    console.log('关闭视频22222222', error);
-  }
  // 卸载 Hls 与清理 video
  destroyHls(monitorVideoRef);
  done();
--- a/src/main.ts
+++ b/src/main.ts
@@ -30,8 +30,6 @@ import './permission';

 // 国际化
 import i18n from '@/lang/index';
-import { useSettingsStore } from '@/store/modules/settings';
-import { getDemo } from '@/api/systemList/index';

 // vxeTable
 import VXETable from 'vxe-table';
@@ -56,24 +54,4 @@ app.use(plugins);
 // 自定义指令
 directive(app);

-const settingsStore = useSettingsStore();
-getDemo()
-  .then((res) => {
-    const name = res?.data?.name;
-    const url = res?.data?.url;
-    if (name || url) {
-      settingsStore.setSystemInfo(name || '', url || '');
-
-      if (url) {
-        const link = document.querySelector("link[rel='icon']") as HTMLLinkElement | null;
-        if (link) {
-          link.href = url;
-        }
-      }
-    }
-  })
-  .catch(() => {
-    // ignore
-  });
-
 app.mount('#app');
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -19,8 +19,6 @@ export const useSettingsStore = defineStore('setting', () => {
    radiusBase: defaultSettings.radiusBase
  });
  const title = ref<string>(defaultSettings.title);
-  const appTitle = ref<string>(defaultSettings.title);
-  const appLogoUrl = ref<string>('');
  const theme = ref<string>(storageSetting.value.theme);
  const sideTheme = ref<string>(storageSetting.value.sideTheme);
  const showSettings = ref<boolean>(defaultSettings.showSettings);
@@ -38,17 +36,8 @@ export const useSettingsStore = defineStore('setting', () => {
    title.value = value;
    useDynamicTitle();
  };
-
-  const setSystemInfo = (name: string, url: string) => {
-    appTitle.value = name || defaultSettings.title;
-    appLogoUrl.value = url || '';
-    useDynamicTitle();
-  };
-
  return {
    title,
-    appTitle,
-    appLogoUrl,
    theme,
    sideTheme,
    showSettings,
@@ -61,7 +50,6 @@ export const useSettingsStore = defineStore('setting', () => {
    dark,
    navType,
    radiusBase,
-    setTitle,
-    setSystemInfo
+    setTitle
  };
 });
--- a/src/utils/dynamicTitle.ts
+++ b/src/utils/dynamicTitle.ts
@@ -6,12 +6,9 @@ import { useSettingsStore } from '@/store/modules/settings';
 */
 export const useDynamicTitle = () => {
  const settingsStore = useSettingsStore();
-  const pageTitle = settingsStore.title || (defaultSettings.title as string);
-  const appTitle = settingsStore.appTitle || (defaultSettings.title as string);
-
  if (settingsStore.dynamicTitle) {
-    document.title = `${pageTitle} - ${appTitle}`;
+    document.title = settingsStore.title + ' - ' + import.meta.env.VITE_APP_TITLE;
  } else {
-    document.title = appTitle;
+    document.title = defaultSettings.title as string;
  }
 };
--- a/src/utils/video.ts
+++ b/src/utils/video.ts
@@ -1,7 +1,5 @@
 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;
@@ -19,16 +17,7 @@ export const initHls = (monitorVideoUrl, monitorVideoRef) => {
  }

  if (Hls.isSupported()) {
-    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 // 自动选择码率
-    });
+    const hls = new Hls();
    hls.loadSource(url);
    hls.attachMedia(video);
    hls.on(Hls.Events.MANIFEST_PARSED, () => {
@@ -36,8 +25,6 @@ export const initHls = (monitorVideoUrl, monitorVideoRef) => {
      try {
        video.play().catch(() => {});
      } catch (e) {}
-      // 加载成功，重置重试计数
-      // hlsRetryCount = 0;
    });
    hlsInstance = hls;
  } else if (video.canPlayType('application/vnd.apple.mpegurl')) {
@@ -69,9 +56,7 @@ export const destroyHls = (monitorVideoRef) => {
      video.removeAttribute('src');
      // 对某些浏览器，需要调用 load() 来重置 media element
      if (typeof video.load === 'function') video.load();
-    } catch (e) {
-      console.log('Error in destroyHls:', e);
-    }
+    } catch (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
@@ -65,121 +65,23 @@
            <el-tag v-else>{{ scope.row.status ?? '-' }}</el-tag>
          </template> -->
        </el-table-column>
-        <!-- <el-table-column label="电池电量" align="center" prop="batteryLevel1" width="150">
+        <el-table-column label="电池电量" align="center" prop="batteryLevel1" width="150">
          <template #default="scope">
-            <el-tag v-if="scope.row.batteryLevel1">左{{ scope.row.batteryLevel1 + '%' }}</el-tag>
+            <!-- <el-button type="primary" v-if="scope.row.batteryLevel1" plain size="small">{{ scope.row.batteryLevel1 + '%' }}</el-button>
+            <el-button type="primary" v-if="scope.row.batteryLevel2" plain size="small">
+              {{ scope.row.batteryLevel2 + '%' }}
+            </el-button> -->
+            <!-- <el-button type="primary" v-else plain size="small"> 未获取 </el-button> -->
+            <el-tag v-if="scope.row.batteryLevel1">{{ scope.row.batteryLevel1 + '%' }}</el-tag>
            <el-tag v-if="scope.row.batteryLevel2" :style="scope.row.batteryLevel1 && scope.row.batteryLevel2 ? 'margin-left: 10px' : ''">
-              右{{ scope.row.batteryLevel2 + '%' }}
+              {{ scope.row.batteryLevel2 + '%' }}
            </el-tag>
+            <!-- <el-tag v-else type="info"> 未获取 </el-tag> -->
            <el-tag v-if="!scope.row.batteryLevel1 && !scope.row.batteryLevel2"> 未获取 </el-tag>
          </template>
-        </el-table-column> -->
-        <el-table-column label="电池电量" align="center" width="160">
-          <template #default="scope">
-            <div v-if="scope.row.batteryLevel1 != null || scope.row.batteryLevel2 != null" class="battery-group">
-              <!-- 左电池 -->
-              <div v-if="scope.row.batteryLevel1 != null" class="battery-item">
-                <svg viewBox="0 0 56 20" width="56" height="20">
-                  <rect
-                    x="0"
-                    y="1"
-                    width="44"
-                    height="18"
-                    rx="4"
-                    ry="4"
-                    fill="none"
-                    :stroke="getBatteryColor(scope.row.batteryLevel1)"
-                    stroke-width="1.5"
-                  />
-                  <rect x="44" y="6" width="4" height="8" rx="2" ry="2" :fill="getBatteryColor(scope.row.batteryLevel1)" />
-                  <rect
-                    x="2"
-                    y="3"
-                    :width="Math.max((40 * scope.row.batteryLevel1) / 100, 0)"
-                    height="14"
-                    rx="2"
-                    ry="2"
-                    :fill="getBatteryColor(scope.row.batteryLevel1)"
-                    opacity="0.25"
-                  />
-                  <text
-                    x="24"
-                    y="11.5"
-                    text-anchor="middle"
-                    dominant-baseline="middle"
-                    font-size="2"
-                    :fill="getBatteryColor(scope.row.batteryLevel1)"
-                  >
-                    左{{ scope.row.batteryLevel1 }}%
-                  </text>
-                </svg>
-              </div>
-              <!-- 右电池 -->
-              <div v-if="scope.row.batteryLevel2 != null" class="battery-item">
-                <svg viewBox="0 0 56 20" width="56" height="20">
-                  <rect
-                    x="0"
-                    y="1"
-                    width="44"
-                    height="18"
-                    rx="4"
-                    ry="4"
-                    fill="none"
-                    :stroke="getBatteryColor(scope.row.batteryLevel2)"
-                    stroke-width="1.5"
-                  />
-                  <rect x="44" y="6" width="4" height="8" rx="2" ry="2" :fill="getBatteryColor(scope.row.batteryLevel2)" />
-                  <rect
-                    x="2"
-                    y="3"
-                    :width="Math.max((40 * scope.row.batteryLevel2) / 100, 0)"
-                    height="14"
-                    rx="2"
-                    ry="2"
-                    :fill="getBatteryColor(scope.row.batteryLevel2)"
-                    opacity="0.25"
-                  />
-                  <text
-                    x="24"
-                    y="11.5"
-                    text-anchor="middle"
-                    dominant-baseline="middle"
-                    font-size="2"
-                    :fill="getBatteryColor(scope.row.batteryLevel2)"
-                  >
-                    右{{ scope.row.batteryLevel2 }}%
-                  </text>
-                </svg>
-              </div>
-            </div>
-            <span v-else>未获取</span>
-          </template>
        </el-table-column>
-        <!-- <el-table-column align="center" label="电量" prop="powerLevel" width="160">
-          <template #default="scope">
-            <div v-if="scope.row.powerLevel !== undefined && scope.row.powerLevel !== null && scope.row.powerLevel !== ''" class="power-level">
-              <svg class="power-level__icon" :class="getPowerLevelClass(scope.row.powerLevel)" viewBox="0 0 48 24" width="48" height="24">
-                <rect x="0" y="2" width="42" height="20" rx="4" ry="4" fill="none" stroke="currentColor" stroke-width="2" />
-
-                <rect x="42" y="8" width="4" height="8" rx="2" ry="2" fill="currentColor" />
-
-                <rect
-                  x="3"
-                  y="5"
-                  :width="Math.max((36 * formatPowerLevel(scope.row.powerLevel)) / 100, 0)"
-                  height="14"
-                  rx="2"
-                  ry="2"
-                  fill="currentColor"
-                />
-              </svg>
-              <span class="power-level__text">{{ formatPowerLevel(scope.row.powerLevel) }}%</span>
-            </div>
-            <span v-else>-</span>
-          </template>
-        </el-table-column> -->
        <el-table-column label="设备型号" align="center" prop="model" />
-        <el-table-column label="固件版本" align="center" prop="version" />
+        <el-table-column label="固件版本" align="center" prop="id" />
        <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>
@@ -199,7 +101,7 @@
              @click="handleActivate(scope.row)"
              >唤醒设备</el-button
            >
-            <el-button :disabled="scope.row.status !== 2 && scope.row.status !== '2'" type="primary" @click="handleDelete(scope.row)">删除</el-button>
+            <el-button type="primary" @click="handleDelete(scope.row)">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -232,7 +134,6 @@
        <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>
@@ -254,12 +155,12 @@
 <script setup name="Demo" lang="ts">
 import { addEquipment, getDevicetList, getDeviceInfo, delDevice, actDevice, updateDeviceInfo, drawInfo } from '@/api/equipmentList/index';
 import { EquipmentList, DeviceInfoForm, AlarmAreaData } from '@/api/equipmentList/types';
+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 { initHls, destroyHls } from '@/utils/video';
+import Hls from 'hls.js';
 import { nextTick } from 'vue';
 import { useVideosStore } from '@/store/modules/video';
-import { addDemo } from '@/api/video/index';

 const videosStore = useVideosStore();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -289,9 +190,68 @@ 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[]>([]);
@@ -459,7 +419,7 @@ const handleSee = async (row?: any) => {
  dialog1.visible = true;
  dialog1.title = '修改设备';

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

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

@@ -604,15 +564,8 @@ const cleanupVisibilityChange = () => {
 };

 const handleMonitorDialogClose = (done: () => void) => {
-  try {
-    addDemo(form.value.id).then(() => {
-      console.log('关闭视频111111');
-    });
-  } catch (error) {
-    console.log('关闭视频22222222', error);
-  }
  // 卸载 Hls 与清理 video
-  destroyHls(monitorVideoRef);
+  destroyHls();
  monitorVideoUrl.value = '';
  destroyVideoResizeObserver();
  resetMonitorDraw();
@@ -757,7 +710,7 @@ const saveImage = async () => {

 const handleMonitorDialogOpen = () => {
  // 初始化 Hls 与 video
-  initHls(monitorVideoUrl, monitorVideoRef);
+  initHls();
  initVideoResizeObserver();
  monitorDrawCollecting.value = false;
  monitorDrawPoints.value = [];
@@ -794,34 +747,6 @@ 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);
-  }
-};
-
-/** 电池颜色：>50% 绿，30-50% 黄，<30% 红 */
-const getBatteryColor = (val: number) => {
-  if (val > 50) return '#52c41a';
-  if (val >= 30) return '#faad14';
-  return '#ff4d4f';
-};
-
-const formatPowerLevel = (val: any) => Number(val) || 0;
-const getPowerLevelClass = (val: any) => {
-  const v = Number(val);
-  if (v > 50) return 'power--high';
-  if (v >= 30) return 'power--mid';
-  return 'power--low';
-};
 </script>

 <style scoped lang="scss">
@@ -921,32 +846,4 @@ const getPowerLevelClass = (val: any) => {
 .monitor-video::-moz-progress-bar {
  display: none !important;
 }
-
-.battery-group {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  gap: 8px;
-  flex-wrap: wrap;
-}
-.battery-item {
-  display: flex;
-  align-items: center;
-  gap: 2px;
-}
-.battery-label {
-  font-size: 12px;
-  color: #909399;
-}
-
-/* 电量电池颜色 */
-.power--high {
-  color: #52c41a;
-}
-.power--mid {
-  color: #faad14;
-}
-.power--low {
-  color: #ff4d4f;
-}
 </style>
--- a/src/views/systemList/base/base.vue
+++ b/src/views/systemList/base/base.vue
@@ -91,7 +91,7 @@ const save = async () => {
    })
    .catch((err) => {
      console.error('保存失败', err);
-      // ElMessage.error('保存失败');
+      ElMessage.error('保存失败');
    });
 };

--- 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 type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
+            <el-button v-hasPermi="['system:role:add']" 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
@@ -23,7 +23,7 @@
          <div v-show="showSearch" class="mb-[10px]">
            <el-card shadow="hover">
              <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-                <el-form-item label="用户账号" prop="userName">
+                <el-form-item label="用户名称" prop="userName">
                  <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
                </el-form-item>
                <!-- <el-form-item label="用户账号" prop="nickName">
@@ -62,7 +62,7 @@
          <template #header>
            <el-row :gutter="10" class="flex justify-end mb8">
              <el-col :span="1.5">
-                <el-button type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
+                <el-button v-has-permi="['system:user:add']" 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 type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
+                <el-button v-hasPermi="['system:user:edit']" type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
                <!-- </el-tooltip>
                <el-tooltip v-if="scope.row.userId !== 1" content="删除" placement="top"> -->
-                <el-button type="primary" @click="handleDelete(scope.row)">删除</el-button>
+                <el-button v-hasPermi="['system:user:remove']" type="primary" @click="handleDelete(scope.row)">删除</el-button>
                <!-- </el-tooltip> -->

                <!-- <el-tooltip v-if="scope.row.userId !== 1" content="重置密码" placement="top">
@@ -156,7 +156,7 @@
      <el-form ref="userFormRef" :model="form" :rules="rules" label-width="80px">
        <el-row>
          <el-col :span="12">
-            <el-form-item label="用户名称" prop="nickName">
+            <el-form-item label="用户账号" prop="nickName">
              <el-input v-model="form.nickName" placeholder="请输入用户账号" maxlength="30" />
            </el-form-item>
          </el-col>
@@ -188,7 +188,7 @@
          <!-- </el-row>
        <el-row> -->
          <el-col :span="12" v-if="form.userId == undefined">
-            <el-form-item label="用户账号" prop="userName">
+            <el-form-item label="用户名称" prop="userName">
              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
            </el-form-item>
          </el-col>