diff --git a/ruoyi-ui/src/api/perception/meteorologyCheck.js b/ruoyi-ui/src/api/perception/meteorologyCheck.js new file mode 100644 index 00000000..f179d38f --- /dev/null +++ b/ruoyi-ui/src/api/perception/meteorologyCheck.js @@ -0,0 +1,32 @@ +import request from "@/utils/request"; + +// 查询天气状况 +export function getWeatherFacts() { + return request({ + url: "/weatherForecast/weatherFacts", + method: "post", + }); +} + +// 按小时查询天气状况 +export function getHourlyWeather() { + return request({ + url: "/weatherForecast/hourlyWeather", + method: "post", + }); +} + +// 查询气象预警 +export function getMeteorologicalEarlyWarning() { + return request({ + url: "/weatherForecast/meteorologicalEarlyWarning", + method: "post", + }); +} +// 查询气象预警数量 +export function getQueryTheNumberOfMeteorologicalWarning() { + return request({ + url: "/weatherForecast/queryTheNumberOfMeteorologicalWarning", + method: "post", + }); +} diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/roadNetwork/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/roadNetwork/index.vue index 66def1ff..28a61516 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/roadNetwork/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/roadNetwork/index.vue @@ -1,177 +1,186 @@ - - - - - \ No newline at end of file +} +.charts { + height: 180px; + width: 100%; +} + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue index 4518ed0b..e10a7355 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue @@ -1,614 +1,768 @@ - - - - - \ No newline at end of file +} +.charts { + height: 180px; + width: 100%; +} + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue index acb1a211..c80496fb 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue @@ -1,296 +1,297 @@ - - - - - \ No newline at end of file +} +.charts { + height: 180px; + width: 100%; +} + diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue index 0dc3b8da..0ec49e7b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue @@ -1,393 +1,464 @@ - + - - - \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/index.vue index 308886e9..efed36e1 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/index.vue @@ -1,160 +1,153 @@ - - - - - \ No newline at end of file +} + diff --git a/ruoyi-ui/src/views/event/event/dispatch.vue b/ruoyi-ui/src/views/event/event/dispatch.vue index 8d292b23..433096b4 100644 --- a/ruoyi-ui/src/views/event/event/dispatch.vue +++ b/ruoyi-ui/src/views/event/event/dispatch.vue @@ -26,7 +26,7 @@ @click="openWorkBench()" /> -
+
处置记录 @@ -39,20 +39,21 @@ :before-close="drawerHandleClose" append-to-body :modal="false" - style="left:26%;"> + style="left: 26%" + > + > -

{{activity.flowDescription}}

-

用户:{{activity.nickName}}

+

{{ activity.flowDescription }}

+

用户:{{ activity.nickName }}

 @@ -60,51 +61,51 @@
-
-
- - 实时视频 - VIDEO MONITORING -
投屏
+
+
+ + 实时视频 + VIDEO MONITORING +
投屏
+
+
+
+ +
{{ videoForm1.title }}
-
-
- -
{{ videoForm1.title }}
-
-
- -
{{ videoForm2.title }}
-
-
- -
{{ videoForm3.title }}
-
-
- -
{{ videoForm4.title }}
-
- -
-
-
- - 事件信息 - EVENT INFORMATION -
-
-
-
-
事件来源：
-
{{ getFrom(eventForm.eventSource) }}
-
-
-
事件类型：
-
{{ eventForm.simplifyName }}
-
-
-
所属隧道：
-
{{ eventForm.tunnelName }}
-
-
-
方向：
-
{{ getDirection(eventForm.direction,eventForm) }}
-
-
-
影响车道：
-
{{ eventForm.laneNoName }}
-
-
-
桩号：
-
{{ eventForm.stakeNum }}
-
+
+
+
+ + 事件信息 + EVENT INFORMATION +
+
+
+
+
事件来源：
+
{{ getFrom(eventForm.eventSource) }}
-
-
- -
-
- +
+
事件类型：
+
{{ eventForm.simplifyName }}
+
+
+
所属隧道：
+
{{ eventForm.tunnelName }}
+
+
+
方向：
+
{{ getDirection(eventForm.direction, eventForm) }}
+
+
+
+ 影响车道：
+
{{ eventForm.laneNoName }}
+
+
+
桩号：
+
{{ eventForm.stakeNum }}
-
-
-
- - 调度联络 - DISPATCHING LIAISON +
+
+ +
+
+ +
-
- - - - - - - - - - -
-
-
-
-
-
-
- - 事件处置 - EVENT HANDLING -
-
-
-
-

{{eventInfo.planName}}

- {{eventInfo.eventGrade}} -
-
- -

{{deadline4}}

-
+
+
+ + 调度联络 + DISPATCHING LIAISON
-
-
-
+ + -
-
-

-

- -
-
- + + + + + + + + + +
+
+
+
+
+
+
+
+ + 事件处置 + EVENT HANDLING +
+
+
+
+

{{ eventInfo.planName }}

+ {{ eventInfo.eventGrade }} +
+
+ +

{{ deadline4 }}

+
+
+
+
+
+
+
+

+ +
+
+ +
+ {{ item.flowContent }} +
+
+ 一键 +
+ +
- {{ item.flowContent }} + 详情
- +
- 一键 + class="dashed" + :style="{ top: index == 0 ? '55px' : '76px' }" + v-show="index != incHandList.length - 1" + > + +

- -
- 详情 -
-
- -

-
-
-
-
-
+
-
{{ itm.flowContent }}
- - - 完成 - - - - 完成 - - - 打开 - - + + 完成 + + + + 完成 + + + 打开 + + - -
- 处置 - +
+ 处置 + +
-
- -
- 立即完结 - 警情升级 + +
+ 立即完结 + 警情升级 +
-
- - - - - - - + + + + + + + -

{{boxName}}:

+

{{ boxName }}:

-
-
- +
+ > +
- -

{{boxName}}:

- -
- +

{{ boxName }}:

+ +
+ -

{{ GDeviceData.deviceState }}

+

{{ GDeviceData.deviceState }}
- 执 行 - 取 消 + 执 行 + 取 消
@@ -856,94 +975,146 @@ :before-close="oneKeyHandleClose" :append-to-body="true" :close-on-click-modal="false" - > + >
-
+

暂无匹配设备

-
- -

{{item.processName}}

+
+ +

{{ item.processName }}

+ style="width: 100%" + class="phoneTable" + > + + + + + v-if="item.deviceType == '16' || item.deviceType == '36'" + > + {{ item.vmsData["content"] }} - - - {{item.vmsData['content']}} - - - {{item.deviceState}} + v-if=" + item.deviceType != '22' && + item.deviceType != '16' && + item.deviceType != '36' + " + > + {{ item.deviceState }} - - {{item.lsData}} + + {{ item.lsData }} - {{item.handleState == '0' ? '未执行':'已执行'}} + {{ item.handleState == "0" ? "未执行" : "已执行" }} - + -

执行模板:

-
+

+ 执行模板: +

+
-
-
- +
+ > +
-

执行文件:

+

+ 执行文件: +

-

{{item.deviceState}}

+

{{ item.deviceState }}
-

执行状态:

-
+

+ 执行状态: +

+
- -

{{item.deviceState}}

+

{{ item.deviceState }}
@@ -953,29 +1124,40 @@ + @click="oneKeyExecute()" + > 执 行 - 取 消 + 取 消 - - + - - - - - - + > + + + + + +
@@ -984,8 +1166,12 @@ import robot from "@/views/workbench/config/components/robotManagement"; import { intervalTime } from "../../../utils/index.js"; import { mapState } from "vuex"; -import { getTunnels,getWorkStagingRobot,listTunnels1 } from "@/api/equipment/tunnel/api.js"; -import { laneImage,laneImage2 } from "../../../utils/configData.js"; +import { + getTunnels, + getWorkStagingRobot, + listTunnels1, +} from "@/api/equipment/tunnel/api.js"; +import { laneImage, laneImage2 } from "../../../utils/configData.js"; import { listType } from "@/api/equipment/type/api.js"; import { getDeviceData } from "@/api/workbench/config.js"; import { getEventCamera, getEntranceExitVideo } from "@/api/eventDialog/api.js"; @@ -1058,10 +1244,10 @@ export default { }, data() { return { - robotTimer:null, - tunnelLang:0, - robotPositon:99, - workBenchProp:{}, + robotTimer: null, + tunnelLang: 0, + robotPositon: 99, + workBenchProp: {}, robotDialogVisible: false, clickEqType: "", yjShow: true, @@ -1123,7 +1309,8 @@ export default { directionList: [], eventForm: {}, timer: null, - laneUrlList: this.$cache.local.get("navigationBar") == '0'?laneImage:laneImage2, + laneUrlList: + this.$cache.local.get("navigationBar") == "0" ? laneImage : laneImage2, eqTypeStateList: null, // selectedIconList: [], backImg: "", @@ -1189,11 +1376,11 @@ export default { }, async created() { const loading = this.$loading({ - lock: true, - text: "Loading", - spinner: "el-icon-loading", - background: "rgba(0, 0, 0, 0.7)", - }); + lock: true, + text: "Loading", + spinner: "el-icon-loading", + background: "rgba(0, 0, 0, 0.7)", + }); await this.getEqTypeStateIcon(); // await this.getTunnelData(); await this.getDispatchExecuted(); @@ -1235,13 +1422,13 @@ export default { // setTimeout(this.getLiPowerDevice, 0) }, 1000 * 5); }, - beforeDestroy(){ + beforeDestroy() { window.clearInterval(this.robotTimer); this.robotTimer = null; }, methods: { - openWorkBench(){ - this.$refs.workBenchRef.init(this.workBenchProp) + openWorkBench() { + this.$refs.workBenchRef.init(this.workBenchProp); }, handleTouping() { this.$confirm("即将投屏, 是否继续?", "提示", { @@ -1340,13 +1527,13 @@ export default { }, getManagementDevice(item) { console.log(item); - console.log(this.$route.query.id,"aaaaa") + console.log(this.$route.query.id, "aaaaa"); if (item.eqTypeId == 29) { this.robotDialogVisible = true; - if(item.eventState == "0"){ - roBotDong(this.$route.query.id,item.id).then((res) => { + if (item.eventState == "0") { + roBotDong(this.$route.query.id, item.id).then((res) => { this.evtHandle(); - }) + }); } return; } @@ -1719,17 +1906,17 @@ export default { }); this.$nextTick(() => { let heightBox = document.querySelectorAll(".heightBox > *"); - let arr = [] - - for( let i = 0;i { - console.log(response.rows,"事件详情") + console.log(response.rows, "事件详情"); this.workBenchProp = { - tunnelStationName:response.rows[0].tunnelStationName, - tunnelName:response.rows[0].tunnelName, - tunnelId:response.rows[0].tunnelId - } - if(response.rows[0].tunnelId == "JQ-JiNan-WenZuBei-MJY"){ - listTunnels1().then((res)=>{ - for(let item of res.rows){ - if(item.tunnelId == "JQ-JiNan-WenZuBei-MJY"){ - this.tunnelLang = - Number(item.endPileNum) - Number(item.startPileNum) + 10; + tunnelStationName: response.rows[0].tunnelStationName, + tunnelName: response.rows[0].tunnelName, + tunnelId: response.rows[0].tunnelId, + }; + if (response.rows[0].tunnelId == "JQ-JiNan-WenZuBei-MJY") { + listTunnels1().then((res) => { + for (let item of res.rows) { + if (item.tunnelId == "JQ-JiNan-WenZuBei-MJY") { + this.tunnelLang = + Number(item.endPileNum) - Number(item.startPileNum) + 10; } } - }) + }); this.robotTimer = setInterval(() => { setTimeout(this.getRobot, 0); }, 1000 * 5); @@ -1806,16 +1994,14 @@ export default { }); } }, - async getRobot(){ + async getRobot() { const param = { deviceId: 7, }; await getWorkStagingRobot(param).then((res) => { // console.log(res, "机器人"); - this.robotPositon = ( - (Number(res.data.position) / this.tunnelLang) * - 100 - ).toFixed(2) - 1; + this.robotPositon = + ((Number(res.data.position) / this.tunnelLang) * 100).toFixed(2) - 1; }); }, // 左上角视频 @@ -2299,14 +2485,14 @@ export default { height: 100%; } } - .workBenchButton{ + .workBenchButton { position: fixed; top: calc(15% + 6px); right: 34%; // right: 22%; cursor: pointer; - >img{ + > img { width: 47px; height: 46px; }