diff --git a/hx-ai-intelligent/src/api/electricDoor.ts b/hx-ai-intelligent/src/api/electricDoor.ts index 4e42fd3..1d0c82d 100644 --- a/hx-ai-intelligent/src/api/electricDoor.ts +++ b/hx-ai-intelligent/src/api/electricDoor.ts @@ -1,6 +1,6 @@ import { BASE_URL } from './index'; export enum electricDoorApi { - getDeviceState = `${BASE_URL}/eleDoorCtrl/getDeviceState`, // 查询设备最新状态 - getDeviceRecordList = `${BASE_URL}/eleDoorCtrl/getDeviceRecordList`, // 查询设备日志列表 + getDeviceState = `${BASE_URL}/api/eleDoorCtrl/getDeviceState`, // 查询设备最新状态 + getDeviceRecordList = `${BASE_URL}/api/eleDoorCtrl/getDeviceRecordList`, // 查询设备日志列表 } diff --git a/hx-ai-intelligent/src/api/liftSystem.ts b/hx-ai-intelligent/src/api/liftSystem.ts index 6cfebb9..50f23e3 100644 --- a/hx-ai-intelligent/src/api/liftSystem.ts +++ b/hx-ai-intelligent/src/api/liftSystem.ts @@ -1,6 +1,6 @@ import { BASE_URL } from './index'; export enum liftSystemApi { - getDeviceState = `${BASE_URL}/elevatorCtrl/getDeviceState`, // 查询设备最新状态 - getDeviceRecordList = `${BASE_URL}/elevatorCtrl/getDeviceRecordList`, // 查询设备日志列表 + getDeviceState = `${BASE_URL}/api/elevatorCtrl/getDeviceState`, // 查询设备最新状态 + getDeviceRecordList = `${BASE_URL}/api/elevatorCtrl/getDeviceRecordList`, // 查询设备日志列表 } diff --git a/hx-ai-intelligent/src/components/ns-steps.vue b/hx-ai-intelligent/src/components/ns-steps.vue index 57627d0..1ee3302 100644 --- a/hx-ai-intelligent/src/components/ns-steps.vue +++ b/hx-ai-intelligent/src/components/ns-steps.vue @@ -12,12 +12,12 @@ {{ item.stateName }} + >{{ item.stateName }} +
{{ item.createTime }}
- + \ No newline at end of file diff --git a/hx-ai-intelligent/src/icon/bianji.svg b/hx-ai-intelligent/src/icon/bianji.svg index ce13c35..f420e39 100644 --- a/hx-ai-intelligent/src/icon/bianji.svg +++ b/hx-ai-intelligent/src/icon/bianji.svg @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue index 58f4291..b76c0d1 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue @@ -98,7 +98,7 @@ {{ `逻辑${index}:` }} {{ @@ -133,7 +133,7 @@ margin-left: 16px; " @click="deleteAlarmList(index - 1)"> - +
- +
+ :autoSize="{ minRows: 9, maxRows: 9 }" />
@@ -158,9 +158,10 @@ logList.value.forEach((item) => { item.stateName = item.state.label; item.color = colorMap[item.state.value]; - item.bgColor = bgColorMap[item.state]; + item.bgColor = bgColorMap[item.state.value]; item.src = 'state-' + item.state.value; }); + console.log(logList.value); config.value.dataSource = logList.value; } }); diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue index f1058a7..e202d6b 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue @@ -213,11 +213,27 @@ { type: 'slider', // backgroundColor: 'yellow', - // fillerColor: 'yellow', + fillerColor: new echarts.graphic.LinearGradient( + 0, + 0, + 1, + 0, + [ + { + offset: 0, + color: 'rgba(97, 134, 255, 1)', + }, + { + offset: 1, + color: 'rgba(36, 186, 255, 1)', + }, + ], + false, + ), height: 12, // 设置slider的高度为15 start: 0, end: 100, - right: 10, + right: 13, left: 10, bottom: 10, handleIcon: @@ -225,9 +241,41 @@ handleSize: '140%', // 放大按钮 // borderColor: 'none', handleStyle: { - // color: 'red', - // shadowBlur: 6, - // shadowColor: 'yellow', + color: new echarts.graphic.LinearGradient( + 0, + 0, + 1, + 0, + [ + { + offset: 0, + color: 'rgba(97, 134, 255, 1)', + }, + { + offset: 1, + color: 'rgba(36, 186, 255, 1)', + }, + ], + false, + ), + borderWidth: 4, + borderColor: new echarts.graphic.LinearGradient( + 0, + 0, + 0, + 1, + [ + { + offset: 0, + color: 'rgba(255, 255, 255, 1)', + }, + { + offset: 1, + color: 'rgba(204, 238, 255, 1)', + }, + ], + false, + ), shadowOffsetX: 0, // 阴影偏移x轴多少 shadowOffsetY: 0, // 阴影偏移y轴多少 }, diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue index b92981c..4f8fdbe 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue @@ -159,7 +159,7 @@ logList.value.forEach((item) => { item.stateName = item.state.label; item.color = colorMap[item.state.value]; - item.bgColor = bgColorMap[item.state]; + item.bgColor = bgColorMap[item.state.value]; item.src = 'state-' + item.state.value; }); config.value.dataSource = logList.value; diff --git a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue index dae7b8e..bd87a86 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue @@ -201,19 +201,70 @@ { type: 'slider', // backgroundColor: 'yellow', - // fillerColor: 'yellow', + fillerColor: new echarts.graphic.LinearGradient( + 0, + 0, + 1, + 0, + [ + { + offset: 0, + color: 'rgba(97, 134, 255, 1)', + }, + { + offset: 1, + color: 'rgba(36, 186, 255, 1)', + }, + ], + false, + ), height: 12, // 设置slider的高度为15 start: 0, end: 100, - right: 11, + right: 12, left: 10, - bottom: 10, + bottom: 12, handleIcon: 'path://M30.9,53.2C16.8,53.2,5.3,41.7,5.3,27.6S16.8,2,30.9,2C45,2,56.4,13.5,56.4,27.6S45,53.2,30.9,53.2z M30.9,3.5M36.9,35.8h-1.3z M27.8,35.8 h-1.3H27L27.8,35.8L27.8,35.8z', // 使用类似 axisPointer 的图标 handleSize: '140%', // 放大按钮 // borderColor: 'none', handleStyle: { - // color: 'red', + color: new echarts.graphic.LinearGradient( + 0, + 0, + 1, + 0, + [ + { + offset: 0, + color: 'rgba(97, 134, 255, 1)', + }, + { + offset: 1, + color: 'rgba(36, 186, 255, 1)', + }, + ], + false, + ), + borderWidth: 4, + borderColor: new echarts.graphic.LinearGradient( + 0, + 0, + 0, + 1, + [ + { + offset: 0, + color: 'rgba(255, 255, 255, 1)', + }, + { + offset: 1, + color: 'rgba(204, 238, 255, 1)', + }, + ], + false, + ), + boxShadow: ' 0px 3px 6px rgba(36, 62, 146, 0.3)', // shadowBlur: 6, // shadowColor: 'yellow', shadowOffsetX: 0, // 阴影偏移x轴多少 @@ -261,9 +312,9 @@ areaStyle: { normal: { color: new echarts.graphic.LinearGradient( + 1, 0, - 0, - 0, + 1, 1, [ {