wente
2024-06-03 e2d963f6e794aed358bf569f0d98dd53da4781be
svgEditor
3个文件已修改
57 ■■■■ 已修改文件
web/public/SVGOrigin/Method-Draw-master/editor/index.html 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/modules/sysPictureBase/SysPictureBase.vue 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/modules/taskReliability/RBD-edit-img.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
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>
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'})