From e2d963f6e794aed358bf569f0d98dd53da4781be Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期一, 03 六月 2024 16:13:41 +0800
Subject: [PATCH] svgEditor
---
web/src/views/modules/taskReliability/RBD-edit-img.vue | 12 +++++++++---
web/src/views/modules/sysPictureBase/SysPictureBase.vue | 27 ++++++++++++++++++++++++---
web/public/SVGOrigin/Method-Draw-master/editor/index.html | 16 ++++++++--------
3 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/web/public/SVGOrigin/Method-Draw-master/editor/index.html b/web/public/SVGOrigin/Method-Draw-master/editor/index.html
index 4fdcf48..095f56c 100644
--- a/web/public/SVGOrigin/Method-Draw-master/editor/index.html
+++ b/web/public/SVGOrigin/Method-Draw-master/editor/index.html
@@ -84,14 +84,14 @@
</div>
v
<div id="menu_bar">
- <a class="menu">
- <div class="menu_title" id="logo"></div>
- <div class="menu_list">
- <div id="tool_about" class="menu_item">About this Editor...</div>
- <div class="separator"></div>
- <div id="tool_about" class="menu_item">Keyboard Shortcuts...</div>
- </div>
- </a>
+<!-- <a class="menu">-->
+<!-- <div class="menu_title" id="logo"></div>-->
+<!-- <div class="menu_list">-->
+<!-- <div id="tool_about" class="menu_item">About this Editor...</div>-->
+<!-- <div class="separator"></div>-->
+<!-- <div id="tool_about" class="menu_item">Keyboard Shortcuts...</div>-->
+<!-- </div>-->
+<!-- </a>-->
<div style="opacity: 0" class="menu">
<div class="menu_title">File</div>
diff --git a/web/src/views/modules/sysPictureBase/SysPictureBase.vue b/web/src/views/modules/sysPictureBase/SysPictureBase.vue
index 668f854..29e5abd 100644
--- a/web/src/views/modules/sysPictureBase/SysPictureBase.vue
+++ b/web/src/views/modules/sysPictureBase/SysPictureBase.vue
@@ -1,6 +1,6 @@
<template>
<div class="mod-sysPictureBase-sysPictureBase fa-card-a">
- <zt-table-wraper query-url="/sysPictureBase/page" delete-url="/sysPictureBase/"
+ <zt-table-wraper ref="tableObj" query-url="/sysPictureBase/page" delete-url="/sysPictureBase/"
:paging='false'
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
@@ -15,6 +15,7 @@
<zt-button type="query" @click="table.query()"/>
<zt-button type="add" @click="table.editHandle()"/>
<zt-button type="delete" @click="table.deleteHandle()"/>
+<!-- <zt-button type="delete" @click="deleteSVG"/>-->
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
@@ -24,7 +25,7 @@
<zt-table-column-dict prop="isDefault" label="鏄惁榛樿" dict="is_or_not"/>
<el-table-column label="鍥剧墖" align="center" prop="svgContent">
<template v-slot="{ row }">
- <el-input v-if="row.id" v-html = row.svgContent></el-input>
+ <div v-if="row.id" class="custom-svg-container" v-html = row.svgContent></div>
</template>
</el-table-column>
<el-table-column prop="contentType" label="妫�绱㈠叧閿瓧"/>
@@ -57,6 +58,26 @@
},
mounted() {
},
- methods: {}
+ methods: {
+ async deleteSVG() {
+ let dataSelectedList = this.$refs.tableObj.dataSelectedList
+ console.log(dataSelectedList, 'dataSelectedList')
+ if(dataSelectedList.length === 0){
+ this.$message({message: '璇峰厛鍕鹃�夋暟鎹�', type: 'warning'})
+ return false
+ }
+ let res = await this.$http.delete('/sysPictureBase/', dataSelectedList)
+ if (res.success) {
+ await this.$tip.success()
+ this.$refs.tableObj.query()
+ }
+ }
+ }
}
</script>
+<style>
+ .custom-svg-container svg {
+ width: 60px; /* 璁剧疆SVG鍥剧墖鐨勫搴︿负60 */
+ height: 60px; /* 璁剧疆SVG鍥剧墖鐨勯珮搴︿负60 */
+ }
+</style>
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index d483b9c..a236bc2 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -41,6 +41,9 @@
<el-button @click="undo()">鎾ら攢</el-button>
<el-button @click="redo()">閲嶅仛</el-button>
</el-form-item>
+ <el-form-item>
+ <zt-button type="delete" @click="deleteCompment()" />
+ </el-form-item>
</el-form>
<div id="containerImg" style="border: 1px solid #EAEBEE;border-radius: 6px;
box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);height: 100%">
@@ -1337,6 +1340,7 @@
}
let isSeriesNode = this.isSeriesNode(startNode, node)
+ let isMultipleBrach = this.isMultipleBrach(node)
if (isSeriesNode) {
//涓茶仈
let inLine = this.getInLinesOfNode(startNode)
@@ -1373,8 +1377,7 @@
})
return false
})
- }
- if (this.isMultipleBrach(node)) {
+ }else if (this.isMultipleBrach(node)) {
//鎻愮ず鏄惁瑕佸垹闄�
this.$confirm('鏄惁鍒犻櫎璇ヨ妭鐐�?', '鎻愮ず', {
confirmButtonText: '纭畾',
@@ -1402,9 +1405,12 @@
})
return false
})
+ }else {
+ //鎻愮ず涓嶈兘鍒犻櫎
+ this.$message({message: '璇ユ潯绾胯矾涓婂彧鏈夎鑺傜偣锛屾棤娉曞垹闄�', type: 'warning'})
+ return false; // 鍙栨秷鎿嶄綔
}
}
- //鎻愮ず涓嶈兘鍒犻櫎
} else {
//鎻愮ず涓嶈兘鍒犻櫎
this.$message({message: '鍙兘閫変腑涓�涓妭鐐�', type: 'warning'})
--
Gitblit v1.9.1