diff --git a/ruoyi-ui/src/utils/auth.js b/ruoyi-ui/src/utils/auth.js index 234a0a7a..6258738c 100644 --- a/ruoyi-ui/src/utils/auth.js +++ b/ruoyi-ui/src/utils/auth.js @@ -1,6 +1,6 @@ import Cookies from 'js-cookie' -const TokenKey = 'DC-Token' +const TokenKey = 'DC-Pro-Token' export function getToken() { return Cookies.get(TokenKey) diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/BroadcastTplList.vue b/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/BroadcastTplList.vue index 201e6de8..4e987255 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/BroadcastTplList.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/BroadcastTplList.vue @@ -3,11 +3,14 @@ - +
-

{{ item.dictLabel }}

-
+
+ {{ item.dictLabel }} + +
+
-
- + + @@ -44,6 +47,8 @@ import BroadcastTplShower from "@screen/components/broadcast/BroadcastTplShower. import broadcastEditor from "@screen/components/broadcast/broadcastEditor"; import scrollOptions from "@/common/scrollbar.js"; import vuescroll from "vuescroll"; +import request from "@/utils/request"; +import draggable from "vuedraggable"; export default { name: "BoardPreview", data() { @@ -63,7 +68,8 @@ export default { components:{ BroadcastTplShower, broadcastEditor, - vuescroll + vuescroll, + draggable }, created(){ Promise.all([ @@ -92,9 +98,24 @@ export default { }, methods: { + ____onDragendTemplate(evt){ + const newMap = this.templateAvailable.map(x=>x.dictCode); + request({ + url:'/business/boardTemplate/updateCategorySort', + method:'post', + data:{ + "dictType":"iot_broadcast_category", + "ids":newMap + } + }).then(res=>{ + console.log(res) + }) + }, // 获取信息模板分类 ____getTemplateCategory() { - return this.getDicts("iot_template_category").then((res) => { + return this.getDicts("iot_broadcast_category").then((res) => { + res.data.forEach(x=>x.fold=false) + res.data[0].fold = true; this.tplCategory = res.data; }); }, @@ -250,4 +271,20 @@ export default { } } + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/broadcastEditor.vue b/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/broadcastEditor.vue index 542b63c8..f8b9b929 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/broadcastEditor.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/broadcast/broadcastEditor.vue @@ -191,7 +191,7 @@ export default { }, mounted() {}, created() { - this.getDicts("iot_template_category").then((res) => { + this.getDicts("iot_broadcast_category").then((res) => { this.templateCategoryList = res.data; this.dataDefault.category = this.templateCategoryList[0].dictValue }); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue index c856fbc4..634b7ee0 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue @@ -12,9 +12,8 @@ - { if (result.code != 200) return Message.error(result?.msg); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue index 30900e0e..a19c4859 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue @@ -24,7 +24,7 @@ 视频 图像 - + @@ -166,6 +166,7 @@ export default { isError:false, //是否误报 submitLoading: false, + videoList: [], realType: 'video', realVideo: 'downCamera', }; @@ -190,6 +191,19 @@ export default { } else if(_data.lang){ _data.lane =_data.lang.toString().split(",") || [] } + if(_data.warningSource === 2){ + + request({ + url: `/business/warning/video/${_data.id}`, + method:'get' + }).then(res=>{ + if(res.code === 200 && res.msg && res.msg !== ''){ + this.videoList = [res.msg] + } + }) + } else { + this.videoList = _data.videoList; + } this.data = _data } else { this.formList = [..._formList] @@ -200,6 +214,7 @@ export default { _data.lane =_data.lang.toString().split(",") || [] } _data.direction=DirectionTypes[_data.direction] + this.videoList = _data.videoList; this.data = _data; } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue index 2f6da094..ebdb8091 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/analysis/index.vue @@ -72,7 +72,7 @@
- +
@@ -330,7 +330,7 @@ export default { padding: 20px; .left { - width: 300px; + width: 18vw; // background-color: #112533; height: 100%; display: flex; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/traffic/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/traffic/index.vue index 019551ae..5217b078 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/traffic/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/components/traffic/index.vue @@ -43,6 +43,13 @@ export default { params }) }, + getTrafficFlowAtToll(params){ + return request({ + url: `/business/traffic-statistics/history/trafficFlowAtToll`, + method: "get", + params + }) + }, toDecimal(x){ var f = parseFloat(x) if(isNaN(f)){ @@ -68,12 +75,10 @@ export default { //日累计车流量 request({ - url: `/business/traffic-statistics/history/trafficFlowAtToll`, - method: "get", - params: { - periodType: 4, - startTime: moment().format('YYYY-MM-DD')+ ' 00:00:00', - endTime: moment().format('YYYY-MM-DD')+ ' 23:59:59', + url: `/business/traffic-statistics/history/trafficFlowAtToll`, + method: "get", + params: { + startDate:moment().format('YYYY-MM-DD') } }).then((result) => { if (result.code != 200) return Message.error(result?.msg); @@ -81,36 +86,26 @@ export default { this.list[1].value = this.toDecimal(_count/10000) }) - this.getAccumulatedFlow({ - periodType: 4, - startTime: moment().subtract(1,'day').format('YYYY-MM-DD')+ ' 00:00:00', - endTime: moment().subtract(1,'day').format('YYYY-MM-DD')+ ' 23:59:59', + this.getTrafficFlowAtToll({ + startDate: moment().subtract(1,'day').format('YYYY-MM-DD') }).then((resultYes) => { - this.getAccumulatedFlow({ - periodType: 4, - startTime: moment().subtract(2,'day').format('YYYY-MM-DD')+ ' 00:00:00', - endTime: moment().subtract(2,'day').format('YYYY-MM-DD')+ ' 23:59:59', + this.getTrafficFlowAtToll({ + startDate: moment().subtract(2,'day').format('YYYY-MM-DD') }).then((resultYes2) => { - if(resultYes.data.length > 0){ - let _countYes = resultYes.data[0].trafficVolume; + let _countYes = resultYes.data; this.list[2].value = this.toDecimal(_countYes/10000) - if(resultYes2.data.length > 0){ - - let _countYes2 = resultYes2.data[0].trafficVolume; - let num = ((_countYes - _countYes2)/_countYes2 * 100) + let _countYes2 = resultYes2.data; + let num = ((_countYes - _countYes2)/_countYes2 * 100) - if(num > 0){ - this.list[3].color = '#22cd39' - num = `↑ +${ this.toDecimal(num)}%` - } else { - this.list[3].color = '#D9001B' - num = `↓ ${ this.toDecimal(num)}%` - } - this.list[3].value = num + if(num > 0){ + this.list[3].color = '#22cd39' + num = `↑ +${ this.toDecimal(num)}%` + } else { + this.list[3].color = '#D9001B' + num = `↓ ${ this.toDecimal(num)}%` } - - } + this.list[3].value = num }) }) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue index 5f187167..55dc97fd 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue @@ -167,10 +167,15 @@
+
-

{{ item.dictLabel }}

-
+
+ {{ item.dictLabel }} + +
+ +