Browse Source

Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

wangqin
王钦 7 months ago
parent
commit
3ad5835dab
  1. 32
      ruoyi-ui/src/views/JiHeExpressway/components/Decorations/BackgroundClip.vue
  2. 8
      ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
  3. 39
      ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/EarlyWarning.vue
  4. 2
      ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/UserArea.vue
  5. 47
      ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue
  6. 56
      ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue
  7. 1
      ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
  8. 3
      ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardRecordPreview.vue
  9. 15
      ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点.svg
  10. 15
      ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_active.svg
  11. 15
      ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_fault.svg
  12. 15
      ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/边坡.svg
  13. 15
      ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/边坡_active.svg
  14. 15
      ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/边坡_fault.svg
  15. 132
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js
  16. 18
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
  17. 23
      ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue
  18. 10
      ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue
  19. 162
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/onLineBarCharts/assets/barCharts.js
  20. 144
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/onLineBarCharts/index.vue
  21. 6
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
  22. 3
      ruoyi-ui/src/views/JiHeExpressway/utils/api/batch.js
  23. 13
      ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
  24. 4
      ruoyi-ui/vue.config.js

32
ruoyi-ui/src/views/JiHeExpressway/components/Decorations/BackgroundClip.vue

@ -1,14 +1,7 @@
<template>
<div
class="BackgroundClip"
:style="{
'--clip-path': clipPath,
'--border-path': borderPath,
'--border-color': borderColor,
'--bg-color': bgColor,
width: width,
top: top,
}"
:style="compStyle"
:class="borderPath ? 'hasBorder' : 'noBoarder'"
>
<slot />
@ -27,6 +20,10 @@ export default {
type: String,
default: null,
},
right: {
type: String,
default: null,
},
clipPath: {
type: String,
default: null,
@ -44,6 +41,25 @@ export default {
default: null,
},
},
computed:{
compStyle(){
let obj = {
'--clip-path': this.clipPath,
'--border-path': this.borderPath,
'--border-color': this.borderColor,
'--bg-color': this.bgColor,
width: this.width,
top: this.top,
}
if(this.right){
obj["margin-left"] = "auto";
obj["margin-right"] = this.right;
}else{
obj["margin"] = "auto";
}
return obj;
}
}
};
</script>

8
ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue

@ -6,7 +6,7 @@
clipPath="polygon(calc(100% - var(--clip-width)) 0, 100% var(--clip-width), 100% 100%, var(--clip-width) 100%, 0 calc(100% - var(--clip-width)), 0 0)"
borderColor="linear-gradient(180deg, rgba(78, 174, 204, .9), rgba(78, 174, 204, 0))"
bgColor="linear-gradient(180deg, rgba(14, 69, 92, 0.9) 0%, rgba(20, 89, 119, 0.9) 100%)"
ref="DialogContentRef" :width="width" :top="top">
ref="DialogContentRef" :width="width" :top="top" :right="right">
<div class="dialog-title">
<img class="title-icon" src="@screen/images/dialog/title-icon.svg" />
<span>{{ title }}</span>
@ -52,6 +52,10 @@ export default {
type: String,
default: null,
},
right: {
type: String,
default: null,
},
title: {
type: String,
},
@ -145,7 +149,7 @@ export default {
position: relative;
box-sizing: border-box;
top: 20%;
margin: auto;
// margin: auto;
padding-bottom: 20px;
// margin: calc(var(--border-width) / 2);

39
ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/EarlyWarning.vue

@ -0,0 +1,39 @@
<template>
<div class="early_warning">
<p @click="onShowCtt">
<i class="el-icon-message-solid" v-if="isShowCtt"></i>
<i class="el-icon-bell" v-else></i>
</p>
<Dialog v-model="isShowCtt" title="事件预警" width="600px" top="100px" right="30px" noneMask>
<WarningList></WarningList>
</Dialog>
</div>
</template>
<script>
import Dialog from "@screen/components/Dialog/index.vue";
import WarningList from "./WarningList.vue";
export default {
data() {
return {
isShowCtt:false
};
},
components: {
Dialog, WarningList
},
computed: {
},
methods: {
onShowCtt(){
this.isShowCtt = !this.isShowCtt;
}
}
};
</script>
<style lang="scss" scoped>
.early_warning{
}
</style>

2
ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/UserArea.vue

@ -2,7 +2,7 @@
<div class="operations">
<div class="opCon">
<div class="menu_recent" @click="onSwitchRecent">
<i class="iconfont icon-menuactive" v-if="menu.isRecentOpen"></i>
<i class="iconfont icon-menuactive" v-if="menu.isRecentOpen"></i>
<i class="iconfont icon-menu" v-else></i>
</div>
<el-dropdown class="userBox">

47
ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue

@ -0,0 +1,47 @@
<template>
<div class="warning_list">
<el-tabs v-model="activeTab" @tab-click="onChangeTab">
<el-tab-pane label="告警事件" name="first">用户管理</el-tab-pane>
<el-tab-pane label="待确认事件" name="second">配置管理</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import request from "@/utils/request";
export default {
data() {
return {
activeTab:"first"
};
},
components: {
},
computed: {
},
methods: {
onChangeTab(tab, event){
console.log(tab, event);
this.getMainData();
},
getMainData(){
request({
// url: `/business/dcBatchFunctionsJobGroup`,
url: `/perceivedEvents/warning/perceivedEventsList`,
method: "GET",
params:{}
})
.then((result) => {
if (result.code != 200) return;
console.log( result.data , "刚发的刚发的发多少++++");
})
}
}
};
</script>
<style lang="scss" scoped>
.warning_list{
}
</style>

56
ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue

@ -4,7 +4,7 @@
<Clock class="time"></Clock>
<!-- 左侧菜单 -->
<CustomMenu :menuData="menuLeft" prefix="l" class="leftMenu">
<!--@onChange="onChange" :activeIndex="activeIndex" -->
<!--@onChange="onChange" :activeIndex="activeIndex" -->
</CustomMenu>
<!-- 中间标题 -->
<div class="vis-title">
@ -12,9 +12,11 @@
<img class="title-img" src="../../images/title.png" />
</div>
<!-- 右侧菜单 -->
<CustomMenu :menuData="menuRight" prefix="r" class="rightMenu">
<CustomMenu :menuData="menuRight" prefix="r" class="rightMenu">
<!-- @onChange="onChange" :activeIndex="activeIndex" -->
</CustomMenu>
<!-- 预警 -->
<EarlyWarning class="early_warning"></EarlyWarning>
<UserArea class="topButton"></UserArea>
</div>
<RecentPages class="recent"></RecentPages>
@ -24,6 +26,7 @@
import menuData from "@/common/menuData";
import CustomMenu from "./CustomMenu.vue";
import Clock from "./Clock.vue";
import EarlyWarning from './EarlyWarning.vue'
import UserArea from './UserArea.vue'
import RecentPages from "../RecentPages/index.vue";
export default {
@ -36,6 +39,7 @@ export default {
};
},
components: {
EarlyWarning,
CustomMenu,
Clock,
UserArea,
@ -116,53 +120,9 @@ export default {
width: 500px;
}
.early_warning{ width: 26px; overflow: hidden;}
.topButton{
width: 190px;
}
.user {
width: 200px;
display: flex;
align-items: center;
justify-content: center;
font-size: 14px;
font-weight: normal;
color: #fff;
line-height: 16px;
.name {
display: inline-block;
margin: 0 10px;
}
.icon {
display: inline-block;
margin: 0 13px;
}
.icon-001 {
display: inline-block;
width: 12px;
height: 14px;
}
.icon-002 {
display: inline-block;
width: 9px;
height: 5px;
}
.icon-003 {
display: inline-block;
width: 18px;
height: 16px;
}
.icon-004 {
display: inline-block;
width: 15px;
height: 15px;
}
width: 164px;
}
}
.recent{

1
ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue

@ -483,6 +483,7 @@ export default {
this.mode
);
} else {
console.log(this.tpl , "tttttttttppplllll")
this.dataForm = infoBoardUtils.dialogSourceFormat(
this.tpl,
this.type,

3
ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardRecordPreview.vue

@ -1,7 +1,8 @@
<template>
<div class="boardPreview" ref="compBox">
<div class="boardBox" :style="boardStyle" v-if="isReady">
<p class="boardTxt" v-for="item,index in contentArr" :key="index" :style="boardTxtStyle" v-html="item" v-if="(index + 1) <= lineTotal">
<p class="boardTxt" v-for="item,index in contentArr" :key="index" :style="boardTxtStyle" v-html="item"
v-if="(index + 1) <= lineTotal">
</p>
</div>
</div>

15
ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点.svg

@ -0,0 +1,15 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
<g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
<g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
<g id="1">
<g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
<path id="Vector" d="M12.5715 12.1523C12.4608 12.1523 12.3516 12.1523 12.2423 12.1441C12.4192 12.2741 12.5498 12.4556 12.6154 12.6627C12.6811 12.8699 12.6784 13.0922 12.6079 13.2978C12.5374 13.5034 12.4025 13.6819 12.2226 13.8077C12.0427 13.9336 11.827 14.0004 11.6061 13.9987C11.3971 14.0004 11.1923 13.9408 11.0179 13.8275C10.8435 13.7143 10.7074 13.5525 10.6271 13.3629C10.5468 13.1733 10.5258 12.9644 10.5669 12.7631C10.6081 12.5617 10.7094 12.3769 10.8579 12.2324C10.9591 12.1351 11.079 12.0584 11.2106 12.0069C10.0831 11.7714 9.03993 11.2447 8.18873 10.4811H2.40641C2.39844 10.4811 2.39058 10.4792 2.3835 10.4757C2.37641 10.4721 2.37031 10.4669 2.3657 10.4605C2.36109 10.4541 2.35812 10.4467 2.35702 10.4389C2.35592 10.4312 2.35673 10.4233 2.35939 10.4159L3.42015 7.46622C3.43121 7.43496 3.45058 7.41322 3.45473 7.39148C3.45515 7.38819 3.45608 7.38498 3.45748 7.38197L3.47823 7.34121C3.83091 6.67682 4.14761 6.20672 4.9207 6.20672H6.0852C6.07362 6.06116 6.06762 5.91523 6.06721 5.76923C6.06791 5.51218 6.08407 5.25539 6.11562 5.00022H4.94146C4.60115 4.99586 4.26328 5.05726 3.94708 5.18092L3.91526 5.19044C3.53793 5.33738 3.20883 5.58315 2.96376 5.90102C2.85194 6.03371 2.7498 6.174 2.65812 6.32084C2.51983 6.53687 2.41194 6.72845 2.33726 6.86432C2.11183 7.25969 1.32215 9.71752 1.32215 9.71752C0.500643 10.2827 0.00829767 11.102 0 11.9335V15.6889C0.00140318 16.2575 0.216221 16.8055 0.603326 17.2282C0.99043 17.6509 1.52262 17.9184 2.098 17.9796C2.58639 18.0428 3.08277 17.9583 3.52107 17.7374C3.95937 17.5166 4.31878 17.1698 4.55145 16.7432C4.55561 16.7353 4.56197 16.7286 4.56979 16.724C4.57762 16.7195 4.5866 16.7172 4.5957 16.7174L7.50001 16.7283L10.4043 16.7174C10.4134 16.7173 10.4223 16.7197 10.4301 16.7243C10.4379 16.7288 10.4443 16.7354 10.4485 16.7432C10.6812 17.1698 11.0406 17.5166 11.4789 17.7375C11.9172 17.9583 12.4136 18.0428 12.902 17.9796C13.4777 17.9169 14.0098 17.6481 14.3968 17.2246C14.7837 16.8011 14.9984 16.2525 15 15.6835V11.9335C14.9981 11.854 14.9921 11.7747 14.982 11.6958C14.2156 11.9978 13.3973 12.1527 12.5715 12.1523ZM4.37028 13.3601C4.28308 13.5653 4.13096 13.7375 3.93643 13.8511C3.7419 13.9647 3.5153 14.0138 3.29016 13.9911C3.06502 13.9684 2.8533 13.8751 2.68634 13.725C2.51937 13.5749 2.40603 13.376 2.3631 13.1577C2.32016 12.9394 2.3499 12.7133 2.44792 12.5129C2.54594 12.3125 2.70703 12.1484 2.90735 12.0449C3.10767 11.9414 3.33658 11.904 3.5602 11.9383C3.78382 11.9726 3.99028 12.0767 4.149 12.2352C4.29436 12.3805 4.39286 12.5648 4.43222 12.7649C4.47157 12.965 4.45003 13.172 4.37028 13.3601Z" fill="#0FD4FF"/>
<path id="Vector_2" d="M12.5 0C11.4122 0 10.3488 0.293245 9.44437 0.842652C8.5399 1.39206 7.83495 2.17295 7.41867 3.08658C7.00238 4.00021 6.89346 5.00555 7.10568 5.97545C7.3179 6.94536 7.84173 7.83627 8.61091 8.53553C9.3801 9.23479 10.3601 9.711 11.427 9.90392C12.4939 10.0969 13.5998 9.99783 14.6048 9.6194C15.6098 9.24096 16.4687 8.6001 17.0731 7.77785C17.6774 6.9556 18 5.98891 18 5C18 3.67392 17.4205 2.40215 16.3891 1.46447C15.3576 0.52679 13.9587 4.45199e-06 12.5 0L12.5 0ZM14.7669 4.91486C14.5895 5.09552 14.3722 5.24008 14.1291 5.33905C13.886 5.43803 13.6226 5.48919 13.3562 5.48919H11.5903V7.35134C11.5872 7.49734 11.5205 7.63625 11.4048 7.73759C11.2891 7.83893 11.134 7.89441 10.9734 7.89187H10.358V2.10675H13.2953C13.7585 2.09711 14.2098 2.24074 14.5653 2.51094C14.9207 2.78113 15.1561 3.1595 15.2277 3.57567C15.2606 3.81586 15.2364 4.05966 15.1569 4.29066C15.0775 4.52166 14.9445 4.7345 14.7669 4.91486Z" fill="#0FD4FF"/>
<path id="Vector_3" d="M13.193 3.00005H11V3.9997H13.1598C13.3488 4.00375 13.5343 3.96644 13.6847 3.89411C13.8351 3.82178 13.9412 3.71888 13.9849 3.60287C13.9963 3.56883 14.0013 3.53406 13.9997 3.49929C13.9992 3.43303 13.9779 3.36748 13.937 3.30644C13.8961 3.2454 13.8365 3.19007 13.7615 3.14365C13.6865 3.09722 13.5976 3.06063 13.5 3.03599C13.4025 3.01134 13.2981 2.99913 13.193 3.00005Z" fill="#0FD4FF"/>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.2 KiB

15
ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_active.svg

@ -0,0 +1,15 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
<g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
<g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
<g id="1">
<g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
<path id="Vector" d="M12.5715 12.1523C12.4608 12.1523 12.3516 12.1523 12.2423 12.1441C12.4192 12.2741 12.5498 12.4556 12.6154 12.6627C12.6811 12.8699 12.6784 13.0922 12.6079 13.2978C12.5374 13.5034 12.4025 13.6819 12.2226 13.8077C12.0427 13.9336 11.827 14.0004 11.6061 13.9987C11.3971 14.0004 11.1923 13.9408 11.0179 13.8275C10.8435 13.7143 10.7074 13.5525 10.6271 13.3629C10.5468 13.1733 10.5258 12.9644 10.5669 12.7631C10.6081 12.5617 10.7094 12.3769 10.8579 12.2324C10.9591 12.1351 11.079 12.0584 11.2106 12.0069C10.0831 11.7714 9.03993 11.2447 8.18873 10.4811H2.40641C2.39844 10.4811 2.39058 10.4792 2.3835 10.4757C2.37641 10.4721 2.37031 10.4669 2.3657 10.4605C2.36109 10.4541 2.35812 10.4467 2.35702 10.4389C2.35592 10.4312 2.35673 10.4233 2.35939 10.4159L3.42015 7.46622C3.43121 7.43496 3.45058 7.41322 3.45473 7.39148C3.45515 7.38819 3.45608 7.38498 3.45748 7.38197L3.47823 7.34121C3.83091 6.67682 4.14761 6.20672 4.9207 6.20672H6.0852C6.07362 6.06116 6.06762 5.91523 6.06721 5.76923C6.06791 5.51218 6.08407 5.25539 6.11562 5.00022H4.94146C4.60115 4.99586 4.26328 5.05726 3.94708 5.18092L3.91526 5.19044C3.53793 5.33738 3.20883 5.58315 2.96376 5.90102C2.85194 6.03371 2.7498 6.174 2.65812 6.32084C2.51983 6.53687 2.41194 6.72845 2.33726 6.86432C2.11183 7.25969 1.32215 9.71752 1.32215 9.71752C0.500643 10.2827 0.00829767 11.102 0 11.9335V15.6889C0.00140318 16.2575 0.216221 16.8055 0.603326 17.2282C0.99043 17.6509 1.52262 17.9184 2.098 17.9796C2.58639 18.0428 3.08277 17.9583 3.52107 17.7374C3.95937 17.5166 4.31878 17.1698 4.55145 16.7432C4.55561 16.7353 4.56197 16.7286 4.56979 16.724C4.57762 16.7195 4.5866 16.7172 4.5957 16.7174L7.50001 16.7283L10.4043 16.7174C10.4134 16.7173 10.4223 16.7197 10.4301 16.7243C10.4379 16.7288 10.4443 16.7354 10.4485 16.7432C10.6812 17.1698 11.0406 17.5166 11.4789 17.7375C11.9172 17.9583 12.4136 18.0428 12.902 17.9796C13.4777 17.9169 14.0098 17.6481 14.3968 17.2246C14.7837 16.8011 14.9984 16.2525 15 15.6835V11.9335C14.9981 11.854 14.9921 11.7747 14.982 11.6958C14.2156 11.9978 13.3973 12.1527 12.5715 12.1523ZM4.37028 13.3601C4.28308 13.5653 4.13096 13.7375 3.93643 13.8511C3.7419 13.9647 3.5153 14.0138 3.29016 13.9911C3.06502 13.9684 2.8533 13.8751 2.68634 13.725C2.51937 13.5749 2.40603 13.376 2.3631 13.1577C2.32016 12.9394 2.3499 12.7133 2.44792 12.5129C2.54594 12.3125 2.70703 12.1484 2.90735 12.0449C3.10767 11.9414 3.33658 11.904 3.5602 11.9383C3.78382 11.9726 3.99028 12.0767 4.149 12.2352C4.29436 12.3805 4.39286 12.5648 4.43222 12.7649C4.47157 12.965 4.45003 13.172 4.37028 13.3601Z" fill="#FFDB82"/>
<path id="Vector_2" d="M12.5 0C11.4122 0 10.3488 0.293245 9.44437 0.842652C8.5399 1.39206 7.83495 2.17295 7.41867 3.08658C7.00238 4.00021 6.89346 5.00555 7.10568 5.97545C7.3179 6.94536 7.84173 7.83627 8.61091 8.53553C9.3801 9.23479 10.3601 9.711 11.427 9.90392C12.4939 10.0969 13.5998 9.99783 14.6048 9.6194C15.6098 9.24096 16.4687 8.6001 17.0731 7.77785C17.6774 6.9556 18 5.98891 18 5C18 3.67392 17.4205 2.40215 16.3891 1.46447C15.3576 0.52679 13.9587 4.45199e-06 12.5 0L12.5 0ZM14.7669 4.91486C14.5895 5.09552 14.3722 5.24008 14.1291 5.33905C13.886 5.43803 13.6226 5.48919 13.3562 5.48919H11.5903V7.35134C11.5872 7.49734 11.5205 7.63625 11.4048 7.73759C11.2891 7.83893 11.134 7.89441 10.9734 7.89187H10.358V2.10675H13.2953C13.7585 2.09711 14.2098 2.24074 14.5653 2.51094C14.9207 2.78113 15.1561 3.1595 15.2277 3.57567C15.2606 3.81586 15.2364 4.05966 15.1569 4.29066C15.0775 4.52166 14.9445 4.7345 14.7669 4.91486Z" fill="#FFDB82"/>
<path id="Vector_3" d="M13.193 3.00005H11V3.9997H13.1598C13.3488 4.00375 13.5343 3.96644 13.6847 3.89411C13.8351 3.82178 13.9412 3.71888 13.9849 3.60287C13.9963 3.56883 14.0013 3.53406 13.9997 3.49929C13.9992 3.43303 13.9779 3.36748 13.937 3.30644C13.8961 3.2454 13.8365 3.19007 13.7615 3.14365C13.6865 3.09722 13.5976 3.06063 13.5 3.03599C13.4025 3.01134 13.2981 2.99913 13.193 3.00005Z" fill="#FFDB82"/>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.2 KiB

15
ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_fault.svg

@ -0,0 +1,15 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
<g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
<g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
<g id="1">
<g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
<path id="Vector" d="M12.5715 12.1523C12.4608 12.1523 12.3516 12.1523 12.2423 12.1441C12.4192 12.2741 12.5498 12.4556 12.6154 12.6627C12.6811 12.8699 12.6784 13.0922 12.6079 13.2978C12.5374 13.5034 12.4025 13.6819 12.2226 13.8077C12.0427 13.9336 11.827 14.0004 11.6061 13.9987C11.3971 14.0004 11.1923 13.9408 11.0179 13.8275C10.8435 13.7143 10.7074 13.5525 10.6271 13.3629C10.5468 13.1733 10.5258 12.9644 10.5669 12.7631C10.6081 12.5617 10.7094 12.3769 10.8579 12.2324C10.9591 12.1351 11.079 12.0584 11.2106 12.0069C10.0831 11.7714 9.03993 11.2447 8.18873 10.4811H2.40641C2.39844 10.4811 2.39058 10.4792 2.3835 10.4757C2.37641 10.4721 2.37031 10.4669 2.3657 10.4605C2.36109 10.4541 2.35812 10.4467 2.35702 10.4389C2.35592 10.4312 2.35673 10.4233 2.35939 10.4159L3.42015 7.46622C3.43121 7.43496 3.45058 7.41322 3.45473 7.39148C3.45515 7.38819 3.45608 7.38498 3.45748 7.38197L3.47823 7.34121C3.83091 6.67682 4.14761 6.20672 4.9207 6.20672H6.0852C6.07362 6.06116 6.06762 5.91523 6.06721 5.76923C6.06791 5.51218 6.08407 5.25539 6.11562 5.00022H4.94146C4.60115 4.99586 4.26328 5.05726 3.94708 5.18092L3.91526 5.19044C3.53793 5.33738 3.20883 5.58315 2.96376 5.90102C2.85194 6.03371 2.7498 6.174 2.65812 6.32084C2.51983 6.53687 2.41194 6.72845 2.33726 6.86432C2.11183 7.25969 1.32215 9.71752 1.32215 9.71752C0.500643 10.2827 0.00829767 11.102 0 11.9335V15.6889C0.00140318 16.2575 0.216221 16.8055 0.603326 17.2282C0.99043 17.6509 1.52262 17.9184 2.098 17.9796C2.58639 18.0428 3.08277 17.9583 3.52107 17.7374C3.95937 17.5166 4.31878 17.1698 4.55145 16.7432C4.55561 16.7353 4.56197 16.7286 4.56979 16.724C4.57762 16.7195 4.5866 16.7172 4.5957 16.7174L7.50001 16.7283L10.4043 16.7174C10.4134 16.7173 10.4223 16.7197 10.4301 16.7243C10.4379 16.7288 10.4443 16.7354 10.4485 16.7432C10.6812 17.1698 11.0406 17.5166 11.4789 17.7375C11.9172 17.9583 12.4136 18.0428 12.902 17.9796C13.4777 17.9169 14.0098 17.6481 14.3968 17.2246C14.7837 16.8011 14.9984 16.2525 15 15.6835V11.9335C14.9981 11.854 14.9921 11.7747 14.982 11.6958C14.2156 11.9978 13.3973 12.1527 12.5715 12.1523ZM4.37028 13.3601C4.28308 13.5653 4.13096 13.7375 3.93643 13.8511C3.7419 13.9647 3.5153 14.0138 3.29016 13.9911C3.06502 13.9684 2.8533 13.8751 2.68634 13.725C2.51937 13.5749 2.40603 13.376 2.3631 13.1577C2.32016 12.9394 2.3499 12.7133 2.44792 12.5129C2.54594 12.3125 2.70703 12.1484 2.90735 12.0449C3.10767 11.9414 3.33658 11.904 3.5602 11.9383C3.78382 11.9726 3.99028 12.0767 4.149 12.2352C4.29436 12.3805 4.39286 12.5648 4.43222 12.7649C4.47157 12.965 4.45003 13.172 4.37028 13.3601Z" fill="#FF5F5F"/>
<path id="Vector_2" d="M12.5 0C11.4122 0 10.3488 0.293245 9.44437 0.842652C8.5399 1.39206 7.83495 2.17295 7.41867 3.08658C7.00238 4.00021 6.89346 5.00555 7.10568 5.97545C7.3179 6.94536 7.84173 7.83627 8.61091 8.53553C9.3801 9.23479 10.3601 9.711 11.427 9.90392C12.4939 10.0969 13.5998 9.99783 14.6048 9.6194C15.6098 9.24096 16.4687 8.6001 17.0731 7.77785C17.6774 6.9556 18 5.98891 18 5C18 3.67392 17.4205 2.40215 16.3891 1.46447C15.3576 0.52679 13.9587 4.45199e-06 12.5 0L12.5 0ZM14.7669 4.91486C14.5895 5.09552 14.3722 5.24008 14.1291 5.33905C13.886 5.43803 13.6226 5.48919 13.3562 5.48919H11.5903V7.35134C11.5872 7.49734 11.5205 7.63625 11.4048 7.73759C11.2891 7.83893 11.134 7.89441 10.9734 7.89187H10.358V2.10675H13.2953C13.7585 2.09711 14.2098 2.24074 14.5653 2.51094C14.9207 2.78113 15.1561 3.1595 15.2277 3.57567C15.2606 3.81586 15.2364 4.05966 15.1569 4.29066C15.0775 4.52166 14.9445 4.7345 14.7669 4.91486Z" fill="#FF5F5F"/>
<path id="Vector_3" d="M13.193 3.00005H11V3.9997H13.1598C13.3488 4.00375 13.5343 3.96644 13.6847 3.89411C13.8351 3.82178 13.9412 3.71888 13.9849 3.60287C13.9963 3.56883 14.0013 3.53406 13.9997 3.49929C13.9992 3.43303 13.9779 3.36748 13.937 3.30644C13.8961 3.2454 13.8365 3.19007 13.7615 3.14365C13.6865 3.09722 13.5976 3.06063 13.5 3.03599C13.4025 3.01134 13.2981 2.99913 13.193 3.00005Z" fill="#FF5F5F"/>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.2 KiB

15
ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/边坡.svg

@ -0,0 +1,15 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 1142814043">
<g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
<g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
<g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
<g id="1">
<g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
<path id="Vector" d="M11.3814 1.063C11.5019 0.979 11.6591 0.979 11.7802 1.063L12.8401 1.8022V6.1982C13.4292 5.90643 14.0728 5.75502 14.7246 5.75488C15.3764 5.75473 16.0201 5.90586 16.6094 6.19737C17.1986 6.48888 17.7187 6.91351 18.1322 7.44066C18.5456 7.96781 18.8422 8.58435 19.0004 9.24585C19.1586 9.90735 19.1746 10.5973 19.0473 11.2661C18.9199 11.9348 18.6523 12.5657 18.2637 13.1132C17.8752 13.6607 17.3754 14.1112 16.8004 14.4323C16.2253 14.7534 15.5894 14.937 14.9384 14.9699V14.9748H12.8401V17.3478C14.5918 16.1522 17.323 15.4137 21.2339 15.4137L21.9398 16.5225C22.0201 16.6485 22.0201 16.813 21.9398 16.9397L21.2339 18.0485C15.6938 18.0485 12.8394 20.4068 12.8394 22H10.3216V14.9748H2.7675L2.06027 13.866C2.02097 13.8042 2 13.7316 2 13.6574C2 13.5832 2.02097 13.5106 2.06027 13.4488L2.76683 12.34H10.3216V1.8022L11.3814 1.063ZM12.8401 10.1448V12.34H14.9384C15.3534 12.34 15.759 12.2113 16.1041 11.97C16.4492 11.7288 16.7181 11.386 16.8769 10.9849C17.0357 10.5837 17.0773 10.1424 16.9963 9.71654C16.9154 9.29071 16.7155 8.89956 16.4221 8.59256C16.1286 8.28555 15.7547 8.07648 15.3477 7.99178C14.9407 7.90708 14.5188 7.95055 14.1354 8.1167C13.752 8.28285 13.4243 8.56421 13.1937 8.92521C12.9631 9.28621 12.8401 9.71063 12.8401 10.1448Z" fill="#0FD4FF"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

15
ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/边坡_active.svg

@ -0,0 +1,15 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 1142814043">
<g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
<g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
<g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
<g id="1">
<g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
<path id="Vector" d="M11.3814 1.063C11.5019 0.979 11.6591 0.979 11.7802 1.063L12.8401 1.8022V6.1982C13.4292 5.90643 14.0728 5.75502 14.7246 5.75488C15.3764 5.75473 16.0201 5.90586 16.6094 6.19737C17.1986 6.48888 17.7187 6.91351 18.1322 7.44066C18.5456 7.96781 18.8422 8.58435 19.0004 9.24585C19.1586 9.90735 19.1746 10.5973 19.0473 11.2661C18.9199 11.9348 18.6523 12.5657 18.2637 13.1132C17.8752 13.6607 17.3754 14.1112 16.8004 14.4323C16.2253 14.7534 15.5894 14.937 14.9384 14.9699V14.9748H12.8401V17.3478C14.5918 16.1522 17.323 15.4137 21.2339 15.4137L21.9398 16.5225C22.0201 16.6485 22.0201 16.813 21.9398 16.9397L21.2339 18.0485C15.6938 18.0485 12.8394 20.4068 12.8394 22H10.3216V14.9748H2.7675L2.06027 13.866C2.02097 13.8042 2 13.7316 2 13.6574C2 13.5832 2.02097 13.5106 2.06027 13.4488L2.76683 12.34H10.3216V1.8022L11.3814 1.063ZM12.8401 10.1448V12.34H14.9384C15.3534 12.34 15.759 12.2113 16.1041 11.97C16.4492 11.7288 16.7181 11.386 16.8769 10.9849C17.0357 10.5837 17.0773 10.1424 16.9963 9.71654C16.9154 9.29071 16.7155 8.89956 16.4221 8.59256C16.1286 8.28555 15.7547 8.07648 15.3477 7.99178C14.9407 7.90708 14.5188 7.95055 14.1354 8.1167C13.752 8.28285 13.4243 8.56421 13.1937 8.92521C12.9631 9.28621 12.8401 9.71063 12.8401 10.1448Z" fill="#FFDB82"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

15
ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/边坡_fault.svg

@ -0,0 +1,15 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 1142814043">
<g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
<g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
<g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
<g id="1">
<g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
<path id="Vector" d="M11.3814 1.063C11.5019 0.979 11.6591 0.979 11.7802 1.063L12.8401 1.8022V6.1982C13.4292 5.90643 14.0728 5.75502 14.7246 5.75488C15.3764 5.75473 16.0201 5.90586 16.6094 6.19737C17.1986 6.48888 17.7187 6.91351 18.1322 7.44066C18.5456 7.96781 18.8422 8.58435 19.0004 9.24585C19.1586 9.90735 19.1746 10.5973 19.0473 11.2661C18.9199 11.9348 18.6523 12.5657 18.2637 13.1132C17.8752 13.6607 17.3754 14.1112 16.8004 14.4323C16.2253 14.7534 15.5894 14.937 14.9384 14.9699V14.9748H12.8401V17.3478C14.5918 16.1522 17.323 15.4137 21.2339 15.4137L21.9398 16.5225C22.0201 16.6485 22.0201 16.813 21.9398 16.9397L21.2339 18.0485C15.6938 18.0485 12.8394 20.4068 12.8394 22H10.3216V14.9748H2.7675L2.06027 13.866C2.02097 13.8042 2 13.7316 2 13.6574C2 13.5832 2.02097 13.5106 2.06027 13.4488L2.76683 12.34H10.3216V1.8022L11.3814 1.063ZM12.8401 10.1448V12.34H14.9384C15.3534 12.34 15.759 12.2113 16.1041 11.97C16.4492 11.7288 16.7181 11.386 16.8769 10.9849C17.0357 10.5837 17.0773 10.1424 16.9963 9.71654C16.9154 9.29071 16.7155 8.89956 16.4221 8.59256C16.1286 8.28555 15.7547 8.07648 15.3477 7.99178C14.9407 7.90708 14.5188 7.95055 14.1354 8.1167C13.752 8.28285 13.4243 8.56421 13.1937 8.92521C12.9631 9.28621 12.8401 9.71063 12.8401 10.1448Z" fill="#FF5F5F"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

132
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js

@ -100,7 +100,7 @@ export const tabList = {
{
name: "基本信息",
key: "first",
labelWidth: "70px",
labelWidth: "82px",
list: [
{
label: "桥梁名称",
@ -356,4 +356,134 @@ export const tabList = {
],
},
],
7: [],
8: [
{
name: "基本信息",
key: "first",
labelWidth: "70px",
list: [
{
label: "驻点名称",
key: "facilityName",
gridColumn: "3",
},
{
label: "道路名称",
key: "roadName",
gridColumn: "3",
},
{
label: "位置桩号",
key: "stakeMark",
gridColumn: "3",
},
{
label: "所在场所",
key: "locationPremises",
gridColumn: "3",
},
{
label: "管养公司",
key: "maintenanceAndOperationCompany",
gridColumn: "3",
},
{
label: "管养单位",
key: "maintenanceAndOperationalUnit",
gridColumn: "3",
},
{
label: "路段名称",
key: "sectionName",
gridColumn: "3",
},
{
label: "车辆数",
key: "vehicleCount",
gridColumn: "3",
},
{
label: "使用状态",
key: "usageStatus",
enum: "controlType",
gridColumn: "3",
},
],
},
],
9: [
{
name: "基本信息",
key: "first",
labelWidth: "70px",
list: [
{
label: "道路编码",
key: "roadCode",
gridColumn: "3",
},
{
label: "道路名称",
key: "roadName",
gridColumn: "3",
},
{
label: "变坡点桩号",
key: "stakeMark1",
gridColumn: "3",
},
{
label: "方向",
key: "direction",
gridColumn: "3",
},
{
label: "起点桩号",
key: "startPileNumber",
gridColumn: "3",
},
{
label: "终点桩号",
key: "endPileNumber",
gridColumn: "3",
},
{
label: "经度",
key: "longitude",
gridColumn: "3",
},
{
label: "纬度",
key: "latitude",
gridColumn: "3",
},
{
label: "直坡段长",
key: "segmentLength",
gridColumn: "3",
},
{
label: "横坡",
key: "lateralSlope",
gridColumn: "3",
},
{
label: "竖曲线半径",
key: "verticalCurveRadius",
gridColumn: "3",
},
{
label: "纵坡",
key: "longitudinalSlope",
gridColumn: "3",
},
{
label: "管养单位",
key: "managementAndMaintenanceUnit",
gridColumn: "6",
},
],
},
],
};

18
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue

@ -2,7 +2,8 @@
<Dialog v-model="obverseVisible" :title="dialogData._itemData && dialogData._itemData.title" width="500px" top="10%">
<div class="RoadNetworkFacilities">
<div class="header">
<Video class="video-stream" :pileNum="dialogData.stakeMark" :showHeader="false" />
<Video class="video-stream" :pileNum="dialogData.stakeMark" rangeIndex="upCamera" :showHeader="false" />
<!-- <Video class="video-stream" :pileNum="dialogData.stakeMark" /> -->
</div>
<div class="SolarEnergy">
@ -22,6 +23,7 @@ import Dialog from "@screen/components/Dialog/index.vue";
import Descriptions from "@screen/components/Descriptions.vue";
// import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
import Video from "@screen/components/VideoMulti";
// import Video from "@screen/components/Video";
import request from "@/utils/request";
import { dialogDelayVisible } from "./../mixin";
import { tabList } from './data'
@ -55,12 +57,12 @@ export default {
let dData = { ...this.dialogData };
this.formList = tabList[dData.facilityType]
if(dData.facilityType)
if (dData.otherConfig) {
let otherConfig = JSON.parse(dData.otherConfig);
dData.latitude = otherConfig.dimension
dData = { ...dData, ...otherConfig }
}
if (dData.facilityType)
if (dData.otherConfig) {
let otherConfig = JSON.parse(dData.otherConfig);
dData.latitude = otherConfig.dimension
dData = { ...dData, ...otherConfig }
}
this.data = dData;
// console.log('this.data', this.data)
},
@ -71,7 +73,7 @@ export default {
<style lang="scss" scoped>
.RoadNetworkFacilities {
width: 456px;
width: 452px;
color: #fff;
display: flex;
flex-direction: column;

23
ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/TaskItem.vue

@ -37,13 +37,14 @@
</div>
</el-form>
<taskEditDialog v-model="isEditingTask" :groupId="groupId" :time="time" :deviceDic="deviceDic" :deviceList="deviceList"
:propData="editData" @onSubmit="onSubmit" />
<taskEditDialog v-model="isEditingTask" :groupId="groupId" :time="time" :deviceDic="deviceDic"
:deviceList="deviceList" :propData="editData" @onSubmit="onSubmit" />
</div>
</template>
<script>
import request from "@/utils/request";
import { deviceTypeDic } from "@screen/utils/enum.js"
import { getDeviceList } from "@screen/utils/api/device.js"
import taskEditDialog from "./taskEditDialog.vue";
@ -85,11 +86,11 @@ export default {
temp.functions[1].params.CONTENT = temp.functions[1].params.CONTENT.replaceAll(/\\n/g, '\\\\n').replaceAll(/=/g, '\\=').replaceAll(/,/g, '\\,').replaceAll(/&nbsp/g, ' ');
this.editData = {
id: this.propData.jobId,
direction: temp.direction || temp.devices[0].direction,
deviceType: temp.deviceType || temp.devices[0].deviceType,
direction: temp.direction,
deviceType: temp.deviceType,
devices: temp.devices,
params: temp.functions[1].params,
screenSize: temp.screenSize || temp.devices[0].screenSize || this.deviceDic[temp.devices[0].id].screenSize
screenSize: temp.screenSize
};
console.log(this.editData , "+++======");
this.isCompReady = true;
@ -108,7 +109,17 @@ export default {
// this.$emit("onModify", {devices});
},
onDelete(){
request({
url: `/business/dcBatchFunctionsJob/` + this.propData.jobId,
method: "DELETE",
// params: {
// jobGroup: this.propData.id
// },
})
.then((result) => {
if (result.code != 200) return;
Message.success("删除成功");
})
},
initBasicData(){

10
ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue

@ -206,7 +206,12 @@ export default {
// { "STAY": 90, "ACTION": "1", "SPEED": "0", "COLOR": "ffff00", "FONT": "3", "FONT_SIZE": "24", "CONTENT": "\\\\n", "width": "160", "height": "80", "formatStyle": "2" }
this.editData.type2 = BoardUtils.contentToDeviceItem(this.propData.params);
}else{
let arr = this.propData.screenSize.split("*");
this.editData.type2 = {
displayAreaWidth: +arr[0],
displayAreaHeight: +arr[1]
};
alert(JSON.stringify());
}
},
onEditBoard(){
@ -273,10 +278,11 @@ export default {
let params = this.processParams();
if(this.mode == "add"){
}
addTaskRequest(devices, params, { deviceType: this.searchData.deviceType, screenSize: this.filterData.screenSize, jobGroup: this.groupId, time:this.time }).then(res=>{
addTaskRequest(this.groupId, devices, params, { deviceType: this.searchData.deviceType, screenSize: this.filterData.screenSize }).then(res=>{
console.log(res)
});
this.$emit("onSubmit")

162
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/onLineBarCharts/assets/barCharts.js

@ -0,0 +1,162 @@
/* 数据 */
let nameList = [
"1月",
"2月",
"3月",
"4月",
"5月",
"6月",
"7月",
"8月",
"9月",
"10月",
"11月",
"12月",
]; // 类别
let valueList = [
800, 520, 650, 950, 420, 600, 450, 720, 303, 503, 203, 703, 903,
]; // 人数
// var yList = ["1000", "800", "轻度拥堵", "基本畅通", "畅通"]
/* 数据整合 */
let dataList = [];
nameList.map((item, index) => {
if (index === 4) {
dataList.push({
name: item,
value: valueList[index],
itemStyle: {
color: {
type: "linear",
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [
{
offset: 0,
color: "#FFB904", // 0% 处的颜色
},
{
offset: 1,
color: "#FF6969", // 100% 处的颜色
},
],
global: false, // 缺省为 false
},
borderRadius: 6,
},
label: { show: false },
});
} else {
dataList.push({
name: item,
value: valueList[index],
itemStyle: {
borderRadius: 6,
},
});
}
});
var options = {
grid: {
top: "15%", //上边距
right: "5px", //右边距
left: "30px", //左边距
bottom: "2%", //下边距
containLabel: true,
},
tooltip: {
valueFormatter: function (value) {
return value + " %";
},
},
xAxis: {
type: "category",
data: nameList,
axisTick: {
show: false, //隐藏X轴刻度
},
axisLine: {
lineStyle: {
color: "rgba(49, 217, 255, 0.8)",
},
},
axisLabel: {
show: true,
color: "#fff",
fontSize: "10px",
fontFamily: "Source Han Sans CN-Regular",
interval: 0,
rotate: 20,
},
},
yAxis: [
{
type: "value",
name: "(%)",
splitNumber: 5,
nameTextStyle: {
color: "#fff",
fontSize: 10,
align: "right",
// fontFamily: "Source Han Sans CN-Regular",
// align: "left",
// verticalAlign: "center",
},
axisLabel: {
fontSize: "10px",
color: "#fff",
fontFamily: "HarmonyOS Sans-Regular",
// formatter:function(value,index){
// return yList[index]
// }
},
axisLine: {
show: false,
},
axisTick: {
show: false,
},
splitLine: {
lineStyle: {
color: "rgba(49, 217, 255, 0.5)",
},
},
},
],
series: [
{
type: "bar",
data: [10, 20, 10, 30, 25, 11, 20],
z: 4,
itemStyle: {
color: {
type: "linear",
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [
{
offset: 0,
color: "#06D7B1", // 0% 处的颜色
},
{
offset: 1,
color: "#80F1BB", // 100% 处的颜色
},
],
global: false, // 缺省为 false
},
borderRadius: [4, 4, 0, 0],
},
barWidth: 10,
label: {
show: false,
},
},
],
};
export default options;

144
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/onLineBarCharts/index.vue

@ -0,0 +1,144 @@
<template>
<div class="congestion">
<WgtTitle title="设备在线率柱状图"></WgtTitle>
<div class="board" ref="box">
<Empty v-if="isEmpty" text="暂无数据..."></Empty>
<div ref="barCharts" v-else style="width: 100%; height: 100%"></div>
</div>
</div>
</template>
<script>
import WgtTitle from "../../../../perception/widgets/title";
import * as echarts from "echarts";
import chartOptions from "./assets/barCharts";
export default {
name: "OnLineBarCharts",
components: {
WgtTitle,
},
data() {
return {
isEmpty: true,
};
},
props: {
dataList: {
type: Array,
default: () => [],
},
},
created() {},
methods: {},
watch: {
dataList: {
handler(newD, oldD) {
if (!newD || newD.length <= 0) {
this.isEmpty = true;
return;
}
let xData = [];
let valueData = [];
console.log("newD", newD);
newD.forEach((element) => {
xData.push(element.title);
valueData.push(+element.pctOnl.replace("%", ""));
});
// newD.forEach((element) => {
// value.push(+element.pctOnl.replace("%", ""));
// indicator.push({ name: element.title, max: 100 });
// toolTip += `<div style="display:flex; justify-content:space-between; line-height:2;">
// <p>${element.title}</p>
// <p style="font-weight:bold; margin-left:30px">${element.pctOnl}</p>
// </div>`;
// });
// chartsStatistics.radar.indicator = indicator;
// chartsStatistics.series[0].data = [
// {
// value: value,
// name: "线",
// },
// ];
// chartsStatistics.tooltip.formatter = (params) => {
// return toolTip;
// };
this.isEmpty = false;
chartOptions.xAxis.data = xData;
chartOptions.series[0].data = valueData;
this.$nextTick(() => {
var myChart = echarts.init(this.$refs["barCharts"]);
myChart.setOption(chartOptions);
chartOptions.counterReset();
});
},
deep: true,
immediate: true,
},
},
mounted() {},
};
</script>
<style lang="scss" scoped>
.congestion {
width: 100%;
display: flex;
flex-direction: column;
.board {
position: relative;
height: 510px;
width: 100%;
padding: 0px 20px;
background: linear-gradient(
180deg,
rgba(6, 66, 88, 0) 0%,
rgba(6, 66, 88, 0.4) 100%
);
// border-radius: 5px 5px 5px 5px;
opacity: 1;
// border: 1px solid;
// border-image: linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0)) 1 1;
display: flex;
justify-content: space-between;
align-items: center;
flex-direction: column;
.ball {
position: absolute;
}
.ballAnimation {
transform: translate(0px, -10px);
animation: mymove 2s infinite ease-in-out alternate;
&.level_0 {
animation-delay: 0s;
}
&.level_1 {
animation-delay: 0.6s;
}
&.level_2 {
animation-delay: 1.4s;
}
&.level_3 {
animation-delay: 1.8s;
}
}
}
}
@keyframes mymove {
0% {
transform: translate(0px, -10px);
}
100% {
transform: translate(0px, 10px);
}
}
</style>

6
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue

@ -8,7 +8,8 @@
></DeviceSummary>
<div class="bottomTabs">
<DeviceUptime :dataList="equipments" class="tabs-lo" />
<MonthlyEquipment class="tabs-mo" :dataList="equipments" />
<OnLineBarCharts :dataList="equipments" class="tabs-mo" />
<!-- <MonthlyEquipment class="tabs-mo" :dataList="equipments" /> -->
</div>
</el-tab-pane>
<el-tab-pane label="设备查询" name="second" class="tab_con">
@ -117,7 +118,9 @@
<script>
import * as echarts from "echarts";
import onlineCharts from "./assets/charts";
// import barCharts from "./assets/barCharts";
import DeviceUptime from "./components/deviceUptime";
import OnLineBarCharts from "./components/onLineBarCharts";
import MonthlyEquipment from "./components/monthlyEquipment";
import DeviceSummary from "./components/deviceSummary";
import {
@ -141,6 +144,7 @@ export default {
Pagination,
InputSearch,
DeviceSummary,
OnLineBarCharts,
},
data() {
return {

3
ruoyi-ui/src/views/JiHeExpressway/utils/api/batch.js

@ -1,7 +1,7 @@
import request from '@/utils/request'
export function addTaskRequest(devices, params, others) {
export function addTaskRequest(jobGroup, devices, params, others) {
let temp = [{
...others,
devices: devices,
@ -27,6 +27,7 @@ export function addTaskRequest(devices, params, others) {
]
}];
let data = {
jobGroup,
callParameter: JSON.stringify(temp)
}
// console.log(JSON.stringify(data));

13
ruoyi-ui/src/views/JiHeExpressway/utils/enum.js

@ -125,6 +125,8 @@ export const RoadNFTopics = {
枢纽立交: 4,
服务区: 6,
停车区: 7,
清障驻点: 8,
边坡: 9
};
// 事件类型 eventType
@ -1085,4 +1087,13 @@ export const boolType = {
1: {
text: "是",
},
};
};
export const usageStatus = {
0: {
text: "使用",
},
1: {
text: "未使用",
},
}

4
ruoyi-ui/vue.config.js

@ -52,9 +52,9 @@ module.exports = {
// target: `http://10.0.81.204:8087`, //现场后台 刘文阁
// target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
// target: `http://10.168.78.135:8087`, //王钦
// target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
// target: `http://10.168.68.42:8087`, //王思祥
target: `http://10.168.72.174:8087`, //赵祥龙
// target: `http://10.168.72.174:8087`, //赵祥龙
// target: `http://10.168.65.156:8097`, //孟
// target: `http://10.168.56.165:8087`, //王家宝
// target: `http://10.168.77.128:8087`, //王兴琳

Loading…
Cancel
Save