Skip to content

T
topology-ui
提交 b22c8347 authored 作者: jianglw's avatar jianglw
浏览文件
操作

修改部分bug

上级 8616b6b1
隐藏空白字符变更
内嵌 并排
正在显示 包含 133 行增加 和 208 行删除
src/router/index.js
浏览文件 @ b22c8347
...@@ -27,7 +27,7 @@ const routes = [ ...@@ -27,7 +27,7 @@ const routes = [
] ]
const router = new VueRouter({ const router = new VueRouter({
mode: 'history', mode: 'hash',
routes routes
}) })
......
src/views/configuration/ParamsConfig.vue
浏览文件 @ b22c8347
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- <el-table v-loading="loading" :data="topologyList"> <el-card>
<el-table-column <el-row :gutter="10" class="mb8">
label="组态名称" <el-col :span="24">
align="center" <!-- v-hasPermi="['topology:index:add']" -->
prop="name"
:show-overflow-tooltip="true"
/>
<el-table-column
label="创建时间"
align="center"
prop="createdTime"
:show-overflow-tooltip="true"
/>
<el-table-column
label="修改时间"
align="center"
prop="alterTime"
:show-overflow-tooltip="true"
/>
<el-table-column label="显示/隐藏" align="center">
<template slot-scope="scope" >
<el-switch
v-model="scope.row.switchIt"
active-value="1"
inactive-value="0"
@change="handleSwitchItChange(scope.row)"
></el-switch>
</template>
</el-table-column>
<el-table-column label="数据" align="center">
<template slot-scope="scope" >
<div @click="previeData(scope.row)">
<preview-to-img
slot="cover"
:canvasData="changeJson(scope.row.data)"
:width="'100%'"
:height="'10vh'"
:title="'点击预览'"
></preview-to-img>
</div>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button <el-button
type="primary"
plain
icon="el-icon-plus"
size="mini" size="mini"
type="text" @click="addTopology"
icon="el-icon-s-tools" >创建组态</el-button
@click="uploadTopology(scope.row)"
>修改组态</el-button
> >
<el-button </el-col>
size="mini" </el-row>
type="text" <el-row>
icon="el-icon-s-tools" <el-col :span="24">
@click="handleAdd(scope.row)" <el-card v-loading="loading">
>参数设置</el-button <el-row :gutter="20">
> <el-col
<el-button :span="6"
size="mini" v-for="(item, index) of topologyList"
type="text" :key="index"
icon="el-icon-delete" >
@click="removeTopology(scope.row.id)" <el-card :body-style="{ padding: '0px' }">
>删除</el-button <div @click="previeData(item)">
> <preview-to-img
</template> :canvasData="changeJson(item.data)"
</el-table-column> :width="'100%'"
</el-table> --> :height="'20vh'"
<el-row :gutter="10" class="mb8"> :title="'点击预览'"
<el-col :span="24"> ></preview-to-img>
<!-- v-hasPermi="['topology:index:add']" --> </div>
<el-button <div style="padding: 14px">
type="primary" <el-row>
plain <el-col :span="19">
icon="el-icon-plus"
size="mini"
@click="addTopology"
>创建组态</el-button
>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-card v-loading="loading">
<el-row :gutter="20">
<el-col
:span="6"
v-for="(item, index) of topologyList"
:key="index"
>
<el-card :body-style="{ padding: '0px' }">
<div @click="previeData(item)">
<preview-to-img
:canvasData="changeJson(item.data)"
:width="'100%'"
:height="'20vh'"
:title="'点击预览'"
></preview-to-img>
</div>
<div style="padding: 14px">
<el-row>
<el-col :span="19">
<el-tooltip
class="item"
effect="dark"
:content="item.name"
placement="top-start"
>
<span>{{ splitName(item.name) }}</span>
</el-tooltip>
</el-col>
<el-col :span="4">
<span>
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
content="显示/隐藏" :content="item.name"
placement="top-start" placement="top-start"
> >
<!-- v-hasPermi="['topology:index:showhide']" --> <span>{{ splitName(item.name) }}</span>
<el-switch
v-model="item.switchIt"
active-value="1"
inactive-value="0"
@change="handleSwitchItChange(item)"
></el-switch>
</el-tooltip> </el-tooltip>
</span> </el-col>
</el-col> <el-col :span="4">
</el-row> <span>
<el-tooltip
class="item"
effect="dark"
content="显示/隐藏"
placement="top-start"
>
<!-- v-hasPermi="['topology:index:showhide']" -->
<el-switch
v-model="item.switchIt"
active-value="1"
inactive-value="0"
@change="handleSwitchItChange(item)"
></el-switch>
</el-tooltip>
</span>
</el-col>
</el-row>
<div class="bottom clearfix"> <div class="bottom clearfix">
<!-- <time class="time">2021-04-29 00:00:00</time> --> <!-- <time class="time">2021-04-29 00:00:00</time> -->
<!-- v-hasPermi="['topology:index:edit']" --> <!-- v-hasPermi="['topology:index:edit']" -->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-s-tools" icon="el-icon-s-tools"
@click="uploadTopology(item)" @click="uploadTopology(item)"
>修改组态</el-button >修改组态</el-button
> >
<!-- v-hasPermi="['topology:params:set']" --> <!-- v-hasPermi="['topology:params:set']" -->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-s-tools" icon="el-icon-s-tools"
@click="handleAdd(item)" @click="handleAdd(item)"
>采集参数设置</el-button
>采集参数设置</el-button >
> <!-- v-hasPermi="['topology:index:delete']" -->
<!-- v-hasPermi="['topology:index:delete']" --> <el-button
<el-button size="mini"
size="mini" type="text"
type="text" icon="el-icon-delete"
icon="el-icon-delete" @click="removeTopology(item.id)"
@click="removeTopology(item.id)" >删除</el-button
>
>删除</el-button <!-- v-hasPermi="['topology:params:set']" -->
> <el-button
<!-- v-hasPermi="['topology:params:set']" --> size="mini"
<el-button type="text"
size="mini" icon="el-icon-s-tools"
type="text" @click="handleMutual(item)"
icon="el-icon-s-tools" >交互参数设置</el-button
@click="handleMutual(item)" >
<!-- v-hasPermi="['topology:index:deleteTopologyHandle']" -->
>交互参数设置</el-button <el-button
> size="mini"
<!-- v-hasPermi="['topology:index:deleteTopologyHandle']" --> type="text"
<el-button icon="el-icon-delete"
size="mini" @click="removeTopologyHandle(item.id)"
type="text" >清空原有配置</el-button
icon="el-icon-delete" >
@click="removeTopologyHandle(item.id)" </div>
>清空原有配置</el-button
>
</div> </div>
</div> </el-card>
</el-card> </el-col>
</el-col> </el-row>
</el-row> <pagination
<pagination v-show="total > 0"
v-show="total > 0" :total="total"
:total="total" :page.sync="queryParams.pageNum"
:page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
:limit.sync="queryParams.pageSize" @pagination="init()"
@pagination="init()" />
/> </el-card>
</el-card> </el-col>
</el-col> </el-row>
</el-row> </el-card>
<add-params ref="addParams" @ok="paramsSet"></add-params> <add-params ref="addParams" @ok="paramsSet"></add-params>
<add-mutual ref="addMutual" @ok="mutualSet"></add-mutual> <add-mutual ref="addMutual" @ok="mutualSet"></add-mutual>
</div> </div>
...@@ -206,28 +129,31 @@ ...@@ -206,28 +129,31 @@
<script> <script>
import AddParams from "./modules/AddParams.vue"; import AddParams from "./modules/AddParams.vue";
import AddMutual from "./modules/AddMutual.vue" import AddMutual from "./modules/AddMutual.vue";
import Pagination from "@/components/Pagination"; import Pagination from "@/components/Pagination";
import PreviewToImg from "@/components/topology/PreviewToImg.vue"; import PreviewToImg from "@/components/topology/PreviewToImg.vue";
import {deleteTopologyHandle,list,deleteTopology} from "@/api/topology.js" import { deleteTopologyHandle, list, deleteTopology } from "@/api/topology.js";
import {encryption,decrypt} from "@/utils/rsautils.js";
export default { export default {
name: "ParamsConfig", name: "ParamsConfig",
props:{ props: {
editorUrl:{ editorUrl: {
type:String, type: String,
default:()=>{return "/toplogyView/workspace"} default: () => {
return "/toplogyView/workspace";
},
},
previewUrl: {
type: String,
default: () => {
return "/toplogyView/preview";
},
}, },
previewUrl:{
type:String,
default:()=>{return "/toplogyView/preview"}
}
}, },
components: { components: {
AddParams, AddParams,
PreviewToImg, PreviewToImg,
AddMutual, AddMutual,
Pagination Pagination,
}, },
data() { data() {
return { return {
...@@ -319,7 +245,7 @@ export default { ...@@ -319,7 +245,7 @@ export default {
}); });
}); });
}, },
removeTopologyHandle(id){ removeTopologyHandle(id) {
this.$confirm("确认要删除原有配置吗?", "警告", { this.$confirm("确认要删除原有配置吗?", "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
...@@ -343,15 +269,15 @@ export default { ...@@ -343,15 +269,15 @@ export default {
this.$message.warning("未设置webscoket或mqttUrl"); this.$message.warning("未设置webscoket或mqttUrl");
return; return;
} }
console.log(this.$refs) console.log(this.$refs);
this.$refs.addParams.update(row); this.$refs.addParams.update(row);
}, },
handleMutual(row){ handleMutual(row) {
this.$refs.addMutual.init(row); this.$refs.addMutual.init(row);
}, },
mutualSet(){ mutualSet() {
this.init(); this.init();
} },
}, },
}; };
</script> </script>
......
src/views/topology/Workspace.vue
浏览文件 @ b22c8347
...@@ -248,7 +248,6 @@ import NodeView from "@/components/topology/NodeView.vue"; ...@@ -248,7 +248,6 @@ import NodeView from "@/components/topology/NodeView.vue";
import LineView from "@/components/topology/LineView.vue"; import LineView from "@/components/topology/LineView.vue";
import PensView from "@/components/topology/PensView.vue"; import PensView from "@/components/topology/PensView.vue";
import { assemble, assembleSvg } from "@/utils/topology/setting.js"; import { assemble, assembleSvg } from "@/utils/topology/setting.js";
import { encryption, decrypt } from "@/utils/rsautils.js";
import { registerIcons, registerSvgs } from "@/utils/topology/customgraph.js"; import { registerIcons, registerSvgs } from "@/utils/topology/customgraph.js";
import { getTopologyId, save } from "@/api/topology.js"; import { getTopologyId, save } from "@/api/topology.js";
registerIcons(); registerIcons();
...@@ -264,7 +263,7 @@ export default { ...@@ -264,7 +263,7 @@ export default {
props: { props: {
backUrl: { backUrl: {
type: String, type: String,
default: "/back", default: "/",
}, },
previewUrl: { previewUrl: {
type: String, type: String,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论