Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
2024-07-16 17:07:49 +08:00
commit 28a0eb0837
5 changed files with 496 additions and 486 deletions

View File

@ -22,52 +22,164 @@
> --> > -->
<!-- <font-awesome-icon icon="heart" /> --> <!-- <font-awesome-icon icon="heart" /> -->
<!-- <FontAwesomeIcon icon="far fa-copy" /> --> <!-- <FontAwesomeIcon icon="far fa-copy" /> -->
<font-awesome-icon data-command="save" class="command fa fa-floppy-o" icon="command far far fa-copy" <div>
title="保存"></font-awesome-icon> <font-awesome-icon
<font-awesome-icon style="margin-left: 10px" icon="fas fa-reply-all" title="历史数据" data-command="save"
@click="readHistoryData"></font-awesome-icon> class="command fa fa-floppy-o"
<font-awesome-icon style="margin-left: 10px" class="fa fa-hdd-o" icon="fas fa-file" title="上传数据" icon="command far far fa-copy"
@click="readUploadData"></font-awesome-icon> title="保存"
<font-awesome-icon icon="fas fa-download" style="margin-left: 10px" title="另存为文件" ></font-awesome-icon>
@click="saveAsFile">文件</font-awesome-icon> <font-awesome-icon
style="margin-left: 10px"
icon="fas fa-reply-all"
title="历史数据"
@click="readHistoryData"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
class="fa fa-hdd-o"
icon="fas fa-file"
title="上传数据"
@click="readUploadData"
></font-awesome-icon>
<font-awesome-icon
icon="fas fa-download"
style="margin-left: 10px"
title="另存为文件"
@click="saveAsFile"
>文件</font-awesome-icon
>
<!-- <FontAwesomeIcon icon="fas fa-image" /> --> <!-- <FontAwesomeIcon icon="fas fa-image" /> -->
<font-awesome-icon style="margin-left: 10px" icon="fas fa-image" title="另存为图片" <font-awesome-icon
@click="openSaveAsImageDialog"></font-awesome-icon> style="margin-left: 10px"
icon="fas fa-image"
title="另存为图片"
@click="openSaveAsImageDialog"
></font-awesome-icon>
<font-awesome-icon style="margin-left: 10px" data-command="undo" icon="fas fa-undo" class="command fa fa-undo" <font-awesome-icon
title="撤销"></font-awesome-icon> style="margin-left: 10px"
<font-awesome-icon style="margin-left: 10px" data-command="redo" class="command fa fa-repeat" data-command="undo"
icon="fas fa-repeat" title="重做"></font-awesome-icon> icon="fas fa-undo"
<font-awesome-icon style="margin-left: 10px" data-command="delete" class="command fa fa-trash-o" class="command fa fa-undo"
icon="fas fa-trash-alt" title="删除"></font-awesome-icon> title="撤销"
<font-awesome-icon style="margin-left: 10px" data-command="zoomOut" class="command fa fa-search-minus" ></font-awesome-icon>
icon="fas fa-search-minus" title="缩小"></font-awesome-icon> <font-awesome-icon
<font-awesome-icon style="margin-left: 10px" data-command="zoomIn" icon="fas fa-search-plus" style="margin-left: 10px"
class="command fa fa-search-plus" title="放大"></font-awesome-icon> data-command="redo"
<font-awesome-icon style="margin-left: 10px" icon="fas fa-eraser" data-command="clear" class="command fa fa-repeat"
class="command fa fa-eraser" title="清除画布"></font-awesome-icon> icon="fas fa-repeat"
<font-awesome-icon style="margin-left: 10px" icon="fas fa-arrow-up" data-command="toFront" title="重做"
class="command fa fa-arrow-up" title="提升层级"></font-awesome-icon> ></font-awesome-icon>
<font-awesome-icon style="margin-left: 10px" icon="fas fa-arrow-down" data-command="toBack" <font-awesome-icon
class="command fa fa-arrow-down" title="下降层级"></font-awesome-icon> style="margin-left: 10px"
<font-awesome-icon style="margin-left: 10px" icon="fas fa-check-square" data-command="selectAll" data-command="delete"
class="command fa fa-check-square-o" title="全选"></font-awesome-icon> class="command fa fa-trash-o"
<font-awesome-icon style="margin-left: 10px" icon="far fa-copy" data-command="copy" icon="fas fa-trash-alt"
class="command fa fa-files-o" title="复制"></font-awesome-icon> title="删除"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
data-command="zoomOut"
class="command fa fa-search-minus"
icon="fas fa-search-minus"
title="缩小"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
data-command="zoomIn"
icon="fas fa-search-plus"
class="command fa fa-search-plus"
title="放大"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="fas fa-eraser"
data-command="clear"
class="command fa fa-eraser"
title="清除画布"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="fas fa-arrow-up"
data-command="toFront"
class="command fa fa-arrow-up"
title="提升层级"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="fas fa-arrow-down"
data-command="toBack"
class="command fa fa-arrow-down"
title="下降层级"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="fas fa-check-square"
data-command="selectAll"
class="command fa fa-check-square-o"
title="全选"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="far fa-copy"
data-command="copy"
class="command fa fa-files-o"
title="复制"
></font-awesome-icon>
<font-awesome-icon style="margin-left: 10px" icon="fas fa-clone" data-command="paste" <font-awesome-icon
class="command fa fa-clipboard" title="粘贴"></font-awesome-icon> style="margin-left: 10px"
<font-awesome-icon style="margin-left: 10px" icon="fas fa-expand" data-command="autoZoom" icon="fas fa-clone"
class="command fa fa-expand" title="实际大小"></font-awesome-icon> data-command="paste"
<font-awesome-icon style="margin-left: 10px" icon="fas fa-compress" data-command="resetZoom" class="command fa fa-clipboard"
class="command fa fa-compress" title="适应页面"></font-awesome-icon> title="粘贴"
<font-awesome-icon style="margin-left: 10px" icon="fas fa-object-group" data-command="addGroup" ></font-awesome-icon>
class="command fa fa-object-group" title="组合"></font-awesome-icon> <font-awesome-icon
<font-awesome-icon style="margin-left: 10px" icon="fas fa-object-ungroup" data-command="unGroup" style="margin-left: 10px"
class="command fa fa-object-ungroup" title="取消组合"></font-awesome-icon> icon="fas fa-expand"
<font-awesome-icon style="margin-left: 10px" icon="fas fa-crop" data-command="multiSelect" data-command="autoZoom"
class="command fa fa fa-crop" title="多选"></font-awesome-icon> class="command fa fa-expand"
title="实际大小"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="fas fa-compress"
data-command="resetZoom"
class="command fa fa-compress"
title="适应页面"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="fas fa-object-group"
data-command="addGroup"
class="command fa fa-object-group"
title="组合"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="fas fa-object-ungroup"
data-command="unGroup"
class="command fa fa-object-ungroup"
title="取消组合"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="fas fa-crop"
data-command="multiSelect"
class="command fa fa fa-crop"
title="多选"
></font-awesome-icon>
</div>
<el-button
type="primary"
plain
size="small"
style="position: absolute; top: 10px; right: 41px"
@click="back"
>返回</el-button
>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@ -99,23 +211,33 @@
<article> <article>
<!-- 下载图片 --> <!-- 下载图片 -->
<section class="save-as-image-dialog"> <section class="save-as-image-dialog">
<el-dialog title="下载图片" :visible.sync="saveAsImageDialogVisible" width="360px"> <el-dialog
title="下载图片"
:visible.sync="saveAsImageDialogVisible"
width="360px"
>
<el-form label-width="100px" label-position="top"> <el-form label-width="100px" label-position="top">
<el-form-item label="选择图片格式"> <el-form-item label="选择图片格式">
<el-select v-model="saveAsImageFormat"> <el-select v-model="saveAsImageFormat">
<el-option label="jpg" value="jpg"> <el-option label="jpg" value="jpg">
<span style="float: left">jpg</span> <span style="float: left">jpg</span>
<span style="float: right; color: #8492a6; font-size: 13px">白色背景</span> <span style="float: right; color: #8492a6; font-size: 13px"
>白色背景</span
>
</el-option> </el-option>
<el-option label="png" value="png"> <el-option label="png" value="png">
<span style="float: left">png</span> <span style="float: left">png</span>
<span style="float: right; color: #8492a6; font-size: 13px">透明背景</span> <span style="float: right; color: #8492a6; font-size: 13px"
>透明背景</span
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer"> <span slot="footer">
<el-button @click="saveAsImageDialogVisible = false"> </el-button> <el-button @click="saveAsImageDialogVisible = false"
> </el-button
>
<el-button type="primary" @click="saveAsImage"> </el-button> <el-button type="primary" @click="saveAsImage"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
@ -140,7 +262,9 @@
</div> </div>
<div data-status="canvas-selected" class="menu"> <div data-status="canvas-selected" class="menu">
<el-button data-command="undo" class="command">撤销</el-button> <el-button data-command="undo" class="command">撤销</el-button>
<el-button data-command="redo" class="command disable">重做</el-button> <el-button data-command="redo" class="command disable"
>重做</el-button
>
</div> </div>
<div data-status="multi-selected" class="menu"> <div data-status="multi-selected" class="menu">
<el-button data-command="copy" class="command">复制</el-button> <el-button data-command="copy" class="command">复制</el-button>
@ -167,329 +291,6 @@ export default {
nodes: [], nodes: [],
edges: [], edges: [],
}, },
// form: {
// nodes: [{
// color
// :
// "#FA8C16",
// id
// :
// "655c5165",
// index
// :
// 0,
// label
// :
// "",
// nodetype
// :
// "startNode",
// shape
// :
// "flow-circle",
// size
// :
// "72*72",
// type
// :
// "node",
// x
// :
// 441.5124969482422,
// y
// :
// 60.79999542236328,
// }, {
// color
// :
// "#1890ff",
// id
// :
// "8660695d",
// index
// :
// 1,
// label
// :
// "",
// size
// :
// "100*50",
// type
// :
// "node",
// x
// :
// 242.5124969482422,
// y
// :
// 183.5999984741211,
// },
// {
// color
// :
// "#1890ff",
// id
// :
// "59c9ceed",
// index
// :
// 2,
// label
// :
// "",
// size
// :
// "100*50",
// type
// :
// "node",
// x
// :
// 606.5124969482422,
// y
// :
// 187.5999984741211,
// }, {
// color
// :
// "#722ED1",
// id
// :
// "16f4c8ba",
// index
// :
// 5,
// label
// :
// "##",
// shape
// :
// "flow-capsule",
// size
// :
// "200*48",
// type
// :
// "node",
// x
// :
// 433.5124969482422,
// y
// :
// 125.5999984741211,
// }, {
// color
// :
// "#722ED1",
// id
// :
// "e4839dcc",
// index
// :
// 6,
// label
// :
// "",
// shape
// :
// "flow-capsule",
// size
// :
// "80*48",
// type
// :
// "node",
// x
// :
// 233.5124969482422,
// y
// :
// 251.5999984741211,
// }, {
// color
// :
// "#1890ff",
// id
// :
// "392ca0b8",
// index
// :
// 7,
// label
// :
// "",
// size
// :
// "100*50",
// type
// :
// "node",
// x
// :
// 55.51249694824219,
// y
// :
// 299.5999984741211
// }, {
// color
// :
// "#1890ff",
// id
// :
// "6bcab22d",
// index
// :
// 8,
// label
// :
// "",
// size
// :
// "100*50",
// type
// :
// "node",
// x
// :
// 384.5124969482422,
// y
// :
// 307.5999984741211
// },
// {
// color
// :
// "#722ED1",
// id
// :
// "dc5de91f",
// index
// :
// 11,
// label
// :
// " ",
// shape
// :
// "flow-capsule",
// size
// :
// "200*48",
// type
// :
// "node",
// x
// :
// 55.51249694824219,
// y
// :
// 366.5
// }],
// edges: [{
// id: "b04d23c7",
// index
// :
// 3,
// label
// :
// "",
// shape
// :
// "flow-polyline-round",
// source
// :
// "655c5165",
// sourceAnchor
// :
// 1,
// target
// :
// "59c9ceed",
// targetAnchor
// :
// 0,
// }, {
// id
// :
// "7894068d",
// index
// :
// 4,
// label
// :
// "",
// shape
// :
// "flow-polyline-round",
// source
// :
// "655c5165",
// sourceAnchor
// :
// 3,
// target
// :
// "8660695d",
// targetAnchor
// :
// 0,
// }, {
// id
// :
// "6aa429cc",
// index
// :
// 9,
// label
// :
// "",
// shape
// :
// "flow-polyline-round",
// source
// :
// "8660695d",
// sourceAnchor
// :
// 3,
// target
// :
// "392ca0b8",
// targetAnchor
// :
// 0,
// },
// {
// id
// :
// "02bfc4d0",
// index
// :
// 10,
// label
// :
// "",
// shape
// :
// "flow-polyline-round",
// source
// :
// "8660695d",
// sourceAnchor
// :
// 1,
// target
// :
// "6bcab22d",
// targetAnchor
// :
// 0
// }
// ]
// },
// //
nodeAttributeForm: { nodeAttributeForm: {
label: "", label: "",
@ -526,6 +327,10 @@ export default {
this.editor.getCurrentPage().read(this.form); this.editor.getCurrentPage().read(this.form);
}, },
methods: { methods: {
//
back() {
this.$router.go(-1);//
},
getlist() { getlist() {
selectScriptEdgeNode(this.$route.query.id).then(res => { selectScriptEdgeNode(this.$route.query.id).then(res => {
if (res.data.flowScheme) { if (res.data.flowScheme) {

View File

@ -492,6 +492,7 @@ export default {
this.title = "添加常用术语(知识库)"; this.title = "添加常用术语(知识库)";
}, },
handle(row) { handle(row) {
console.log(row,'row')
// this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { // this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
this.$router.push({ this.$router.push({
path: "/knowledge/bankSpecialization", path: "/knowledge/bankSpecialization",

View File

@ -239,7 +239,7 @@ import {
selectTermBankList, selectTermBankList,
} from "@/api/system/bank"; } from "@/api/system/bank";
export default { export default {
name: "Bank", name: "Banks",
data() { data() {
return { return {
itemname: "", itemname: "",
@ -299,23 +299,13 @@ export default {
mounted() { mounted() {
this.getMaxTableHeight(); this.getMaxTableHeight();
this.screenChange(); this.screenChange();
},
created() {
// console.log(this.$route.query, "parentTermCode");
this.queryParams.parentTermCode = this.$route.query.parentTermCode; this.queryParams.parentTermCode = this.$route.query.parentTermCode;
this.getList(); this.getList();
// this.mentlist(); },
created() {
}, },
methods: { methods: {
// change(e) {
// console.log(e, "78");
// // console.log(this.$refs.cascader)
// // this.form.parentId = e;
// if (e) {
// this.form.parentId = e[e.length - 1];
// }
// },
/** 查询常用术语(知识库)列表 */ /** 查询常用术语(知识库)列表 */
getList() { getList() {
this.loading = true; this.loading = true;

View File

@ -21,7 +21,7 @@ body {
#toolbar { #toolbar {
background: @backgroundColor; background: @backgroundColor;
border-bottom: 1px solid @borderColor; border-bottom: 1px solid @borderColor;
padding: 4px 14px; padding: 15px 14px;
i { i {
font-size: 18px; font-size: 18px;
padding: 4px; padding: 4px;

View File

@ -9,65 +9,164 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div id="toolbar"> <div id="toolbar">
<!-- <font-awesome-icon icon="fa fa-history" /> <div>
<font-awesome-icon icon="heart" /> <font-awesome-icon
<font-awesome-icon icon="clock" />
<font-awesome-icon icon="clock" style="color: #476151" />
<i
class="el-icon-edit"
data-command="save" data-command="save"
class="command fa fa-floppy-o"
icon="command far far fa-copy"
title="保存" title="保存"
@click="submitForm" ></font-awesome-icon>
>保存</i <font-awesome-icon
> --> style="margin-left: 10px"
<!-- <font-awesome-icon icon="heart" /> --> icon="fas fa-reply-all"
<!-- <FontAwesomeIcon icon="far fa-copy" /> --> title="历史数据"
<font-awesome-icon data-command="save" class="command fa fa-floppy-o" icon="command far far fa-copy" @click="readHistoryData"
title="保存"></font-awesome-icon> ></font-awesome-icon>
<font-awesome-icon style="margin-left: 10px" icon="fas fa-reply-all" title="历史数据" <font-awesome-icon
@click="readHistoryData"></font-awesome-icon> style="margin-left: 10px"
<font-awesome-icon style="margin-left: 10px" class="fa fa-hdd-o" icon="fas fa-file" title="上传数据" class="fa fa-hdd-o"
@click="readUploadData"></font-awesome-icon> icon="fas fa-file"
<font-awesome-icon icon="fas fa-download" style="margin-left: 10px" title="另存为文件" title="上传数据"
@click="saveAsFile">文件</font-awesome-icon> @click="readUploadData"
></font-awesome-icon>
<font-awesome-icon
icon="fas fa-download"
style="margin-left: 10px"
title="另存为文件"
@click="saveAsFile"
>文件</font-awesome-icon
>
<!-- <FontAwesomeIcon icon="fas fa-image" /> --> <!-- <FontAwesomeIcon icon="fas fa-image" /> -->
<font-awesome-icon style="margin-left: 10px" icon="fas fa-image" title="另存为图片" <font-awesome-icon
@click="openSaveAsImageDialog"></font-awesome-icon> style="margin-left: 10px"
icon="fas fa-image"
title="另存为图片"
@click="openSaveAsImageDialog"
></font-awesome-icon>
<font-awesome-icon style="margin-left: 10px" data-command="undo" icon="fas fa-undo" class="command fa fa-undo" <font-awesome-icon
title="撤销"></font-awesome-icon> style="margin-left: 10px"
<font-awesome-icon style="margin-left: 10px" data-command="redo" class="command fa fa-repeat" data-command="undo"
icon="fas fa-repeat" title="重做"></font-awesome-icon> icon="fas fa-undo"
<font-awesome-icon style="margin-left: 10px" data-command="delete" class="command fa fa-trash-o" class="command fa fa-undo"
icon="fas fa-trash-alt" title="删除"></font-awesome-icon> title="撤销"
<font-awesome-icon style="margin-left: 10px" data-command="zoomOut" class="command fa fa-search-minus" ></font-awesome-icon>
icon="fas fa-search-minus" title="缩小"></font-awesome-icon> <font-awesome-icon
<font-awesome-icon style="margin-left: 10px" data-command="zoomIn" icon="fas fa-search-plus" style="margin-left: 10px"
class="command fa fa-search-plus" title="放大"></font-awesome-icon> data-command="redo"
<font-awesome-icon style="margin-left: 10px" icon="fas fa-eraser" data-command="clear" class="command fa fa-repeat"
class="command fa fa-eraser" title="清除画布"></font-awesome-icon> icon="fas fa-repeat"
<font-awesome-icon style="margin-left: 10px" icon="fas fa-arrow-up" data-command="toFront" title="重做"
class="command fa fa-arrow-up" title="提升层级"></font-awesome-icon> ></font-awesome-icon>
<font-awesome-icon style="margin-left: 10px" icon="fas fa-arrow-down" data-command="toBack" <font-awesome-icon
class="command fa fa-arrow-down" title="下降层级"></font-awesome-icon> style="margin-left: 10px"
<font-awesome-icon style="margin-left: 10px" icon="fas fa-check-square" data-command="selectAll" data-command="delete"
class="command fa fa-check-square-o" title="全选"></font-awesome-icon> class="command fa fa-trash-o"
<font-awesome-icon style="margin-left: 10px" icon="far fa-copy" data-command="copy" icon="fas fa-trash-alt"
class="command fa fa-files-o" title="复制"></font-awesome-icon> title="删除"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
data-command="zoomOut"
class="command fa fa-search-minus"
icon="fas fa-search-minus"
title="缩小"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
data-command="zoomIn"
icon="fas fa-search-plus"
class="command fa fa-search-plus"
title="放大"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="fas fa-eraser"
data-command="clear"
class="command fa fa-eraser"
title="清除画布"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="fas fa-arrow-up"
data-command="toFront"
class="command fa fa-arrow-up"
title="提升层级"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="fas fa-arrow-down"
data-command="toBack"
class="command fa fa-arrow-down"
title="下降层级"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="fas fa-check-square"
data-command="selectAll"
class="command fa fa-check-square-o"
title="全选"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="far fa-copy"
data-command="copy"
class="command fa fa-files-o"
title="复制"
></font-awesome-icon>
<font-awesome-icon style="margin-left: 10px" icon="fas fa-clone" data-command="paste" <font-awesome-icon
class="command fa fa-clipboard" title="粘贴"></font-awesome-icon> style="margin-left: 10px"
<font-awesome-icon style="margin-left: 10px" icon="fas fa-expand" data-command="autoZoom" icon="fas fa-clone"
class="command fa fa-expand" title="实际大小"></font-awesome-icon> data-command="paste"
<font-awesome-icon style="margin-left: 10px" icon="fas fa-compress" data-command="resetZoom" class="command fa fa-clipboard"
class="command fa fa-compress" title="适应页面"></font-awesome-icon> title="粘贴"
<font-awesome-icon style="margin-left: 10px" icon="fas fa-object-group" data-command="addGroup" ></font-awesome-icon>
class="command fa fa-object-group" title="组合"></font-awesome-icon> <font-awesome-icon
<font-awesome-icon style="margin-left: 10px" icon="fas fa-object-ungroup" data-command="unGroup" style="margin-left: 10px"
class="command fa fa-object-ungroup" title="取消组合"></font-awesome-icon> icon="fas fa-expand"
<font-awesome-icon style="margin-left: 10px" icon="fas fa-crop" data-command="multiSelect" data-command="autoZoom"
class="command fa fa fa-crop" title="多选"></font-awesome-icon> class="command fa fa-expand"
title="实际大小"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="fas fa-compress"
data-command="resetZoom"
class="command fa fa-compress"
title="适应页面"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="fas fa-object-group"
data-command="addGroup"
class="command fa fa-object-group"
title="组合"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="fas fa-object-ungroup"
data-command="unGroup"
class="command fa fa-object-ungroup"
title="取消组合"
></font-awesome-icon>
<font-awesome-icon
style="margin-left: 10px"
icon="fas fa-crop"
data-command="multiSelect"
class="command fa fa fa-crop"
title="多选"
></font-awesome-icon>
</div>
<el-button
type="primary"
plain
size="small"
style="position: absolute; top: 10px; right: 41px"
@click="back"
>返回</el-button
>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@ -77,30 +176,66 @@
<el-col :span="2"> <el-col :span="2">
<div id="itempannel"> <div id="itempannel">
<!-- 开始节点 --> <!-- 开始节点 -->
<div id="startNode" class="getItem" data-type="node" data-shape="flow-circle" data-size="72*72" <div
data-label="开始节点" data-color="#FA8C16" data-nodeType="startNode"> id="startNode"
class="getItem"
data-type="node"
data-shape="flow-circle"
data-size="72*72"
data-label="开始节点"
data-color="#FA8C16"
data-nodeType="startNode"
>
<img draggable="false" :src="startNodeSVGUrl" alt srcset /> <img draggable="false" :src="startNodeSVGUrl" alt srcset />
</div> </div>
<!-- 常规节点 --> <!-- 常规节点 -->
<div id="regularNode" class="getItem" data-type="node" data-size="100*50" data-label="常规节点" <div
data-color="#1890ff"> id="regularNode"
class="getItem"
data-type="node"
data-size="100*50"
data-label="常规节点"
data-color="#1890ff"
>
<img draggable="false" :src="regularNodeSVGUrl" alt srcset /> <img draggable="false" :src="regularNodeSVGUrl" alt srcset />
</div> </div>
<!-- 条件节点 --> <!-- 条件节点 -->
<div id="judgeNode" class="getItem" data-type="node" data-shape="flow-rhombus" data-size="80*80" <div
data-label="条件节点" data-color="#13C2C2"> id="judgeNode"
class="getItem"
data-type="node"
data-shape="flow-rhombus"
data-size="80*80"
data-label="条件节点"
data-color="#13C2C2"
>
<img draggable="false" :src="conditionNodeSVGUrl" /> <img draggable="false" :src="conditionNodeSVGUrl" />
</div> </div>
<!-- 自定义节点 --> <!-- 自定义节点 -->
<div class="getItem" data-type="node" data-shape="customNode" data-size="80*48" data-labeltitle="" <div
data-labelconcent="" data-color="#722ED1"> class="getItem"
data-type="node"
data-shape="customNode"
data-size="80*48"
data-labeltitle=""
data-labelconcent=""
data-color="#722ED1"
>
<img draggable="false" :src="nNodeSVGUrl" /> <img draggable="false" :src="nNodeSVGUrl" />
</div> </div>
<!-- 结束节点 --> <!-- 结束节点 -->
<div id="endNode" class="getItem" data-type="node" data-shape="flow-circle" data-size="80*80" <div
data-label="结束节点" data-color="#FA8C16" data-nodeType="endNode"> id="endNode"
class="getItem"
data-type="node"
data-shape="flow-circle"
data-size="80*80"
data-label="结束节点"
data-color="#FA8C16"
data-nodeType="endNode"
>
<img draggable="false" :src="endNodeSVGUrl" /> <img draggable="false" :src="endNodeSVGUrl" />
</div> </div>
</div> </div>
@ -116,43 +251,84 @@
<section class="right-part"> <section class="right-part">
<div id="detailpannel"> <div id="detailpannel">
<!-- 节点属性栏 --> <!-- 节点属性栏 -->
<div id="nodeAttributeBar" class="pannel" data-status="node-selected"> <div
id="nodeAttributeBar"
class="pannel"
data-status="node-selected"
>
<div class="title">节点属性</div> <div class="title">节点属性</div>
<div class="main"> <div class="main">
<el-form :model="nodeAttributeForm" label-position="top" label-width="80px"> <el-form
:model="nodeAttributeForm"
label-position="top"
label-width="80px"
>
<el-form-item label="节点文本" v-if="type != 'customNode'"> <el-form-item label="节点文本" v-if="type != 'customNode'">
<el-input v-model="nodeAttributeForm.label" @change="saveNodeAttribute"></el-input> <el-input
v-model="nodeAttributeForm.label"
@change="saveNodeAttribute"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标题" v-if="type == 'customNode'"> <el-form-item label="标题" v-if="type == 'customNode'">
<el-input class="bold-input" v-model="nodeAttributeForm.labeltitle" <el-input
@change="saveNodeAttribute"></el-input> class="bold-input"
v-model="nodeAttributeForm.labeltitle"
@change="saveNodeAttribute"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="内容" v-if="type == 'customNode'"> <el-form-item label="内容" v-if="type == 'customNode'">
<el-input type="textarea" v-model="nodeAttributeForm.labelconcent" <el-input
@change="saveNodeAttribute"></el-input> type="textarea"
v-model="nodeAttributeForm.labelconcent"
@change="saveNodeAttribute"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="宽度"> <el-form-item label="宽度">
<el-input v-model="nodeAttributeForm.width" @change="saveNodeAttribute"></el-input> <el-input
v-model="nodeAttributeForm.width"
@change="saveNodeAttribute"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="高度"> <el-form-item label="高度">
<el-input v-model="nodeAttributeForm.height" @change="saveNodeAttribute"></el-input> <el-input
v-model="nodeAttributeForm.height"
@change="saveNodeAttribute"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="颜色"> <el-form-item label="颜色">
<el-color-picker v-model="nodeAttributeForm.color" @change="saveNodeAttribute"></el-color-picker> <el-color-picker
v-model="nodeAttributeForm.color"
@change="saveNodeAttribute"
></el-color-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</div> </div>
<!-- 边属性栏 --> <!-- 边属性栏 -->
<div id="edgeAttributeBar" class="pannel" data-status="edge-selected"> <div
id="edgeAttributeBar"
class="pannel"
data-status="edge-selected"
>
<div class="title">边属性</div> <div class="title">边属性</div>
<div class="main"> <div class="main">
<el-form :model="edgeAttributeForm" label-position="top" label-width="80px" @submit.native.prevent> <el-form
:model="edgeAttributeForm"
label-position="top"
label-width="80px"
@submit.native.prevent
>
<el-form-item label="边文本"> <el-form-item label="边文本">
<el-input v-model="edgeAttributeForm.label" @change="saveEdgeAttribute"></el-input> <el-input
v-model="edgeAttributeForm.label"
@change="saveEdgeAttribute"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="关键字"> <el-form-item label="关键字">
<el-input type="textarea" v-model="edgeAttributeForm.keyword" @change="saveEdgeAttribute" <el-input
type="textarea"
v-model="edgeAttributeForm.keyword"
@change="saveEdgeAttribute"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="边文本"> <!-- <el-form-item label="边文本">
@ -177,20 +353,35 @@
</el-form> </el-form>
</div> </div>
</div> </div>
<div id="groupAttributeBar" class="pannel" data-status="group-selected"> <div
id="groupAttributeBar"
class="pannel"
data-status="group-selected"
>
<div class="title">群组属性栏</div> <div class="title">群组属性栏</div>
</div> </div>
<div id="canvasAttributeBar" class="pannel" data-status="canvas-selected"> <div
id="canvasAttributeBar"
class="pannel"
data-status="canvas-selected"
>
<div class="title">画布属性栏</div> <div class="title">画布属性栏</div>
<div class="main"> <div class="main">
<el-form label-width="80px" label-position="right"> <el-form label-width="80px" label-position="right">
<el-form-item label="网格对齐"> <el-form-item label="网格对齐">
<el-checkbox v-model="canvasAttributeForm.grid" @change="toggleGridShowStatus"></el-checkbox> <el-checkbox
v-model="canvasAttributeForm.grid"
@change="toggleGridShowStatus"
></el-checkbox>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</div> </div>
<div id="multiAttributeBar" class="pannel" data-status="multi-selected"> <div
id="multiAttributeBar"
class="pannel"
data-status="multi-selected"
>
<div class="title">多选时属性栏</div> <div class="title">多选时属性栏</div>
</div> </div>
</div> </div>
@ -205,13 +396,19 @@
<article> <article>
<!-- 下载图片 --> <!-- 下载图片 -->
<section class="save-as-image-dialog"> <section class="save-as-image-dialog">
<el-dialog title="生成图片" :visible.sync="saveAsImageDialogVisible" width="360px"> <el-dialog
title="生成图片"
:visible.sync="saveAsImageDialogVisible"
width="360px"
>
<el-form label-width="100px" label-position="top"> <el-form label-width="100px" label-position="top">
<el-form-item label="图片格式"> <el-form-item label="图片格式">
<el-select v-model="saveAsImageFormat"> <el-select v-model="saveAsImageFormat">
<el-option label="jpg" value="jpg"> <el-option label="jpg" value="jpg">
<span style="float: left">jpg</span> <span style="float: left">jpg</span>
<span style="float: right; color: #8492a6; font-size: 13px">白色背景</span> <span style="float: right; color: #8492a6; font-size: 13px"
>白色背景</span
>
</el-option> </el-option>
<!-- <el-option label="png" value="png"> <!-- <el-option label="png" value="png">
<span style="float: left">png</span> <span style="float: left">png</span>
@ -223,7 +420,9 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer"> <span slot="footer">
<el-button @click="saveAsImageDialogVisible = false"> </el-button> <el-button @click="saveAsImageDialogVisible = false"
> </el-button
>
<el-button type="primary" @click="saveAsImage"> </el-button> <el-button type="primary" @click="saveAsImage"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
@ -248,7 +447,9 @@
</div> </div>
<div data-status="canvas-selected" class="menu"> <div data-status="canvas-selected" class="menu">
<el-button data-command="undo" class="command">撤销</el-button> <el-button data-command="undo" class="command">撤销</el-button>
<el-button data-command="redo" class="command disable">重做</el-button> <el-button data-command="redo" class="command disable"
>重做</el-button
>
</div> </div>
<div data-status="multi-selected" class="menu"> <div data-status="multi-selected" class="menu">
<el-button data-command="copy" class="command">复制</el-button> <el-button data-command="copy" class="command">复制</el-button>
@ -354,6 +555,10 @@ export default {
}, },
methods: { methods: {
//
back(){
this.$router.go(-1);//
},
getlist() { getlist() {
selectScriptEdgeNode(this.$route.query.id).then(res => { selectScriptEdgeNode(this.$route.query.id).then(res => {
if (res.data.flowScheme) { if (res.data.flowScheme) {
@ -538,14 +743,23 @@ export default {
if (ev.item.isNode) { if (ev.item.isNode) {
this.type = selectedItemDataModel.shape this.type = selectedItemDataModel.shape
if (selectedItemDataModel.label && selectedItemDataModel.labelconcent == '' && selectedItemDataModel.labeltitle == '') { if (selectedItemDataModel.label && selectedItemDataModel.labelconcent == '' && selectedItemDataModel.labeltitle == '') {
if (selectedItemDataModel.label.split('\n').shift() && selectedItemDataModel.label.split('\n').slice(1).join('\n')) { var titles = selectedItemDataModel.label.split('\n').shift()
// this.nodeAttributeForm.labeltitle = `<h2>${selectedItemDataModel.label.split('\n').shift()}</h2>` var concent = selectedItemDataModel.label.split('\n').slice(1).join('\n')
this.nodeAttributeForm.labeltitle = selectedItemDataModel.label.split('\n').shift() console.log(titles, 'shift()')
this.nodeAttributeForm.labelconcent = selectedItemDataModel.label.split('\n').slice(1).join('\n') console.log(concent, 'join')
} else if (selectedItemDataModel.label.split('\n').shift()) { if (titles && concent) {
this.nodeAttributeForm.label = selectedItemDataModel.label.split('\n').shift(); this.nodeAttributeForm.labeltitle = titles
this.nodeAttributeForm.labelconcent = concent
} else if (titles && !concent) {
this.nodeAttributeForm.labeltitle = titles;
this.nodeAttributeForm.labelconcent = ''
} else if (!titles && concent) {
this.nodeAttributeForm.labeltitle = '';
this.nodeAttributeForm.labelconcent = concent
} }
} else { }
else {
this.nodeAttributeForm.labelconcent = selectedItemDataModel.labelconcent; this.nodeAttributeForm.labelconcent = selectedItemDataModel.labelconcent;
this.nodeAttributeForm.labeltitle = selectedItemDataModel.labeltitle; this.nodeAttributeForm.labeltitle = selectedItemDataModel.labeltitle;
} }