diff --git a/ruoyi-ui/src/api/equipment/type/api.js b/ruoyi-ui/src/api/equipment/type/api.js index 251e726a..72980505 100644 --- a/ruoyi-ui/src/api/equipment/type/api.js +++ b/ruoyi-ui/src/api/equipment/type/api.js @@ -6,141 +6,146 @@ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \TunnelPlatform-V3\src\api\equipment\type\api.js */ -import request from '@/utils/request' +import request from "@/utils/request"; // 查询设备类型列表 export function listType(query) { return request({ - url: '/type/list', - method: 'get', - params: query - }) + url: "/type/list", + method: "get", + params: query, + }); } // 查询存在设备的设备类型列表 export function listHasType(tunnelId) { return request({ - url: '/type/hasList?tunnelId=' + tunnelId, - method: 'get', - }) + url: "/type/hasList?tunnelId=" + tunnelId, + method: "get", + }); } export function hasListByBigType(bigType) { return request({ - url: '/type/hasListByBigType?bigType=' + bigType, - method: 'get', - }) + url: "/type/hasListByBigType?bigType=" + bigType, + method: "get", + }); } // 查询存在设备的设备类型列表 export function groupByBigType(tunnelId) { return request({ - url: '/type/hasListGroupByBigType', - method: 'get', - }) + url: "/type/hasListGroupByBigType", + method: "get", + }); } // 查询设备类型列表 export function eqTypeList(data) { return request({ - url: '/type/eqTypeList', - method: 'get', - params: data - }) + url: "/type/eqTypeList", + method: "get", + params: data, + }); } // 查询设备类型详细 export function getType(typeId) { return request({ - url: '/type/' + typeId, - method: 'get' - }) + url: "/type/" + typeId, + method: "get", + }); } // 新增设备类型 export function addType(data) { return request({ - url: '/type',///addEquipmentType - method: 'post', - data: data - }) + url: "/type", ///addEquipmentType + method: "post", + data: data, + }); } // 修改设备类型 export function updateType(data) { return request({ - url: '/type', - method: 'put', - data: data - }) + url: "/type", + method: "put", + data: data, + }); } // 删除设备类型 export function delType(typeId) { return request({ - url: '/type/' + typeId, - method: 'delete' - }) + url: "/type/" + typeId, + method: "delete", + }); } //加载图片 export function loadPicture(data) { return request({ - url: '/type/loadPicture', - method: 'post', - params: data - }) + url: "/type/loadPicture", + method: "post", + params: data, + }); } // 查询自动触发设备类型列表 export function autoEqTypeList(data) { return request({ - url: '/type/getHasItemEqTypeList', - method: 'get', - params: data - }) + url: "/type/getHasItemEqTypeList", + method: "get", + params: data, + }); } - // 查询设备需要执行的操作 export function getStateTypeId(data) { return request({ - url: '/eqTypeState/getDataTypeList', - method: 'get', - params: data - }) + url: "/eqTypeState/getDataTypeList", + method: "get", + params: data, + }); } // 回显自动触发的接口 export function getTriggersByRelateId(data) { return request({ - url: '/strategy/trigger/getTriggersByRelateId', - method: 'get', - params: data - }) + url: "/strategy/trigger/getTriggersByRelateId", + method: "get", + params: data, + }); } // 相关策略查询 export function getTypeAndStrategy(data) { return request({ - url: '/type/getTypeAndStrategy', - method: 'get', - params: data - }) + url: "/type/getTypeAndStrategy", + method: "get", + params: data, + }); } - - // 导出设备图标 export function exportDeviceIcon(query) { return request({ - url: '/type/export', - method: 'get', - params: query - }) + url: "/type/export", + method: "get", + params: query, + }); } export function listDevicesType() { return request({ - url: '/type/list', - method: 'get', - }) + url: "/type/list", + method: "get", + }); +} + +// 设备在线率统计 +export function deviceStatusList(id) { + return request({ + url: "/system/status/deviceStatusList?deviceld=" + id, + method: "get", + }); } diff --git a/ruoyi-ui/src/api/event/perceiveEvent.js b/ruoyi-ui/src/api/event/perceiveEvent.js index c8336aa6..d409b245 100644 --- a/ruoyi-ui/src/api/event/perceiveEvent.js +++ b/ruoyi-ui/src/api/event/perceiveEvent.js @@ -1,174 +1,171 @@ -import request from '@/utils/request' -import { download } from '../../utils/request' +import request from "@/utils/request"; +import { download } from "../../utils/request"; // 全景数据 - 运行环境接口 - //查询预警表与历史表所有感知事件的数量 export function geTwarningTotal(query) { - return request({ - url: '/perceivedEvents/warning/warningTotal', - method: 'post', - params: { - ...query, - } - }) - } + return request({ + url: "/perceivedEvents/warning/warningTotal", + method: "post", + params: { + ...query, + }, + }); +} - //查询全部的感知事件类型 - export function getSystemStatusTabList(query) { - //system/status/tablist - return request({ - url: '/system/status/tablist', - method: 'post', - params: { - ...query, - } - }) - } +//查询全部的感知事件类型 +export function getSystemStatusTabList(query) { + //system/status/tablist + return request({ + url: "/system/status/tablist", + method: "post", + params: { + ...query, + }, + }); +} - //根据事件主子类查询事件列表 - export function getPerceivedEventsList(query) { - //system/status/tablist - return request({ - url: '/perceivedEvents/warning/perceivedEventsList', - method: 'post', - params: { - ...query, - } - }) - } +//根据事件主子类查询事件列表 +export function getPerceivedEventsList(query) { + //system/status/tablist + return request({ + url: "/perceivedEvents/warning/perceivedEventsList", + method: "post", + params: { + ...query, + }, + }); +} - //路段感知事件排名 - export function getSectionPerceivedList(query) { - //system/status/tablist - return request({ - url: '/perceivedEvents/warning/sectionPerceivedList', - method: 'post', - params: { - ...query, - } - }) - } +//路段感知事件排名 +export function getSectionPerceivedList(query) { + //system/status/tablist + return request({ + url: "/perceivedEvents/warning/sectionPerceivedList", + method: "post", + params: { + ...query, + }, + }); +} - - //路段日感知事件 - export function getSectionPerceivedNumber(query) { - //system/status/tablist - return request({ - url: '/perceivedEvents/warning/sectionPerceivedNumber', - method: 'post', - params: { - ...query, - } - }) - } +//路段日感知事件 +export function getSectionPerceivedNumber(query) { + //system/status/tablist + return request({ + url: "/perceivedEvents/warning/sectionPerceivedNumber", + method: "post", + params: { + ...query, + }, + }); +} - //日累计感知事件 - export function getDailyCumulative(query) { - //system/status/tablist - return request({ - url: '/perceivedEvents/warning/dailyCumulative', - method: 'post', - params: { - ...query, - } - }) - } +//日累计感知事件 +export function getDailyCumulative(query) { + //system/status/tablist + return request({ + url: "/perceivedEvents/warning/dailyCumulative", + method: "post", + params: { + ...query, + }, + }); +} - //感知事件源分析 - export function getWarningSourceGroup(query) { - return request({ - url: '/perceivedEvents/warning/warningSourceGroup', - method: 'post', - // url: '/business/warning/list', - // method: 'get', - params: { - ...query, - } - }) - } +//感知事件源分析 +export function getWarningSourceGroup(query) { + return request({ + url: "/perceivedEvents/warning/warningSourceGroup", + method: "post", + // url: '/business/warning/list', + // method: 'get', + params: { + ...query, + }, + }); +} - //日事件处置情况占比 - export function getWarningStateDay(query) { - //system/status/tablist - return request({ - url: '/perceivedEvents/warning/warningStateDay', - method: 'post', - params: { - ...query, - } - }) - } +//日事件处置情况占比 +export function getWarningStateDay(query) { + //system/status/tablist + return request({ + url: "/perceivedEvents/warning/warningStateDay", + method: "post", + params: { + ...query, + }, + }); +} - //近一月感知事件时段分布统计 - export function getDailyCumulativeMonth(query) { - //system/status/tablist - return request({ - url: '/perceivedEvents/warning/dailyCumulativeMonth', - method: 'post', - params: { - ...query, - } - }) - } +//近一月感知事件时段分布统计 +export function getDailyCumulativeMonth(query) { + //system/status/tablist + return request({ + url: "/perceivedEvents/warning/dailyCumulativeMonth", + method: "post", + params: { + ...query, + }, + }); +} - //感知事件类型分析 - export function getWarningTypeDay(query) { - //system/status/tablist - return request({ - url: '/perceivedEvents/warning/warningTypeDay', - method: 'post', - params: { - ...query, - } - }) - } +//感知事件类型分析 +export function getWarningTypeDay(query) { + //system/status/tablist + return request({ + url: "/perceivedEvents/warning/warningTypeDay", + method: "post", + params: { + ...query, + }, + }); +} - //感知事件查询-感知事件趋势 - export function getWarningTrend(query) { - //system/status/tablist - return request({ - url: '/perceivedEvents/warning/warningTrend', - method: 'post', - data: { - ...query, - } - }) - } +//感知事件查询-感知事件趋势 +export function getWarningTrend(query) { + //system/status/tablist + return request({ + url: "/perceivedEvents/warning/warningTrend", + method: "post", + data: { + ...query, + }, + }); +} - //感知事件查询-类型占比 - export function getWarningSectionType(query) { - //system/status/tablist - return request({ - url: '/perceivedEvents/warning/warningSectionType', - method: 'post', - data: { - ...query, - } - }) - } +//感知事件查询-类型占比 +export function getWarningSectionType(query) { + //system/status/tablist + return request({ + url: "/perceivedEvents/warning/warningSectionType", + method: "post", + data: { + ...query, + }, + }); +} - //感知事件查询-路段范围内桩号分布 - export function getSectionMarkNumber(query) { - //system/status/tablist - return request({ - url: '/perceivedEvents/warning/sectionMarkNumber', - method: 'post', - data: { - ...query, - } - }) - } +//感知事件查询-路段范围内桩号分布 +export function getSectionMarkNumber(query) { + //system/status/tablist + return request({ + url: "/perceivedEvents/warning/sectionMarkNumber", + method: "post", + data: { + ...query, + }, + }); +} -/// - //查询辖区路段列表 - export function getRoadSectionList(query) { - //system/status/tablist - return request({ - url: '/business/roadSection/listAll', - method: 'get', - params: { - ...query, - } - }) - } \ No newline at end of file +//查询辖区路段列表 +export function getRoadSectionList(query) { + //system/status/tablist + return request({ + url: "/business/roadSection/listAll", + method: "get", + params: { + ...query, + }, + }); +} diff --git a/ruoyi-ui/src/components/eventDialogTable/video.vue b/ruoyi-ui/src/components/eventDialogTable/video.vue index 3e4ae9f4..14dcad9a 100644 --- a/ruoyi-ui/src/components/eventDialogTable/video.vue +++ b/ruoyi-ui/src/components/eventDialogTable/video.vue @@ -46,7 +46,7 @@ size="mini" style="padding: 0 15px 15px 15px" > - + @@ -142,7 +142,13 @@ - 在线率统计 + + +
@@ -372,9 +378,11 @@ - - diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue index 83695172..a539da76 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue @@ -5,24 +5,24 @@
+ - +
{ this.dialogData.brand = data.brand; @@ -124,6 +134,15 @@ export default { if (roadInfo) this.data.roadName = roadInfo.roadName; }, + methods:{ + async getDeviceInfo() { + return request({ + url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || '10.0.36.143-1883'}/3`, + method: "get", + params: {} + }); + } + } }; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue index 460059f3..c3377bd1 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue @@ -91,9 +91,13 @@ 设备参数 - 在线率统计 + + +
@@ -235,6 +239,8 @@ import testDeviceInfo from "@screen/testData/infoBoard.js"; import CameraShower from "@screen/components/CameraShower"; import InfoBoard from "@screen/mixins/InfoBoard"; +import LineChart from "../LineChart/index.vue"; + export default { name: "InfoBoard", mixins: [InfoBoard], @@ -303,6 +309,7 @@ export default { }, }, components: { + LineChart, BoardPreview, BoardTplPreview, BoardInfoEditor, @@ -751,7 +758,8 @@ export default { .dialogContent_bottom { width: 105%; - height: 16.52vh; + margin-bottom: 2vh; + // height: 16.52vh; } .deviceInfo { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/LineChart/chart.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/LineChart/chart.js similarity index 61% rename from ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/LineChart/chart.js rename to ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/LineChart/chart.js index b8fb844a..690685b9 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/LineChart/chart.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/LineChart/chart.js @@ -35,26 +35,9 @@ export const lineChartOption = { }, tooltip: { trigger: "axis", - backgroundColor: "rgba(0,0,0,0.36)", - borderWidth: 0, - textStyle: { - color: "#fff", + valueFormatter: (value) => { + return value + "%"; }, - formatter: "{b}:{c}", - // formatter: function([axisData]) { - // console.log(axisData) - // let str = axisData.name + ' ' + axisData.data + '辆
'; - // // params.forEach(item => { - // // if (item.seriesName === '供温' || item.seriesName === '回温') { - // // str += item.marker + item.seriesName + ' : ' + item.data.value + ' ℃' + '
'; - // // } else if (item.seriesName === '压力值(Mpa)') { - // // // 柱状图渐变时设置marker - // // item.marker = ''; - // // str += item.marker + item.seriesName + ' : ' + item.data.value + ' m'; - // // } - // // }); - // return str; - // } }, yAxis: { max: 100, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/LineChart/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/LineChart/index.vue new file mode 100644 index 00000000..e1230b26 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/LineChart/index.vue @@ -0,0 +1,53 @@ + + + + + diff --git a/ruoyi-ui/src/views/workbench/config/components/board.vue b/ruoyi-ui/src/views/workbench/config/components/board.vue index edbe7206..0ebcef94 100644 --- a/ruoyi-ui/src/views/workbench/config/components/board.vue +++ b/ruoyi-ui/src/views/workbench/config/components/board.vue @@ -168,9 +168,12 @@ - 在线率统计 + +
{ export default { // props: ["eqInfo", "brandList", "directionList", "eqTypeDialogList"], components: { + LineChart, editInfo, addinfo, }, diff --git a/ruoyi-ui/src/views/workbench/config/components/video.vue b/ruoyi-ui/src/views/workbench/config/components/video.vue index dcc584ed..22aa6363 100644 --- a/ruoyi-ui/src/views/workbench/config/components/video.vue +++ b/ruoyi-ui/src/views/workbench/config/components/video.vue @@ -156,7 +156,12 @@ - 在线率统计 + +