From 41c12150fa634663d712cb03748800ec2c8067a8 Mon Sep 17 00:00:00 2001 From: linwenling <3256558519@qq.com> Date: 星期三, 09 八月 2023 20:34:44 +0800 Subject: [PATCH] 修改 行锯齿bug --- ruoyi-ui/src/views/collection/collectionInfo.vue | 139 +++++++++++++++++++++++++++------------------- 1 files changed, 81 insertions(+), 58 deletions(-) diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue index ce641b6..77800ff 100644 --- a/ruoyi-ui/src/views/collection/collectionInfo.vue +++ b/ruoyi-ui/src/views/collection/collectionInfo.vue @@ -17,14 +17,19 @@ <el-row :span="12"> <el-cow > <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime" label-width="70px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> - <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" type="date" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> + </el-form-item> + </el-cow> <el-cow > <el-form-item label="绫诲埆" prop="type" label-width="40px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> - <el-input v-model="formData.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" :disabled="dsb"> - </el-input> + <el-select v-model="formData.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" :disabled="dsb"> + <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value" + ></el-option> + </el-select> + <el-input v-model="newOption" v-if="showInput" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴旂被鍒紝璇峰湪姝よ緭鍏ユ柊鐨勭被鍒�" @change="addNewOption"></el-input> </el-form-item> </el-cow> <el-cow > @@ -83,53 +88,33 @@ :preview-src-list="[file.url]" > <span class="el-upload-list__item-actions" > - <span - v-if="isShow" - class="el-upload-list__item-preview" - @click="handlePictureCardPreview(file)" - > - <i class="el-icon-zoom-in"></i> - </span> - <span - v-if="isShow" - class="el-upload-list__item-delete" - @click="handleDownload(file.url)" - > - <i class="el-icon-download"></i> - </span> - <span - v-if="isShow" - class="el-upload-list__item-delete" - @click="handleRemove(file)" - > - <i class="el-icon-delete"></i> - </span> - </span> + <span + + class="el-upload-list__item-preview" + @click="handlePictureCardPreview(file)" + > + <i class="el-icon-zoom-in"></i> + </span> + <span + + class="el-upload-list__item-delete" + @click="handleDownload(file.url)" + > + <i class="el-icon-download"></i> + </span> + <span + v-if="isShow" + class="el-upload-list__item-delete" + @click="handleRemove(file)" + > + <i class="el-icon-delete"></i> + </span> + </span> </div> </el-upload> - <!--<h4 class="form-header">鍏朵粬闄勪欢 </h4> - <el-upload - action="" - :file-list="fileListOther" - class="upload-demo" - multiple - :on-preview="handlePreview" - - :on-remove="handleRemove" - :http-request="requestUpload" - :show-file-list="true" - > - <el-button v-if="isShow" type="primary" >鐐瑰嚮涓婁紶</el-button> - <template #tip> - <div class="el-upload__tip"> - </div> - </template> - - - </el-upload>--> <h4 class="form-header">鍏朵粬闄勪欢 </h4> <el-upload action="" @@ -138,7 +123,7 @@ multiple list-type="picture-card" :on-preview="handleFileCardPreview" - :on-remove="handleRemove" + :on-remove="handleRemoveFile" :http-request="requestUpload" :show-file-list="true" > @@ -153,20 +138,19 @@ fit="cover" > <span class="el-upload-list__item-actions"> - <span v-if="isShow" + <span class="el-upload-list__item-preview" @click="handleFileCardPreview(file)" > <i class="el-icon-zoom-in"></i> </span> <span - v-if="isShow" - @click="handleRemove(file)" - class="el-upload-list__item-delete" + class="el-upload-list__item-delete" + @click="handleDownload(file.url)" > - <i class="el-icon-download"></i> - </span> + <i class="el-icon-download"></i> + </span> <span v-if="isShow" class="el-upload-list__item-delete" @@ -189,7 +173,7 @@ </div> <el-dialog :visible.sync="dialogVisible"> - <img w-full :src="dialogImageUrl" alt="Preview Image" /> + <img w-full :src="dialogImageUrl" style="width: 700px; height: 700px" alt="Preview Image" /> </el-dialog> @@ -201,7 +185,8 @@ import {blobValidate} from "@/utils/ruoyi"; import errorCode from "@/utils/errorCode"; import {Message} from "element-ui"; -import {getCollection, updateCollection,download,uploadPic} from "@/api/collection/index"; +import {getCollection, updateCollection,download,uploadPic,listType} from "@/api/collection/index"; + export default { components: {}, @@ -210,7 +195,8 @@ return { cdi:"鏀惰棌涓庤崳瑾夎缁嗕俊鎭�", udi:"鏀惰棌涓庤崳瑾変俊鎭鎯�", - fot:[".jpg",".jif"], + fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx', + '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'], fileList:[ ], fileListOther:[ @@ -221,7 +207,7 @@ isShow:true, // 鏀惰棌涓庤崳瑾夎〃鏍兼暟鎹� collectionList: [], - + typeList:[], formData: { //鏀惰棌涓庤崳瑾夎褰� id:undefined, @@ -283,6 +269,8 @@ }, typeOptions: [], + newOption: undefined, + showInput: false } }, computed: {}, @@ -295,12 +283,13 @@ jd = this.$route.query.detail this.btn= jd this.dsb = !jd + this.showInput=true document.title = "淇敼鏀惰棌涓庤崳瑾夎缁嗕俊鎭�"; this.$route.meta.title = "淇敼鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";//鍒楄〃鐨勫悕绉� } else{ - document.title = "鏌ョ湅鏀惰棌涓庤崳瑾夎缁嗕俊鎭�"; - this.$route.meta.title = "鏌ョ湅鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";//鍒楄〃鐨勫悕绉� + document.title = "鏀惰棌涓庤崳瑾夎缁嗕俊鎭�"; + this.$route.meta.title = "鏀惰棌涓庤崳瑾夎缁嗕俊鎭�";//鍒楄〃鐨勫悕绉� this.isShow=false } @@ -328,6 +317,15 @@ } this.loading = false; }); + listType(this.queryParams).then(response => { + this.typeList = response.data; + this.total = response.data.total; + // console.log( this.typeList ) + // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions() + this.getTypeOptions(); + this.loading = false; + } + ); // this.getCateInfor() } @@ -345,6 +343,31 @@ // }) // }) // }, + //绫诲埆 + addNewOption() { + const newOption = this.newOption.trim(); + if (newOption && !this.typeOptions.includes(newOption)) { + this.typeOptions.push(newOption); + this.$set(this.formData, 'type', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」 + } + }, + getTypeOptions() { + const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== ''); + // 鍒涘缓涓�涓┖瀵硅薄鐢ㄤ簬瀛樺偍鍞竴鐨勫瓧绗︿覆閫夐」 + const uniqueOptions = {}; + // 鏋勫缓涓嬫媺閫夐」鍒楄〃 + this.typeOptions = filteredOptions.reduce((options, option) => { + if (!uniqueOptions[option]) { + uniqueOptions[option] = true; + options.push({ + label: option, + value: option + }); + } + return options; + }, []); + + }, submitForm() { let ul = this.fileList.map(function (elem){ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"") -- Gitblit v1.9.1