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/honor/index.vue |  132 +++++++++++++++++++++-----------------------
 1 files changed, 63 insertions(+), 69 deletions(-)

diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index ee60237..7ff7ffc 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -1,25 +1,12 @@
 <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="鍦ㄢ�滆瘉浠躲�佽崳瑾夈�佽祫璐ㄢ�濅腑鎼滅储"
-          clearable
-          style="width: 240px"
-          @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="name">
         <el-select v-model="queryParams.name" placeholder="鎵�鏈夊悕绉�" clearable
-                   style="width: 240px" @keyup.enter.native="handleQuery">
+                   style="width: 200px;
+                   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>
@@ -29,7 +16,10 @@
           v-model="queryParams.type"
           placeholder="鎵�鏈夌被鍒�"
           clearable
-          style="width: 240px"
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
           @keyup.enter.native="handleQuery"
         >
           <el-option
@@ -48,7 +38,10 @@
           v-model="queryParams.grade"
           placeholder="璇疯緭鍏ョ骇鍒�"
           clearable
-          style="width: 240px"
+          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>
@@ -237,13 +230,15 @@
           </el-input>
         </el-form-item>
         <el-form-item label="鏈夋晥鏃堕棿" prop="validityDate">
-          <el-input v-model="formDat.validityDate" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >
-          </el-input>
+          <el-date-picker v-model="formDat.validityDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                          :editable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
+          ></el-date-picker>
         </el-form-item>
 
         <el-form-item label="鑾峰緱鏃堕棿" prop="getDate">
-          <el-input v-model="formDat.getDate" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >
-          </el-input>
+          <el-date-picker v-model="formDat.getDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                          :editable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
+          ></el-date-picker>
         </el-form-item>
         <el-form-item label="瀛樻斁浣嶇疆" prop="location">
           <el-input v-model="formDat.location" placeholder="璇疯緭鍏ュ瓨鏀句綅缃�" clearable :style="{width: '100%'}" >
@@ -254,25 +249,27 @@
           <el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
         </el-form-item>
 
-        <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
+        <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"
         >
-          <div v-if="uploading" class="upload-status">姝e湪涓婁紶...</div>
-          <i v-if="!uploading" 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]"
-            >
+         <i  slot="default" class="el-icon-plus"></i>
+          <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"
@@ -301,10 +298,11 @@
           multiple
 
           :on-remove="handleRemoveFile"
-          :http-request="requestUpload"
+          :http-request="requestUpload1"
           :show-file-list="true"
         >
           <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+          <div v-if="uploading1" class="upload-status">姝e湪涓婁紶...</div>
           <template #tip>
             <div class="el-upload__tip">
             </div>
@@ -382,6 +380,7 @@
       btn:false,
       fit:['fill'],
       uploading: false,
+      uploading1: false,
       formDat: {
         //鑽h獕璇佷功璁板綍
         id:undefined,
@@ -546,21 +545,6 @@
       }, []);
 
     },
-    /** 鏌ヨ绫诲埆淇℃伅 */
-    // 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]})
-    //     response.data.itemValues.replace("{", "").replace("}", "").split(",").map(elem => {
-    //       const label = elem.split(":")[0].trim();
-    //       const value = parseInt(elem.split(":")[1].trim());
-    //       _this.typeOptions.push({ "label": label, "value": value });
-    //     })
-    //   })
-    // },
     //绫诲埆閫夋嫨
     getSrc1(type){
       if(type===0){
@@ -721,21 +705,21 @@
           addHonor(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)
     {
@@ -751,15 +735,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