From 4bff52e938ae2c260fe54d32ef680908868bb27e Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 07 六月 2024 09:57:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/sysPictureBase/SysPictureBase-AddOrUpdate.vue | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/web/src/views/modules/sysPictureBase/SysPictureBase-AddOrUpdate.vue b/web/src/views/modules/sysPictureBase/SysPictureBase-AddOrUpdate.vue
index 671bf72..dbaf9aa 100644
--- a/web/src/views/modules/sysPictureBase/SysPictureBase-AddOrUpdate.vue
+++ b/web/src/views/modules/sysPictureBase/SysPictureBase-AddOrUpdate.vue
@@ -5,7 +5,7 @@
<el-input v-model="dataForm.name"></el-input>
</zt-form-item>
<zt-form-item label="浜у搧绫诲瀷" prop="productType" rules="required">
- <zt-dict v-model="dataForm.productType" dict="product"></zt-dict>
+ <zt-dict v-model="dataForm.productType" dict="product" :additional=additional></zt-dict>
</zt-form-item>
<zt-form-item label="鏄惁榛樿" prop="isDefault" rules="required">
<zt-dict v-model="dataForm.isDefault" dict="is_or_not"></zt-dict>
@@ -17,14 +17,14 @@
<el-input v-model="dataForm.remark"></el-input>
</zt-form-item>
<input type="hidden" id="svgContentId" :value="dataForm.svgContent"/>
- <zt-form-item>
-<!-- <el-upload action="*" :on-change="uploadSvgContent">-->
-<!-- <el-button slot="trigger" size="small" type="primary">閫夊彇鏂囦欢</el-button>-->
-<!-- </el-upload>-->
- <label class="custom-file-upload">
- <input type="file" @change="uploadSvgContent" />
- </label>
- </zt-form-item>
+ <zt-form-item>
+ <!-- <el-upload action="*" :on-change="uploadSvgContent">-->
+ <!-- <el-button slot="trigger" size="small" type="primary">閫夊彇鏂囦欢</el-button>-->
+ <!-- </el-upload>-->
+ <label class="custom-file-upload">
+ <input type="file" @change="uploadSvgContent"/>
+ </label>
+ </zt-form-item>
</el-form>
<iframe :src='SVGEditorUrl' ref="myIframe" width="100%" id="iframe"
style="height:calc(100vh - 300px)">
@@ -39,6 +39,7 @@
export default {
data() {
return {
+ additional: [{dictValue: '20', dictLabel: '杩愮畻鍥惧厓', remark: ''}],
SVGEditorUrl: `/SVGOrigin/Method-Draw-master/editor/index.html`,
url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getProductImg?token=${Cookies.get('token')}&id=`,
fileList: [],
@@ -58,14 +59,14 @@
}
},
methods: {
- async init() {
- if (this.dataForm.id) {
- let res = await this.$http.get(`/sysPictureBase/${this.dataForm.id}`)
+ async init(id,row) {
+ if (id) {
+ //let res = await this.$http.get(`/sysPictureBase/${this.dataForm.id}`)
this.dataForm = {
...this.dataForm,
- ...res.data
+ ...row
}
- console.log(this.dataForm,'this.dataForm this.dataForm')
+ console.log(this.dataForm, 'this.dataForm this.dataForm')
}
},
httpRequest(option) {
@@ -103,10 +104,10 @@
async formSubmit() {
const iframeWindow = this.$refs.myIframe.contentWindow;
this.dataForm.svgContent = iframeWindow.getSVGContentTest()
- console.log(this.dataForm.svgContent+'this.dataForm.svgContent')
+ console.log(this.dataForm.svgContent + 'this.dataForm.svgContent')
this.$http.post('/sysPictureBase/save', this.dataForm).then(res => {
if (res.success) {
- console.log(this.dataForm,'this.dataForm')
+ console.log(this.dataForm, 'this.dataForm')
this.$tip.success()
this.$refs.dialog.close()
this.$emit('refreshDataList')
@@ -117,9 +118,9 @@
async uploadSvgContent(event) {
const iframeWindow = this.$refs.myIframe.contentWindow
const file = event.target.files[0];
- console.log(file,'file file')
+ console.log(file, 'file file')
// 鍙互鍦ㄨ繖閲岃繘琛岃繘涓�姝ョ殑鏂囦欢澶勭悊锛屾瘮濡傝鍙栨枃浠跺唴瀹圭瓑鎿嶄綔
- if (file && file.type==='image/svg+xml') {
+ if (file && file.type === 'image/svg+xml') {
const reader = new FileReader();
reader.onload = (e) => {
const fileContent = e.target.result;
@@ -127,7 +128,7 @@
iframeWindow.setSvgContent(fileContent)
}
reader.readAsText(file); // 浠ユ枃鏈舰寮忚鍙栨枃浠跺唴瀹�
- }else {
+ } else {
this.$message({message: '璇烽�夋嫨SVG鍥剧墖', type: 'warning'})
return false; // 鍙栨秷鎿嶄綔
}
@@ -151,6 +152,7 @@
cursor: pointer;
background-color: #f9f9f9;
}
+
.img-sc > .el-form-item > .el-form-item__content {
width: 100%;
}
--
Gitblit v1.9.1