diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 1dcca805..06413bed 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -81,6 +81,7 @@ "sortable.js": "^0.3.0", "sortablejs": "^1.10.2", "swiper": "^5.4.5", + "uuid": "^9.0.1", "video.js": "^5.6.0", "videojs-contrib-hls": "^5.15.0", "vue": "2.6.12", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js index e34fb615..8dc15efb 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js @@ -1,3 +1,4 @@ +import * as echarts from "echarts"; let data = [{ average:30, typeName:'行人', @@ -97,11 +98,31 @@ let data = [{ icon: "circle", //改变legend小图标形状 itemGap: 20, // 设置legend的间距 itemWidth: 12, // 设置宽度 - itemHeight: 15, // 设置高度 + itemHeight: 12, // 设置高度 + itemStyle:{ + + }, textStyle: { right: -19, fontSize: 50, color: "#fff", + backgroundColor:new echarts.graphic.LinearGradient( + 0, + 0, + 1, + 0, + [ + { + offset: 0, + color: "#5CC5FF55", // 0% 处的颜色 + }, + { + offset: 1, + color: "#5CC5FF00", // 100% 处的颜色 + }, + ], + false + ), rich:{ a:{ fontSize: 12, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue index d879160c..c915ce98 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue @@ -95,34 +95,52 @@ area: '济南', dataList:[ { - title:"大学城收费站" + title:"殷家林枢纽" }, { - title:"长清收费站" + title:"大学城立交" }, { - title:"孝里收费站" + title:"长清立交" }, { - title:"平阴北收费站" + title:"松竹枢纽" }, { - title:"平阴收费站" + title:"孝里立交" }, { - title:"平阴南收费站" + title:"平阴立交" }, { - title:"东平收费站" + title:"孔村枢纽" }, { - title:"梁山东收费站" + title:"平阴南立交" }, { - title:"梁山收费站" + title:"魏雪枢纽" }, { - title:"嘉祥西收费站" + title:"东平立交" + }, + { + title:"东平湖枢纽" + }, + { + title:"韩岗立交" + }, + { + title:"梁山立交" + }, + { + title:"鄄郓枢纽" + }, + { + title:"嘉祥西立交" + }, + { + title:"王官屯枢纽" } ], quarter:"", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/progressBar.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/progressBar.vue index c22d5bea..7951fbe0 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/progressBar.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/progressBar.vue @@ -68,7 +68,7 @@ import { number } from 'echarts'; display: inline-flex; left:0px; top:-5px; - width:75px !important; + width:45px !important; height:35px !important; background-color: transparent; cursor: pointer; @@ -80,7 +80,7 @@ import { number } from 'echarts'; display: inline-flex; left:0px; top:8px; - width:75px !important; + width:45px !important; height:3px !important; background-color: #C7C7C7; } @@ -90,7 +90,7 @@ import { number } from 'echarts'; display: inline-flex; right:0px; top:-5px; - width:75px; + width:45px; height:35px; background-color: transparent; cursor: pointer; @@ -102,13 +102,13 @@ import { number } from 'echarts'; display: inline-flex; left:0px; top:8px; - width:75px !important; + width:45px !important; height:3px !important; background-color: #C7C7C7; } .item.action .after::after { - background-color: #90FFEC ; + background-color: #72FDC9 ; } .item.action.Aafter .after::after{ @@ -116,38 +116,38 @@ import { number } from 'echarts'; } > .item.action.Aafter .before::after { - background-color: #90FFEC ; + background-color: #72FDC9 ; } > .item.action.Abefore .after::after { - background-color: #90FFEC ; + background-color: #72FDC9 ; } > .bef::before { - background-color: #90FFEC !important; + background-color: #72FDC9 !important; } > .aft::after { - background-color: #90FFEC !important; + background-color: #72FDC9 !important; } > .item.action span { - background-color: #90FFEC ; + background-color: #72FDC9 ; cursor: pointer; } > .item.action span::after { - border-color: #90FFEC ; + border-color: #72FDC9 ; } > .action div { - color:#90FFEC !important; + color:#72FDC9 !important; } >.item { position: relative; - width:300px; + width: 180px; height:35px; display: inline-flex; flex-direction: column; @@ -162,7 +162,7 @@ import { number } from 'echarts'; background: #C7C7C7; border-radius: 50%; opacity: 1; - left:85px; + left:53px; } >div { 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 c104000a..4518ed0b 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 @@ -576,7 +576,7 @@ border-radius:7px; > div { display: inline-flex; - width:100%; + width:auto; height:21px; margin:9px 29px; @@ -586,7 +586,7 @@ font-family: PingFang SC, PingFang SC; font-weight: 400; color: #37E7FF; - width:108px; + width:84px; } >.text { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/assets/charts.js new file mode 100644 index 00000000..2491f1bc --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/assets/charts.js @@ -0,0 +1,148 @@ +import * as echarts from "echarts"; +var options = { + + color: ["#5090FF", "#01B3E4"], + grid: { + left: "2%", + right: "5%", + bottom: "10%", + top: "10%", + containLabel: true, + }, + legend: { + icon: 'rect', + top: '0%', + right: '5%', + data: ['实时数据'], + itemWidth:18, + itemHeight: 5, + itemGap: 30, + itemStyle:{ + color:"#FFD15C", + }, + textStyle: { + fontSize: 12, + color: '#fff', + padding: [0, 0, 0, 10], + }, + }, + xAxis: { + type: "category", + axisLine: { + lineStyle: { + color: "#BDD8FB", + fontSize: 12, + }, + }, + axisLabel: { + // interval:0, + color: "#BDD8FB", + fontSize: 12, + }, + axisTick: { + show: false, + }, + data: [ + "00:00", + "01:00", + "02:00", + "03:00", + "04:00", + "05:00", + "06:00", + "07:00", + "08:00", + "09:00", + "10:00", + "11:00", + "12:00", + "13:00", + "14:00", + "15:00", + "16:00", + "17:00", + "18:00", + "19:00", + "20:00", + "21:00", + "22:00", + "23:00", + ], + }, + yAxis: { + type: "value", + min: 0, + max:40, + minInterval: 1, + nameTextStyle: { + fontSize: 12, + color: "#BDD8FB", + align: "center", + }, + splitLine: { + lineStyle: { + color: "rgba(255, 255, 255, 0.15)", + // type: 'dashed', // dotted 虚线 + }, + }, + splitArea: { show: false }, + axisLine: { + show: false, + }, + axisTick: { + show: false, + }, + axisLabel: { + fontSize: 12, + fontFamily: "Bebas", + color: "#BDD8FB", + }, + }, + series: [ + { + type: "line", + // symbol: "none", + showSymbol: false, + smooth: true, // 是否曲线 + name: "实时数据", // 图例对应类别 + data: [12, 12, 23, 23, 30, 12, 26,28, 31, 23, 25, 12, 18, 18,18, 18, 23, 21, 20, 20, 20,20, 20, 22, 22, 12, 12, 12], // 纵坐标数据 + lineStyle :{ + color:"#FFD15C" + }, + areaStyle: { + // 区域颜色 + // color: new graphic.LinearGradient(0, 0, 0, 1, [ + // { + // offset: 0, + // color: "#5090FF", + // }, + // { + // offset: 1, + // color: "#1057E5", + // }, + // ]), + color: { + type: 'linear', + x: 0, //右 + y: 0, //下 + x2: 0, //左 + y2: 1, //上 + colorStops: [ + { + offset: 0.1, + color: '#FFD15C99' // 0% 处的颜色 + }, + { + offset: 1, + opacity:0.01, + color: '#FFD15C01' // 100% 处的颜色 + } + ] + }, + }, + }, + + ], +}; + +export default options; \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/index.vue new file mode 100644 index 00000000..5a414476 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/index.vue @@ -0,0 +1,76 @@ + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/assets/charts.js new file mode 100644 index 00000000..ab037e02 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/assets/charts.js @@ -0,0 +1,154 @@ +import * as echarts from "echarts"; +var options = { + + color: ["#5090FF", "#01B3E4"], + tooltip: { + trigger: "axis", + backgroundColor: "rgba(0,0,0,.6)", + borderColor: "rgba(147, 235, 248, .8)", + textStyle: { + color: "#FFF", + }, + }, + grid: { + left: "2%", + right: "5%", + bottom: "10%", + top: "10%", + containLabel: true, + }, + legend: { + icon: 'rect', + top: '0%', + right: '5%', + data: ['实时数据'], + itemWidth:18, + itemHeight: 5, + itemGap: 30, + textStyle: { + fontSize: 12, + color: '#C9D2FA', + padding: [0, 0, 0, 10], + }, + }, + xAxis: { + type: "category", + axisLine: { + lineStyle: { + color: "#BDD8FB", + fontSize: 12, + }, + }, + axisLabel: { + // interval:0, + color: "#BDD8FB", + fontSize: 12, + }, + axisTick: { + show: false, + }, + data: [ + "00:00", + "01:00", + "02:00", + "03:00", + "04:00", + "05:00", + "06:00", + "07:00", + "08:00", + "09:00", + "10:00", + "11:00", + "12:00", + "13:00", + "14:00", + "15:00", + "16:00", + "17:00", + "18:00", + "19:00", + "20:00", + "21:00", + "22:00", + "23:00", + ], + }, + yAxis: { + type: "value", + min: 0, + max:40, + minInterval: 5, + splitNumber:5, + nameTextStyle: { + fontSize: 12, + color: "#BDD8FB", + align: "center", + }, + splitLine: { + lineStyle: { + color: "rgba(255, 255, 255, 0.15)", + // type: 'dashed', // dotted 虚线 + }, + }, + splitArea: { show: false }, + axisLine: { + show: false, + }, + axisTick: { + show: false, + }, + axisLabel: { + fontSize: 12, + fontFamily: "Bebas", + color: "#BDD8FB", + }, + }, + series: [ + { + type: "line", + // symbol: "none", + showSymbol: false, + smooth: true, // 是否曲线 + name: "实时数据", // 图例对应类别 + data: [12, 12, 23, 23, 30, 12, 26,28, 31, 23, 25, 12, 18, 18,18, 18, 23, 21, 20, 20, 20,20, 20, 22, 22, 12, 12, 12], // 纵坐标数据 + lineStyle :{ + color:"#0783FA" + }, + areaStyle: { + // 区域颜色 + // color: new graphic.LinearGradient(0, 0, 0, 1, [ + // { + // offset: 0, + // color: "#5090FF", + // }, + // { + // offset: 1, + // color: "#1057E5", + // }, + // ]), + color: { + type: 'linear', + x: 0, //右 + y: 0, //下 + x2: 0, //左 + y2: 1, //上 + colorStops: [ + { + offset: 0.1, + color: '#0783FA99' // 0% 处的颜色 + }, + { + offset: 1, + opacity:0.01, + color: '#0783FA01' // 100% 处的颜色 + } + ] + }, + }, + }, + + ], +}; + +export default options; \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/index.vue new file mode 100644 index 00000000..9d06554f --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/index.vue @@ -0,0 +1,77 @@ + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue index c88fb985..3594fb11 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue @@ -1,6 +1,6 @@