Browse Source

改bug

wangqin
hui 8 months ago
parent
commit
9c67583ec4
  1. 2
      ruoyi-ui/public/static/systemConfig.js
  2. 4
      ruoyi-ui/src/assets/styles/JiHeExpressway.scss
  3. 2
      ruoyi-ui/src/components/Verifition/Verify.vue
  4. 4
      ruoyi-ui/src/components/Verifition/Verify/VerifySlide.vue
  5. 8
      ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue
  6. BIN
      ruoyi-ui/src/views/JiHeExpressway/images/logo.png
  7. BIN
      ruoyi-ui/src/views/JiHeExpressway/images/title.png
  8. 4
      ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js
  9. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/index.vue
  10. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
  11. 54
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js
  12. 13
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue
  13. 5
      ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts3.js
  14. 18
      ruoyi-ui/src/views/login.vue
  15. 4
      ruoyi-ui/vue.config.js

2
ruoyi-ui/public/static/systemConfig.js

@ -27,7 +27,7 @@ const systemConfig = {
title0: '管理系统',
url0: 'ry',
navBarShow0: {bigScreen: 'false', frontPage: 'true', doc: 'true',weather:'true',breadcrumb:'true'},
title1: '济菏数运营管理平台',
title1: '济菏数运营管理平台',
url1: "athena",
navBarShow1: {bigScreen: 'false', frontPage: 'false', doc: 'false',weather:'false',breadcrumb:'true'},

4
ruoyi-ui/src/assets/styles/JiHeExpressway.scss

@ -273,4 +273,8 @@
}
}
.el-time-range-picker{
.el-time-spinner__item.active{ color: #fff !important;}
}
}

2
ruoyi-ui/src/components/Verifition/Verify.vue

@ -466,7 +466,7 @@ export default {
background-size: contain;
}
.icon-right:before {
.icon-rig:before {
content: " ";
display: block;
width: 16px;

4
ruoyi-ui/src/components/Verifition/Verify/VerifySlide.vue

@ -178,7 +178,7 @@ export default {
moveBlockBackgroundColor: undefined,
leftBarBorderColor: "#ddd",
iconColor: undefined,
iconClass: "icon-right",
iconClass: "icon-rig",
status: false, //
isEnd: false, //
showRefresh: true,
@ -377,7 +377,7 @@ export default {
this.leftBarBorderColor = "#ddd";
this.moveBlockBackgroundColor = "#fff";
this.iconColor = "#000";
this.iconClass = "icon-right";
this.iconClass = "icon-rig";
this.isEnd = false;
this.getPictrue();

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

@ -103,13 +103,13 @@ export default {
.title-img {
display: inline-block;
margin-left: 10px;
width: 373px;
height: 28px;
width: 370px;
height: 37px;
}
}
.leftMenu {
width: 560px;
width: 550px;
}
.rightMenu {
@ -117,7 +117,7 @@ export default {
}
.topButton{
width: 180px;
width: 190px;
}
.user {

BIN
ruoyi-ui/src/views/JiHeExpressway/images/logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
ruoyi-ui/src/views/JiHeExpressway/images/title.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 39 KiB

4
ruoyi-ui/src/views/JiHeExpressway/mixins/InfoBoard.js

@ -94,6 +94,10 @@ export default{
} else {
publishToBoard(data).then(res => {
// this.saveLog(content);
this.$message({
type:"success",
message:"发布成功!"
});
this.____getDeviceInfo();
}).catch(err=>{

2
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/ConditionStatistics/index.vue

@ -307,7 +307,7 @@ export default {
font-family: PangMenZhengDao-3, PangMenZhengDao-3;
font-weight: 400;
color: #FFCD4D;
text-align: left;
text-align: center;
font-style: normal;
text-transform: none;
}

2
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue

@ -311,7 +311,7 @@ export default {
grid-auto-rows: 60px;
flex: 1;
max-height: 100%;
overflow: auto;
// overflow: auto;
position: relative;
gap: 6px;
transition: all .24s linear;

54
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js

@ -15,16 +15,27 @@ let indicator = [
{ name: '180°全景摄像机', max: 100 },
{ name: '360°全景摄像机', max: 100 },
{ name: '高清网络枪型固定摄像机', max: 100 },
{ name: '高清网络球形摄像机', max: 100 },
{ name: '高清网络球形摄像机++++', max: 100 },
]
let data = [{
value: [60, 30, 50, 80, 90, 98, 50, 56],
name: "哈哈哈佛挡杀佛很多事"
}];
let counter = -1;
let options = {
tooltip:{
show: false
show: true,
trigger:"item",
backgroundColor:"rgba(20,89,119,0.9)",
borderColor:"rgba(78, 174, 204, 1)",
borderWidth:1,
padding:20,
textStyle:{
color:"#f4f4f4"
},
// formatter(params){
// }
},
radar: {
center: ['50%', '50%'],
@ -54,24 +65,33 @@ let options = {
lineStyle: {
color: '#2AD1BCCC'
}
},
axisLabel:{
show:true,
formatter: function (value, index) {
counter ++ ;
if(counter<6){
return value + "%";
}
}
}
},
series: [
{
type: 'radar',
data:[],
name: '设备在线率',
label: {
show: true,
formatter: function (params) {
return params.value + "%";
},
color: '#fff',
// position:[-20,-10,-10,-10],
align: 'right',
distance: 10,
align: 'right'
},
// name: '设备在线率',
// label: {
// show: true,
// formatter: function (params) {
// return params.value + "%";
// },
// color: '#fff',
// // position:[-20,-10,-10,-10],
// align: 'right',
// distance: 10,
// align: 'right'
// },
symbolSize: 10,
lineStyle: { //边缘颜色
width: 2,
@ -89,5 +109,7 @@ let options = {
}
]
};
export default options;
let counterReset = function(){
counter = -1;
}
export default {options, counterReset};

13
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue

@ -11,7 +11,8 @@
<script>
import WgtTitle from "../../../../perception/widgets/title";
import * as echarts from "echarts";
import chartsStatistics from "./assets/charts";
import chartOptions from "./assets/charts";
let chartsStatistics = chartOptions.options;
export default {
name: 'DeviceUptime',
components: {
@ -39,9 +40,14 @@ export default {
let value = [];
let indicator = [];
let toolTip = "";
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;
@ -50,10 +56,15 @@ export default {
name: "设备在线率"
}];
chartsStatistics.tooltip.formatter = (params)=>{
return toolTip;
}
this.isEmpty = false;
this.$nextTick(() => {
var myChart = echarts.init(this.$refs['deviceUptime']);
myChart.setOption(chartsStatistics);
chartOptions.counterReset();
});

5
ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts3.js

@ -102,7 +102,7 @@ let options = {
type: "bar",
barWidth: "10px",
barGap: "-100%",
selectedMode: true,
selectedMode: false,
select: {
itemStyle: {
opacity: 1,
@ -183,7 +183,8 @@ let options = {
},
symbol:
"image://data:image/png;base64,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",
symbolSize: [26, 26],
// symbolSize: [26, 26],
symbolSize: [0, 0],
itemStyle: {
color: "#FFF",
shadowColor: "rgba(0, 255, 254, 0.53)",

18
ruoyi-ui/src/views/login.vue

@ -4,7 +4,7 @@
<div class="login-l">
<div class="logo"><img src="../assets/images/login/logo.png" /></div>
<span>山东高速</span>
<span>济菏数运营管理平台</span>
<span>济菏数运营管理平台</span>
</div>
<div class="login-r">
<span class="title">欢迎登录</span>
@ -273,14 +273,9 @@ export default {
font-weight: 400;
color: #999 !important;
margin-bottom: 10px;
margin-top: 20px;
margin-top: 6px;
}
// ::v-deep .el-form-item__error {
// position: absolute;
// top: 75px;
// }
::v-deep .el-input__inner::placeholder {
color: #999999;
}
@ -423,6 +418,12 @@ export default {
// }
// }
.login-form{
::v-deep .el-form-item{
margin-bottom: 22px;
}
}
.el-login-footer {
height: 40px;
line-height: 40px;
@ -456,7 +457,4 @@ export default {
.el-button--goon:hover {
}
::v-deep .el-form-item__error {
top: 62px;
}
</style>

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.65.156:8087`, //王思祥
target: `http://10.168.65.194:8087`, //赵祥龙
// target: `http://10.168.65.194:8087`, //赵祥龙
// target: `http://10.168.65.156:8097`, //孟
// target: `http://10.168.56.165:8087`, //王家宝

Loading…
Cancel
Save