Compare commits

...

2 Commits

Author SHA1 Message Date
lau572 100010879c 样式调整 1 week ago
lau572 f8f87af149 websocket地址错误 1 week ago
  1. 14
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
  2. 9
      ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/index.vue
  3. 2
      ruoyi-ui/src/views/websocket.vue

14
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue

@ -90,7 +90,7 @@ export default {
this.debug();
}, 200);
}
});
},
methods: {
@ -129,7 +129,7 @@ export default {
debug() {
const nodes = _.cloneDeep(this._graph.getNodes()).filter(x => x.id.length < 11);
this._graph.dispose();
//
//
setTimeout(() => {
this.mapInit();
@ -220,7 +220,7 @@ export default {
}
}
},
{
/*{
type: "text",
label: "项目起点",
x: 270,
@ -279,7 +279,7 @@ export default {
fill: "#ddc85a",
}
}
},
},*/
],
};
const graph = new Graph({
@ -318,7 +318,7 @@ export default {
const { shape, nowBg, src, length } = data;
const { height, width } = node.prop().size;
const div = document.createElement('div')
let marginHeight = (data.extData.direction === '3'?height*-.3:height*2.2)
if(data.length && data.extNode.length > 1){
let d1 = data.extNode.filter(x=>x.extData.direction === '1')
@ -372,7 +372,7 @@ export default {
})
window.graphInstance = graph;
//
graph.addNodes(baseData.nodes);
@ -407,7 +407,7 @@ export default {
},
async drayLine(text, graph, isFoot = false) {
let x = this.translateX + 141;
const ipxDiff = window.screen.width === 3840?135:0;
x = x+ipxDiff
if (isFoot) {

9
ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/index.vue

@ -75,6 +75,8 @@ export default {
{ id:'3', label:'事件时间分析'},
{ id:'4', label:'事件地市分布'},
{ id:'5', label:'交通管制情况统计'},
{ id:'14', label:'拥堵地点统计'},
{ id:'15', label:'拥堵事件处置统计'},
]
},{
id:'b',
@ -99,14 +101,13 @@ export default {
{ id:'12', label:'事故地市分布'},
{ id:'13', label:'事故路段分布'},
]
},{
},/*{
id:'e',
label:'拥堵情况',
children:[
{ id:'14', label:'拥堵地点统计'},
{ id:'15', label:'路段平均拥堵时长'},
]
}
}*/
],
tableData:[],
menuNodeAll: false,

2
ruoyi-ui/src/views/websocket.vue

@ -31,7 +31,7 @@ export default {
// websocket
this.socket.initialize({
// url: 'ws://' + location.hostname + ':' + port + path,
url: 'wss://' + locatoin.hostname + ':' + window.location.port + '/ws' || 80 + '/ws',
url: 'wss://' + location.hostname + ':' + window.location.port + '/ws' || 80 + '/ws',
// url: "ws://10.168.66.196:7789" + path,
// url: 'ws://10.168.77.128:7789/ws',
// url: "ws://10.7.179.15" + ":" + port + path,

Loading…
Cancel
Save