Merge branch 'liubiao-main'

Reviewed-on: #30

.env.development

@@ -6,8 +6,8 @@ VITE_APP_ENV = 'development'
 
 # 开发环境
 #  VITE_APP_BASE_API = 'http://139.224.253.23:8000'
-  VITE_APP_BASE_API = 'https://www.cnxhyc.com/jq'
+VITE_APP_BASE_API = 'https://www.cnxhyc.com/jq'
-#VITE_APP_BASE_API = 'http://192.168.110.56:8000'   
+# VITE_APP_BASE_API = 'http://192.168.110.57:8000'   
 #代永飞接口
 # VITE_APP_BASE_API = 'http://457102h2d6.qicp.vip:24689'   
 

.env.production

@@ -2,13 +2,16 @@
 VITE_APP_TITLE = 云平台管理系统
 
 # 生产环境配置 晶全1
-VITE_APP_ENV = 'https://www.cnxhyc.com'
+VITE_APP_ENV = 'production'
 
 # 生产环境配置 富源晟2
 # VITE_APP_ENV = 'https://fuyuanshen.com/backend-fys'
 
 # 应用访问路径 晶全1
-VITE_APP_CONTEXT_PATH = '/jingquan/'
+VITE_APP_CONTEXT_PATH = '/PC/'
+
+# 高德地图Key
+VITE_AMAP_KEY='84a12a692ae378effdf741e16d584cd3'
 
 # 应用访问路径 富源晟2
 #VITE_APP_CONTEXT_PATH = '/sys/'          
@@ -20,7 +23,9 @@ VITE_APP_MONITOR_ADMIN = '/admin/applications'
 VITE_APP_SNAILJOB_ADMIN = '/snail-job'
 
 # 生产环境 晶全3 代理访问
-VITE_APP_BASE_API = '/jq'
+VITE_APP_BASE_API = 'https://www.cnxhyc.com/jq'
+
+# VITE_APP_BASE_API = 'http://139.224.253.23:8000'
 
 # 生产环境 富源晟3
 #VITE_APP_BASE_API = '/backend-fys'

index.html

@@ -6,7 +6,12 @@
     <meta name="renderer" content="webkit" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
     <link rel="icon" href="/favicon.ico" />
-      <script src="https://webapi.amap.com/maps?v=2.0&key=90bc158992feb8ccd0145e168cab1307&plugin=AMap.CircleEditor"></script>
+    <script  type="text/javascript">
+      window._AMapSecurityConfig = {
+        securityJsCode: "4239900f4fb7b2569df651ac814a28de",
+      };
+    </script>
+      <script src="https://webapi.amap.com/maps?v=2.0&key=78c36a1e251a95f1a21a9e5ea7a1331c&plugin=AMap.CircleEditor"></script>
     <title>物联网管理平台</title>
     <!--[if lt IE 11
       ]><script>

src/api/controlCenter/controlPanel/100J.ts

@@ -0,0 +1,51 @@
+import request from '@/utils/request';
+
+// 详情信息
+export const deviceDeatil = (id: string) => {
+    return request({
+        url: `/api/hby100j/device/${id}`,
+        method: 'get',
+    });
+};
+// 灯光模式
+function lightModeSettings (data: any) {
+    return request({
+        url: `/app/hby100j/device/lightAdjustment`,
+        method: 'post',
+        data: data
+    });
+};
+//频率调节
+function staticPowerSetting  (data: any)  {
+    return request({
+        url: `/app/hby100j/device/strobeFrequency`,
+        method: 'post',
+        data: data
+    });
+};
+// 修改音量
+function settingUpdateVolume  (data: any)  {
+    return request({
+        url: `/app/hby100j/device/updateVolume`,
+        method: 'post',
+        data: data
+    });       
+};
+
+// 强制报警
+function SosSetting  (data: any) {
+    return request({
+        url: `/app/hby100j/device/forceAlarmActivation`,
+        method: 'post',
+        data: data
+    });
+};
+
+
+export default {
+    deviceDeatil,
+   lightModeSettings:lightModeSettings,
+   SosSetting:SosSetting,
+   staticPowerSetting:staticPowerSetting,
+   settingUpdateVolume:settingUpdateVolume
+};

src/api/controlCenter/controlPanel/types.ts

@@ -36,14 +36,10 @@ export interface DeviceDetail {
   currentLightMode?: string;// 当前选中的灯光模式（如"strong"，对应强光）
   sendMsg: string;
   lightBrightness: string;
-  personnelInfo: {                  // 人员信息（嵌套对象，根据接口调整）
+  strobeFrequency: string;
-    unitName: string;           // 单位
+  volume: string;
-    position: string;       // 职位
-    name: string;           // 姓名
-    code: string;         // ID（身份证/工号）
-  };
   chargeState: string;
-  alarmStatus:number
+  alarmStatus: number
 }
 // 定义灯光模式的类型接口
 export interface LightMode {

src/api/equipmentManagement/deviceType/index.ts

@@ -17,7 +17,10 @@ export const addDeviceType = (data: any): AxiosPromise<deviceTypeVO[]> => {
   return request({
     url: '/api/deviceType/add',
     method: 'post',
-    data: data
+    data: data,
+     headers:{
+      'Content-Type':'application/x-www-form-urlencoded;charset=UTF-8'
+    }
   });
 };
 
@@ -26,6 +29,9 @@ export const updateDeviceType = (data: any): AxiosPromise<deviceTypeVO[]> => {
   return request({
     url: '/api/deviceType/update',
     method: 'put',
+    headers:{
+      'Content-Type':'application/x-www-form-urlencoded;charset=UTF-8'
+    },
     data
   })
 }
@@ -34,6 +40,7 @@ export const deleteDeviceType = (ids: any): AxiosPromise<deviceTypeVO[]> => {
   return request({
     url: '/api/deviceType/delete',
     method: 'delete',
+    
     data: ids
   })
 }

src/components/FileUpload/index.vue

@@ -57,9 +57,9 @@ const props = defineProps({
   // 数量限制
   limit: propTypes.number.def(5),
   // 大小限制(MB)
-  fileSize: propTypes.number.def(5),
+  fileSize: propTypes.number.def(200),
   // 文件类型, 例如['png', 'jpg', 'jpeg']
-  fileType: propTypes.array.def(['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf']),
+  fileType: propTypes.array.def(['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf','apk','wgt','html','mp3','mp4']),
   // 是否显示提示
   isShowTip: propTypes.bool.def(true),
   // 禁用组件（仅查看文件）

src/directive/common/copyText.ts

@@ -28,7 +28,6 @@ function copyTextToClipboard(input: string, { target = document.body } = {}) {
   element.value = input;
   // Prevent keyboard from showing on mobile
   element.setAttribute('readonly', '');
-
   element.style.contain = 'strict';
   element.style.position = 'absolute';
   element.style.left = '-9999px';

src/views/controlCenter/100J/index.vue

@@ -0,0 +1,886 @@
+<template>
+    <div class="device-page p-2">
+        <!-- 头部信息栏 -->
+        <div class="header-bar">
+            <div>设备名称：{{ deviceDetail.deviceName }}</div>
+            <div>设备型号：{{ deviceDetail.deviceImei }}</div>
+            <div class="device-status">设备状态：
+                <span :class="{ online: deviceDetail.onlineStatus === 1, offline: deviceDetail?.onlineStatus === 0 }">
+                    {{ deviceDetail.onlineStatus === 1 ? '在线' : '离线' }}
+                </span>
+            </div>
+            <div>电量：{{ deviceDetail.batteryPercentage || 0 }}%</div>
+            <div>续航：{{ deviceDetail.batteryRemainingTime || "0" }} 分钟</div>
+        </div>
+
+        <!-- 主体内容区域 -->
+        <div class="content-wrapper">
+            <el-row :gutter="20" class="content-row" :class="deviceDetail.alarmStatus == 1 ? '' : 'displayNone'">
+                <el-col :lg="24" :xs="24">
+                    <div class="staticRwo" :class="deviceDetail.alarmStatus == 1 ? '' : 'displayNone'"
+                        @click="showClose()">
+                        设备强制报警中!
+                    </div>
+                </el-col>
+            </el-row>
+            <!-- 第一行：灯光模式 + 灯光亮度、强制报警、位置信息 -->
+            <el-row :gutter="20" class="content-row">
+                <el-col :lg="16" :xs="24">
+                    <div class="content-card">
+                        <h4 class="section-title">报警模式</h4>
+                        <div class="light-mode">
+                            <!-- 使用v-for循环渲染灯光模式卡片 -->
+                            <div class="mode-card" :class="{ 'active': mode.active }"
+                                @click.stop="handleVoiceType(mode.id)" v-for="mode in sta_VoiceType" :key="mode.id">
+                                <img :src="mode.active ? mode.activeIcon : mode.icon" :alt="mode.name"
+                                    class="mode-icon" />
+                                <div class="mode-name">{{ mode.name }}</div>
+                                <el-switch v-model="mode.switchStatusVioice" />
+                            </div>
+                        </div>
+                    </div>
+                </el-col>
+                <el-col :lg="8" :xs="24">
+                    <div class="brightness-alarm">
+                        <el-button type="danger" class="alarm-btn" @click="forceAlarm" :loading="forceAlarmLoading"
+                            v-if="deviceDetail.alarmStatus === 0 || deviceDetail.alarmStatus === null"
+                            :loading-text="forceAlarmLoading ? '报警中...' : '强制报警'"> {{
+                                forceAlarmLoading ? '报警中' : '强制报警' }}</el-button>
+                    </div>
+                    <div class="content-card_gps">
+                        <h4 class="section-title">位置信息</h4>
+                        <div class="location-info">
+                            <div class="location-item">
+                                <span class="location-icon"></span>
+                                <span>经纬度 {{ deviceDetail && deviceDetail.longitude ?
+                                    Number(deviceDetail.longitude).toFixed(4) : '无' }}
+                                    {{ deviceDetail && deviceDetail.latitude ? Number(deviceDetail.latitude).toFixed(4)
+                                        : '无' }} </span>
+                            </div>
+                            <div class="location-item">
+
+                                <div>地址 <span class="lacatin_gps">{{ deviceDetail.address || "未获取到地址" }}</span></div>
+                                <el-button link type="primary" class="view-btn"
+                                    @click="lookMap(deviceDetail)">查看</el-button>
+                            </div>
+                        </div>
+                    </div>
+                </el-col>
+            </el-row>
+
+            <!-- 第二行：人员信息登记 + 发送信息 -->
+            <el-row :gutter="20" class="content-row">
+                <el-col :lg="16" :xs="24">
+                    <div class="content-card">
+                        <h4 class="section-title">警示灯模式</h4>
+                        <div class="light-mode">
+                            <!-- 使用v-for循环渲染灯光模式卡片 -->
+                            <div class="mode-card" :class="{ 'active': mode.active }"
+                                @click.stop="handleModeClick(mode.id)" v-for="mode in lightModes" :key="mode.id">
+                                <img :src="mode.active ? mode.activeIcon : mode.icon" :alt="mode.name"
+                                    class="mode-icon" />
+                                <div class="mode-name">{{ mode.name }}</div>
+                                <el-switch v-model="mode.switchStatus" />
+                            </div>
+                        </div>
+                    </div>
+                </el-col>
+                <el-col :lg="8" :xs="24">
+                    <div class="content-card ">
+                        <div class="brightness-alarm">
+                            <div class="brightness-control">
+                                <span class="brightness-label">亮度</span>
+                                <el-input class="inputTFT" v-model="deviceDetail.lightBrightness" :min="10" :max="100"
+                                    :step="1" size="small" />
+                                <span class="brightness-value">%</span>
+                                <el-button type="primary" class="save-btn" v-loading="lightModesLoading"
+                                    @click="saveBtnlight">保存 </el-button>
+                            </div>
+                        </div>
+                        <div class="brightness-alarm">
+                            <div class="brightness-control">
+                                <span class="brightness-label">频率</span>
+                                <el-input class="inputTFT" v-model="deviceDetail.strobeFrequency" :min="0.5" :max="10"
+                                    :step="1" size="small" />
+                                <span class="brightness-value">HZ</span>
+                                <el-button type="primary" class="save-btn" @click="saveBtnstrobe">保存 </el-button>
+                            </div>
+                        </div>
+                        <div class="brightness-alarm">
+                            <div class="brightness-control">
+                                <span class="brightness-label">音量</span>
+                                <el-input class="inputTFT" v-model="deviceDetail.volume" :min="10" :max="100" :step="1"
+                                    size="small" />
+                                <span class="brightness-value">%</span>
+                                <el-button type="primary" class="save-btn" @click="saveBtnVolume">保存 </el-button>
+                            </div>
+                        </div>
+                    </div>
+                </el-col>
+            </el-row>
+        </div>
+        <!-- ===========充电提示框====== -->
+        <el-dialog title="充电提示" v-model="centerDialogVisible" width="15%">
+            <div style="display: flex; align-items: center;">
+                <h3 style="color: rgba(224, 52, 52, 1)">设备电量低于20%</h3>
+            </div>
+            <div>请及时充电</div>
+            <span slot="footer" class="dialog-footer" style="text-align: right;display: block;">
+                <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+<script setup name="DeviceControl" lang="ts">
+const route = useRoute();
+import { useMqtt } from '@/utils/mqtt';
+import api from '@/api/controlCenter/controlPanel/100J'
+import { DeviceDetail, LightMode } from '@/api/controlCenter/controlPanel/types';
+import {getDeviceStatus } from '@/utils/function';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const router = useRouter();
+// 导入图片资源（确保路径正确）
+import closeDefault from '@/assets/images/close.png';
+import closeActive from '@/assets/images/close_HL.png';
+import rb from '@/assets/images/rb.png';
+import rbAc from '@/assets/images/rbAc.png';
+import sg from '@/assets/images/sg.png';
+import sgAc from '@/assets/images/sgAc.png';
+const forceAlarmLoading = ref(false)  //强制报警
+const lightModesLoading = ref(false)
+const centerDialogVisible = ref(false)
+const {
+    connected,
+    connect,
+    subscribe,
+    onConnect,
+    onError,
+    onMessage,
+    disconnect
+} = useMqtt();
+// 报警模式
+const sta_VoiceType = ref([
+    {
+        id: 'fire',
+        name: '消防',
+        icon: sg, // 直接使用导入的变量
+        activeIcon: sgAc,
+        switchStatusVioice: true,
+        active: true
+    },
+    {
+        id: '0',
+        name: '公安',
+        icon: sg, // 直接使用导入的变量
+        activeIcon: sgAc,
+        active: false,
+        switchStatusVioice: false,
+    },
+    {
+        id: '3',
+        name: '交警',
+        icon: sg, // 直接使用导入的变量
+        activeIcon: sgAc,
+        switchStatusVioice: false,
+        active: false
+    },
+    {
+        id: '4',
+        name: '市政',
+        icon: sg, // 直接使用导入的变量
+        activeIcon: sgAc,
+        switchStatusVioice: false,
+        active: false
+    },
+    {
+        id: '2',
+        name: '应急',
+        icon: sg, // 直接使用导入的变量
+        activeIcon: sgAc,
+        switchStatusVioice: false,
+        active: false
+    },
+    {
+        id: '6',
+        name: '医疗',
+        icon: sg, // 直接使用导入的变量
+        activeIcon: sgAc,
+        switchStatusVioice: false,
+        active: false
+    },
+    {
+        id: '5',
+        name: '铁道',
+        icon: sg, // 直接使用导入的变量
+        activeIcon: sgAc,
+        switchStatusVioice: false,
+        active: false
+    },
+    {
+        id: '7',
+        name: 'app语音',
+        icon: sg, // 直接使用导入的变量
+        activeIcon: sgAc,
+        switchStatusVioice: false,
+        active: false
+    },
+    {
+        id: '-1',
+        name: '关闭',
+        icon: closeDefault, // 直接使用导入的变量
+        activeIcon: closeActive,
+        switchStatusVioice: false,
+        active: false
+    },
+])
+// 警示灯灯光模式数据（引用导入的图片）
+const lightModes = ref<LightMode[]>([
+    {
+        id: 'redBlueAlternate', // 红蓝交替
+        name: '红蓝交替',
+        icon: rb,
+        activeIcon: rbAc,
+        switchStatus: true,
+        instructValue: '6',
+        active: true,
+    },
+    {
+        id: 'redFlash', // 红闪
+        name: '红闪',
+        icon: rb,
+        activeIcon: rbAc,
+        switchStatus: false,
+        instructValue: '0',
+        active: false,
+    },
+    {
+        id: 'yellowFlash', // 黄闪
+        name: '黄闪',
+        icon: rb,
+        activeIcon: rbAc,
+        switchStatus: false,
+        instructValue: '2',
+        active: false
+    },
+    {
+        id: 'blueFlash', // 蓝闪
+        name: '蓝闪',
+        icon: rb,
+        activeIcon: rbAc,
+        switchStatus: false,
+        instructValue: '1',
+        active: false
+    },
+    {
+        id: 'redClockwise', // 红色顺时针
+        name: '红色顺时针',
+        icon: rb,
+        activeIcon: rbAc,
+        switchStatus: false,
+        instructValue: '3',
+        active: false
+    },
+    {
+        id: 'yellowClockwise', // 黄色顺时针
+        name: '黄色顺时针',
+        icon: rb,
+        activeIcon: rbAc,
+        switchStatus: false,
+        instructValue: '4',
+        active: false
+    },
+    {
+        id: 'redBlueClockwise', // 红蓝顺时针
+        name: '红蓝顺时针',
+        icon: rb,
+        activeIcon: rbAc,
+        switchStatus: false,
+        instructValue: '5',
+        active: false
+    },
+    {
+        id: 'close', // 关闭
+        name: '关闭',
+        icon: closeDefault,
+        activeIcon: closeActive,
+        switchStatus: false,
+        instructValue: '-1',
+        active: false
+    },
+]);
+const deviceDetail = ref<DeviceDetail & { typeName: string }>({
+    lightBrightness: '',
+    deviceName: '',
+    deviceImei: '',
+    onlineStatus: 0,
+    batteryPercentage: 0,
+    batteryRemainingTime: '',
+    longitude: '',
+    latitude: '',
+    address: '',
+    sendMsg: '',
+    chargeState: '0',
+    typeName: '',
+    alarmStatus: 0,
+    strobeFrequency: '0.5',
+    volume: '10'
+});
+const isUpdatingStatus = ref(false);
+// 报警模式// 2. 点击卡片事件
+const handleVoiceType = async (targetId: string) => {
+    const deviceId = route.params.deviceId as string;
+    if (!deviceId) return;
+    const targetMode = sta_VoiceType.value.find(mode => mode.id === targetId);
+    if (!targetMode) return;
+    if (targetMode.active) return;
+    sta_VoiceType.value.forEach(mode => {
+        mode.active = mode.id === targetId;
+        if (mode.active) {
+            mode.switchStatusVioice = true;
+        } else {
+            mode.switchStatusVioice = false;
+        }
+    });
+    // 2. 调用强制报警接口
+    const params = {
+        deviceIds: [deviceId],
+        voiceStrobeAlarm: targetId === '-1' ? 0 : 1,
+        mode: targetId == '-1' ? 0 : targetId
+    };
+    try {
+        const res = await api.SosSetting(params);
+        if (res.code == 200) {
+            proxy?.$modal.msgSuccess(res.msg);
+        }
+    } catch (error) {
+        await getList()
+    }
+};
+// 警示灯模式
+const handleModeClick = async (modeId: string) => {
+    if (isUpdatingStatus.value || isSyncingStatus.value) return;
+    try {
+        const deviceId = route.params.deviceId as string;
+        if (!deviceId) return;
+        const targetMode = lightModes.value.find(m => m.id === modeId);
+        if (!targetMode || !targetMode.instructValue) return;
+        isUpdatingStatus.value = true;
+        const res = await api.lightModeSettings({
+            deviceId,
+            instructValue: targetMode.instructValue,
+            deviceImei: deviceDetail.value.deviceImei,
+            typeName: deviceDetail.value.typeName,
+        });
+        if (res.code === 200) {
+            ElMessage.closeAll();
+            proxy?.$modal.msgSuccess(res.msg);
+            setActiveLightMode(modeId);
+        } else {
+            proxy?.$modal.msgError(res.msg);
+            const prevActiveMode = lightModes.value.find(m => m.active);
+            if (prevActiveMode) {
+                setActiveLightMode(prevActiveMode.id);
+            }
+        }
+    } catch (error) {
+        // 异常时恢复状态
+        const prevActiveMode = lightModes.value.find(m => m.active);
+        if (prevActiveMode) {
+            setActiveLightMode(prevActiveMode.id);
+        }
+    } finally {
+        isUpdatingStatus.value = false;
+    }
+};
+const isSyncingStatus = ref(false);
+// 警示灯接口
+const setActiveLightMode = (targetModeId: string) => {
+    isSyncingStatus.value = true;
+    lightModes.value.forEach(mode => {
+        const isActive = mode.id === targetModeId;
+        mode.active = isActive;
+        mode.switchStatus = isActive;
+    });
+    isSyncingStatus.value = false;
+};
+const getList = async () => {
+    try {
+        const deviceId = route.params.deviceId;
+        if (!deviceId) return;
+        const res = await api.deviceDeatil(deviceId as string);
+        deviceDetail.value = res.data;
+
+        // ==========灯光模式逻辑==========
+        let targetModeId = "redBlueAlternate";
+        const mainLightMode = String(res.data.strobeMode);
+        const matchedMode = lightModes.value.find(
+            mode => mode.instructValue === mainLightMode
+        );
+        if (matchedMode) {
+            targetModeId = matchedMode.id;
+        }
+        setActiveLightMode(targetModeId);
+        // 报警模式
+        const alarmMode = String(res.data.alarmMode); // 报警模式ID
+        const voiceStrobeAlarm = String(res.data.voiceStrobeAlarm); // 报警开关状态：1开启，0关闭
+        // 先重置所有报警模式的状态
+        sta_VoiceType.value.forEach(mode => {
+            mode.active = false;
+            mode.switchStatusVioice = false;
+        });
+        if (voiceStrobeAlarm === '1') {
+            const matchedVoiceMode = sta_VoiceType.value.find(
+                mode => mode.id === alarmMode
+            );
+            if (matchedVoiceMode) {
+                matchedVoiceMode.active = true;
+                matchedVoiceMode.switchStatusVioice = true;
+            } else {
+                console.warn('未找到对应的报警模式:', alarmMode);
+            }
+        } else {
+            const closeMode = sta_VoiceType.value.find(mode => mode.id === '-1');
+            if (closeMode) {
+                closeMode.active = true;
+                closeMode.switchStatusVioice = true;
+            }
+        }
+    } catch (error) {
+        console.error('获取设备详情失败:', error);
+    }
+};
+
+// 灯光亮度
+const saveBtnlight = () => {
+    lightModesLoading.value = true
+    let data = {
+        deviceId: route.params.deviceId,
+        brightness: deviceDetail.value.lightBrightness,
+    }
+    api.lightModeSettings(data).then((res) => {
+        if (res.code === 200) {
+            lightModesLoading.value = false
+            proxy?.$modal.msgSuccess(res.msg);
+
+        } else {
+            lightModesLoading.value = false
+            proxy?.$modal.msgError(res.msg);
+        }
+
+    }).catch((error) => {
+        lightModesLoading.value = false
+    });
+}
+// 爆闪频率
+const saveBtnstrobe = () => {
+    let data = {
+        deviceId: route.params.deviceId,
+        frequency: deviceDetail.value.strobeFrequency,
+    }
+    api.staticPowerSetting(data).then((res) => {
+        if (res.code === 200) {
+            proxy?.$modal.msgSuccess(res.msg);
+        }
+    })
+}
+// 修改音量
+const saveBtnVolume = () => {
+    let data = {
+        deviceId: route.params.deviceId,
+        volume: deviceDetail.value.volume,
+    }
+    api.settingUpdateVolume(data).then((res) => {
+        if (res.code === 200) {
+            proxy?.$modal.msgSuccess(res.msg);
+        }
+    })
+}
+
+// 解除报警
+const showClose = async () => {
+    try {
+        await proxy?.$modal.confirm('确定要对该设备解除报警？', '提示');
+        // 2. 准备请求数据
+        let data = {
+            deviceIds: [route.params.deviceId],
+            typeName: deviceDetail.value.typeName,
+            deviceImeiList: [deviceDetail.value.deviceImei],
+            instructValue: '0', //强制报警1，解除报警0
+        }
+    } catch (error: any) {
+    }
+}
+
+// 强制报警
+const forceAlarm = async () => {
+    try {
+        await proxy?.$modal.confirm('确定要对该设备开启强制报警？', '提示');
+        forceAlarmLoading.value = true
+        // 2. 准备请求数据
+        let data = {
+            deviceIds: [route.params.deviceId],
+            typeName: deviceDetail.value.typeName,
+            deviceImeiList: [deviceDetail.value.deviceImei],
+            instructValue: '1', //强制报警1，解除报警0
+        }
+
+    } catch (error: any) {
+        // proxy?.$modal.msgWarning(error.msg)
+        forceAlarmLoading.value = false;
+
+    } finally {
+        forceAlarmLoading.value = false;
+    }
+}
+const lookMap = (row: any) => {
+    console.log(row, 'rowrowrowrowrworowrowrowrowrowrow');
+    router.push({
+        path: '/controlCenter/controlPanel',
+        query: {
+            view: 'map',
+            deviceId: row.deviceId
+        }
+    });
+}
+
+
+onMounted(async () => {
+    await getList();
+});
+onUnmounted(() => {
+});
+
+</script>
+<style lang="scss" scoped>
+.p-2 {
+    background: rgba(247, 248, 252, 1);
+    min-height: 100vh;
+    box-sizing: border-box;
+    padding: 15px;
+}
+
+.device-page {
+    .header-bar {
+        border-radius: 8px;
+        background: linear-gradient(135deg, #3400e7, #009bff);
+        color: white;
+        padding: 20px;
+        margin-bottom: 20px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        font-weight: 600;
+
+        .device-status {
+            .online {
+                color: #00ff00;
+            }
+
+            .offline {
+                color: rgb(224, 52, 52);
+            }
+        }
+    }
+
+    .content-wrapper {
+        .content-row {
+            margin-bottom: 10px;
+        }
+
+        .content-card {
+            border-radius: 8px;
+            box-shadow: 0 2px 12px rgba(0, 34, 96, 0.1);
+            background: white;
+            padding: 0px 20px 50px;
+            border: 1px solid #ebeef5;
+            height: 289px;
+            position: relative;
+        }
+
+        .content-card_gps {
+            border-radius: 8px;
+            box-shadow: 0 2px 12px rgba(0, 34, 96, 0.1);
+            background: white;
+            padding: 0px 20px 50px;
+            border: 1px solid #ebeef5;
+            height: 78%;
+
+        }
+
+        .section-title {
+            font-size: 16px;
+            font-weight: 600;
+            margin-bottom: 20px;
+            color: #303133;
+        }
+
+        .light-mode {
+            display: flex;
+
+            justify-content: space-between;
+        }
+
+        .lacatin_gps {
+            height: 70px;
+            border-radius: 4px;
+            background: rgba(247, 248, 252, 1);
+            display: inline-block;
+            width: 400px;
+            padding: 10px;
+        }
+
+        .mode-card {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            padding: 15px;
+            border: 1px solid #dcdfe6;
+            border-radius: 8px;
+            width: 107px;
+            cursor: pointer;
+            transition: all 0.3s ease;
+
+            &.active {
+                border-color: #409eff;
+                background-color: rgba(64, 158, 255, 0.05);
+            }
+
+            .mode-icon {
+                width: 48px;
+                margin-bottom: 10px;
+                transition: all 0.3s ease;
+                object-fit: scale-down;
+                height: 50px;
+            }
+
+            .mode-name {
+                font-size: 14px;
+                margin-bottom: 12px;
+                color: #606266;
+            }
+
+            .el-switch {
+                --el-switch-on-color: #409eff;
+                --el-switch-off-color: #dcdfe6;
+            }
+
+
+        }
+
+        .brightness-alarm {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 10px;
+
+            .brightness-control {
+                display: flex;
+                align-items: center;
+                gap: 10px;
+                border-radius: 39px;
+                // box-shadow: 0px 0px 6px 0px rgba(0, 34, 96, 0.1);
+                background: rgba(255, 255, 255, 1);
+                width: 100%;
+                // height: 54px;
+                padding: 10px 20px;
+                margin-top: 20px;
+
+                .brightness-label {
+                    font-size: 14px;
+                    color: #606266;
+                    min-width: 70px;
+                }
+
+                .brightness-value {
+                    font-size: 14px;
+                    color: #409eff;
+                    font-weight: 500;
+                }
+
+                .save-btn {
+                    padding: 6px 20px;
+                    border-radius: 29px;
+                    background: rgba(2, 124, 251, 1);
+                    border: none
+                }
+
+                .inputTFT {
+                    width: 130px;
+                    height: 40px;
+                }
+            }
+
+            .alarm-btn {
+                background-color: rgba(224, 52, 52, 1);
+                border-color: rgba(224, 52, 52, 1);
+                padding: 8px 20px;
+                border-radius: 27px;
+            }
+        }
+
+        .location-info {
+            .location-item {
+                display: flex;
+                align-items: center;
+                margin-bottom: 15px;
+                font-size: 14px;
+                color: #606266;
+
+                .location-icon {
+                    margin-right: 8px;
+                    font-weight: bold;
+                    color: #409eff;
+                }
+
+                .view-btn {
+                    margin: 0 8px;
+                    padding: 0;
+                    font-size: 13px;
+                }
+            }
+        }
+
+        .form-grid {
+            display: grid;
+            grid-template-columns: 1fr 1fr;
+            gap: 15px;
+            margin-bottom: 15px;
+            text-align: right;
+
+            .form-item {
+                display: flex;
+                align-items: center;
+
+                .form-label {
+                    min-width: 35px;
+                    font-size: 14px;
+                    color: #606266;
+                    margin-right: 10px;
+                }
+
+                .el-input {
+                    flex: 1;
+                }
+            }
+
+            .register-btn {
+                grid-column: 1 / 3;
+                justify-self: start;
+                padding: 6px 20px;
+                position: absolute;
+                right: 19px;
+                bottom: 30px;
+                border-radius: 29px;
+                background: rgba(2, 124, 251, 1);
+                border: none
+            }
+        }
+
+        .message-content {
+            // display: flex;
+            // flex-direction: column;
+            // gap: 10px;
+
+            .el-textarea {
+                border: 1px solid rgba(29, 111, 255, 1);
+                border-radius: 4px;
+                background: rgba(247, 248, 252, 1);
+                border-radius: 6px;
+                padding: 10px;
+            }
+
+            .el-textarea__inner {
+                background: rgba(247, 248, 252, 1);
+            }
+
+            .send-btn {
+                align-self: flex-end;
+                padding: 10px 20px;
+                border-radius: 29px;
+                background: rgba(2, 124, 251, 1);
+                border: none;
+                margin: 20px 0px 30px 0;
+
+            }
+        }
+
+        .upload-area {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100px;
+            border: 1px dashed #dcdfe6;
+            border-radius: 6px;
+            cursor: pointer;
+        }
+
+        .video-input {
+            display: flex;
+            gap: 10px;
+            align-items: center;
+
+            .el-input {
+                flex: 1;
+            }
+
+            .save-video-btn {
+                padding: 6px 12px;
+            }
+        }
+    }
+
+    // 响应式调整
+    @media (max-width: 768px) {
+        .header-bar {
+            flex-direction: column;
+            align-items: flex-start;
+            gap: 16px;
+        }
+
+        .form-grid {
+            grid-template-columns: 1fr;
+        }
+
+        .form-grid .register-btn {
+            grid-column: 1;
+        }
+
+        .light-mode .mode-group {
+            gap: 10px;
+        }
+
+        .light-mode .mode-item {
+            width: 60px;
+        }
+
+        .light-mode .mode-icon {
+            width: 30px;
+            height: 30px;
+        }
+    }
+}
+
+.path-img {
+    width: 52px;
+    height: 28px;
+}
+
+.staticRwo {
+    border-radius: 8px;
+    box-shadow: 0 2px 12px rgba(0, 34, 96, 0.1);
+    background: white;
+    border: 1px solid #ebeef5;
+    height: auto;
+    line-height: 36px;
+    box-sizing: border-box;
+    text-indent: 15px;
+    color: #ff0000;
+    font-weight: bold;
+    font-size: 17px;
+    margin-bottom: 5px;
+}
+
+.displayNone {
+    display: none !important;
+}
+</style>

src/views/controlCenter/controlPanel/index.vue

@@ -37,7 +37,7 @@
                 <el-collapse-item name="1">
                   <el-form ref="queryFormRef" :model="queryParams" :inline="true" class="queryFormRef">
                     <el-form-item label="设备类型" prop="deviceType">
-                      <el-select v-model="queryParams.deviceType" placeholder="设备类型" clearable>
+                      <el-select v-model="queryParams.deviceType" placeholder="设备类型" clearable filterable>
                         <el-option v-for="item in deviceTypeOptions" :key="item.value" :label="item.typeName"
                           :value="item.deviceTypeId" />
                       </el-select>

src/views/debugCenter/debugPanel/index.vue

@@ -25,7 +25,7 @@
           <el-collapse-item name="1">
             <el-form ref="queryFormRef" :model="queryParams" :inline="true" class="queryFormRef">
               <el-form-item label="设备类型" prop="deviceType">
-                <el-select v-model="queryParams.deviceType" placeholder="设备类型">
+                <el-select v-model="queryParams.deviceType" placeholder="设备类型" clearable filterable>
                   <el-option v-for="item in deviceTypeOptions" :key="item.value" :label="item.typeName" :value="item.deviceTypeId" />
                 </el-select>
               </el-form-item>
@@ -69,7 +69,7 @@
         :data="List"
         :height="Status.showSearch.length > 0 ? 'calc(100vh - 355px)' : 'calc(100vh - 255px)'"
       >
-        <el-table-column type="selection" width="50" align="center"  :selectable="isSelectable"/>
+        <el-table-column type="selection" width="50" align="center" :selectable="isSelectable" />
         <el-table-column label="设备名称" align="center" prop="deviceName" />
         <el-table-column label="设备图片" align="center" prop="devicePic">
           <template #default="scope">
@@ -189,7 +189,7 @@
             <div class="Preview">
               <div class="imgContent" v-for="(item, index) in cEdit.fileParam">
                 <img class="img" :src="item.src" />
-                <div class="opt" @click.stop="DelImg(item,index,'fileParam')">
+                <div class="opt" @click.stop="DelImg(item, index, 'fileParam')">
                   <el-icon>
                     <Delete />
                   </el-icon>
@@ -207,7 +207,14 @@
           <div class="title">操作说明</div>
           <div class="imgs">
             <div class="Preview">
-              <img onerror="this.style.display='none'" v-for="(item, index) in cEdit.fileOprat" class="img" :src="item.src" />
+              <div class="imgContent" v-for="(item, index) in cEdit.fileOprat">
+                <img class="img" :src="item.src" />
+                <div class="opt" @click.stop="DelImg(item, index, 'fileOprat')">
+                  <el-icon>
+                    <Delete />
+                  </el-icon>
+                </div>
+              </div>
             </div>
           </div>
           <div class="option center" @click.stop="showCheckFile('fileOprat')">添加</div>
@@ -231,8 +238,8 @@
 
     <!-- 提示框 -->
     <el-dialog :width="300" :draggable="true" v-model="Status.confirm.Visible" :title="Status.confirm.title" center>
-      <span>
+      <span v-html="Status.confirm.text">
-        {{ Status.confirm.text }}
+        
       </span>
       <template #footer>
         <div class="dialog-footer">
@@ -248,7 +255,7 @@
 import api from '@/api/debugCenter/debugCenter';
 import common from '@/utils/common';
 import apiTypeAll from '@/api/equipmentManagement/device/index';
-import uploadHelper   from '@/api/debugCenter/deviceApi';
+import uploadHelper from '@/api/debugCenter/deviceApi';
 
 var fileInput = document.getElementById('fileInput');
 var fileInputs = {
@@ -293,7 +300,7 @@ var cEdit = reactive({
   fileParam: [],
   fileOprat: [],
   Video: '',
-  fileIds:[]
+  fileIds: []
 });
 //页码控件数据
 var pagin = reactive({
@@ -340,8 +347,7 @@ function handleQuery() {
 const isSelectable = (row: any) => {
   // 仅当在线状态（onlineStatus == 1）时允许选中
   return row.onlineStatus === 1;
-}
+};
-
 
 function getList() {
   Status.loading = true;
@@ -425,6 +431,7 @@ function ShowMultiEdit(type: MideaType) {
 
   setTimeout(dragImgAddEvt, 500);
 }
+
 function ShowSingleEdit(item) {
   Status.ShowEditPop = true;
   //期待接口返回以下4个字段
@@ -454,7 +461,7 @@ function ShowSingleEdit(item) {
           return v.fileType == 1;
         })
         .map((v) => {
-          return {id:v.id, name: v.fileName, type: '', size: '', src: v.fileUrl, file: null };
+          return { id: v.id, name: v.fileName, type: '', size: '', src: v.fileUrl, file: null };
         });
 
       cEdit.fileParam = arr
@@ -462,7 +469,7 @@ function ShowSingleEdit(item) {
           return v.fileType == 2;
         })
         .map((v) => {
-          return {id:v.id, name: v.fileName, type: '', size: '', src: v.fileUrl, file: null };
+          return { id: v.id, name: v.fileName, type: '', size: '', src: v.fileUrl, file: null };
         });
 
       cEdit.fileBoot.src = '';
@@ -478,7 +485,7 @@ function CloseSingleEdit() {
   cEdit.fileBoot = { name: '', type: '', size: '', src: '', file: null };
   cEdit.fileOprat = [];
   cEdit.fileParam = [];
-  cEdit.fileIds=[];
+  cEdit.fileIds = [];
 }
 
 //关闭上传框
@@ -591,7 +598,7 @@ function SaveItemData() {
   var formData = new FormData();
   formData.append('deviceId', cEdit.deviceId);
   formData.append('deviceImei', cEdit.deviceImei);
-  formData.append("fileIds",cEdit.fileIds);
+  formData.append('fileIds', cEdit.fileIds);
 
   cEdit.fileParam.forEach((v) => {
     if (v.file) {
@@ -615,11 +622,20 @@ function SaveItemData() {
       if (res[0].status == 'fulfilled' && res[1].status == 'fulfilled') {
         if (res[0].value.code == 200 && res[1].value.code == 200) {
           CloseSingleEdit();
-          alert('操作成功');
+          alert('<span class="green">操作成功</span>');
           return;
         }
       }
-      alert('全部失败或部分失败');
+      if(res[0].status == 'fulfilled' && res[0].value.code == 200){
+        alert('<span class="green">产品参数、操作说明、操作视频保存成功</span>，<span class="red">开机画面保存失败</span>');
+        return;
+      }
+
+      if(res[1].status == 'fulfilled' && res[1].value.code == 200){
+        alert('<span class="red">产品参数、操作说明、操作视频保存失败</span>，<span class="green">开机画面保存成功</span>');
+        return;
+      }
+      alert('<span class="red">操作失败</span>');
     })
     .finally(() => {
       Status.fullLoading = false;
@@ -822,17 +838,15 @@ var hideConfirm = function () {
 };
 
 //删除某个图片
-function DelImg(item,index,type){
+function DelImg(item, index, type) {
-  
+  if (item.id) {
-if(item.id){
+    confirm('您确认删除吗?', () => {
-confirm('您确认删除吗?',()=>{
+      cEdit.fileIds.push(item.id);
-  cEdit.fileIds.push(item.id);
+      cEdit[type].splice(index, 1);
-   cEdit[type].splice(index,1);
+    });
-
+  } else {
-});
+    cEdit[type].splice(index, 1);
-}else{
+  }
-  cEdit[type].splice(index,1);
-}
 }
 
 onMounted(() => {
@@ -1079,8 +1093,8 @@ onMounted(() => {
   cursor: pointer;
   color: #bd2b2b;
   font-size: 30px;
- text-align: center;
+  text-align: center;
- line-height: 90px;
+  line-height: 90px;
 }
 .SingEditContent .item .imgContent:hover .opt {
   display: block !important;
@@ -1093,5 +1107,4 @@ onMounted(() => {
 .red {
   color: rgba(224, 52, 52, 1);
 }
-
 </style>

src/views/equipmentManagement/devices/eqDetail.vue

@@ -24,7 +24,7 @@
         
         <div class="item">
           <div class="lable">通讯方式<span>：</span></div>
-          <div class="val">{{ detailData?.communicationMode===1 ?'蓝牙':'4G' }}</div>
+          <div class="val">{{ detailData?.communicationMode===1 ?'4G':'蓝牙' }}</div>
         </div>
         <div class="item">
           <div class="lable">蓝牙名称<span>：</span></div>

src/views/equipmentManagement/devices/index.vue

@@ -16,7 +16,7 @@
                 <el-input v-model="queryParams.deviceImei" placeholder="请输入设备IMEI" clearable />
               </el-form-item>
               <el-form-item label="设备类型" prop="deviceType" >
-                <el-select v-model="queryParams.deviceType" placeholder="设备类型" clearable>
+                <el-select v-model="queryParams.deviceType" placeholder="设备类型" clearable filterable>
                   <el-option v-for="item in deviceTypeOptions" :key="item.value" :label="item.typeName"
                     :value="item.id" />
                 </el-select>
@@ -226,8 +226,8 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="设备类型" prop="deviceType">
-              <el-select v-model="form.deviceType" placeholder="设备类型" @change="(id) => handleDeviceTypeChange(id)"
+              <el-select v-model="form.deviceType"  placeholder="设备类型" @change="(id) => handleDeviceTypeChange(id)"
-                :disabled="form.id != ''">
+                clearable filterable>
                 <el-option v-for="item in deviceTypeOptions" :key="item.value" :label="item.typeName"
                   :value="item.id" />
               </el-select>
@@ -248,7 +248,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="showImeiField">
+        <el-row  v-if="showImeiField">
           <el-col :span="24">
             <el-form-item label="设备IMEI" prop="deviceImei" required>
               <el-input v-model="form.deviceImei" placeholder="请输入设备IMEI" />
@@ -622,6 +622,7 @@ const handleAdd = async () => {
 };
 /** 修改按钮操作 */
 const handleUpdate = async (row?: deviceForm) => {
+  debugger;
   reset();
   dialog.visible = true;
   dialog.title = '修改设备';
@@ -663,29 +664,29 @@ const handleDeviceTypeChange = async (deviceTypeId: string | number) => {
   showImeiField.value = false;
   communicationModeInfo.value = null;
   // 编辑时如果有值，根据已有值确定显示哪个字段
-  if (form.value.id) {
+  // if (form.value.id) {
-    console.log('zheshi me1 ');
+  //   console.log('zheshi me1 ');
-    // 1. 先判断：Mac 和 Imei 都有值（新增的关键分支）
+  //   // 1. 先判断：Mac 和 Imei 都有值（新增的关键分支）
-    const hasMac = typeof form.value.deviceMac === 'string' && form.value.deviceMac.trim() !== '';
+  //   const hasMac = typeof form.value.deviceMac === 'string' && form.value.deviceMac.trim() !== '';
-    const hasImei = typeof form.value.deviceImei === 'string' && form.value.deviceImei.trim() !== '';
+  //   const hasImei = typeof form.value.deviceImei === 'string' && form.value.deviceImei.trim() !== '';
-    if (hasMac && hasImei) {
+  //   if (hasMac && hasImei) {
-      //两个都有值：显示两个字段 + 都加校验
+  //     //两个都有值：显示两个字段 + 都加校验
-      showMacField.value = true;
+  //     showMacField.value = true;
-      showImeiField.value = true;
+  //     showImeiField.value = true;
-      console.log('两个字段都有值');
+  //     console.log('两个字段都有值');
-    } else if (hasMac) {
+  //   } else if (hasMac) {
-      showMacField.value = true;
+  //     showMacField.value = true;
-      showImeiField.value = false;
+  //     showImeiField.value = false;
-      rules.value.deviceImei = [];
+  //     rules.value.deviceImei = [];
-      console.log('只有 Mac 有值');
+  //     console.log('只有 Mac 有值');
-    } else if (hasImei) {
+  //   } else if (hasImei) {
-      showImeiField.value = true;
+  //     showImeiField.value = true;
-      showMacField.value = false;
+  //     showMacField.value = false;
-      rules.value.deviceMac = [];
+  //     rules.value.deviceMac = [];
-      console.log('只有 Imei 有值');
+  //     console.log('只有 Imei 有值');
-    }
+  //   }
-    return;
+  //   return;
-  }
+  // } 
   if (isProcessing) return;
   isProcessing = true;
   // 新增或编辑时没有值，根据设备类型获取通讯方式

src/views/equipmentManagement/devices/shareManage.vue

@@ -141,6 +141,7 @@
 import request from '@/utils/request';
 import common from '@/utils/common';
 import api from '@/api/equipmentManagement/device/shareManage';
+import { dataURLtoImage } from 'image-conversion';
 const props = defineProps({
   data: {
     type: Object,
@@ -211,18 +212,172 @@ var dic = reactive({
 });
 
 
-var power = computed(() => {
+var power =ref([]); 
-  let arr = [];
+
-  let keys = Object.keys(dic);
+function calcPower() {
-  keys.forEach((key) => {
+  
-    arr.push({ label: dic[key], value: key });
+
-  });
+  let array = [{
-  return arr;
+				value: "1",
-});
+				label: "灯光模式",
+				checked: false,
+				type: ['BJQ6170', 'HBY670','HBY102','BJQ6155','HBY650','BJQ7305','61XH55']
+			},
+			{
+				value: "2",
+				label: "激光模式",
+				checked: false,
+				type: ['BJQ6170']
+			},
+			{
+				value: "3",
+				label: "开机画面",
+				checked: false,
+				type: ['HBY210', 'BJQ6170', 'HBY670','BJQ6155','HBY650','BJQ7305','61XH55']
+			},
+			{
+				value: "4",
+				label: "人员信息登记",
+				checked: false,
+				type: ['HBY210', 'BJQ6170', 'HBY670','BJQ6155','HBY650','BJQ7305','61XH55']
+			},
+			{
+				value: "5",
+				label: "发送信息",
+				checked: false,
+				type: ['HBY210', 'BJQ6170', 'HBY670']
+			},
+			{
+				value: "6",
+				label: "产品信息",
+				checked: false,
+				type: ['HBY210', 'BJQ6170', 'HBY670']
+			}, {
+				value: "41",
+				label: "静电探测",
+				checked: false,
+				type: ['HBY670','HBY650']
+			}, {
+				value: "42",
+				label: "SOS",
+				checked: false,
+				type: ['HBY670','BJQ4877']
+			},
+			{
+				value: "43",
+				label: "联机设备",
+				checked: false,
+				type: ['HBY210']
+			},
+				{
+				value: "44",
+				label: "报警声音",
+				checked: false,
+				type: ['HBY210']
+			},
+				{
+				value: "45",
+				label: "自动报警",
+				checked: false,
+				type: ['HBY210']
+			},
+				{
+				value: "46",
+				label: "手动报警",
+				checked: false,
+				type: ['HBY210','HBY102']
+			},
+				{
+				value: "47",
+				label: "报警时长",
+				checked: false,
+				type: ['HBY210']
+			},
+			{
+				value: "48",
+				label: "物体感应",
+				checked: false,
+				type: ['HBY102']
+			},
+			{
+				value: "49",
+				label: "联机模式",
+				checked: false,
+				type: ['HBY102']
+			},
+			
+			{
+				value: "50",
+				label: "报警模式",
+				checked: false,
+				type: ['HBY100','HBY100-J']
+			},
+			
+			{
+				value: "51",
+				label: "警示灯",
+				checked: false,
+				type: ['HBY100','HBY100-J']
+			},
+			
+			{
+				value: "52",
+				label: "语音管理",
+				checked: false,
+				type: ['HBY100','HBY100-J']
+			},
+			
+			{
+				value: "53",
+				label: "箭头模式",
+				checked: false,
+				type: ['BJQ4877']
+			},
+			{
+				value: "54",
+				label: "配组设置",
+				checked: false,
+				type: ['BJQ4877']
+			},
+			{
+				value: "55",
+				label: "修改信道",
+				checked: false,
+				type: ['BJQ4877']
+			},
+			{
+				value: "56",
+				label: "灯光类型设置",
+				checked: false,
+				type: ['HBY100-J']
+			}
+		];
+
+     
+let f=array.filter(v=>{
+ if(v.type.indexOf(data.value.typeName)>-1){
+  return true;
+ }
+ return false;
+})
+
+power.value=f;
+
+  // let arr = [];
+  // let keys = Object.keys(dic);
+
+  // keys.forEach((key) => {
+  //   arr.push({ label: dic[key], value: key });
+  // });
+  // return arr;
+};
+
+
 //打开编辑
 function ShowEdit() {
   Status.ShowEditPop = true;
   getUsrs();
+  calcPower();
 }
 //关闭编辑
 function CloseEdit() {
@@ -276,6 +431,7 @@ function SaveFormData(type) {
 }
 
 function getPower(item) {
+  
   let str = [];
   if (item && item.permission) {
     let arr = item.permission.split(',');

src/views/index.vue

@@ -4,20 +4,28 @@
     <div>
       <h2>数据总览</h2>
       <div class="data-item">
-        <div class="data_bck">
+        <div class="data_bck data">
-          <div class="number"><span>{{ DataOverview.devicesNumber }}</span> 个</div>
+          <div class="number">
+            <span>{{ DataOverview.devicesNumber }}</span> 个
+          </div>
           <div class="title_number">设备数量</div>
         </div>
-        <div class="data_green">
+        <div class="data_green data">
-          <div class="number"><span>{{ DataOverview.equipmentOnline }}</span> 个</div>
+          <div class="number">
+            <span>{{ DataOverview.equipmentOnline }}</span> 个
+          </div>
           <div class="title_number">在线设备</div>
         </div>
-        <div class="data_orgine">
+        <div class="data_orgine data">
-          <div class="number"><span>{{ DataOverview.binding }}</span> 个</div>
+          <div class="number">
+            <span>{{ DataOverview.binding }}</span> 个
+          </div>
           <div class="title_number">已绑定设备</div>
         </div>
-        <div class="data_red">
+        <div class="data_red data">
-          <div class="number"><span>{{ DataOverview.equipmentAbnormal }}</span> 个</div>
+          <div class="number">
+            <span>{{ DataOverview.equipmentAbnormal }}</span> 个
+          </div>
           <div class="title_number">异常设备</div>
         </div>
       </div>
@@ -28,10 +36,8 @@
           <div class="content-row">
             <h2>设备分类</h2>
             <div class="card-header">
-              <div v-for="(item, index) in deviceList" :key="index" class="progress-item"
+              <div v-for="(item, index) in deviceList" :key="index" class="progress-item" style="display: inline-block; margin-right: 40px">
-                style="display: inline-block; margin-right: 40px;">
+                <el-progress :stroke-width="7" type="circle" :width="100" :percentage="item.total === 0 ? 0 : (item.current / item.total) * 100">
-                <el-progress :stroke-width="7" type="circle" :width="100"
-                  :percentage="item.total === 0 ? 0 : (item.current / item.total) * 100">
                   <template #default>
                     <div class="progress-text">
                       <span class="current">{{ item.current }}</span>
@@ -77,20 +83,12 @@
             <div class="card-header">
               <h2>设备使用频次</h2>
               <div class="chart-controls">
-                <el-select v-model="deviceType" placeholder="设备类型" style="width: 150px;"
+                <el-select v-model="deviceType" placeholder="设备类型" style="width: 150px" @change="handleDeviceTypeChange">
-                  @change="handleDeviceTypeChange">
+                  <el-option v-for="item in deviceTypeOptions" :key="item.value" :label="item.typeName" :value="item.deviceTypeId" />
-                  <el-option v-for="item in deviceTypeOptions" :key="item.value" :label="item.typeName"
-                    :value="item.deviceTypeId" />
                 </el-select>
                 <div class="tab-group">
-                  <div class="tab-item" :class="{ 'tab-item--active': activeTab === '1' }"
+                  <div class="tab-item" :class="{ 'tab-item--active': activeTab === '1' }" @click="updateFrequencyChart('1')">近半年</div>
-                    @click="updateFrequencyChart('1')">
+                  <div class="tab-item" :class="{ 'tab-item--active': activeTab === '2' }" @click="updateFrequencyChart('2')">近一年</div>
-                    近半年
-                  </div>
-                  <div class="tab-item" :class="{ 'tab-item--active': activeTab === '2' }"
-                    @click="updateFrequencyChart('2')">
-                    近一年
-                  </div>
                 </div>
               </div>
             </div>
@@ -141,8 +139,8 @@
 </template>
 
 <script setup name="Index" lang="ts">
-import api from '@/api/home/index'
+import api from '@/api/home/index';
-import { DataOverviewType } from '@/api/home/types'
+import { DataOverviewType } from '@/api/home/types';
 import router from '@/router';
 import * as echarts from 'echarts'; // 引入ECharts核心库
 import apiTypeAll from '@/api/equipmentManagement/device/index';
@@ -153,15 +151,15 @@ const DataOverview = ref<DataOverviewType>({
   equipmentAbnormal: 0
 });
 const deviceTypeOptions = ref([]); //设备类型
-const deviceType = ref()
+const deviceType = ref();
 const activeTab = ref('1');
-const alarmsData = ref()
+const alarmsData = ref();
 // ---------------------- 基础数据 ----------------------
 // 设备分类数据
 const deviceList = ref([
-  { name: "4G设备", current: 0, total: 0 },
+  { name: '4G设备', current: 0, total: 0 },
-  { name: "蓝牙设备", current: 0, total: 0 },
+  { name: '蓝牙设备', current: 0, total: 0 },
-  { name: "4G&蓝牙设备", current: 0, total: 0 },
+  { name: '4G&蓝牙设备', current: 0, total: 0 }
 ]);
 // ---------------------- 图表Ref（用于挂载图表实例） ----------------------
 const frequencyChartRef = ref<HTMLDivElement | null>(null); // 设备使用频次折线图
@@ -193,7 +191,7 @@ const initFrequencyChart = async (range: any = '1', deviceTypeId: any) => {
   try {
     let data = {
       deviceTypeId: deviceTypeId
-    }
+    };
     const res = await api.getEquipmentUsageData(range, data);
     const monthData = res.data[0] || {};
     const monthKeys = ['m1', 'm2', 'm3', 'm4', 'm5', 'm6', 'm7', 'm8', 'm9', 'm10', 'm11', 'm12'];
@@ -202,23 +200,24 @@ const initFrequencyChart = async (range: any = '1', deviceTypeId: any) => {
     let filteredKeys, filteredNames, yAxisData;
     const today = new Date();
     const currentMonth = today.getMonth();
-    if (range === '1') {
+
-      const result = [];
+    let mm = 6;
-      for (let i = 0; i < 6; i++) {
+    if (range === '2') {
-        const targetMonth = (currentMonth - i + 12) % 12;
+      mm = 12;
-        result.push(targetMonth);
-      }
-      const recent6Months = result.reverse();
-      // 匹配接口字段和名称
-      filteredKeys = recent6Months.map(monthIndex => monthKeys[monthIndex]);
-      filteredNames = recent6Months.map(monthIndex => monthNames[monthIndex]);
-      yAxisData = filteredKeys.map(key => monthData[key] || 0);
-    } else {
-      // 近一年：全部12个月（1月→12月）
-      filteredKeys = monthKeys;
-      filteredNames = monthNames;
-      yAxisData = filteredKeys.map(key => monthData[key] || 0);
     }
+    const result = [];
+    for (let i = 0; i < mm; i++) {
+      const targetMonth = (currentMonth - i + 12) % 12;
+      result.push(targetMonth);
+    }
+    const recentMonths = result.reverse();
+
+
+    // 匹配接口字段和名称
+    filteredKeys = recentMonths.map((monthIndex) => monthKeys[monthIndex]);
+    filteredNames = recentMonths.map((monthIndex) => monthNames[monthIndex]);
+    yAxisData = filteredKeys.map((key) => monthData[key] || 0);
+
     const chartData = {
       xAxis: filteredNames,
       yAxis: yAxisData,
@@ -258,7 +257,10 @@ const initFrequencyChart = async (range: any = '1', deviceTypeId: any) => {
           areaStyle: {
             color: {
               type: 'linear',
-              x: 0, y: 0, x2: 0, y2: 1,
+              x: 0,
+              y: 0,
+              x2: 0,
+              y2: 1,
               colorStops: [
                 { offset: 0, color: 'rgba(64, 158, 255, 0.3)' },
                 { offset: 1, color: 'rgba(64, 158, 255, 0)' }
@@ -267,21 +269,22 @@ const initFrequencyChart = async (range: any = '1', deviceTypeId: any) => {
           },
           markPoint: {
             data: chartData.peak.value
-              ? [{
+              ? [
-                name: chartData.peak.name,
+                  {
-                value: chartData.peak.value,
+                    name: chartData.peak.name,
-                xAxis: chartData.xAxis.indexOf(chartData.peak.month),
+                    value: chartData.peak.value,
-                yAxis: chartData.peak.value,
+                    xAxis: chartData.xAxis.indexOf(chartData.peak.month),
-                itemStyle: { color: '#409eff' }
+                    yAxis: chartData.peak.value,
-              }]
+                    itemStyle: { color: '#409eff' }
+                  }
+                ]
               : []
           }
         }
       ]
     };
     frequencyChartInstance.setOption(option);
-  } catch (error) {
+  } catch (error) {}
-  }
 };
 /**
  * 2. 报警环形图（今日报警处理占比）
@@ -292,7 +295,7 @@ const initAlarmRingChart = async () => {
   try {
     const res = await api.getAlarmInformation({});
     const { alarmsTotalToday = 0, processingAlarmToday = 0 } = res.data || {};
-    alarmsData.value = res.data || '0'
+    alarmsData.value = res.data || '0';
     alarmRingChartInstance = echarts.init(alarmRingChartRef.value);
     const option = {
       tooltip: {
@@ -312,22 +315,19 @@ const initAlarmRingChart = async () => {
           label: {
             show: true,
             position: 'center',
-            formatter: [
+            formatter: ['{valueStyle|' + alarmsTotalToday + '/' + processingAlarmToday + '}', '{textStyle|今日报警/处理}'].join('\n'), // 换行
-              '{valueStyle|' + alarmsTotalToday + '/' + processingAlarmToday + '}',
-              '{textStyle|今日报警/处理}'
-            ].join('\n'), // 换行
             // 关键：配置 rich 定义样式
             rich: {
               valueStyle: {
-                color: '#333',    // 数字颜色
+                color: '#333', // 数字颜色
-                fontSize: 18,     // 数字字号
+                fontSize: 18, // 数字字号
-                fontWeight: 'bold',// 数字加粗
+                fontWeight: 'bold', // 数字加粗
-                lineHeight: 24    // 行高（控制与下一行间距）
+                lineHeight: 24 // 行高（控制与下一行间距）
               },
               textStyle: {
                 color: 'rgba(56, 64, 79, 0.6)', // 文字颜色（可自定义）
-                fontSize: 14,     // 文字字号
+                fontSize: 14, // 文字字号
-                lineHeight: 20    // 文字行高
+                lineHeight: 20 // 文字行高
               }
             },
             fontSize: 16,
@@ -338,27 +338,24 @@ const initAlarmRingChart = async () => {
             show: false // 隐藏标签连接线
           },
           data: [
-         
             {
-              value:processingAlarmToday ,
+              value: processingAlarmToday,
               name: '已处理',
               itemStyle: { color: '#07BE75' }
             },
-               {
+            {
               value: alarmsTotalToday,
               name: '报警',
               itemStyle: { color: '#F65757' }
-            },
+            }
-
           ]
         }
       ]
     };
     alarmRingChartInstance.setOption(option);
     // 报警柱状图
-    initAlarmBarChart()
+    initAlarmBarChart();
-  } catch (error) {
+  } catch (error) {}
-  }
 };
 
 /**
@@ -367,21 +364,21 @@ const initAlarmRingChart = async () => {
 const initAlarmBarChart = () => {
   if (!alarmBarChartRef.value) return;
   const alarmTypeMap = [
-    { name: '强制报警', field: 'alarmForced' },         // alarmForced 
+    { name: '强制报警', field: 'alarmForced' }, // alarmForced
-    { name: '撞击闯入', field: 'intrusionImpact' },     // intrusionImpact 
+    { name: '撞击闯入', field: 'intrusionImpact' }, // intrusionImpact
-    { name: '自动报警', field: 'alarmAuto' },          // alarmAuto 
+    { name: '自动报警', field: 'alarmAuto' }, // alarmAuto
-    { name: '电子围栏', field: 'fenceElectronic' }       // fenceElectronic 
+    { name: '电子围栏', field: 'fenceElectronic' } // fenceElectronic
   ];
 
-  const alarmTypes = alarmTypeMap.map(item => item.name);
+  const alarmTypes = alarmTypeMap.map((item) => item.name);
-  const alarmCounts = alarmTypeMap.map(item => {
+  const alarmCounts = alarmTypeMap.map((item) => {
     const value = alarmsData.value[item.field]; // 提取对应字段值
     console.log(`${item.name}数值:`, value); // 打印每个类型的数值
     return value;
   });
   const commonGradient = new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-    { offset: 0, color: 'rgba(246, 87, 87, 1)' },    // 渐变起点：#F65757（不透明）
+    { offset: 0, color: 'rgba(246, 87, 87, 1)' }, // 渐变起点：#F65757（不透明）
-    { offset: 1, color: 'rgba(224, 52, 52, 0)' }     // 渐变终点：#E03434（全透明）
+    { offset: 1, color: 'rgba(224, 52, 52, 0)' } // 渐变终点：#E03434（全透明）
   ]);
   const option = {
     tooltip: {
@@ -413,8 +410,8 @@ const initAlarmBarChart = () => {
         data: alarmCounts,
         barWidth: '20%',
         itemStyle: {
-          color: commonGradient,       // 所有柱子共用同一渐变色
+          color: commonGradient, // 所有柱子共用同一渐变色
-          borderRadius: 4              // 统一4px圆角
+          borderRadius: 4 // 统一4px圆角
         }
       }
     ]
@@ -429,19 +426,18 @@ const updateFrequencyChart = (tabValue: any) => {
   if (frequencyChartInstance) {
     frequencyChartInstance.dispose();
   }
-  deviceType.value=''
+  deviceType.value = '';
   initFrequencyChart(tabValue, '');
 };
 const handleDeviceTypeChange = (all) => {
   initFrequencyChart(activeTab.value, all);
-
 };
 // 首页统计接口
 const getData = async () => {
   //  设备总览
-  api.getDataOverview({}).then(res => {
+  api.getDataOverview({}).then((res) => {
-    DataOverview.value = res.data
+    DataOverview.value = res.data;
-  })
+  });
   // 设备分类
   try {
     const res = await api.getEquipmentClassification({});
@@ -450,48 +446,42 @@ const getData = async () => {
     // 映射数据：current 为各类型设备数量，total 为总设备数（6）
     deviceList.value = [
       {
-        name: "4G设备",
+        name: '4G设备',
         current: equipment4G,
         total: total
       },
       {
-        name: "蓝牙设备",
+        name: '蓝牙设备',
         current: deviceBluetooth,
         total: total
       },
       {
-        name: "4G&蓝牙设备",
+        name: '4G&蓝牙设备',
         current: devices4GAndBluetooth,
         total: total
-      },
+      }
     ];
   } catch (error) {
     console.log('获取设备分类数据失败：', error);
   }
   // 设备类型
-  apiTypeAll.deviceTypeAll().then(res => {
+  apiTypeAll
-    if (res.code == 200) {
+    .deviceTypeAll()
-      const originalData = Array.isArray(res.data) ? res.data : [];
+    .then((res) => {
-      deviceTypeOptions.value = [{ typeName: '全部', deviceTypeId: ''}].concat(originalData); 
+      if (res.code == 200) {
-    }
+        const originalData = Array.isArray(res.data) ? res.data : [];
-  }).catch(err => {
+        deviceTypeOptions.value = [{ typeName: '全部', deviceTypeId: '' }].concat(originalData);
-
+      }
-  })
+    })
+    .catch((err) => {});
 };
 
-
-
-
-
-
-
-
 // ---------------------- 生命周期钩子（初始化/销毁图表） ----------------------
 onMounted(() => {
   // 页面加载时初始化所有图表
   initFrequencyChart('1', '');
   initAlarmRingChart();
-  getData()
+  getData();
 
   // 监听窗口 resize，自动调整图表大小
   window.addEventListener('resize', () => {
@@ -506,11 +496,15 @@ onUnmounted(() => {
   frequencyChartInstance?.dispose();
   alarmRingChartInstance?.dispose();
   //alarmBarChartInstance?.dispose();
-  window.removeEventListener('resize', () => { });
+  window.removeEventListener('resize', () => {});
 });
 </script>
 
 <style lang="scss" scoped>
+
+.data,.content-row,.region-chart-card{
+  box-shadow: 0px 0px 12px 0px #3c3c3c2b;
+}
 .home {
   padding: 10px 20px 10px 20px;
   background-color: #f5f7fa;
@@ -528,7 +522,7 @@ onUnmounted(() => {
     .data_green,
     .data_orgine,
     .data_red {
-      width:23%;
+      width: 23%;
       height: 135px;
       border-radius: 10px;
       position: relative;
@@ -556,7 +550,7 @@ onUnmounted(() => {
     }
 
     .number {
-      padding-top:30px;
+      padding-top: 30px;
       font-size: 18px;
 
       span {
@@ -675,7 +669,6 @@ onUnmounted(() => {
     padding: 16px;
     height: 360px; // 固定图表卡片高度，避免布局错乱
 
-
     .card-body {
       height: calc(100% - 40px); // 卡片内容区高度（减去header高度）
     }
@@ -713,7 +706,7 @@ onUnmounted(() => {
         }
 
         .stat.green {
-          color: #07BE75;
+          color: #07be75;
         }
 
         .label {

vite/plugins/icons.ts

@@ -6,3 +6,4 @@ export default () => {
     autoInstall: true
   });
 };
+