100j相关bug修复

Reviewed-on: dyf/dyf-vue-ui#30

.env.development

@@ -5,12 +5,13 @@ VITE_APP_TITLE = 云平台管理系统
 VITE_APP_ENV = 'development'
 
 # 开发环境
-#  VITE_APP_BASE_API = 'http://47.120.79.150/backend'
- VITE_APP_BASE_API = 'http://192.168.110.56:8000'
-
+VITE_APP_BASE_API = 'http://192.168.2.34:8000'
+#VITE_APP_BASE_API = 'https://www.cnxhyc.com/jq'
+# VITE_APP_BASE_API = 'http://192.168.110.57:8000'   
 #代永飞接口
 # VITE_APP_BASE_API = 'http://457102h2d6.qicp.vip:24689'   
 
+VITE_AMAP_KEY='84a12a692ae378effdf741e16d584cd3'
 
 # 应用访问路径 例如使用前缀 /admin/
 VITE_APP_CONTEXT_PATH = '/'

.env.production

@@ -2,10 +2,7 @@
 VITE_APP_TITLE = 云平台管理系统
 
 # 生产环境配置 晶全1
-VITE_APP_ENV = 'https://fuyuanshen.com/backend'
-
-# 生产环境配置 富源晟2
-# VITE_APP_ENV = 'https://fuyuanshen.com/backend-fys'
+VITE_APP_ENV = 'https://www.cnxhyc.com'
 
 # 应用访问路径 晶全1
 VITE_APP_CONTEXT_PATH = '/jingquan/'
@@ -19,11 +16,8 @@ VITE_APP_MONITOR_ADMIN = '/admin/applications'
 # SnailJob 控制台地址
 VITE_APP_SNAILJOB_ADMIN = '/snail-job'
 
-# 生产环境 晶全3
-VITE_APP_BASE_API = '/backend'
-
-# 生产环境 富源晟3
-#VITE_APP_BASE_API = '/backend-fys'
+# 生产环境 晶全3 代理访问
+VITE_APP_BASE_API = '/jq'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

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>

package.json

@@ -35,11 +35,13 @@
     "image-conversion": "2.1.1",
     "js-cookie": "3.0.5",
     "jsencrypt": "3.3.2",
+    "lamejs": "^1.2.1",
     "mitt": "^3.0.1",
     "nprogress": "0.2.0",
     "paho-mqtt": "^1.1.0",
     "pinia": "3.0.2",
     "qrcode-vue3": "^1.7.1",
+    "recorder-core": "^1.3.25011100",
     "screenfull": "6.0.2",
     "vue": "3.5.13",
     "vue-cropper": "1.1.1",
@@ -72,7 +74,7 @@
     "sass": "1.87.0",
     "terser": "^5.43.1",
     "typescript": "~5.8.3",
-    "unocss": "^66.0.0",
+    "unocss": "^0.58.0",
     "unplugin-auto-import": "19.1.2",
     "unplugin-icons": "22.1.0",
     "unplugin-vue-components": "28.5.0",

src/api/FenceManager/fence.ts

@@ -64,6 +64,34 @@ function DelFence(ids) {
     })
 }
 
+//添加终端
+function addTerminal(data){
+  return request({
+        url: '/api/equipment/geoFence/addTerminal',
+        method: 'post',
+        data: data
+    })
+}
+
+//删除终端
+function delTerminal(data){
+ return request({
+        url: '/api/equipment/geoFence/delTerminal',
+        method: 'post',
+        data:data
+    })
+}
+
+//查询终端
+function pageTerminal(data){
+    return request({
+        url:'api/device/pageTerminal',
+        method:'get',
+        params:data
+    });
+}
+
+
 export default{
     updateFence:updateFence,
     AddFence:AddFence,
@@ -71,7 +99,10 @@ export default{
     check:check,
     geoFenceById:geoFenceById,
     getList:getList,
-    DelFence:DelFence
+    DelFence:DelFence,
+    addTerminal:addTerminal,
+    delTerminal:delTerminal,
+    pageTerminal:pageTerminal
 }
 
 

src/api/FenceManager/mapOpt.ts

@@ -1,7 +1,7 @@
 var map = null;
 var circle = null;
 var polygon = null;
-
+import mapLocation from '@/assets/images/mapLocation.png';
 
 function initMap() {
     // let key = '90bc158992feb8ccd0145e168cab1307';
@@ -9,12 +9,18 @@ function initMap() {
         map = new AMap.Map("map", {
             viewMode: '2D', //默认使用 2D 模式
             zoom: 11, //地图级别
+              dragEnable: true, // 强制开启拖拽
+    zoomEnable: true, // 开启滚轮缩放（辅助验证）
             center: [114.420739, 30.487514], //地图中心点
         });
 
-        map.on('click',function(evt){
-          alert('您点击的位置:'+evt.lnglat.lng+' , '+ evt.lnglat.lat);
-        });
+        
+setTimeout(() => {
+    map.resize();
+}, 1000);
+        // map.on('click',function(evt){
+        //   alert('您点击的位置:'+evt.lnglat.lng+' , '+ evt.lnglat.lat);
+        // });
     }
     return new Promise((resolve, reject) => {
         if(map){
@@ -39,7 +45,7 @@ function AddPoint(point, index, dragEnd, click) {
             let center = point ? new AMap.LngLat(point.lng, point.lat) : map.getCenter();
 
             let marker = new AMap.Text({
-                icon: "http://wdxm.ztzhtech.com:8111/Script/Home/img/welComeImg/mapLocation.png",
+                icon: mapLocation,
                 position: center,
                 offset: new AMap.Pixel(-15, -24),
                 draggable: true,

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

@@ -0,0 +1,135 @@
+import { param } from '@/utils';
+import request from '@/utils/request';
+
+// 详情信息
+export const deviceDeatil = (id: string) => {
+    return request({
+        url: `/api/hby100j/device/${id}`,
+        method: 'get',
+    });
+};
+// 警示灯爆闪模式
+export const strobeMode = (data: any) => {
+    return request({
+        url: `/api/hby100j/device/strobeMode`,
+        method: 'post',
+        data: data
+    });
+};
+
+
+// 灯光亮度
+function lightModeSettings (data: any) {
+    return request({
+        url: `/api/hby100j/device/lightAdjustment`,
+        method: 'post',
+        data: data
+    });
+};
+//频率调节
+function staticPowerSetting  (data: any)  {
+    return request({
+        url: `/api/hby100j/device/strobeFrequency`,
+        method: 'post',
+        data: data
+    });
+};
+// 修改音量
+function settingUpdateVolume  (data: any)  {
+    return request({
+        url: `/api/hby100j/device/updateVolume`,
+        method: 'post',
+        data: data
+    });       
+};
+
+// 强制报警
+function SosSetting  (data: any) {
+    return request({
+        url: `/api/hby100j/device/forceAlarmActivation`,
+        method: 'post',
+        data: data
+    });
+};
+// 语音列表
+function queryAudioFileList (params: any) {
+    return request({
+        url: `/api/video/queryAudioFileList`,
+        method: 'get',
+       params: params
+    });
+}
+// 提取文本内容
+function extractText (data: any) {
+    return request({
+        url: `/api/video/extract`,
+        method: 'post',
+        data: data
+    });
+}
+// 上传音频文件
+function uploadAudioToOss (data: any) {
+    return request({
+        url: `/api/video/uploadAudioToOss`,
+        method: 'post',
+        data: data
+    });
+}
+// 文本转语音
+export function videTtsToOss(data:any) {
+  return request({
+    url: `/api/video/ttsToOss`,
+    method: 'post',
+	data:data
+  })
+}
+// 重命名
+export function videRenameAudioFile(data:any) {
+  return request({
+    url: `/api/video/renameAudioFile`,
+    method: 'post',
+	data:data
+  })
+}
+// 删除语音文件列表
+export function deviceDeleteAudioFile(params:any) {
+  return request({
+    url: `/api/video/deleteAudioFile`,
+    method: 'get',
+	params:params
+  })
+}
+
+// 更新语音,使用语音
+export function deviceUpdateVoice(data:any) {
+  return request({
+    url: `/api/hby100j/device/updateVoice`,
+    method: 'post',
+	data:data
+  })
+}
+// 语音播放
+export function deviceVoiceBroadcast(data:any) {
+  return request({
+    url: `/api/hby100j/device/voiceBroadcast`,
+    method: 'post',
+	data:data
+  })
+}
+
+export default {
+    deviceDeatil,
+   lightModeSettings:lightModeSettings,
+   SosSetting:SosSetting,
+   staticPowerSetting:staticPowerSetting,
+   settingUpdateVolume:settingUpdateVolume,
+   queryAudioFileList,
+   videRenameAudioFile,
+   deviceDeleteAudioFile,
+   deviceUpdateVoice,
+   videTtsToOss,
+   uploadAudioToOss,
+   extractText,
+   strobeMode,
+   deviceVoiceBroadcast
+};

src/api/controlCenter/controlPanel/670.ts

@@ -26,6 +26,14 @@ function SosSetting  (data: any) {
         data: data
     });
 };
+//批量强制报警
+function SosSettingBatch(data:any){
+     return request({
+        url: `/api/xinghan/device/SOSGradeSettingsBatch`,
+        method: 'post',
+        data: data
+    });
+}
 
 //静电探测档位控制
 function staticPowerSetting  (data: any)  {
@@ -62,5 +70,6 @@ export default {
    SosSetting:SosSetting,
    staticPowerSetting:staticPowerSetting,
    deviceRealTimeStatus:deviceRealTimeStatus,
-   SendMessage:SendMessage
+   SendMessage:SendMessage,
+   SosSettingBatch:SosSettingBatch
 };

src/api/controlCenter/controlPanel/eqControl.ts

@@ -0,0 +1,114 @@
+import xhyc from '@/api/controlCenter/controlPanel/670'
+import fys from '@/api/controlCenter/controlPanel/index'
+
+
+var dic = [{
+    typeNames: ['670'],//星汉的配置
+    sendMsg: {
+        cfg: ['sendMsg', 'deviceIds', 'deviceImeiList', 'instructValue', 'batchId'],
+        method: xhyc.SendMessage
+    },
+    SOS: {
+
+        cfg: ["deviceIds", "typeName", "batchId", "deviceImeiList", "instructValue"],
+        method: xhyc.SosSettingBatch
+    },
+    sendImg: {
+        cfg: [],
+        method: null
+    }
+},
+{
+    typeNames: ['6170', '210'],//富源晟的配置
+    sendMsg: {
+        cfg: ["deviceIds", "typeName", "batchId", "deviceImeiList", "sendMsg"],
+        method: fys.deviceSendMessage
+    },
+    SOS: {
+        cfg: ["deviceIds", "typeName", "batchId", "deviceImeiList", "instructValue"],
+        method: fys.sendAlarmMessage
+    },
+    sendImg: {
+        cfg: [],
+        method: null
+    }
+},
+{
+    typeNames: null,//如果找不到，以富源晟的配置为准
+    sendMsg: {
+        cfg: ["deviceIds", "typeName", "batchId", "deviceImeiList", "sendMsg"],
+        method: fys.deviceSendMessage
+    },
+    SOS: {
+        cfg: ["deviceIds", "typeName", "batchId", "deviceImeiList", "instructValue"],
+        method: fys.sendAlarmMessage
+    },
+    sendImg: {
+        cfg: [],
+        method: null
+    }
+    
+}
+];
+
+function getCfg(json, type) {
+    let f = dic.find(v => {
+
+        let flag = false;
+        for (let index = 0; index < v.typeNames.length; index++) {
+            let i = v.typeNames[index];
+            if (i.toLowerCase().indexOf(json.typeName.toLowerCase()) > -1 || json.typeName.toLowerCase().indexOf(i.toLowerCase()) > -1) {
+                flag = true;
+                break;
+            }
+        }
+        return flag;
+    });
+
+    if (!f) {
+        f = dic.find(v => {
+            return !v.typeNames;
+        });
+    }
+    if (f) {
+        let keys = f[type].cfg;
+        let method = f[type].method;
+
+        let formData = {};
+        keys.forEach(key => {
+            formData[key] = json[key];
+        });
+
+        return {
+            formData: formData,
+            method: method
+        }
+
+
+    }
+    return null;
+}
+
+//发送信息
+function deviceSendMessage(json) {
+    let cfg = getCfg(json, 'sendMsg');
+    if (cfg.method) {
+        return cfg.method(cfg.formData);
+    }
+    return Promise.reject({ code: 500, msg: '配置中找不到该类型的设备' });
+
+}
+
+//强制报警
+function sendAlarmMessage(json) {
+    
+ let cfg = getCfg(json, 'SOS');
+    if (cfg.method) {
+        return cfg.method(cfg.formData);
+    }
+    return Promise.reject({ code: 500, msg: '配置中找不到该类型的设备' });
+}
+export default {
+    deviceSendMessage: deviceSendMessage,
+    sendAlarmMessage: sendAlarmMessage
+}

src/api/controlCenter/controlPanel/types.ts

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

src/api/debugCenter/debugCenter.ts

@@ -58,8 +58,17 @@ function uploadBoot(formData){
   //     });
 }
 
-function getDeviceInfoById(id){
+// 6170上传logo开机画面
+function deviceUploadLogo(formData){
+   return request({
+    url: '/api/bjq/device/batchUploadLogo',
+    method: 'post',
+    data: formData
+  })
+}
 
+
+function getDeviceInfoById(id){
      return request({
     url: '/api/device/debug/detail/'+id,
     method: 'get'
@@ -67,11 +76,14 @@ function getDeviceInfoById(id){
 }
 
 
+
+
 export default{
     getDevice:getDevice,
     uploadFile:uploadFile,
     addVideo:addVideo,
     updateItem:updateItem,
     uploadBoot:uploadBoot,
-    getDeviceInfoById:getDeviceInfoById
+    getDeviceInfoById:getDeviceInfoById,
+    deviceUploadLogo:deviceUploadLogo
 }

src/api/debugCenter/deviceApi.ts

@@ -0,0 +1,29 @@
+
+import debugCenter from '@/api/debugCenter/debugCenter';
+const uploadConfig = {
+  670: {
+    api: debugCenter.uploadBoot,   // 670对应接口
+    requiredParams: ['deviceIds', 'file']
+  },
+  6170: {
+    api: debugCenter.deviceUploadLogo, 
+    requiredParams: ['deviceIds', 'file',] 
+  },
+  default: {
+    api: debugCenter.uploadBoot,
+    requiredParams: ['deviceIds', 'file']
+  }
+};
+function handleParams(deviceType, deviceIds, file) {
+  const formattedIds = Array.isArray(deviceIds) ? deviceIds : [deviceIds];
+  const formData = new FormData();
+  formattedIds.forEach(id => formData.append('deviceIds', id));
+  formData.append('file', file);
+  return formData;
+}
+export function uploadLogo(deviceType, deviceIds, file) {
+  const currentConfig = uploadConfig[deviceType] || uploadConfig.default;
+  const formData = handleParams(deviceType, deviceIds, file);
+  return currentConfig.api(formData);
+}
+export default { uploadLogo };

src/api/equipmentAlarmRecord/types.ts

@@ -16,6 +16,7 @@ export interface AlarmVO {
   deviceMac: string;
   devicePic:string;
   finishTime: string;
+  timeDiff:string
   
 }
 

src/api/equipmentManagement/device/types.ts

@@ -5,6 +5,8 @@ export interface deviceQuery extends PageQuery {
     deviceType: string;
     deviceStatus: string;
     bluetoothName?: string; // 蓝牙名称查询字段
+    onlineStatus?: string;
+    bindingStatus?:string
 }
 
 export interface deviceForm {
@@ -37,6 +39,7 @@ export interface deviceVO {
     customerId?: string | number;
     typeName?: string;
     bluetoothName?: string; // 蓝牙名称字段
+    
 }
 
 export interface deviceTypeOption {

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/api/equipmentManagement/repairRecords/index.ts

@@ -89,8 +89,9 @@ function getRepairList(data) {
             "repairPart": data.repairPart,
             "repairReason": data.repairReason,
             "repairPerson": data.repairPerson,
-            "repairBeginTime": data.repairBeginTime,
-            "repairEndTime": data.repairBeginTime,
+            "repairBeginTime":data.Date?data.Date[0]:'',
+            "repairEndTime": data.Date?data.Date[1]:'',
+            "searchValue":data.searchValue,
             "pageNum": data.pageNum,
             "pageSize": data.pageSize
         }
@@ -126,6 +127,13 @@ function getDeviceTypeAll() {
     });
 }
 
+function getDeviceAll(){
+    return request({
+        url:'api/device?pageNum=1&pageSize=99999',
+        method:'get'}
+    );
+}
+
 export default {
     updateRepair: updateRepair,
     addRepir: addRepir,
@@ -133,5 +141,6 @@ export default {
     getRepirDetail: getRepirDetail,
     getRepairList: getRepairList,
     dropRepir: dropRepir,
-    getDeviceTypeAll: getDeviceTypeAll
+    getDeviceTypeAll: getDeviceTypeAll,
+    getDeviceAll:getDeviceAll
 }

src/api/homeIndex/index.ts

@@ -0,0 +1,59 @@
+import request from '@/utils/request';
+// 获取设备总览 DataOverview
+export const getDeviceOverview = (params) => {
+  return request({
+    url: '/api/largeScreen/getDeviceOverview',
+    method: 'get',
+    params: params
+  });
+};
+
+
+// 报警事件，报警总数统计
+export const getAlarmStatistics = (params) => {
+  return request({
+    url: '/api/largeScreen/getAlarmStatistics',
+    method: 'get',
+    params: params
+  });
+}
+
+
+// 报警次数
+export const getMonthlyAlarmStatistics = (params) => {
+  return request({
+    url: '/api/largeScreen/getMonthlyAlarmStatistics',
+    method: 'get',
+    params: params
+  });
+}
+
+// 设备类别
+export const getDeviceCommunicationModeStatistics = (params = {}) => {
+  return request({
+    url: '/api/largeScreen/getDeviceCommunicationModeStatistics',
+    method: 'get',
+    params: params
+  });
+}
+
+// 设备使用频次
+export const getDeviceUsageFrequency = (params = {}) => {
+  return request({
+    url: '/api/largeScreen/getDeviceUsageFrequency',
+    method: 'get',
+    params: params
+  });
+}
+
+// 实时报警
+export const getRealtimeAlarm = (params = {}) => {
+  return request({
+    url: '/api/largeScreen/getRealtimeAlarm',
+    method: 'get',
+    params: params
+  });
+}
+
+
+

src/api/largeScreen/mapOpt.ts

@@ -0,0 +1,241 @@
+var map = null;
+var layPoints = [];
+
+function initMap(click) {
+    // let key = '90bc158992feb8ccd0145e168cab1307';
+    let init = function () {
+        map = new AMap.Map("map", {
+            viewMode: '2D', //默认使用 2D 模式
+            zoom: 11, //地图级别
+            center: [116.396477, 39.909278], //地图中心点
+            mapStyle: "amap://styles/darkblue"
+        });
+
+        map.on('click', function (evt) {
+            //    alert('您点击的位置:'+evt.lnglat.lng+' , '+ evt.lnglat.lat);
+            if (click) {
+                click(evt.lnglat);
+            }
+        });
+    }
+    return new Promise((resolve, reject) => {
+        if (map) {
+            resolve(200);
+            return;
+        }
+        if (window.AMap) {
+            init();
+            resolve(200);
+            return;
+        }
+        reject({ code: 500, msg: '高德地图未能初始化成功' });
+    });
+
+}
+
+//添加一个点
+function AddPoint(point, index, dragEnd, click, iconImg) {
+  
+    return new Promise((resolve, reject) => {
+        try {
+            if (!point) {
+                reject("point不可用")
+                return;
+            }
+            if (!point.longitude || !point.latitude) {
+                reject("point的经纬度不可用")
+                return;
+            }
+            layPoints.push({ lng: point.longitude, lat: point.latitude });
+
+            let center = new AMap.LngLat(point.longitude, point.latitude);
+
+            let icon = new AMap.Icon({
+                size: new AMap.Size(45, 45), //图标尺寸
+                image: iconImg, //Icon 的图像
+
+                imageSize: new AMap.Size(45, 45), //根据所设置的大小拉伸或压缩图片
+            });
+            let marker = new AMap.Marker({
+                icon: icon,
+                position: center,
+                offset: new AMap.Pixel(-15, -24),
+                draggable: dragEnd ? true : false,
+                cursor: 'point',
+                title: point.isAlarming ? '正在报警:' + point.deviceName : point.deviceName,
+                text: index,
+                class: 'point',
+                extData: point,
+                anchor:'bottom-center'
+            });
+            marker.setMap(map);
+
+            let lays = map.getAllOverlays('text');
+            for (let i = 0; i < lays.length; i++) {
+                const element = lays[i];
+                let cls = element.getOptions();
+                if (cls.class) {
+                    element.dom.classList.add(cls.class);
+                }
+            }
+
+
+            resolve(center);
+        } catch (ex) {
+            reject(ex)
+        }
+
+    });
+
+
+}
+
+function getCenter() {
+    var center = map.getCenter().toJSON();
+    return center;
+}
+
+function setCenter(lon, latitude) {
+    var position = new AMap.LngLat(lon, latitude); //传入经纬度    
+    map.setCenter(position); //简写 设置地图中心点
+
+}
+
+function calcCenter() {
+
+    
+}
+//画多边形
+function DrawPoy(points) {
+    
+    return new Promise((resolve, reject) => {
+        if (!map) {
+            reject("map未初始化");
+            return;
+        }
+        if (!points) {
+            reject("points未初始化");
+            return;
+        }
+        if (!points.coordinates) {
+            reject("coordinates未初始化");
+            return;
+        }
+
+        if (!Array.isArray(points.coordinates)) {
+            points.coordinates = JSON.parse(points.coordinates);
+        }
+
+        let path = [];
+
+
+        setTimeout(() => {
+            points.coordinates.filter(v => {
+                if (v.lng && v.lat) {
+                    path.push(new AMap.LngLat(v.lng, v.lat));
+                    layPoints.push({ lng: v.lng, lat: v.lat });
+                    return true;
+                }
+                return false;
+            });
+            if (!path.length) {
+                reject("path为空");
+            }
+            let polygon = new AMap.Polygon({
+                path: path,
+                fillColor: '#F00C0C',
+                fillOpacity: 0.03,
+                strokeOpacity: 0.1,
+                strokeColor: '#F00C0C',
+
+                strokeWeight: 3,
+                strokeStyle: 'dashed',
+                // strokeDasharray: [50,50,50],
+                extData: points
+            });
+            map.add(polygon);
+            resolve("添加多边形成功");
+        }, 0);
+    });
+
+
+}
+//画圆形
+function DrawCicle(points, raduis, dragEnd) {
+    
+    return new Promise((resolve, reject) => {
+        if (!map) {
+            reject("map未初始化");
+            return;
+        }
+        if (!points) {
+            reject("points未初始化");
+            return;
+        }
+        if (!points.coordinates) {
+            reject("coordinates未初始化");
+            return;
+        }
+
+        if (!Array.isArray(points.coordinates)) {
+            points.coordinates = JSON.parse(points.coordinates);
+        }
+
+        if (!(points.coordinates[0].lng && points.coordinates[0].lat)) {
+            reject("圆的中心点不正确")
+            return;
+        }
+        
+        let circle = new AMap.Circle({
+            center: [points.coordinates[0].lng, points.coordinates[0].lat],
+            radius: raduis ? raduis : 1000, //半径
+            borderWeight: 3,
+            strokeColor: "#F00C0C",
+            strokeWeight: 1,
+            strokeOpacity: 0.2,
+            fillOpacity: 0.4,
+            strokeStyle: 'dashed',
+            strokeDasharray: [10, 10],
+            // 线样式还支持 'dashed'
+            fillColor: '#1791fc',
+            zIndex: 50,
+        })
+        map.add(circle);
+        layPoints.push({ lng: points.coordinates[0].lng, lat: points.coordinates[0].lat });
+        resolve("添加圆成功");
+    });
+
+
+
+}
+
+//清除所有
+function clearOverLays() {
+    map && map.clearMap();
+    layPoints = [];
+}
+
+
+
+function removeOverLay(lay) {
+    map && map.remove(lay);
+}
+
+
+
+function setFitView() {
+    if (map) { map.setFitView(); }
+}
+export default {
+    gdMap: map,
+    initMap: initMap,
+    AddPoint: AddPoint,
+    getCenter: getCenter,
+    DrawPoy: DrawPoy,
+    DrawCicle: DrawCicle,
+    clearOverLays: clearOverLays,
+    removeOverLay: removeOverLay,
+    setCenter: setCenter,
+    calcCenter: calcCenter,
+    setFitView: setFitView
+}

src/api/system/service/api.ts

@@ -0,0 +1,118 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ServiceVO, ServiceForm, ServiceQuery } from '@/api/system/service/types';
+
+/**
+ * 查询轨迹服务列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listService = (query?: ServiceQuery): AxiosPromise<ServiceVO[]> => {
+  return request({
+    url: '/api/trackService/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询轨迹服务详细
+ * @param id
+ */
+export const getService = (id: string | number): AxiosPromise<ServiceVO> => {
+  return request({
+    url: '/api/trackService/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增轨迹服务
+ * @param data
+ */
+export const addService = (data: ServiceForm) => {
+  return request({
+    url: '/api/trackService/add',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改轨迹服务
+ * @param data
+ */
+export const updateService = (data: ServiceForm) => {
+    return Promise.reject({code:500,msg:'不允许此操作'});
+//   return request({
+//     url: '/api/trackService/update',
+//     method: 'put',
+//     data: data
+//   });
+};
+
+/**
+ * 删除轨迹服务
+ * @param id
+ */
+export const delService = (id: string | number | Array<string | number>) => {
+//   return request({
+//     url: '/api/trackService/' + id,
+//     method: 'delete'
+//   });
+
+return Promise.reject({code:500,msg:'不允许此操作'});
+};
+
+
+//获取设备
+export const getDevice = (data) => {
+  return request({
+    url: '/api/device',
+    method: 'get',
+    params:data
+  });
+};
+
+//获取设备
+export const getDeviceList = (data) => {
+  return request({
+    url: '/api/device/list',
+    method: 'get',
+    params:data
+  });
+};
+//保存
+export const terminalDevice=(data)=>{
+   return request({
+    url: '/api/trackService/terminal',
+    method: 'post',
+    data:data
+  });
+}
+//删除
+export const delTerminalDevice=(id)=>{
+   return request({
+    url: '/api/trackService/delTerminal/'+id,
+    method: 'delete'    
+  });
+}
+
+//获取地图的终端，列表查询
+export const getMapDevice = (data) => {
+  return request({
+    url: '/api/trackService/listTerminal',
+    method: 'get',
+    params:data
+  });
+};
+
+//获取地图的终端，模糊查询
+export const getMapDeviceByFilter = (data) => {
+  return request({
+    url: '/api/trackService/searchTerminal',
+    method: 'get',
+    params:data
+  });
+};

src/api/system/service/types.ts

@@ -0,0 +1,56 @@
+export interface ServiceVO {
+  /**
+   * 
+   */
+  id: string | number;
+
+  /**
+   * 猎鹰服务ID
+   */
+  sid: string | number;
+
+  /**
+   * 服务名称
+   */
+  sname: string;
+
+}
+
+export interface ServiceForm extends BaseEntity {
+  /**
+   * 
+   */
+  id?: string | number;
+
+  /**
+   * 猎鹰服务ID
+   */
+  sid?: string | number;
+
+  /**
+   * 服务名称
+   */
+  sname?: string;
+
+}
+
+export interface ServiceQuery extends PageQuery {
+
+  /**
+   * 猎鹰服务ID
+   */
+  sid?: string | number;
+
+  /**
+   * 服务名称
+   */
+  sname?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/assets/icons/svg/home.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="_图层_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 17.99 18">
+  <path id="_矢量_42" d="M17.82,5.81L9.5.08c-.16-.11-.38-.11-.54,0L.2,5.81c-.13.08-.2.21-.2.35v11.41c0,.24.21.43.46.43h5.54c.25,0,.46-.19.46-.43v-2.48c0-1.42,1.17-2.65,2.68-2.69,1.57-.04,2.85,1.13,2.85,2.58v2.59c0,.24.21.43.46.43h5.08c.25,0,.46-.19.46-.43V6.15c0-.14-.06-.26-.18-.35h.01Z"/>
+</svg>

src/assets/icons/svg/报警信息1.1.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 18">
+
+        <path  d="M8.1,3.9c.6,0,1-.5,1-1v-1.9C9.1.5,8.6,0,8.1,0s-1,.4-1,1v1.9c0,.6.4,1,1,1h0ZM3.3,5.7c-.4.4-1,.4-1.4,0l-1.6-1.5c-.4-.4-.4-.9,0-1.3.4-.4,1-.4,1.4,0l1.6,1.5c.4.4.4.9,0,1.3ZM12.6,5.7c.4.4,1,.4,1.4,0l1.6-1.5c.4-.4.4-.9,0-1.3-.4-.4-1-.4-1.4,0l-1.6,1.5c-.4.4-.4.9,0,1.3ZM3,15.4v-5.4c0-2.8,2.3-5.1,5-5.1s5.1,2.3,5.1,5.1v5.4h1.6c.7,0,1.3.6,1.3,1.3s-.6,1.3-1.3,1.3H1.5c-.7,0-1.3-.6-1.3-1.3s.6-1.3,1.3-1.3c0,0,1.6,0,1.6,0ZM10.1,11.3h-1.1c-.1,0-.2,0-.2-.2l.4-2.1c0-.1-.2-.2-.3-.1l-2.9,2.6c0,0,0,.2.1.2h1.2c0,0,.2,0,.2.2l-.4,2.1c0,.1.2.2.3.1l2.9-2.6c.1,0,0-.2-.1-.2Z"/>
+   
+</svg>

src/assets/icons/svg/控制中心1.1.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 18 16">
+      <path id="_矢量_54" class="cls-1" d="M13.5,12.6v-1.1h2.2v1.1h2.2v2.3h-2.2v1.1h-2.2v-1.1H0v-2.3h13.5ZM7.9,6.9v-1.1h2.2v1.1h7.9v2.3h-7.9v1.1h-2.2v-1.1H0v-2.3s7.9,0,7.9,0ZM2.2,1.1V0h2.2v1.1h13.5v2.3H4.5v1.1h-2.2v-1.1H0V1.1h2.2Z"/>
+</svg>

src/assets/icons/svg/数据可视化1.1.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 18 15">
+ 
+      <path  d="M.8,0h16.4s.1,0,.2,0c0,0,.1,0,.1,0,0,0,.1,0,.1,0,0,0,0,0,.1,0,0,0,0,0,.1.1s0,0,0,.1c0,0,0,.1,0,.2,0,0,0,.1,0,.2v10.8c0,0,0,.1,0,.2,0,0,0,.1,0,.2,0,0,0,.1,0,.1,0,0,0,0-.1.1s0,0-.1.1c0,0,0,0-.1,0,0,0-.1,0-.1,0s-.1,0-.2,0H.8c0,0-.1,0-.2,0,0,0-.1,0-.1,0,0,0,0,0-.1,0s0,0-.1-.1c0,0,0,0,0-.1s0,0,0-.1c0,0,0-.1,0-.2C0,11.8,0,11.7,0,11.7V.8S0,.7,0,.7c0,0,0-.1,0-.2s0,0,0-.1c0,0,0,0,0-.1s0,0,.1,0c0,0,0,0,.1,0,0,0,.1,0,.1,0C.7,0,.8,0,.8,0h0ZM2.5,6.7h0s0,0,0,0c0,0,0,0,0,0s0,0,0,0,0,0,0,0,0,0,0,0c0,0,0,0,0,0v2.7s0,0,0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0h1s0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0s0,0,0,0,0,0,0,0c0,0,0,0,0,0v-2.7s0,0,0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0h-.9ZM6.5,5h0s0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0c0,0,0,0,0,0v4.3s0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0h1s0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0s0,0,0,0,0,0,0,0c0,0,0,0,0,0v-4.3s0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0-.9,0-.9,0ZM10.6,2.5h0s0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0s0,0,0,0,0,0,0,0c0,0,0,0,0,0v6.8s0,0,0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0h1s0,0,0,0c0,0,0,0,0,0s0,0,0,0,0,0,0,0,0,0,0,0c0,0,0,0,0,0V2.8s0,0,0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0h0s-.8,0-.8,0ZM14.7,5.8h0s0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0v3.5s0,0,0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0h1s0,0,0,0c0,0,0,0,0,0s0,0,0,0,0,0,0,0,0,0,0,0c0,0,0,0,0,0v-3.5s0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0h0s-.8,0-.8,0ZM6.6,14.2v-.5s0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0h4.3s0,0,0,0c0,0,0,0,0,0s0,0,0,0,0,0,0,0,0,0,0,0c0,0,0,0,0,0v.5h3.8s0,0,0,0c0,0,0,0,0,0s0,0,0,0,0,0,0,0,0,0,0,0c0,0,0,0,0,0v.2s0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0H2.8s0,0,0,0c0,0,0,0,0,0s0,0,0,0,0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0v-.2s0,0,0,0,0,0,0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0s0,0,0,0h3.8Z"/>
+
+</svg>

src/assets/icons/svg/日志报表1.1.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 18">
+ 
+        <path d="M5.8,2.4h4.4c.4,0,.7-.3.7-.7V.7c0-.4-.3-.7-.7-.7h-4.4c-.4,0-.7.3-.7.7v1.1c0,.4.3.7.7.7Z"/>
+        <path  d="M13.8,1.3h-2.3v.7c0,.5-.4.8-.9.8h-5.2c-.5,0-.9-.4-.9-.8v-.7h-2.3C1,1.3,0,2.2,0,3.4v12.5c0,1.1,1,2.1,2.2,2.1h11.5c1.2,0,2.2-.9,2.2-2.1V3.4c0-1.2-1-2.1-2.2-2.1ZM13.2,13.4H3.3c-.3,0-.6-.2-.6-.5s.2-.5.6-.5h9.9c.3,0,.6.2.6.5s-.3.5-.6.5h0ZM13.2,10H3.3c-.3,0-.6-.2-.6-.5s.2-.5.6-.5h9.9c.3,0,.6.2.6.5s-.3.5-.6.5h0ZM13.2,6.5H3.3c-.3,0-.6-.2-.6-.5s.2-.5.6-.5h9.9c.3,0,.6.2.6.5s-.3.5-.6.5h0Z"/>
+
+</svg>

src/assets/icons/svg/用户管理1.1.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 18 18">
+  
+      <path  d="M16.9,12.8c-.1-.4-.3-.8-.5-1.2l.6-1-.5-.6-1,.6c-.3-.2-.7-.4-1.1-.4l-.3-1.2h-.8l-.3,1.2c-.4,0-.7.2-1.1.4l-1-.6-.5.6.6,1c-.2.4-.4.8-.5,1.2l-1.1.3v.8l1,.3c0,.5.2,1,.5,1.4l-.5.9.5.5.8-.5c.4.3.9.6,1.4.7l.2.9h.8l.2-.9c.3,0,.5-.1.8-.2s.5-.2.7-.4l.8.5.5-.5-.5-.9c.3-.4.4-.9.5-1.4l1-.3v-.8l-1.1-.3s0,0,0,0ZM13.7,15.6h-.2c0,0-.1,0-.2,0,0,0-.1,0-.2,0s-.1,0-.2,0c0,0-.1,0-.2,0,0,0-.1,0-.2-.1s-.1,0-.1-.1c0,0,0,0-.1-.1,0,0,0,0-.1-.1s0-.1-.1-.1c0,0,0-.1,0-.2,0,0,0-.1,0-.2s0-.1,0-.2,0-.1,0-.2c0,0,0-.1,0-.2v-.4c0,0,0-.1,0-.2,0,0,0-.1,0-.2,0,0,0-.1,0-.2s0-.1,0-.2c0,0,0-.1,0-.2s0-.1.1-.1c0,0,0-.1.1-.1,0,0,0,0,.1-.1s.1,0,.1-.1c0,0,.1,0,.2-.1s.1,0,.2,0c0,0,.1,0,.2,0,0,0,.1,0,.2,0,0,0,.1,0,.2,0h.4c0,0,.1,0,.2,0,0,0,.1,0,.2,0s.1,0,.2,0c0,0,.1,0,.2,0,0,0,.1,0,.2.1s.1,0,.1.1c0,0,0,0,.1.1,0,0,0,0,.1.1s0,.1.1.1c0,0,0,.1,0,.2,0,0,0,.1,0,.2s0,.1,0,.2,0,.1,0,.2c0,0,0,.1,0,.2v.4c0,0,0,.1,0,.2,0,0,0,.1,0,.2,0,0,0,.1,0,.2s0,.1,0,.2c0,0,0,.1,0,.2s0,.1-.1.1c0,0,0,.1-.1.1,0,0,0,0-.1.1s-.1,0-.1.1c0,0-.1,0-.2.1,0,0-.1,0-.2,0,0,0-.1,0-.2,0,0,0-.1,0-.2,0,0,0-.1,0-.2,0,0,0-.2,0-.2,0ZM10.4,9.6c-.6-.5-1.3-.8-2-1,1.4-.7,2.5-2.3,2.5-4S8.9,0,6.5,0,2.2,2,2.2,4.5s1,3.3,2.4,4C1.9,9.4,0,11.9,0,14.8,0,14.8,3.3,15.8,6.6,15.8s1.7,0,2.5-.2c-.1-.3-.2-.7-.3-1,0-.4-.1-.7-.1-1.1,0-1.6.7-3,1.7-3.9h0Z"/>
+  
+</svg>

src/assets/icons/svg/租户管理1.1.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 18 18">
+ 
+        <path  d="M7.4,12.7c.3-2,1.8-3.2,2.4-3.7h0c0,0,.2,0,.3-.2,1.9-.7,3.2-2.3,3.2-4.3,0-2.5-2.3-4.6-5.1-4.6S3.1,2.1,3.1,4.6s1.4,3.6,3.3,4.3c-.9.2-1.8.6-2.5,1C.6,11.7,0,14.2,0,17.7s.3.3.6.3h9.9l-.9-.4c-.9-.4-2.7-2.3-2.3-4.9h0Z"/>
+        <path  d="M13.2,11.6l-1.7,1.4v2.4h.7v-1.2h2v1.2h.7v-2.4l-1.7-1.4h0ZM14.9,11.9h-.3l.3.3v-.3Z"/>
+        <path  d="M13.2,9.1c-2.7,0-4.8,2-4.8,4.4s2.2,4.4,4.8,4.4,4.8-2,4.8-4.4-2.1-4.4-4.8-4.4ZM15.9,13.6c0,0-.1,0-.3,0s-.1,0-.2,0v2c0,.2-.2.4-.5.4h-1.6v-1.2h-.6v1.2h-1.6c-.3,0-.5-.2-.5-.4v-2s0,0-.2,0-.2,0-.3,0,0-.2,0-.2,0-.2,0-.2l2.4-2c.3-.2.6-.2.9,0l.4.4c0,0,.2-.2.3-.2h.9c.2,0,.3.2.3.3v.8c0,.1,0,.2-.1.2l.5.5c0,0,0,.1,0,.2,0,0,0,.1,0,.2h0Z"/>
+
+</svg>

src/assets/icons/svg/维修记录1.1.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 18 18">
+ 
+      <path  d="M17.2,2.8s0,0,0,0c-.1-.1-.3-.1-.4,0l-3.2,3.2c-.4.4-1,.4-1.4,0h-.1c-.4-.5-.4-1.1,0-1.5l3.2-3.2s0,0,0,0c0-.1,0-.3-.1-.4-2.2-1.3-5.1-1-7,.9-1.4,1.4-1.9,3.2-1.6,5,0,.3,0,.7-.3,1L0,13.9c0,0,0,.2,0,.2l3.8,3.8c0,0,.2,0,.2,0l6.2-6.2c.2-.2.6-.3,1-.3,1.8.3,3.7-.2,5-1.6,1.9-1.9,2.2-4.8.9-7h0Z"/>
+   
+</svg>

src/assets/icons/svg/联调中心1.1.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 18 18"> 
+      <path id="_联调中心图标" class="cls-1" d="M9.8,12.3c-1.1,0-2.1-.4-2.9-1.2-.2-.2-.3-.5-.3-.8s.1-.6.3-.8c.4-.4,1.2-.4,1.6,0,.8.8,2.1.7,3-.2l3.5-3.5c.5-.5.7-1.1.7-1.7s0-.9-.6-1.3c-.5-.5-1-.6-1.4-.5-.6,0-1.1.3-1.6.7l-2,2c-.5-.5-2.4-.8-2.9-.3l3.3-3.3c.9-.9,2-1.4,3.1-1.4,1.2,0,2.3.4,3.1,1.2.8.8,1.2,1.8,1.2,2.9s-.5,2.4-1.4,3.3l-3.5,3.5c-.9.9-2.1,1.4-3.3,1.4M4.9,7.1l-3.5,3.5C.5,11.5,0,12.7,0,13.9s.4,2.1,1.2,2.9c.8.8,1.9,1.3,3.1,1.2,1.1,0,2.2-.5,3.1-1.4l3.3-3.3c-.5.5-2.5.2-2.9-.3l-2,2c-.4.4-1,.7-1.6.7-.4,0-.9,0-1.4-.6-.5-.4-.5-1-.5-1.3,0-.6.3-1.2.7-1.7l3.5-3.5c.9-.9,2.2-1,3-.2s.5.3.8.3.6-.1.8-.3.3-.5.3-.8-.1-.6-.3-.8c-.8-.8-1.9-1.2-2.9-1.2s-2.4.5-3.3,1.4h0Z"/>
+</svg>

src/assets/icons/svg/设备管理1.1.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 18 18">
+
+      <path  d="M17.6,14.4l-6.4,3.5s-.1,0-.1,0c0,0-.1,0-.2,0h-.2c0,0-.1,0-.2,0,0,0-.1,0-.2,0,0,0-.1,0-.1,0s0,0-.1-.1,0,0-.1-.1c0-.1-.1-.3-.1-.4v-5.9c0,0,0-.1,0-.2,0,0,0-.1,0-.2,0,0,0-.1.1-.2,0,0,.1,0,.2-.1l6.4-3.5s.1,0,.1,0,.1,0,.2,0h.2c0,0,.1,0,.2,0,0,0,.1,0,.2,0,0,0,.1,0,.1,0,0,0,0,0,.1.1s0,0,.1.1c0,.1.1.3.1.4v5.9c0,0,0,.1,0,.2,0,0,0,.1,0,.2,0,0,0,.1-.1.2,0,0-.1,0-.2.1h0ZM.4,14.4c0,0-.1,0-.2-.1,0,0,0-.1-.1-.2,0,0,0-.1,0-.2C0,13.8,0,13.7,0,13.6v-5.9C0,7.3.4,7,.9,7s.3,0,.4.1l6.4,3.5c0,0,.1,0,.2.1,0,0,0,.1.1.2s0,.1,0,.2,0,.1,0,.2v5.9c0,.5-.4.8-.9.8s-.3,0-.4-.1L.4,14.4H.4ZM8.6.1c.3-.1.6-.1.9,0l7.3,3.9s0,0,0,0,0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0v.2s0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0l-7.3,3.9c0,0-.1,0-.2,0,0,0-.1,0-.2,0s-.1,0-.2,0-.1,0-.2,0L1.3,5.5s0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0v-.2s0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0,0,0,0,0,0,0L8.6.1h0Z"/>
+ 
+</svg>

src/assets/icons/svg/首页1.1.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 18 18">
+
+      <path  d="M17.8,5.8L9.5,0c-.2-.1-.4-.1-.5,0L.2,5.8c-.1,0-.2.2-.2.3v11.4c0,.2.2.4.5.4h5.5c.2,0,.5-.2.5-.4v-2.5c0-1.4,1.2-2.6,2.7-2.7,1.6,0,2.8,1.1,2.8,2.6v2.6c0,.2.2.4.5.4h5.1c.2,0,.5-.2.5-.4V6.2c0-.1,0-.3-.2-.3h0Z"/>
+
+</svg>

src/assets/styles/index.scss

@@ -88,12 +88,7 @@ div:focus {
 .pl-5 {
   padding-left: 5px;
 }
-.p-2{
-  background: rgba(247, 248, 252, 1);
-  min-height: 100vh;
-  box-sizing: border-box;
-  padding: 15px;
-}
+
 
 .block {
   display: block;

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/layout/components/Sidebar/SidebarItem.vue

@@ -1,13 +1,16 @@
 <template>
   <div v-if="!item.hidden">
-    <template v-if="hasOneShowingChild(item, item.children) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !item.alwaysShow">
+    <template
+      v-if="hasOneShowingChild(item, item.children) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !item.alwaysShow">
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path, onlyOneChild.query)">
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{ 'submenu-title-noDropdown': !isNest }">
-          <svg-icon :icon-class="onlyOneChild.meta.icon || (item.meta && item.meta.icon)" />
-          <template #title>
-            <span class="menu-title" :title="hasTitle(onlyOneChild.meta.title)">{{ onlyOneChild.meta.title }}</span>
-          </template>
-        </el-menu-item>
+        <span @click="handleMenuClick(onlyOneChild, $event)">
+          <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{ 'submenu-title-noDropdown': !isNest }">
+            <svg-icon :icon-class="onlyOneChild.meta.icon || (item.meta && item.meta.icon)" />
+            <template #title>
+              <span class="menu-title" :title="hasTitle(onlyOneChild.meta.title)">{{ onlyOneChild.meta.title }}</span>
+            </template>
+          </el-menu-item>
+        </span>
       </app-link>
     </template>
 
@@ -17,14 +20,8 @@
         <span class="menu-title" :title="hasTitle(item.meta?.title)">{{ item.meta?.title }}</span>
       </template>
 
-      <sidebar-item
-        v-for="(child, index) in item.children"
-        :key="child.path + index"
-        :is-nest="true"
-        :item="child"
-        :base-path="resolvePath(child.path)"
-        class="nest-menu"
-      />
+      <sidebar-item v-for="(child, index) in item.children" :key="child.path + index" :is-nest="true" :item="child"
+        :base-path="resolvePath(child.path)" class="nest-menu" />
     </el-sub-menu>
   </div>
 </template>
@@ -77,8 +74,25 @@ const hasOneShowingChild = (parent: RouteRecordRaw, children?: RouteRecordRaw[])
 
   return false;
 };
-
+const router = useRouter();
+// 处理菜单点击，完全控制跳转行为
+const handleMenuClick = (route, event) => {
+  console.log(route, 'route');
+  if (route.meta.openInNewTab) {
+    // 完全阻止默认行为和事件冒泡
+    event.preventDefault();
+    event.stopPropagation();
+    console.log('Opening in new tab:', route);
+    const resolvedRoute = router.resolve({
+      name: route.name || route.path
+    });
+    const fullUrl = new URL(resolvedRoute.href, window.location.origin).href;
+    window.open(fullUrl, '_blank');
+  } else {
+  }
+};
 const resolvePath = (routePath: string, routeQuery?: string): any => {
+
   if (isExternal(routePath)) {
     return routePath;
   }

src/plugins/modal.ts

@@ -35,7 +35,7 @@ export default {
     ElMessageBox.alert(content, '系统提示', { type: 'warning' });
   },
   // 通知提示
-  notify(content: any) {
+  notify(content: any) {   
     ElNotification.info(content);
   },
   // 错误通知
@@ -56,7 +56,7 @@ export default {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning'
-    });
+    });           
   },
   // 提交内容
   prompt(content: any) {

src/router/index.ts

@@ -39,6 +39,12 @@ export const constantRoutes: RouteRecordRaw[] = [
     component: () => import('@/views/error/401.vue'),
     hidden: true
   },
+  {
+    path: "/homeIndex",
+    name: "HomeIndex",
+    component: () => import("@/views/homeIndex/index.vue"),
+    meta: { title: '数据大屏', icon: '首页1.1', preload: true, keepAlive: true, openInNewTab: true },
+  },
   {
     path: '',
     component: Layout,
@@ -48,10 +54,11 @@ export const constantRoutes: RouteRecordRaw[] = [
         path: '/index',
         component: () => import('@/views/index.vue'),
         name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true,keepAlive: false }
+        meta: { title: '首页', icon: '首页1.1', affix: true, keepAlive: false }
       }
     ]
   },
+
   {
     path: '/user',
     component: Layout,

src/utils/mqtt.ts

@@ -17,8 +17,10 @@ export interface SubscribeOptions {
 // 根据当前页面协议自动选择MQTT配置
 const getMqttConfig = () => {
   // 检测当前页面协议（http: 或 https:）
-  const isHttps = window.location.protocol === 'https:';
-  console.log(isHttps,'检测环境');
+  //const isHttps = window.location.protocol === 'https:';
+
+  const isHttps = import.meta.env.VITE_APP_ENV === 'production' || window.location.protocol === 'https:';
+    console.log(isHttps,'检测环境');
   
   return {
     // 自动切换协议：https页面用wss，http页面用ws

src/utils/timeConverter.ts

@@ -0,0 +1,113 @@
+/**
+ * 时间转换工具类
+ * 提供时间格式化、时间差计算等功能
+ */
+export class TimeConverter {
+  /**
+   * 检查时间字符串是否有效
+   * @param timeStr 时间字符串
+   * @returns 是否有效的时间
+   */
+  static isValidTime(timeStr: string): boolean {
+    if (!timeStr) return false;
+    return !isNaN(new Date(timeStr).getTime());
+  }
+
+  /**
+   * 格式化时间
+   * @param timeStr 时间字符串
+   * @param format 格式，可选值: 'YYYY-MM-DD', 'HH:mm:ss', 'YYYY-MM-DD HH:mm:ss'
+   * @returns 格式化后的时间字符串
+   */
+  static formatTime(timeStr: string, format: 'YYYY-MM-DD' | 'HH:mm:ss' | 'YYYY-MM-DD HH:mm:ss' = 'YYYY-MM-DD HH:mm:ss'): string {
+    if (!this.isValidTime(timeStr)) return '无效时间';
+
+    const date = new Date(timeStr);
+    const year = date.getFullYear();
+    const month = this.padZero(date.getMonth() + 1);
+    const day = this.padZero(date.getDate());
+    const hours = this.padZero(date.getHours());
+    const minutes = this.padZero(date.getMinutes());
+    const seconds = this.padZero(date.getSeconds());
+
+    switch (format) {
+      case 'YYYY-MM-DD':
+        return `${year}-${month}-${day}`;
+      case 'HH:mm:ss':
+        return `${hours}:${minutes}:${seconds}`;
+      case 'YYYY-MM-DD HH:mm:ss':
+      default:
+        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    }
+  }
+
+  /**
+   * 计算与当前时间的差值（格式为 HH:mm:ss）
+   * @param startTimeStr 起始时间字符串
+   * @returns 格式化的时间差字符串
+   */
+  static calculateTimeDiff(startTimeStr: string): string {
+    if (!this.isValidTime(startTimeStr)) return '';
+
+    const startTime = new Date(startTimeStr).getTime();
+    const nowTime = new Date().getTime();
+    const diffMs = nowTime - startTime;
+
+    // 处理未来时间
+    if (diffMs < 0) {
+      return '00:00:00';
+    }
+
+    // 计算总秒数
+    const totalSeconds = Math.floor(diffMs / 1000);
+
+    // 计算时、分、秒
+    const hours = this.padZero(Math.floor(totalSeconds / 3600));
+    const minutes = this.padZero(Math.floor((totalSeconds % 3600) / 60));
+    const seconds = this.padZero(totalSeconds % 60);
+
+    return `${hours}:${minutes}:${seconds}`;
+  }
+
+  /**
+   * 数字补零
+   * @param num 数字
+   * @returns 补零后的字符串
+   */
+  private static padZero(num: number): string {
+    return num < 10 ? `0${num}` : num.toString();
+  }
+
+  /**
+   * 创建一个时间差更新定时器
+   * @param startTimeStr 起始时间字符串
+   * @param callback 回调函数，接收计算后的时间差
+   * @param interval 刷新间隔(毫秒)
+   * @returns 定时器ID，用于清除定时器
+   */
+  static createTimeDiffTimer(
+    startTimeStr: string,
+    callback: (diffText: string) => void,
+    interval: number = 1000
+  ): number {
+    // 立即执行一次
+    callback(this.calculateTimeDiff(startTimeStr));
+
+    // 设置定时器
+    const timerId = window.setInterval(() => {
+      callback(this.calculateTimeDiff(startTimeStr));
+    }, interval);
+
+    return timerId;
+  }
+
+  /**
+   * 清除时间差更新定时器
+   * @param timerId 定时器ID
+   */
+  static clearTimeDiffTimer(timerId: number | null): void {
+    if (timerId) {
+      clearInterval(timerId);
+    }
+  }
+}

src/utils/websocket.ts

@@ -11,7 +11,7 @@ export const initWebSocket = (url: any) => {
   useWebSocket(url, {
     autoReconnect: {
       // 重连最大次数
-      retries: 3,
+      retries: 3,  
       // 重连间隔
       delay: 1000,
       onFailed() {

src/views/controlCenter/210/index.vue

@@ -4,4 +4,11 @@
     </div>
 </template>
 <script setup lang="ts"></script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.p-2{
+  background: rgba(247, 248, 252, 1);
+  min-height: 100vh;
+  box-sizing: border-box;
+  padding: 15px;
+}
+</style>

src/views/controlCenter/6170/index.vue

@@ -6,7 +6,7 @@
             <div>设备型号：{{ deviceDetail.deviceImei }}</div>
             <div class="device-status">设备状态：
                 <span :class="{ online: deviceDetail.onlineStatus === 1, offline: deviceDetail?.onlineStatus === 0 }">
-                    {{ deviceDetail.onlineStatus === 1 ? "在线" : "离线" }}
+                    {{ deviceDetail.onlineStatus === 1 ? '在线' : (deviceDetail.onlineStatus === 2 ? '故障' : '离线') }}
                 </span>
             </div>
             <div>电量：{{ deviceDetail.batteryPercentage || 0 }}%</div>
@@ -15,6 +15,14 @@
 
         <!-- 主体内容区域 -->
         <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">
@@ -50,8 +58,8 @@
                                 :loading-text="lightModesLoading ? '保存中...' : '保存'"> {{
                                     lightModesLoading ? '保存中' : '保存' }}</el-button>
                         </div>
-                        <el-button type="danger" class="alarm-btn" @click="forceAlarm" :loading="forceAlarmLoading"
-                            :loading-text="forceAlarmLoading ? '报警中...' : '强制报警'"> {{
+                        <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">
@@ -248,7 +256,8 @@ const deviceDetail = ref<DeviceDetail & { typeName: string }>({
     address: '',
     sendMsg: '',
     chargeState: '0',
-    typeName: ''
+    typeName: '',
+    alarmStatus: 0
 });
 // 保留原有的操作中标志位
 const isUpdatingStatus = ref(false);
@@ -357,7 +366,7 @@ const handleLaserClick = async () => {
             laserMode.value.switchStatus = !targetStatus;
         }
     } catch (error: any) {
-        proxy?.$modal.msgError(error.msg)          ;
+       // proxy?.$modal.msgError(error.msg);
         // 恢复之前的状态
         laserMode.value.switchStatus = !laserMode.value.switchStatus;
     } finally { }
@@ -420,11 +429,56 @@ const saveBtn = () => {
 
         } else {
             lightModesLoading.value = false
-            proxy?.$modal.msgError(res.msg);
+            //proxy?.$modal.msgError(res.msg);
         }
 
     })
 }
+// 解除报警
+const showClose = async () => {
+    try {
+        await proxy?.$modal.confirm('确定要对该设备解除报警？', '提示');
+        // 2. 准备请求数据
+        const batchId = generateShortId();
+        let data = {
+            deviceIds: [route.params.deviceId],
+            typeName: deviceDetail.value.typeName,
+            deviceImeiList: [deviceDetail.value.deviceImei],
+            batchId: batchId,
+            instructValue: '0', //强制报警1，解除报警0
+        }
+        const registerRes = await api.sendAlarmMessage(data);
+        if (registerRes.code !== 200) {
+            proxy?.$modal.msgWarning(registerRes.msg)
+            return
+        }
+        // 4. 获取设备状态
+        let deviceImei = deviceDetail.value.deviceImei
+        const statusRes = await getDeviceStatus({
+            functionMode: 2,
+            batchId,
+            typeName: 'FunctionAccessBatchStatusRule',
+            deviceImei,
+            interval: 500
+        },
+            api.deviceRealTimeStatus
+        );
+        // 只有当状态为'OK'时才显示成功弹窗
+        if (statusRes.data.functionAccess === 'OK') {
+            proxy?.$modal.msgSuccess(statusRes.msg);
+            await getList();
+        }
+
+    } catch (error: any) {
+    }
+
+
+}
+
+
+
+
+
 // 强制报警
 const forceAlarm = async () => {
     try {
@@ -458,10 +512,12 @@ const forceAlarm = async () => {
         // 只有当状态为'OK'时才显示成功弹窗
         if (statusRes.data.functionAccess === 'OK') {
             proxy?.$modal.msgSuccess(statusRes.msg);
+            await getList();
         }
 
     } catch (error: any) {
-        proxy?.$modal.msgWarning(error.msg)
+       // proxy?.$modal.msgWarning(error.msg)
+         forceAlarmLoading.value = false;
 
     } finally {
         forceAlarmLoading.value = false;
@@ -536,17 +592,15 @@ const getMainLightModeLabel = (mode: any) => {
 // 处理设备消息
 const handleDeviceMessage = (msg: any) => {
     try {
-        // 解析设备消息（假设格式为 { state: [类型, 模式值, 亮度, 续航...] }）
         const payloadObj = JSON.parse(msg.payload.toString());
         const deviceState = payloadObj.state; // 设备状态数组
         if (!Array.isArray(deviceState)) {
             return;
         }
-        // 用switch处理不同的消息类型（deviceState[0]）
         switch (deviceState[0]) {
             case 1:
                 // 类型1灯光主键
-                const lightModeId = getMainLightModeLabel(deviceState[1]); // 获取模式ID（如'strong'）
+                const lightModeId = getMainLightModeLabel(deviceState[1]);
                 const brightness = deviceState[2]; // 亮度值
                 const batteryTime = deviceState[3]; // 续航时间
                 console.log('灯光模式消息:', { 模式ID: lightModeId, 亮度: brightness, 续航: batteryTime });
@@ -569,7 +623,7 @@ const handleDeviceMessage = (msg: any) => {
                 break;
             case 12:
                 // 灯光主键
-                const lightModeIdA = getMainLightModeLabel(deviceState[1]); // 获取模式ID（如'strong'）
+                const lightModeIdA = getMainLightModeLabel(deviceState[1]);
                 if (lightModeIdA !== 'unknown') {
                     lightModes.value.forEach(mode => {
                         const isActive = mode.id === lightModeIdA;
@@ -586,11 +640,14 @@ const handleDeviceMessage = (msg: any) => {
                 deviceDetail.value.batteryRemainingTime = deviceState[5]; //续航时间
                 // getList(); // 重新获取设备详情
                 if (deviceDetail.value.batteryPercentage < 20 && Number(deviceDetail.value.chargeState) == 0) {
-                    centerDialogVisible.value=true
+                    centerDialogVisible.value = true
                 }
+                break;
+            case 7:
+                deviceDetail.value.alarmStatus = deviceState[1];
+
                 break;
             default:
-                // 其他类型消息（不处理，仅打印）
                 console.log('未处理的消息类型:', deviceState[0]);
                 break;
         }
@@ -598,7 +655,7 @@ const handleDeviceMessage = (msg: any) => {
     }
 };
 onMounted(async () => {
-    await getList(); // 先获取设备信息
+    await getList();
     // 连接mqtt
     onConnect(async () => {
         const deviceImei = deviceDetail.value.deviceImei;
@@ -624,7 +681,7 @@ onMounted(async () => {
         handleDeviceMessage(msg);
     });
     onError((err) => {
-        console.error('MQTT连接失败原因:', err.message); // 关键：打印连接失败的具体原因
+        console.error('MQTT连接失败原因:', err.message);
     });
     connect();
 });
@@ -638,6 +695,13 @@ 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;
@@ -942,4 +1006,23 @@ onUnmounted(() => {
     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/670/index.vue

@@ -2,7 +2,7 @@
   <div class="device-page p-2">
     <!-- 头部信息栏 -->
     <div class="header-bar">
-      <div>设备名称：{{ deviceDetail.deviceName }}</div>
+      <div>设备名称：{{ deviceDetail.deviceName }}，IMEI:{{ deviceDetail.deviceImei }}</div>
       <div>设备型号：{{ deviceDetail.typeName }}</div>
       <div class="device-status">
         设备状态：
@@ -19,8 +19,8 @@
       <el-row :gutter="20" class="content-row" :class="deviceDetail.sta_ShakeBit == 1 || deviceDetail.staSOSGrade == 1 ? '' : 'displayNone'">
         <el-col :lg="24" :xs="24">
           <div class="staticRwo" :class="deviceDetail.sta_ShakeBit == 1 ? '' : 'displayNone'">设备静止报警中!</div>
-          <div class="staticRwo" :class="deviceDetail.staSOSGrade == 1 ? '' : 'displayNone'" @click="showClose()">
-            设备强制报警中,<span v-show="Status.timeOut>0">{{ Status.timeOut }}S</span>!
+          <div class="staticRwo" :class="deviceDetail.staSOSGrade == 1 && Status.timeOut > 0 ? '' : 'displayNone'" @click="showClose()">
+            设备强制报警中<span v-show="Status.timeOut > 0">,{{ Status.timeOut }}S</span>!
           </div>
         </el-col>
       </el-row>
@@ -95,15 +95,15 @@
             <div class="form-grid">
               <div class="form-item">
                 <span class="form-label">单位:</span>
-                <el-input v-if="deviceDetail" placeholder="请输入单位名称" v-model="deviceDetail.personnelInfo.unitName" />
+                <el-input v-if="deviceDetail" placeholder="请输入单位" v-model="deviceDetail.personnelInfo.unitName" />
               </div>
               <div class="form-item">
                 <span class="form-label">职位:</span>
-                <el-input v-if="deviceDetail" placeholder="请输入职位名称" v-model="deviceDetail.personnelInfo.position" />
+                <el-input v-if="deviceDetail" placeholder="请输入职位" v-model="deviceDetail.personnelInfo.position" />
               </div>
               <div class="form-item">
-                <span class="form-label">姓名</span>
-                <el-input v-if="deviceDetail" placeholder="请输入职位姓名" v-model="deviceDetail.personnelInfo.name" />
+                <span class="form-label">姓名:</span>
+                <el-input v-if="deviceDetail" placeholder="请输入姓名" v-model="deviceDetail.personnelInfo.name" />
               </div>
               <div class="form-item">
                 <span class="form-label">ID:</span>
@@ -206,11 +206,23 @@ const router = useRouter();
 // 导入图片资源（确保路径正确）
 import strongLightDefault from '@/assets/images/strong-light.png';
 import strongLightActive from '@/assets/images/strong-light_HL.png';
-import weakLightDefault from '@/assets/images/weak-light.png';
-import weakLightActive from '@/assets/images/weak-light_HL.png';
+import floodLightDefault from '@/assets/images/flood-light.png';
+import floodLightActive from '@/assets/images/flood-light_HL.png';
 
+import di from '@/assets/images/di.png';
+import diAc from '@/assets/images/diAc.png';
+import high from '@/assets/images/high.png';
+import highAc from '@/assets/images/highAc.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';
+import zhong from '@/assets/images/zhong.png';
+import zhongAc from '@/assets/images/zhongAc.png';
 import closeDefault from '@/assets/images/close.png';
 import closeActive from '@/assets/images/close_HL.png';
+import { hi } from 'element-plus/es/locale/index.mjs';
+
 const fullscreenLoading = ref(false);
 var timer = null;
 const sendTextLoading = ref(false);
@@ -248,8 +260,8 @@ const lightModes = ref<any[]>([
   {
     id: '2',
     name: '弱光',
-    icon: weakLightDefault,
-    activeIcon: weakLightActive,
+    icon: floodLightDefault,
+    activeIcon: floodLightActive,
     active: false
   },
   {
@@ -265,24 +277,24 @@ const sosModes = ref<any[]>([
   {
     id: '1',
     name: '声光报警',
-    icon: strongLightDefault, // 直接使用导入的变量
-    activeIcon: strongLightActive,
+    icon: sg, // 直接使用导入的变量
+    activeIcon: sgAc,
 
     active: false
   },
   {
     id: '2',
     name: '红蓝模式',
-    icon: strongLightDefault, // 直接使用导入的变量
-    activeIcon: strongLightActive,
+    icon: rb, // 直接使用导入的变量
+    activeIcon: rbAc,
 
     active: false
   },
   {
     id: '0',
     name: '关闭',
-    icon: strongLightDefault, // 直接使用导入的变量
-    activeIcon: strongLightActive,
+    icon: closeDefault, // 直接使用导入的变量
+    activeIcon: closeActive,
 
     active: false
   }
@@ -292,32 +304,32 @@ const staticModes = ref<any[]>([
   {
     id: '3',
     name: '高档',
-    icon: strongLightDefault, // 直接使用导入的变量
-    activeIcon: strongLightActive,
+    icon: high, // 直接使用导入的变量
+    activeIcon: highAc,
 
     active: false
   },
   {
     id: '2',
     name: '中档',
-    icon: strongLightDefault, // 直接使用导入的变量
-    activeIcon: strongLightActive,
+    icon: zhong, // 直接使用导入的变量
+    activeIcon: zhongAc,
 
     active: false
   },
   {
     id: '1',
     name: '低档',
-    icon: strongLightDefault, // 直接使用导入的变量
-    activeIcon: strongLightActive,
+    icon: di, // 直接使用导入的变量
+    activeIcon: diAc,
 
     active: false
   },
   {
     id: '0',
     name: '关闭',
-    icon: strongLightDefault, // 直接使用导入的变量
-    activeIcon: strongLightActive,
+    icon: closeDefault, // 直接使用导入的变量
+    activeIcon: closeActive,
 
     active: false
   }
@@ -373,7 +385,6 @@ const deviceDetail = ref<any>({
 
 //模式设置
 const handleModeClick = async (id: string, type: string) => {
-  
   if (Status[type] == id) {
     return;
   }
@@ -382,7 +393,7 @@ const handleModeClick = async (id: string, type: string) => {
 
     let dic = { promise: null, callback: null, key: '' };
 
-   //测试环境假装成功
+    //测试环境假装成功
     dic.promise = Promise.resolve({ code: 200, msg: '操作成功' });
 
     let arr = [];
@@ -407,7 +418,6 @@ const handleModeClick = async (id: string, type: string) => {
     };
 
     dic.promise.then((res) => {
-  
       if (res.code === 200) {
         Status[type] = id;
         ElMessage.closeAll();
@@ -416,7 +426,6 @@ const handleModeClick = async (id: string, type: string) => {
           dic.callback();
         }
         if (callback) {
-          
           callback();
         }
       } else {
@@ -424,28 +433,28 @@ const handleModeClick = async (id: string, type: string) => {
       }
     });
   };
-  if(type == 'sosMode' && Status.sosMode=== '1' && id==='0'){
+  if (type == 'sosMode' && Status.sosMode === '1' && id === '0' && timer) {
     showClose();
     return;
-  }
-  else if (type == 'sosMode' && id === '1') {
+  } else if (type == 'sosMode' && id === '1' && timer == null) {
     ShowConfirm({
       title: '提示',
       text: '您确认开启180秒强制报警',
-      cancelCallback: null,
+      cancelCallback: () => {
+        timer = null;
+      },
       OkCallback: () => {
         sendCmd(function () {
-          
           Status.confirm.Visible = false;
-           deviceDetail.value.staSOSGrade="1";
+          deviceDetail.value.staSOSGrade = '1';
           Status.timeOut = 180;
           timer = setInterval(() => {
             if (Status.timeOut === 0) {
               clearInterval(timer);
               timer = null;
               hideConfirm();
-              handleModeClick('sosMode','1');
-             deviceDetail.value.staSOSGrade="0";
+              handleModeClick('1', 'sosMode');
+              deviceDetail.value.staSOSGrade = '0';
               return;
             }
 
@@ -464,16 +473,32 @@ const handleModeClick = async (id: string, type: string) => {
 };
 
 const getList = () => {
-  api.deviceRealTimeStatus(route.params.deviceId).then((res) => {
-    if (res && res.code == 200) {
-      let keys = Object.keys(res.data);
-      keys.forEach((key) => {
-        deviceDetail.value[key] = res.data[key];
-      });
-      Status.sosMode = res.data.staSOSGrade;
-      Status.staticPower = res.data.staDetectGrade;
-      Status.lightMode = res.data.staLightGrade;
-    }
+  return new Promise((resolve, reject) => {
+    api
+      .deviceRealTimeStatus(route.params.deviceId)
+      .then((res) => {
+        if (res && res.code == 200) {
+          
+          let keys = Object.keys(res.data);
+          keys.forEach((key) => {
+            deviceDetail.value[key] = res.data[key];
+          });
+          Status.sosMode = res.data.staSOSGrade;
+          Status.staticPower = res.data.staDetectGrade;
+          Status.lightMode = res.data.staLightGrade;
+          if (!deviceDetail.value.personnelInfo) {
+            deviceDetail.value.personnelInfo = {
+              'id': null,
+              'deviceId': null,
+              'name': null,
+              'position': null,
+              'unitName': null,
+              'code': null
+            };
+          }
+        }
+      })
+      .finally(resolve);
   });
 };
 
@@ -547,6 +572,7 @@ const sendTextMessage = async () => {
       proxy?.$modal.msgError(res.msg);
     }
   });
+
 };
 const lookMap = (row: any) => {
   console.log(row, 'row');
@@ -562,50 +588,63 @@ const lookMap = (row: any) => {
 function showClose() {
   Status.confirm.Visible = true;
   Status.confirm.OkTxt = '关闭';
-  Status.confirm.OkCallback=()=>{
-    handleModeClick('sosMode','0');
-    deviceDetail.value.staSOSGrade="0";
+  Status.confirm.OkCallback = () => {
     clearInterval(timer);
-    timer=null;
-    Status.timeOut=0;
+    timer = null;
+    handleModeClick('0', 'sosMode');
+    deviceDetail.value.staSOSGrade = '0';
+
+    Status.timeOut = 0;
+
     hideConfirm();
-  }
+  };
 }
 // 处理设备消息
 const handleDeviceMessage = (payload: any) => {
-  let json = JSON.parse(payload);
+  let json = null;
+  try {
+    json = JSON.parse(payload);
+  } catch (ex) {
+    return;
+  }
+
   let keys = Object.keys(json);
 
   function parseDataMQ(json) {
-    deviceDetail.value.staDetectGrade = json.sta_DetectGrade;
-    deviceDetail.value.staLightGrade = json.sta_LightGrade;
-    deviceDetail.value.staDetectResult = json.sta_DetectResult;
-    deviceDetail.value.staSOSGrade = json.sta_SOSGrade;
-    deviceDetail.value.sta_ShakeBit = json.sta_ShakeBit;
-    deviceDetail.value.staPowerTime = json.sta_PowerTime;
-    deviceDetail.value.staPowerPercent = json.sta_PowerPercent;
-    deviceDetail.value.longitude = json.sta_longitude;
-    deviceDetail.value.latitude = json.sta_latitude;
-    deviceDetail.value.onlineStatus = 1;
+    try {
+      debugger;
+      deviceDetail.value.staDetectGrade = json.sta_DetectGrade;
+      deviceDetail.value.staLightGrade = json.sta_LightGrade;
+      deviceDetail.value.staDetectResult = json.sta_DetectResult;
+      deviceDetail.value.staSOSGrade = json.sta_SOSGrade;
+      deviceDetail.value.sta_ShakeBit = json.sta_ShakeBit;
+      deviceDetail.value.staPowerTime = json.sta_PowerTime;
+      deviceDetail.value.staPowerPercent = json.sta_PowerPercent;
+      deviceDetail.value.longitude = json.sta_longitude;
+      deviceDetail.value.latitude = json.sta_latitude;
+      deviceDetail.value.onlineStatus = 1;
 
-    Status.sosMode = json.sta_SOSGrade;
-    Status.staticPower = json.sta_DetectGrade;
-    Status.lightMode = json.sta_LightGrade;
+      Status.sosMode = json.sta_SOSGrade;
+      Status.staticPower = json.sta_DetectGrade;
+      Status.lightMode = json.sta_LightGrade;
+      console.log('Status=', Status);
+      console.log('sosModes=', sosModes.value);
+      console.log('sta_SOSGrade=', json.sta_SOSGrade);
+      if (json.sta_PowerPercent < 20) {
+        centerDialogVisible.value = true;
+      }
 
-    if (json.sta_PowerPercent < 20) {
-      centerDialogVisible.value = true;
-    }
-
-    if (json.sta_SOSGrade == 1 && json.sta_ShakeBit == 1) {
-      confirm('设备SOS报警、静止预警中');
-      return;
-    }
-    if (json.sta_SOSGrade == 1) {
-      confirm('设备SOS报警中');
-    }
-    if (json.sta_ShakeBit == 1) {
-      confirm('设备静止报警中');
-    }
+      if (json.sta_SOSGrade == 1 && json.sta_ShakeBit == 1) {
+        confirm('设备SOS报警、静止预警中');
+        return;
+      }
+      if (json.sta_SOSGrade == 1) {
+        confirm('设备SOS报警中');
+      }
+      if (json.sta_ShakeBit == 1) {
+        confirm('设备静止报警中');
+      }
+    } catch (err) {}
   }
 
   if (keys.indexOf('sta_DetectGrade') > -1) {
@@ -613,11 +652,21 @@ const handleDeviceMessage = (payload: any) => {
     console.log('收到设备上报的数据', payload);
     parseDataMQ(json);
   }
+
+  
+  if(keys.indexOf('sta_BreakNews')>-1){
+    if(json.sta_BreakNews==='I get it'){
+
+      confirm('用户已确认收到紧急通知');
+    }
+  }
+
 };
 onMounted(async () => {
   await getList(); // 先获取设备信息
   // 连接mqtt
   onConnect(async () => {
+    
     const deviceImei = deviceDetail.value.deviceImei;
     if (!deviceImei) {
       return;
@@ -631,6 +680,7 @@ onMounted(async () => {
   });
   // 2. 注册消息接收回调（核心：处理设备发送的消息）
   onMessage((msg) => {
+    
     console.log('收到新消息:', {
       主题: msg.topic,
       内容: msg.payload,
@@ -638,7 +688,7 @@ onMounted(async () => {
       QoS: msg.qos
     });
     // 在这里处理消息（根据实际业务逻辑）
-    handleDeviceMessage(msg);
+    handleDeviceMessage(msg.payload);
   });
   onError((err) => {
     console.error('MQTT连接失败原因:', err.message); // 关键：打印连接失败的具体原因
@@ -719,6 +769,12 @@ window.hideConfirm = function () {
 };
 </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;

src/views/controlCenter/controlPanel/components/map.vue

@@ -222,7 +222,7 @@ onUnmounted(() => {
 }
 
 .amap-container {
-  height: 640px;
+  height: calc(100vh - 25vh);
   border-radius: 4px;
   overflow: hidden;
   width: 100%;
@@ -234,11 +234,12 @@ onUnmounted(() => {
   border-radius: 4px;
   box-shadow: 0px 0px 6px 0px rgba(0, 34, 96, 0.1);
   background: rgba(255, 255, 255, 1);
-  height: 620px;
+ height: calc(100vh - 25vh);
   position: absolute;
   z-index: 1;
   top: 10px;
-  left: 10px
+  left: 10px;
+  overflow: auto;
 }
 
 /* 其他样式保持不变... */

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>
@@ -49,6 +49,7 @@
                       <el-select v-model="queryParams.onlineStatus" placeholder="设备状态" clearable>
                         <el-option label="在线" value="1"></el-option>
                         <el-option label="离线" value="0"></el-option>
+                        <el-option label="故障" value="2"></el-option>
                       </el-select>
                     </el-form-item>
                     <el-form-item label="设备MAC" prop="deviceMac">
@@ -81,7 +82,7 @@
         </transition>
         <el-card class="Maplist">
           <div v-if="isListView" key="list">
-            <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange">
+            <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange"  height="calc(100vh - 310px)">
               <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">
@@ -109,6 +110,7 @@
                 <template #default="scope">
                   <div class="normal green" v-if="scope.row.onlineStatus == 1">在线</div>
                   <div class="normal red" v-if="scope.row.onlineStatus == 0">离线</div>
+                   <div class="normal red" v-if="scope.row.onlineStatus == 2">故障</div>
                 </template>
               </el-table-column>
               <el-table-column label="电量" align="center" prop="battery">
@@ -118,10 +120,22 @@
                     'battery-yellow': Number(scope.row.battery) >= 20 && Number(scope.row.battery) < 80,
                     'battery-green': Number(scope.row.battery) >= 80 && Number(scope.row.battery) <= 100
                   }">
-                    {{ scope.row.battery }}%
+                    {{ scope.row.battery || '0' }}%
                   </div>
                 </template>
               </el-table-column>
+               <el-table-column label="绑定状态" align="center" prop="bindingStatus">
+                <template #default="scope">
+                  <div class="normal green" v-if="scope.row.bindingStatus == 1">已绑定</div>
+                  <div class="normal red" v-if="scope.row.bindingStatus == 0">未绑定</div>
+                </template>
+              </el-table-column>
+              <el-table-column label="报警状态" align="center" prop="alarmStatus">
+                <template #default="scope">
+                  <div class="normal red" v-if="scope.row.alarmStatus == 1">报警中</div>
+                  <div class="normal green" v-if="scope.row.alarmStatus == 0">未报警</div>
+                </template>
+              </el-table-column>
 
               <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
                 <template #default="scope">
@@ -163,6 +177,8 @@ import apiTypeAll from '@/api/equipmentManagement/device/index';
 import { deviceQuery, deviceVO } from '@/api/controlCenter/controlPanel/types';
 import Amap from "./components/map.vue";
 import { generateShortId, getDeviceStatus } from '@/utils/function';
+import eqControl from '@/api/controlCenter/controlPanel/eqControl';
+
 const router = useRouter();
 const route = useRoute(); // 新增：用于获取URL中的query参数
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -306,7 +322,6 @@ const handleControl = (row: any) => {
   const detailPageUrl = row.detailPageUrl;
   const basePath = detailPageUrl.replace(/\/index$/, '');
   const dynamicPath = `/${basePath}/${deviceId}`;
-  debugger;
   router.push(dynamicPath); // 跳转路由
 };
 
@@ -379,6 +394,7 @@ const submitForm = async () => {
     return
   }
   try {
+   
     sendTextLoading.value = true;
     // 2. 准备请求数据
     const deviceIds = ids.value.map(item => item.id);
@@ -391,10 +407,11 @@ const submitForm = async () => {
       typeName: typeName,
       batchId: batchId,
       deviceImeiList: deviceImeiList,
-      sendMsg: form.value.messageToSend
+      sendMsg: form.value.messageToSend,
+      instructValue:""
     };
     // 3.人员信息
-    const registerRes = await api.deviceSendMessage(data);
+    const registerRes = await eqControl.deviceSendMessage(data);
     if (registerRes.code !== 200) {
       proxy?.$modal.msgWarning(registerRes.msg)
       return
@@ -450,12 +467,13 @@ const forceAlarm = async () => {
     const typeName = firstDevice.typeName; // 取第一个设备的typeName，为空时给默认值
     let data = {
       deviceIds: deviceIds,
-      typeName: typeName,
+      typeName: typeName,      
       batchId: batchId,
       deviceImeiList: deviceImeiList,
-      instructValue: '1', //强制报警1，解除报警0
+      instructValue: '1' //强制报警1，解除报警0
+      
     }
-    const registerRes = await api.sendAlarmMessage(data);
+    const registerRes = await eqControl.sendAlarmMessage(data);
     if (registerRes.code !== 200) {
       proxy?.$modal.msgWarning(registerRes.msg)
       return
@@ -486,9 +504,17 @@ const forceAlarm = async () => {
 
 </script>
 <style lang="scss" scoped>
-:deep .el-collapse{
-  border-top:none
+.p-2 {
+  background: rgba(247, 248, 252, 1);
+  min-height: 100vh;
+  box-sizing: border-box;
+  padding: 15px;
 }
+
+:deep .el-collapse {
+  border-top: none
+}
+
 :deep .el-collapse-item__header {
   display: none;
 }
@@ -549,7 +575,7 @@ const forceAlarm = async () => {
 }
 
 .Maplist {
-  height: 680px;
-  overflow: auto;
+ //height: calc(100vh - 24vh);
+  //overflow: auto;
 }
 </style>

src/views/controlCenter/delivery/index.vue

@@ -58,12 +58,17 @@
         </transition>
         <el-card class="Maplist">
           <div>
-            <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange">
+            <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange" height="calc(100vh - 400px)">
               <el-table-column type="selection" width="50" align="center" />
               <el-table-column label="设备名称" align="center" prop="deviceName" />
               <el-table-column label="设备型号" align="center" prop="deviceType" />
               <el-table-column label="操作模块" align="center" prop="deviceAction" />
-              <el-table-column label="操作内容" align="center" prop="content" show-overflow-tooltip />
+              <el-table-column label="操作内容" align="center" prop="content" show-overflow-tooltip >
+                  <template #default="scope">
+                  <div>{{scope.row.content || '/'}}</div>
+                </template>
+              </el-table-column>
+
               <el-table-column label="操作时间" align="center" prop="createTime" />
             </el-table>
             <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
@@ -244,6 +249,12 @@ const handleExport = () => {
 
 </script>
 <style lang="scss" scoped>
+.p-2{
+  background: rgba(247, 248, 252, 1);
+height: calc(100vh - 8vh);
+  box-sizing: border-box;
+  padding: 15px;
+}
 :deep .el-collapse{
   border-top:none
 }
@@ -288,7 +299,7 @@ const handleExport = () => {
 }
 
 .Maplist {
-  height: 680px;
-  overflow: auto;
+ height: calc(100vh - 24vh);
+ // overflow: auto;
 }
 </style>

src/views/controlCenter/historyjectory/index.vue

@@ -58,7 +58,7 @@
         </transition>
         <el-card class="Maplist">
           <div>
-            <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange">
+            <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange" height="calc(100vh - 400px)">
               <el-table-column type="selection" width="50" align="center" />
               <el-table-column label="设备名称" align="center" prop="deviceName" />
               <el-table-column label="设备型号" align="center" prop="deviceType" />
@@ -257,6 +257,12 @@ const historyjectory = (row: any) => {
 
 </script>
 <style lang="scss" scoped>
+.p-2{
+  background: rgba(247, 248, 252, 1);
+height: calc(100vh - 8vh);
+  box-sizing: border-box;
+  padding: 15px;
+}
 :deep .el-collapse{
   border-top:none
 }
@@ -301,7 +307,7 @@ const historyjectory = (row: any) => {
 }
 
 .Maplist {
-  height: 680px;
-  overflow: auto;
+ height: calc(100vh - 24vh);
+  // overflow: auto;
 }
 </style>

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" />
+        <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">
@@ -169,42 +169,57 @@
     </el-dialog>
 
     <!-- 单个个设备编辑层 -->
-    <el-dialog v-model="Status.ShowEditPop" title="编辑" :draggable="true" width="500px">
+    <el-dialog v-model="Status.ShowEditPop" title="编辑" :draggable="true" width="50%">
       <div class="SingEditContent">
         <div class="Boot item">
           <div class="title">开机画面</div>
-          <div class="img">
+          <div class="imgs">
             <div class="Preview">
-              <img class="img" :src="cEdit.fileBoot.src" @click.stop="showCheckFile('fileBoot')" />
+              <img class="img" v-show="cEdit.fileBoot.src" :src="cEdit.fileBoot.src" @click.stop="showCheckFile('fileBoot')" />
             </div>
           </div>
           <div class="option center" @click.stop="showCheckFile('fileBoot')">修改</div>
           <div class="clear">
-            <input type="file" id="fileBoot" class="displayNone" />
+            <input type="file" accept="image/*" id="fileBoot" class="displayNone" />
           </div>
         </div>
         <div class="Param item">
           <div class="title">产品参数</div>
-          <div class="img">
+          <div class="imgs">
             <div class="Preview">
-              <img v-for="(item, index) in cEdit.fileParam" class="img" :src="item.src" />
+              <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')">
+                  <el-icon>
+                    <Delete />
+                  </el-icon>
+                </div>
+              </div>
+              <div class="clear"></div>
             </div>
           </div>
-          <div class="option center" @click.stop="showCheckFile('fileParam')">修改</div>
+          <div class="option center" @click.stop="showCheckFile('fileParam')">添加</div>
           <div class="clear">
-            <input type="file" id="fileParam" class="displayNone" />
+            <input type="file" accept="image/*" id="fileParam" class="displayNone" />
           </div>
         </div>
         <div class="Oprat item">
           <div class="title">操作说明</div>
-          <div class="img">
+          <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>
+          <div class="option center" @click.stop="showCheckFile('fileOprat')">添加</div>
           <div class="clear">
-            <input type="file" id="fileOprat" class="displayNone" />
+            <input type="file" accept="image/*" id="fileOprat" class="displayNone" />
           </div>
         </div>
         <div class="Video item">
@@ -223,8 +238,8 @@
 
     <!-- 提示框 -->
     <el-dialog :width="300" :draggable="true" v-model="Status.confirm.Visible" :title="Status.confirm.title" center>
-      <span>
-        {{ Status.confirm.text }}
+      <span v-html="Status.confirm.text">
+        
       </span>
       <template #footer>
         <div class="dialog-footer">
@@ -240,6 +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';
 
 var fileInput = document.getElementById('fileInput');
 var fileInputs = {
@@ -283,7 +299,8 @@ var cEdit = reactive({
   fileBoot: { name: '', type: '', size: '', src: '', file: null },
   fileParam: [],
   fileOprat: [],
-  Video: ''
+  Video: '',
+  fileIds: []
 });
 //页码控件数据
 var pagin = reactive({
@@ -327,6 +344,11 @@ function handleQuery() {
   queryTime = setTimeout(getList, 500);
 }
 
+const isSelectable = (row: any) => {
+  // 仅当在线状态（onlineStatus == 1）时允许选中
+  return row.onlineStatus === 1;
+};
+
 function getList() {
   Status.loading = true;
   api
@@ -357,6 +379,7 @@ function resetQuery() {
   keys.forEach((k) => {
     queryParams[k] = cfg[k];
   });
+  handleQuery();
 }
 
 // 设备类型
@@ -408,9 +431,11 @@ function ShowMultiEdit(type: MideaType) {
 
   setTimeout(dragImgAddEvt, 500);
 }
+
 function ShowSingleEdit(item) {
   Status.ShowEditPop = true;
   //期待接口返回以下4个字段
+
   cEdit.deviceId = item.id;
   cEdit.deviceImei = item.deviceImei;
   cEdit.Video = item.Video;
@@ -436,7 +461,7 @@ function ShowSingleEdit(item) {
           return v.fileType == 1;
         })
         .map((v) => {
-          return { 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
@@ -444,8 +469,10 @@ function ShowSingleEdit(item) {
           return v.fileType == 2;
         })
         .map((v) => {
-          return { 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 = '';
     }
   });
 
@@ -458,6 +485,7 @@ function CloseSingleEdit() {
   cEdit.fileBoot = { name: '', type: '', size: '', src: '', file: null };
   cEdit.fileOprat = [];
   cEdit.fileParam = [];
+  cEdit.fileIds = [];
 }
 
 //关闭上传框
@@ -480,7 +508,6 @@ function SaveMultiData() {
   }
   Status.fullLoading = true;
   setTimeout(() => {
-    
     let promise = null;
 
     let formData = new FormData();
@@ -506,7 +533,7 @@ function SaveMultiData() {
     });
 
     if (Status.currMideaType == MideaType.Boot) {
-      promise=updaeLogo(arr,checkFile.file);
+      promise = updaeLogo(arr, checkFile.file);
     } else if (Status.currMideaType == MideaType.Video) {
       promise = api.addVideo(json); //操作视频
     } else {
@@ -527,21 +554,39 @@ function SaveMultiData() {
   }, 0);
 }
 //上传开机画面
-function updaeLogo(ids, file) {
-  if (!file || !ids) {
+// function updaeLogo(ids, file) {
+//   if (!file || !ids) {
+//     return Promise.resolve({ code: 200, msg: '成功' });
+//   }
+//   if (!Array.isArray(ids)) {
+//     ids = [ids];
+//   }
+//   var formData = new FormData();
+//   ids.forEach((element) => {
+//     formData.append('deviceIds', element);
+//   });
+//   formData.append('file', file);
+//   return api.uploadBoot(formData);
+// }
+// 上传开机画面根据类型适配不同的上传接口，其他类型暂且默认670
+function updaeLogo(ids, file, deviceType?: number) {
+  const selectedRows = getSelectionRows(grid);
+  let realDeviceType = 670; // 默认670
+  if (selectedRows.length > 0) {
+    const deviceTypeName = selectedRows[0].typeName || '';
+    if (deviceTypeName.includes('670')) {
+      realDeviceType = 670;
+    } else if (deviceTypeName.includes('6170')) {
+      realDeviceType = 6170;
+    }
+  }
+  const finalDeviceType = deviceType || realDeviceType;
+  const finalIds = Array.isArray(ids) ? ids : [ids];
+  const finalFile = file || checkFile.file || cEdit.fileBoot.file;
+  if (!finalFile || finalIds.length === 0) {
     return Promise.resolve({ code: 200, msg: '成功' });
   }
-  if (!Array.isArray(ids)) {
-    ids = [ids];
-  }
-  var formData = new FormData();
-  ids.forEach((element) => {
-    formData.append('deviceIds', element);
-  });
-
-  formData.append('file', file);
-
-  return api.uploadBoot(formData);
+  return uploadHelper.uploadLogo(finalDeviceType, finalIds, finalFile);
 }
 //保存单个设备的数据
 function SaveItemData() {
@@ -553,8 +598,7 @@ function SaveItemData() {
   var formData = new FormData();
   formData.append('deviceId', cEdit.deviceId);
   formData.append('deviceImei', cEdit.deviceImei);
-
-  //  formData.append("logoFile",cEdit.fileBoot.file);//开机画面
+  formData.append('fileIds', cEdit.fileIds);
 
   cEdit.fileParam.forEach((v) => {
     if (v.file) {
@@ -576,13 +620,22 @@ function SaveItemData() {
   Promise.allSettled([promise1, promise2])
     .then((res) => {
       if (res[0].status == 'fulfilled' && res[1].status == 'fulfilled') {
-        if (res[0].code == 200 && res[1].code == 200) {
+        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;
@@ -647,7 +700,6 @@ function dragImgAddEvt() {
     });
   }
   function handleDrop(e) {
-    
     const dt = e.dataTransfer;
     const files = dt.files;
 
@@ -660,7 +712,6 @@ function dragImgAddEvt() {
 }
 
 function addFileEvt() {
-  
   var checkImgOver = function (res, type) {
     if (type == 'fileBoot') {
       let keys = Object.keys(res);
@@ -675,16 +726,16 @@ function addFileEvt() {
     fileInputs.fileBoot = document.getElementById('fileBoot');
     fileInputs.fileOprat = document.getElementById('fileOprat');
     fileInputs.fileParam = document.getElementById('fileParam');
-  }
 
-  let keys = Object.keys(fileInputs);
-  keys.forEach((k) => {
-    fileInputs[k].addEventListener('change', () => {
-      handleFiles(fileInputs[k].files).then((res) => {
-        checkImgOver(res, k);
+    let keys = Object.keys(fileInputs);
+    keys.forEach((k) => {
+      fileInputs[k].addEventListener('change', () => {
+        handleFiles(fileInputs[k].files).then((res) => {
+          checkImgOver(res, k);
+        });
       });
     });
-  });
+  }
 }
 
 // 处理选择的文件
@@ -786,6 +837,18 @@ var hideConfirm = function () {
   Status.confirm = Cfg;
 };
 
+//删除某个图片
+function DelImg(item, index, type) {
+  if (item.id) {
+    confirm('您确认删除吗?', () => {
+      cEdit.fileIds.push(item.id);
+      cEdit[type].splice(index, 1);
+    });
+  } else {
+    cEdit[type].splice(index, 1);
+  }
+}
+
 onMounted(() => {
   getDeviceType();
   getList();
@@ -912,7 +975,8 @@ onMounted(() => {
 
 .SingEditContent .item {
   width: 100%;
-  height: 90px;
+  min-height: 90px;
+  height: auto;
   border-bottom: 1px dashed #e7e7e7;
 
   padding: 12px 0px;
@@ -945,10 +1009,11 @@ onMounted(() => {
   text-align: left;
 }
 
-.SingEditContent .item .img {
+.SingEditContent .item .imgs {
   width: calc(100% - 110px);
   float: left;
-  height: 100%;
+  min-height: 90px;
+  height: auto;
 }
 
 .SingEditContent .item .option {
@@ -1001,10 +1066,45 @@ onMounted(() => {
 }
 
 .SingEditContent .Preview .img {
-  height: 100%;
+  height: 90px;
   width: 160px;
   object-fit: contain;
   border-radius: 4px;
   border: 1px solid #d3d5d7;
 }
+
+.SingEditContent .item .imgContent {
+  height: 90px;
+  width: 160px;
+  float: left;
+  margin-right: 8px;
+  position: relative;
+}
+
+.SingEditContent .item .imgContent .opt {
+  position: absolute;
+  z-index: 1;
+  background-color: #00000091;
+  display: none;
+  top: 0px;
+  left: 0px;
+  height: 90px;
+  width: 160px;
+  cursor: pointer;
+  color: #bd2b2b;
+  font-size: 30px;
+  text-align: center;
+  line-height: 90px;
+}
+.SingEditContent .item .imgContent:hover .opt {
+  display: block !important;
+}
+
+.green {
+  color: rgba(0, 165, 82, 1);
+}
+
+.red {
+  color: rgba(224, 52, 52, 1);
+}
 </style>

src/views/equipmentAlarmRecord/index.vue

@@ -62,7 +62,7 @@
 
     <el-card shadow="never">
       <div v-if="isListView" key="card">
-        <el-row :gutter="20">
+        <el-row :gutter="20" v-if="alarmList.length > 0">
           <el-col :span="6" v-for="(item, index) in alarmList" :key="index">
             <el-card class="custom-alarm-card">
               <div class="card-header">
@@ -89,21 +89,21 @@
                 <div class="label">报警事项</div>
                 <div class="alearm">
                   <template v-if="item.deviceAction === 0">强制报警
-                    <span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span>
+                    <span v-if="item.treatmentState === 1">({{ item.timeDiff }})</span>
                   </template>
                   <template v-else-if="item.deviceAction === 1">撞击闯入
-                    <span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span>
+                    <span v-if="item.treatmentState === 1">({{ item.timeDiff }})</span>
                   </template>
                   <template v-else-if="item.deviceAction === 2">自动报警
-                    <span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span>
+                    <span v-if="item.treatmentState === 1">({{ item.timeDiff }})</span>
                   </template>
                   <template v-else-if="item.deviceAction === 3">电子围栏告警
-                    <span v-if="item.treatmentState === 1">({{ item.startTime.split(' ')[1] || '' }})</span>
+                    <span v-if="item.treatmentState === 1">({{ item.timeDiff }})</span>
                   </template>
                 </div>
                 <div class="label">报警地点</div>
                 <div class="alearmADD">
-                  {{ item.location }}
+                 {{ item.location && item.location !== '[]' ? item.location : '无' }}
                 </div>
                 <div v-if="item.treatmentState === 0" class="dl_bot d_fl">
                   <div v-if="item.durationTime">时长:{{ item.durationTime }}</div>
@@ -113,6 +113,14 @@
             </el-card>
           </el-col>
         </el-row>
+        <el-row :gutter="20" v-else>
+          <!-- 使用flex容器实现垂直居中布局 -->
+          <div
+            style="display: flex; flex-direction: column; align-items: center; justify-content: center; text-align: center; width: 100%;">
+            <img src="@/assets/images/noData.png" alt="暂无数据" style="max-width: 150px; margin-bottom: 16px;">
+            <div style="color: #999; font-size: 14px;">暂无数据</div>
+          </div>
+        </el-row>
       </div>
       <div v-else key="list">
         <el-table v-loading="loading" border :data="alarmList">
@@ -123,7 +131,11 @@
               <div>{{ scope.row.deviceImei }} {{ scope.row.deviceMac }}</div>
             </template>
           </el-table-column>
-          <el-table-column label="报警地点" align="center" prop="location" />
+          <el-table-column label="报警地点" align="center" prop="location"  show-overflow-tooltip>
+            <template #default="scope">
+              <div>{{ scope.row.location && scope.row.location !== '[]' ? scope.row.location : '无' }}</div>
+            </template>
+          </el-table-column>
           <el-table-column label="报警事项" align="center" prop="deviceAction">
             <template #default="scope">
               <el-tag type="danger" v-if="scope.row.deviceAction == 0">强制报警</el-tag>
@@ -134,13 +146,14 @@
           </el-table-column>
           <el-table-column label="报警持续时间" align="center" prop="durationTime" width="180">
             <template #default="scope">
-              <el-tag type="danger">{{ scope.row.durationTime }}</el-tag>
+              <el-tag type="danger">{{ scope.row.durationTime || '/' }}</el-tag>
             </template>
           </el-table-column>
           <el-table-column label="处理状态" align="center" prop="treatmentState">
             <template #default="scope">
               <div class="ysStatus" v-if="scope.row.treatmentState == 0">已处理</div>
               <el-tag type="danger" v-if="scope.row.treatmentState == 1">未处理</el-tag>
+
             </template>
           </el-table-column>
           <el-table-column label="报警时间" align="center" prop="startTime" />
@@ -156,8 +169,10 @@
 import { listAlarm } from '@/api/equipmentAlarmRecord/index';
 import { AlarmVO, AlarmQuery, AlarmForm } from '@/api/equipmentAlarmRecord/types';
 import apiTypeAll from '@/api/equipmentManagement/device/index';
+import { TimeConverter } from '@/utils/timeConverter';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const alarmList = ref<AlarmVO[]>([]);
+const timers = ref<Record<string, number>>({});
 const isListView = ref(true);
 const dateRange = ref(['', '']);
 const loading = ref(true);
@@ -220,12 +235,47 @@ const getList = async () => {
   };
   const res = await listAlarm(queryParams.value);
   if (res.rows) {
-    alarmList.value = res.rows;
+    // 先清除已有定时器
+    clearAllTimers();
+    //alarmList.value = res.rows;
+    // 为每个项添加timeDiff属性并初始化
+    alarmList.value = res.rows.map(item => ({
+      ...item,
+      timeDiff: '' // 用于存储计算出的时间差
+    }));
     total.value = res.total;
+    // 为每个需要计时的项创建定时器
+    initTimers();
   }
 
   loading.value = false;
 }
+// 初始化所有定时器
+const initTimers = () => {
+  alarmList.value.forEach(item => {
+    // 只对需要计时的项创建定时器（根据你的业务逻辑判断）
+    if (item.treatmentState === 1 && item.startTime) {
+      // 使用项的唯一标识作为定时器键名（假设id是唯一标识）
+      timers.value[item.id] = TimeConverter.createTimeDiffTimer(
+        item.startTime,
+        (diff) => {
+          // 找到对应的项并更新时间差
+          const index = alarmList.value.findIndex(i => i.id === item.id);
+          if (index !== -1) {
+            alarmList.value[index].timeDiff = diff;
+          }
+        }
+      );
+    }
+  });
+};
+// 清除所有定时器
+const clearAllTimers = () => {
+  Object.values(timers.value).forEach(timerId => {
+    TimeConverter.clearTimeDiffTimer(timerId);
+  });
+  timers.value = {};
+};
 // 设备类型
 const getDeviceType = () => {
   apiTypeAll.deviceTypeAll().then(res => {
@@ -269,6 +319,10 @@ onMounted(() => {
   getList();
   getDeviceType()
 });
+// 组件卸载时清除所有定时器
+onUnmounted(() => {
+  clearAllTimers();
+});
 </script>
 <style lang="scss" scoped>
 :deep .el-collapse {
@@ -293,7 +347,7 @@ onMounted(() => {
 }
 
 .custom-alarm-card {
-  height: 270px;
+  min-height: 270px;
   display: flex;
   flex-direction: column;
   box-shadow: 0px 0px 6px 0px rgba(0, 27, 74, 0.1);
@@ -337,7 +391,7 @@ onMounted(() => {
 .deviceName {
   color: rgba(56, 64, 79, 1);
   font-family: Microsoft YaHei;
-  font-size: 16px;
+  font-size: 14px;
   font-weight: 700;
 }
 

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>
@@ -183,7 +183,7 @@ watch(
   font-size: 14px;
   font-weight: 400;
 
-  letter-spacing: 0px;
+  letter-spacing: 0px;   
   text-align: left;
   float: left;
 }

src/views/equipmentManagement/devices/index.vue

@@ -12,21 +12,34 @@
               <el-form-item label="设备MAC" prop="deviceMac">
                 <el-input v-model="queryParams.deviceMac" placeholder="请输入设备MAC" clearable />
               </el-form-item>
-              <el-form-item label="请输入设备IMEI" prop="deviceImei">
+              <el-form-item label="设备IMEI" prop="deviceImei">
                 <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="设备类型">
+              <el-form-item label="设备类型" prop="deviceType" >
+                <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>
               </el-form-item>
-              <el-form-item label="设备状态" prop="deviceStatus">
-                <el-select v-model="queryParams.deviceStatus" placeholder="设备状态" style="margin-left: 10px">
+              <el-form-item label="设备状态" prop="deviceStatus" v-hasPermi="['equipment:devices:allocate']">
+                <el-select v-model="queryParams.deviceStatus" placeholder="设备状态"  clearable>
                   <el-option label="正常" value="1" />
                   <el-option label="失效" value="0" />
                 </el-select>
               </el-form-item>
+              <el-form-item label="在线状态" prop="onlineStatus">
+                <el-select v-model="queryParams.onlineStatus" placeholder="在线状态" clearable>
+                  <el-option label="在线" value="1" />
+                  <el-option label="离线" value="0" />
+                  <el-option label="故障" value="2" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="绑定状态" prop="bindingStatus">
+                <el-select v-model="queryParams.bindingStatus" placeholder="绑定状态" clearable>
+                  <el-option label="已绑定" value="1" />
+                  <el-option label="未绑定" value="0" />
+                </el-select>
+              </el-form-item>
               <el-form-item label="创建时间">
                 <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
                   range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
@@ -56,8 +69,8 @@
             </el-col>
 
             <el-col :span="1.5">
-              <el-button v-hasPermi="['equipment:devices:export']" type="warning" :disabled="multiple" plain
-                icon="Download" @click="handleExport">导出</el-button>
+              <el-button v-hasPermi="['equipment:devices:export']" type="warning" plain icon="Download"
+                @click="handleExport">导出</el-button>
             </el-col>
             <el-col :span="1.5">
               <el-button v-hasPermi="['equipment:devices:remove']" type="danger" plain :disabled="multiple"
@@ -87,9 +100,10 @@
             <template #default="scope">
               <el-popover placement="right" trigger="click">
                 <template #reference>
-                  <img :src="scope.row.devicePic"
-                    style="width: 40px; height: 40px; cursor: pointer; object-fit: contain"
+                  <img v-if="scope.row.devicePic" :src="scope.row.devicePic"
+                    style="width: 50px; height: 50px; cursor: pointer; object-fit: contain"
                     class="hover:opacity-80 transition-opacity" />
+                  <img v-else src="@/assets/index/IMG.png" alt="" style="width: 40px; height: 40px;">
                 </template>
                 <img :src="scope.row.devicePic" style="max-width: 600px; max-height: 600px; object-fit: contain" />
               </el-popover>
@@ -106,6 +120,13 @@
               </el-tag>
             </template>
           </el-table-column>
+          <el-table-column prop="onlineStatus" label="设备状态">
+            <template #default="scope">
+              <el-tag :type="scope.row.onlineStatus === 1 ? 'success' : 'info'">
+                {{ scope.row.onlineStatus === 1 ? '在线' : (scope.row.onlineStatus === 2 ? '故障' : '离线') }}
+              </el-tag>
+            </template>
+          </el-table-column>
           <el-table-column prop="deviceStatus" label="设备状态" v-hasPermi="['equipment:devices:allocate']">
             <template #default="scope">
               <el-tag :type="scope.row.deviceStatus == 1 ? 'success' : 'danger'">
@@ -205,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)"
-                :disabled="form.id != ''">
+              <el-select v-model="form.deviceType"  placeholder="设备类型" @change="(id) => handleDeviceTypeChange(id)"
+                clearable filterable>
                 <el-option v-for="item in deviceTypeOptions" :key="item.value" :label="item.typeName"
                   :value="item.id" />
               </el-select>
@@ -227,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" />
@@ -297,11 +318,11 @@
           <span style="color: #409eff">批量导入完成，共检测到 <span style="color: #e6a23c">{{ importResult.total }}</span> 条数据，导入成功
             <span style="color: #67c23a">{{ importResult.succeed }}</span> 条，失败
             <span style="color: red">{{ importResult.errorSun }}</span> 条。</span>
-          <p v-if="importResult.errorSun > 0" style="padding: 10px">
-            <a :href="importResult.link">>>> 上传失败明细下载 <i class="el-icon-download" /></a>
-          </p>
         </div>
       </el-upload>
+      <p v-if="importResult.errorSun > 0" style="padding: 10px">
+        <a :href="importResult.link">>>> 上传失败明细下载 <i class="el-icon-download" /></a>
+      </p>
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="importDialogVisible = false">取 消</el-button>
@@ -443,7 +464,9 @@ const initData: PageData<deviceForm, deviceQuery> = {
     deviceMac: '',
     deviceImei: '',
     deviceType: '',
-    deviceStatus: ''
+    deviceStatus: '',
+    onlineStatus: '',
+    bindingStatus:''
   },
   rules: {
     deviceName: [{ required: true, message: '请输入设备名称', trigger: 'blur' }],
@@ -516,7 +539,7 @@ const handleExport = () => {
     {
       ...queryParams.value
     },
-    `${new Date().getTime()}.xlsx`,
+    `设备列表${new Date().getTime()}.xlsx`,
     'get'
   );
 };
@@ -599,6 +622,7 @@ const handleAdd = async () => {
 };
 /** 修改按钮操作 */
 const handleUpdate = async (row?: deviceForm) => {
+  debugger;
   reset();
   dialog.visible = true;
   dialog.title = '修改设备';
@@ -640,29 +664,29 @@ const handleDeviceTypeChange = async (deviceTypeId: string | number) => {
   showImeiField.value = false;
   communicationModeInfo.value = null;
   // 编辑时如果有值，根据已有值确定显示哪个字段
-  if (form.value.id) {
-    console.log('zheshi me1 ');
-    // 1. 先判断：Mac 和 Imei 都有值（新增的关键分支）
-    const hasMac = typeof form.value.deviceMac === 'string' && form.value.deviceMac.trim() !== '';
-    const hasImei = typeof form.value.deviceImei === 'string' && form.value.deviceImei.trim() !== '';
-    if (hasMac && hasImei) {
-      //两个都有值：显示两个字段 + 都加校验
-      showMacField.value = true;
-      showImeiField.value = true;
-      console.log('两个字段都有值');
-    } else if (hasMac) {
-      showMacField.value = true;
-      showImeiField.value = false;
-      rules.value.deviceImei = [];
-      console.log('只有 Mac 有值');
-    } else if (hasImei) {
-      showImeiField.value = true;
-      showMacField.value = false;
-      rules.value.deviceMac = [];
-      console.log('只有 Imei 有值');
-    }
-    return;
-  }
+  // if (form.value.id) {
+  //   console.log('zheshi me1 ');
+  //   // 1. 先判断：Mac 和 Imei 都有值（新增的关键分支）
+  //   const hasMac = typeof form.value.deviceMac === 'string' && form.value.deviceMac.trim() !== '';
+  //   const hasImei = typeof form.value.deviceImei === 'string' && form.value.deviceImei.trim() !== '';
+  //   if (hasMac && hasImei) {
+  //     //两个都有值：显示两个字段 + 都加校验
+  //     showMacField.value = true;
+  //     showImeiField.value = true;
+  //     console.log('两个字段都有值');
+  //   } else if (hasMac) {
+  //     showMacField.value = true;
+  //     showImeiField.value = false;
+  //     rules.value.deviceImei = [];
+  //     console.log('只有 Mac 有值');
+  //   } else if (hasImei) {
+  //     showImeiField.value = true;
+  //     showMacField.value = false;
+  //     rules.value.deviceMac = [];
+  //     console.log('只有 Imei 有值');
+  //   }
+  //   return;
+  // } 
   if (isProcessing) return;
   isProcessing = true;
   // 新增或编辑时没有值，根据设备类型获取通讯方式
@@ -703,17 +727,17 @@ const httpRequestImg = (parm): Promise<any> => {
   return Promise.resolve();
 };
 const beforeUpload = (file) => {
-  const isLt2M = file.size / 1024 / 1024 < 2;
+  //const isLt2M = file.size / 1024 / 1024 < 2;
   const isJPG = file.type === 'image/jpeg' || file.type === 'image/png';
   if (!isJPG) {
-    ElMessage.warning('请上传jpg、png格式，大小不超过2M的照片');
+    ElMessage.warning('请上传jpg、png格式');
     return false;
   }
-  if (!isLt2M) {
-    ElMessage.warning('大小不超过2M的照片片');
-    return false;
-  }
-  return isJPG && isLt2M;
+  // if (!isLt2M) {
+  //   ElMessage.warning('大小不超过2M的照片片');
+  //   return false;
+  // }
+  return isJPG;
 };
 // 文件上传状态改变时触发
 const fileUploadChange = (files, fileList) => {
@@ -787,11 +811,11 @@ const submitForm = async () => {
 };
 
 // URL转Blob的方法函数
-const urlToBlob = async (url: string): Promise<Blob> => {
-  const response = await fetch(url);
-  if (!response.ok) throw new Error('图片加载失败');
-  return await response.blob();
-};
+// const urlToBlob = async (url: string): Promise<Blob> => {
+//   const response = await fetch(url);
+//   if (!response.ok) throw new Error('图片加载失败');
+//   return await response.blob();
+// };
 
 /**
  * 关闭用户弹窗
@@ -893,7 +917,7 @@ const handleBatchImport = () => {
 const downloadTemplate = () => {
   // 这里可用 window.open 或 a 标签下载模板
   const link = document.createElement('a');
-  link.href = 'https://fuyuanshen.com/fys/Equipmentimporttemplate/EquipmentImportTemplate.xlsx';
+  link.href = 'https://www.cnxhyc.com/jquan/Equipmentimporttemplate/EquipmentImportTemplate.xlsx';
   link.download = '设备数据导入模板.xlsx'; // 可选：指定下载文件名
   link.style.display = 'none'; // 隐藏标签
   document.body.appendChild(link);
@@ -901,27 +925,35 @@ const downloadTemplate = () => {
   document.body.removeChild(link); // 移除标签
 };
 const beforeImportUpload = (file: any) => {
-  const isLt5M = file.size / 1024 / 1024 < 5;
-  if (!isLt5M) {
-    proxy?.$modal.msgError('上传文件大小不能超过 5MB!');
-  }
-  return isLt5M;
+  // const isLt5M = file.size / 1024 / 1024 < 5;
+  // if (!isLt5M) {
+  //   proxy?.$modal.msgError('上传文件大小不能超过 5MB!');
+  // }
+  // return isLt5M;
 };
 
 //添加tokenf方法head_upload 直接返回 getBearerToken()
 const head_upload = () => getBearerToken();
 const handleImportSuccess = (response: any) => {
   if (response.code == 200) {
+    console.log('导入成功了么');
     importResult.value.isShow = true;
     if (response.data) {
-      importResult.value.succeed = response.data.successCount || 0;
-      importResult.value.errorSun = response.data.failureCount || 0;
+      console.log(response.data, 'response.data');
+      importResult.value.succeed = response.data.successCount;
+      importResult.value.errorSun = response.data.failureCount;
       importResult.value.total = importResult.value.succeed + importResult.value.errorSun;
-      importResult.value.link = response.data.errorExcelUrl || '';
+      importResult.value.link = response.data.errorExcelUrl;
+    }
+    if (importUpload.value) {
+      importUpload.value.clearFiles();
     }
     getList(); // 初始化列表数据
   } else {
-    proxy?.$modal.msgError(response.msg || '导入失败');
+    if (importUpload.value) {
+      importUpload.value.clearFiles();
+    }
+    proxy?.$modal.msgError(response.msg);
   }
 };
 const handleImportError = () => {
@@ -944,15 +976,13 @@ const handleBatchAssignConfirm = () => {
     customerId: batchAssignCustomerId.value, // 目标客户ID
     deviceIds: selectedIds // 选中的设备ID数组
   };
-  api
-    .deviceAssignCustomer(data)
-    .then((res) => {
-      if (res.code == 200) {
-        batchAssignDialogVisible.value = false;
-        getList();
-        return proxy?.$modal.msgSuccess(`分配成功`);
-      }
-    })
+  api.deviceAssignCustomer(data).then((res) => {
+    if (res.code == 200) {
+      batchAssignDialogVisible.value = false;
+      getList();
+      return proxy?.$modal.msgSuccess(`分配成功`);
+    }
+  })
     .catch(() => { });
 };
 

src/views/equipmentManagement/devices/shareManage.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="content" v-loading="Status.fullLoading">
     <div class="topFilter">
-      <div>
+      <div class="topTool">
         <el-button type="primary" @click="ShowEdit"
           ><el-icon> <Plus /> </el-icon>添加分享</el-button
         >
         <el-button type="danger" @click="DelShare(null, true)" :disabled="selectRows.length === 0">批量删除</el-button>
       </div>
-
+      <br/>
       <el-form :inline="true" :model="filter" class="demo-form-inline">
         <el-form-item label="">
         
@@ -96,7 +96,7 @@
       <div class="form">
         <el-form :model="cEdit" ref="ruleFormRef" style="max-width: 750px" :label-width="'75px'">
           <el-form-item label="分享用户" label-position="right">
-            <el-select v-model="cEdit.phonenumber" filterable placeholder="输入以搜索">
+            <el-select v-model="cEdit.phonenumber" filterable allow-create  default-first-option placeholder="输入以搜索">
               <el-option v-for="item in Usrs" :key="item.phonenumber" :label="item.userName" :value="item.phonenumber" />
             </el-select>
           </el-form-item>
@@ -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,
@@ -205,33 +206,207 @@ var dic = reactive({
   '3': '开机画面',
   '4': '人员信息登记',
   '5': '发送信息',
-  '6': '产品信息'
+  '6': '产品信息',
+  '41':'静电探测',
+  '42':'SOS'
 });
 
-var power = computed(() => {
-  let arr = [];
-  let keys = Object.keys(dic);
-  keys.forEach((key) => {
-    arr.push({ label: dic[key], value: key });
-  });
-  return arr;
-});
+
+var power =ref([]); 
+
+function calcPower() {
+  
+
+  let array = [{
+				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() {
   Status.ShowEditPop = false;
   Status.ShowPowerSet = false;
+  cEdit.phonenumber="";
+  cEdit.permission= [];
+  cEdit.remark= '';
+  cEdit.smsCode= '';
 }
 
 //添加分享
 
 //保存分享数据
 function SaveFormData(type) {
-  let data = {
+
+  if(!cEdit.phonenumber){
+
+    alert("请输入或选择手机号");
+    return ;
+  }
+
+  let reg=/^1\d{10}$/
+  if(reg.test(cEdit.phonenumber)){
+    alert("手机号格式不正确");
+    return;
+  }
+
+    let data = {
     'deviceId': deviceid,
     'phonenumber': cEdit.phonenumber,
     'permission': cEdit.permission.join(','),
@@ -239,7 +414,6 @@ function SaveFormData(type) {
     'remark': cEdit.remark,
     'smsCode': cEdit.smsCode
   };
-
   Status.fullLoading = true;
   api
     .SaveShare(data, type)
@@ -247,22 +421,17 @@ function SaveFormData(type) {
       if (res.code == 200) {
         getRecordList();
         CloseEdit();
+         Status.fullLoading = false;
       }
       alert(res.msg);
     })
     .catch((ex) => {
       console.log('出现异常', ex);
     })
-    .finally(() => {
-      Status.fullLoading = false;
-      cEdit.phonenumber = '';
-      cEdit.permission = [];
-      cEdit.remark = '';
-      cEdit.smsCode = '';
-    });
 }
 
 function getPower(item) {
+  
   let str = [];
   if (item && item.permission) {
     let arr = item.permission.split(',');
@@ -519,7 +688,7 @@ watch(
   width: 100%;
   height: 100%;
   box-sizing: border-box;
-  padding: 30px 12px 12px 12px;
+  padding: 12px 12px 12px 12px;
 }
 .center {
   display: flex;
@@ -541,6 +710,8 @@ watch(
   align-content: center;
   justify-content: space-between;
   align-items: flex-start;
+  
+  
 }
 :deep .pickerContent .el-date-editor {
   border: none !important;
@@ -567,4 +738,13 @@ watch(
 :deep .topFilter .el-input-group__append {
   padding: 0px 10px !important;
 }
+.topTool{
+      display: flex
+;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-content: center;
+    justify-content: flex-start;
+    align-items: center;
+}
 </style>

src/views/equipmentManagement/log/index.vue

@@ -23,44 +23,14 @@
     </transition>
 
     <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['equipment:log:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['equipment:log:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['equipment:log:remove']">删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['equipment:log:export']">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-
       <el-table v-loading="loading" border :data="logList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="ID" align="center" prop="id" v-if="true" />
         <el-table-column label="设备行为" align="center" prop="deviceAction" />
         <el-table-column label="设备名称" align="center" prop="deviceName" />
         <el-table-column label="数据来源" align="center" prop="dataSource" />
           <el-table-column label="操作时间" align="center" prop="createTime" />
         <el-table-column label="内容" align="center" prop="content" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['equipment:log:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['equipment:log:remove']"></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
       </el-table>
-
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改设备日志对话框 -->