From b23fec0d1c46a72e9be33f6e949a55d0dd7d5bca Mon Sep 17 00:00:00 2001 From: feige <feige@qq.com> Date: 星期四, 19 十月 2023 11:33:37 +0800 Subject: [PATCH] 修改了vue_app_base_other_api 为47.93.189.255:8085 clean/cleanInfo.vue 里面判断ip修改为域名www.bendudu.com 另外,在process.env.VUE_APP_BASE_OTHER_API加了preview --- ruoyi-ui/src/views/collection/index.vue | 234 +++++++++++++++++++++++++++++++--------------------------- 1 files changed, 125 insertions(+), 109 deletions(-) diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue index c5dbaa9..6247371 100644 --- a/ruoyi-ui/src/views/collection/index.vue +++ b/ruoyi-ui/src/views/collection/index.vue @@ -1,56 +1,6 @@ <template> <div class="app-container"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"> - <el-form-item label="" prop="phone wx qq twitter isAlways remark" > - <el-input - v-model:phone="queryParams.phone" - v-model:wx="queryParams.wx" - v-model:qq="queryParams.qq" - v-model:twitter="queryParams.twitter" - v-model:isAlways="queryParams.isAlways" - v-model:remark="queryParams.remark" - placeholder="鍦ㄢ�滄敹钘忓拰鑽h獕鈥濅腑鎼滅储" - clearable - style="width: 240px" - @keyup.enter.native="handleQuery"> - <i slot="prefix" class="el-input__icon el-icon-search"></i> - </el-input> - <!-- <el-input - v-model="searchVal" - placeholder="鍦ㄢ�滈�氳褰曗�濅腑鎼滅储" - clearable - style="width: 240px" - @input="inputChange"> - <i slot="prefix" class="el-input__icon el-icon-search"></i> - </el-input> - <div class="outer-table"> - 姝ょ埗缁勪欢寮曠敤瀛愮粍浠秚ablemax - <tablemax label="myLabel" :tableData="contactList"> - <template v-slot:table> - <el-table-column label="鎿嶄綔" width="180"> - <template slot-scope="scope"> - <el-button @click="handleCheck(scope.row)" type="text" size="small" - >璋冪敤</el-button - > - </template> - </el-table-column> - </template> - </tablemax> - </div>--> - - - <!-- v-model="queryParams.id" - - v-model:phone="queryParams.phone" - v-model:wx="queryParams.wx" - v-model:qq="queryParams.qq" - v-model:twitter="queryParams.twitter" - v-model:isAlways="queryParams.isAlways" - v-model:remark="queryParams.remark" - @keyup.enter.native="handleQuery" - --> - </el-form-item> - <el-form-item label="鏃堕棿" prop="happenTime"> <el-date-picker v-model="dateRange" @@ -58,8 +8,7 @@ height: 30px; background: #FFFFFF; border-radius: 14px 14px 14px 14px; - opacity: 0.5; - border: 1px solid rgba(0,0,0,0.25);" + opacity: 0.5;" value-format="yyyy-MM-dd" type="daterange" range-separator="-" @@ -70,43 +19,101 @@ <el-form-item label="绫诲埆" prop="type"> <el-select v-model="queryParams.type" placeholder="鎵�鏈夌被鍒�" clearable - style="width: 240px" @keyup.enter.native="handleQuery"> + style="width: 233px; + height: 35px; + border-radius: 16px 16px 16px 16px; + opacity: 0.5;" + @keyup.enter.native="handleQuery" + > <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value"/> </el-select> </el-form-item> - - <el-cntainer> - <el-col :span="9" > - <el-form-item> - <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3; - border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button> - <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3; - border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button> - </el-form-item> - </el-col> - </el-cntainer> + <el-form-item label="鍚嶇О" prop="name" > + <el-input + v-model="queryParams.name" + placeholder="璇疯緭鍏ュ悕绉�" + clearable + style="width: 233px; + height: 35px; + border-radius: 16px 16px 16px 16px; + opacity: 0.5;" + @keyup.enter.native="handleQuery"> + <i slot="prefix" class="el-input__icon el-icon-search"></i> + </el-input> + </el-form-item> + <el-form-item label="鏉ユ簮" prop="source" > + <el-input + v-model="queryParams.source" + placeholder="璇疯緭鍏ユ潵婧�" + clearable + style="width: 233px; + height: 35px; + border-radius: 16px 16px 16px 16px; + opacity: 0.5;" + @keyup.enter.native="handleQuery"> + <i slot="prefix" class="el-input__icon el-icon-search"></i> + </el-input> + </el-form-item> <el-form-item label="鎸佹湁鑰�" prop="owner" > <el-input v-model="queryParams.owner" placeholder="璇疯緭鍏ユ寔鏈夎��" clearable - style="width: 240px" + style="width: 233px; + height: 35px; + border-radius: 16px 16px 16px 16px; + opacity: 0.5;" @keyup.enter.native="handleQuery"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input> </el-form-item> - + <el-form-item label="浠峰��" prop="price" > + <el-input + v-model="queryParams.price" + placeholder="璇疯緭鍏ヤ环鍊�" + clearable + style="width: 233px; + height: 35px; + border-radius: 16px 16px 16px 16px; + opacity: 0.5;" + @keyup.enter.native="handleQuery"> + <i slot="prefix" class="el-input__icon el-icon-search"></i> + </el-input> + </el-form-item> <el-form-item label="瀛樻斁浣嶇疆" prop="location"> <el-input v-model="queryParams.location" placeholder="璇疯緭鍏ュ瓨鏀句綅缃�" clearable - style="width: 240px" + style="width: 233px; + height: 35px; + border-radius: 16px 16px 16px 16px; + opacity: 0.5;" @keyup.enter.native="handleQuery"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input> </el-form-item> + <el-form-item label="澶囨敞" prop="remark"> + <el-input + v-model="queryParams.remark" + placeholder="璇疯緭鍏ュ娉�" + clearable + style="width: 200px; + height: 35px; + border-radius: 16px 16px 16px 16px; + opacity: 0.5;" + @keyup.enter.native="handleQuery"> + <i slot="prefix" class="el-input__icon el-icon-search"></i> + </el-input> + </el-form-item> + <el-form-item> + <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3; + border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button> + <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3; + border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button> + </el-form-item> + </el-form> <div> @@ -284,7 +291,9 @@ <!-- <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>--> <!-- </el-form-item>--> <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime"> - <el-input v-model='formDat.happenTime' type='date' clearable placeholder='閫夋嫨鏃ユ湡'></el-input> + <el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + ></el-date-picker> </el-form-item> <el-form-item label="绫诲埆" prop="type"> <el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" > @@ -321,21 +330,24 @@ <h4 class="form-header">鐩稿叧鍥剧墖 </h4> <el-upload action="#" + accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif" list-type="picture-card" multiple :http-request="requestUpload" :file-list="fileList" > <i slot="default" class="el-icon-plus"></i> - <div slot="file" slot-scope="{file}"> - <img - class="el-upload-list__item-thumbnail" - :src="file.url" - alt="" - style="width: 126px; height: 126px" - fit="cover" - :preview-src-list="[file.url]" - > + <div slot="file" slot-scope="{ file }"> + <template v-if="fileList"> + <img + class="el-upload-list__item-thumbnail" + :src="file.url" + alt="" + style="width: 100%; height: 100%; object-fit: cover;" + fit="cover" + :preview-src-list="[file.url]" + > + </template> <span class="el-upload-list__item-actions"> <span class="el-upload-list__item-preview" @@ -364,11 +376,11 @@ multiple :on-remove="handleRemoveFile" - :http-request="requestUpload" + :http-request="requestUpload1" :show-file-list="true" > <el-button type="primary">鐐瑰嚮涓婁紶</el-button> - <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div> + <div v-if="uploading1" class="upload-status">姝e湪涓婁紶...</div> <template #tip> <div class="el-upload__tip"> </div> @@ -448,6 +460,7 @@ btn:false, fit:['fill'], uploading: false, + uploading1: false, formDat: { //鏀惰棌涓庤崳瑾夎褰� id:undefined, @@ -471,9 +484,12 @@ pageNum: 1, pageSize: 10, type:undefined, + name:undefined, + source:undefined, owner:undefined, + price:undefined, location:undefined, - // happenTime:undefined, + remark:undefined, }, // searchVal:"", @@ -610,17 +626,7 @@ }, []); }, - // /** 鏌ヨ绫诲埆淇℃伅 */ - // getCateInfor() - // { - // let _this = this - // getCategory().then(response=>{ - // - // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{ - // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]}) - // }) - // }) - // }, + //绫诲埆閫夋嫨 getSrc(type) { if (type === '閭エ') { @@ -761,21 +767,21 @@ addCollection(this.formDat).then(response => { this.$modal.msgSuccess("鏂板鎴愬姛"); this.open = false; + // 娓呯┖formDat瀵硅薄鐨勬暟鎹� + Object.keys(this.formDat).forEach(key => { + this.formDat[key] = ''; + }); + for(let i = 0; i <= this.fileList.length; i++) + { + this.handleRemove(this.fileList[0]); + } + for(let i = 0; i < this.fileListOther.length; i++){ + this.handleRemoveFile(this.fileListOther[0]); + } this.getList(); }); } }); - // 娓呯┖formDat瀵硅薄鐨勬暟鎹� - Object.keys(this.formDat).forEach(key => { - this.formDat[key] = ''; - }); - for(let i = 0; i <= this.fileList.length; i++) - { - this.handleRemove(this.fileList[0]); - } - for(let i = 0; i < this.fileListOther.length; i++){ - this.handleRemoveFile(this.fileListOther[0]); - } }, requestUpload(params) { @@ -791,15 +797,25 @@ if(_this.fot.includes(pth) === true) { _this.fileList.push({name:response.data.fileName, "url":response.data.url}) - - } - - else{ - _this.fileListOther.push({name:response.data.fileName, url:response.data.url}) - } }) - + }, + requestUpload1(params) + { + var file = params.file; + var formData = new FormData(); + formData.append('uploadFile', file); + let _this = this + this.uploading1 = true; + uploadPic(formData).then(response => { + let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length) + this.uploading1 = false; + this.$modal.msgSuccess("涓婁紶鎴愬姛"); + if(_this.fot.includes(pth) !== true) + { + _this.fileListOther.push({name:response.data.fileName, url:response.data.url}) + } + }) }, /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { -- Gitblit v1.9.1