提交 5ee6b811 authored 作者: jianglw's avatar jianglw

修改部分代码

上级 50349fa8
此差异已折叠。
...@@ -58,7 +58,7 @@ export function addDateRange(params, dateRange, propName) { ...@@ -58,7 +58,7 @@ export function addDateRange(params, dateRange, propName) {
var search = params; var search = params;
search.params = {}; search.params = {};
if (null != dateRange && '' != dateRange) { if (null != dateRange && '' != dateRange) {
if (typeof(propName) === "undefined") { if (typeof (propName) === "undefined") {
search.params["beginTime"] = dateRange[0]; search.params["beginTime"] = dateRange[0];
search.params["endTime"] = dateRange[1]; search.params["endTime"] = dateRange[1];
} else { } else {
...@@ -68,7 +68,32 @@ export function addDateRange(params, dateRange, propName) { ...@@ -68,7 +68,32 @@ export function addDateRange(params, dateRange, propName) {
} }
return search; return search;
} }
/**
* 获取url上的token
* @returns
*/
export function urlParse() {
let url = window.location.search;
let obj = {};
let reg = /[?&][^?&]+=[^?&]+/g;
let arr = url.match(reg);
// ['?id=12345', '&a=b']
let token = '';
if (arr) {
arr.forEach((item) => {
let tempArr = item.substring(1).split('=');
let key = decodeURIComponent(tempArr[0]);
let val = decodeURIComponent(tempArr[1]);
console.log(key)
if (key === 'token') {
token = val;
return;
}
obj[key] = val;
});
}
return token;
};
// 回显数据字典 // 回显数据字典
export function selectDictLabel(datas, value) { export function selectDictLabel(datas, value) {
var actions = []; var actions = [];
......
<template> <template>
<div style="overflow: hidden"> <div style="overflow: hidden">
<div id="topology-hrhx" style="width: 100%; height: 100vh;overflow: hidden"></div> <div
id="topology-hrhx"
style="width: 100%; height: 100vh; overflow: hidden"
></div>
<div class="tools"> <div class="tools">
<a-button type="primary" @click="onBack"> <a-button type="primary" @click="onBack">
<a-icon type="left" /> 返回 <a-icon type="left" /> 返回
...@@ -21,15 +24,16 @@ ...@@ -21,15 +24,16 @@
import { Topology } from "@topology/core"; import { Topology } from "@topology/core";
export const Data = ""; export const Data = "";
import { encryption, decrypt } from "@/utils/rsautils.js"; import { encryption, decrypt } from "@/utils/rsautils.js";
import {getTopologyId} from "@/api/topology.js" import { getTopologyId } from "@/api/topology.js";
import { urlParse } from "@/utils/ruoyi";
export default { export default {
name:"Preview", name: "Preview",
data() { data() {
return { return {
canvas: {}, canvas: {},
locked: 0, locked: 0,
showTools: true, showTools: true,
topologyData:null topologyData: null,
}; };
}, },
created() {}, created() {},
...@@ -76,24 +80,31 @@ export default { ...@@ -76,24 +80,31 @@ export default {
this.topologyData = {}; this.topologyData = {};
}); });
if (this.topologyData) {
let data = JSON.parse(this.topologyData);
data.websocket = data.websocket + "/" + urlParse()===''?null:urlParse();
this.topologyData=JSON.stringify(data)
}
this.canvas.open(this.topologyData); this.canvas.open(this.topologyData);
this.canvas.data.locked = 1; this.canvas.data.locked = 1;
// 或 用window.topology对象 === 上面的canvas // 或 用window.topology对象 === 上面的canvas
// topology.open(json); // topology.open(json);
// 4. 如果json发送变化,重绘 // 4. 如果json发送变化,重绘
this.canvas.render(); this.canvas.render();
this.onSizeWindow(); this.$nextTick(()=>{
topology.data.socketEvent = true; this.onSizeWindow();
topology.on("websocket", (e) => { })
let msg = JSON.parse(e); // topology.data.socketEvent = true;
if (msg.code) { // topology.on("websocket", (e) => {
if (msg.code === 200) { // let msg = JSON.parse(e);
this.$message.success(msg.msg); // if (msg.code) {
} else { // if (msg.code === 200) {
this.$message.error(msg.msg); // this.$message.success(msg.msg);
} // } else {
} // this.$message.error(msg.msg);
}); // }
// }
// });
}, },
}, },
}; };
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论