From f5edbc080d696fbd55de84f6a906aeb2cde3b1b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 03 三月 2025 22:57:00 +0800
Subject: [PATCH] 修改了对应bug

---
 ruoyi-ui/src/views/honor/honorInfo.vue |  626 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 501 insertions(+), 125 deletions(-)

diff --git a/ruoyi-ui/src/views/honor/honorInfo.vue b/ruoyi-ui/src/views/honor/honorInfo.vue
index d424aa9..062deff 100644
--- a/ruoyi-ui/src/views/honor/honorInfo.vue
+++ b/ruoyi-ui/src/views/honor/honorInfo.vue
@@ -1,11 +1,15 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="printable-content">
     <div class="form-header mt">
-      <h4 class="dt h4">鑽h獕璇佷功璇︾粏淇℃伅 </h4>
-      <!--      <el-button v-if="isShow" type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>-->
-      <!--      <br>-->
-      <!--      <el-button type="primary" class="pt"   @click="handleExport"-->
-      <!--                 v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>-->
+      <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;" >
+        <span>鑽h獕璇佷功璇︾粏淇℃伅</span>
+        <div style="display: flex; align-items: center;">
+          <el-button size="mini" type="text"  v-print="'#printable-content'" v-hasPermi="['person:information:memo']">
+            <div class="form" ><el-icon  style="padding-right:100px;"></el-icon>
+              <span class="text" style="width: 69px;height: 26px;font-size: 16px;
+            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鎵撳嵃</span></div>
+          </el-button></div>
+      </h1>
     </div>
     <div>
       <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="100px">
@@ -18,25 +22,25 @@
             <el-container>
               <el-row>
                 <el-cow :span="8">
-                  <el-form-item label="鏃堕棿" prop="createTime" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
-                    <el-input v-model="formData.createTime" placeholder="璇疯緭鍏ユ椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
-                    </el-input>
-                  </el-form-item>
-                </el-cow>
-                <el-cow :span="8">
-                  <el-form-item label="绫诲埆" prop="type" label-width="50px" 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-form-item label="绫诲埆" prop="type" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;" :disabled="dsb">
+                    <el-select v-model="formData.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}"   :disabled="dsb">
+                      <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
+                      ></el-option>
+                    </el-select>
                   </el-form-item>
                 </el-cow>
                 <el-cow :span="8">
                   <el-form-item label="鍚嶇О" prop="name" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
-                    <el-input v-model="formData.name" placeholder="璇疯緭鍏ュ悕绉�" clearable :style="{width: '100%'}" :disabled="dsb">
-                    </el-input>
+                    <el-select v-model="formData.name" 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 :span="8">
-                  <el-form-item label="璇佸彿/涓撲笟" prop="idNo" label-width="90px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+                  <el-form-item label="璇佸彿/涓撲笟" prop="idNo" label-width="90px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;" :disabled="dsb">
                     <el-input v-model="formData.idNo" placeholder="璇疯緭鍏ヨ瘉鍙�/涓撲笟" clearable :style="{width: '100%'}" :disabled="dsb">
                     </el-input>
                   </el-form-item>
@@ -60,14 +64,16 @@
               <el-row>
                 <el-cow :span="8">
                   <el-form-item label="鏈夋晥鏃堕棿" prop="validityDate" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
-                    <el-input v-model="formData.validityDate" placeholder="璇疯緭鍏ユ湁鏁堟椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
-                    </el-input>
+                    <el-date-picker v-model="formData.validityDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                                    :editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd"
+                    ></el-date-picker>
                   </el-form-item>
                 </el-cow>
                 <el-cow :span="8">
                   <el-form-item label="鑾峰緱鏃堕棿" prop="getDate" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
-                    <el-input v-model="formData.getDate" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
-                    </el-input>
+                    <el-date-picker v-model="formData.getDate" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                                    :editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd"
+                    ></el-date-picker>
                   </el-form-item>
                 </el-cow>
                 <el-cow :span="8">
@@ -80,34 +86,41 @@
             </el-container>
           </div>
         </el-container>
-        <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"
+
+		  :show-file-list="true"
+		  :http-request="requestUpload"
+		         :file-list="fileList"
+		       :on-change="handleChange"
+		  	  :auto-upload="false"
+          :disabled="!btn"
+          :class="{ hide: !btn }"
         >
-          <i slot="default" class="el-icon-plus"></i>
+          <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: 147px; height: 147px"
+              style="width: 147px; height: 147px; object-fit: cover;"
               fit="cover"
               :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)"
         >
@@ -121,11 +134,15 @@
           <i class="el-icon-delete"></i>
         </span>
       </span>
-
-
           </div>
         </el-upload>
-
+ <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+				  v-if="btn"
+		          @click="picUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
         <h4 class="form-header">鍏朵粬闄勪欢 </h4>
         <el-upload
           action=""
@@ -134,50 +151,71 @@
           multiple
           list-type="picture-card"
           :on-preview="handleFileCardPreview"
-          :on-remove="handleRemove"
-          :http-request="requestUpload"
+          :on-remove="handleRemoveFile"
+          :http-request="requestUpload1"
           :show-file-list="true"
-        >
 
-          <i slot="default" class="el-icon-plus"></i>
+
+		  ref="upload1"
+		  		:on-change="handleChange1"
+		  				:auto-upload="false"
+          :disabled="!btn"
+          :class="{ hide: !btn }"
+        >
+          <div v-if="uploading1" class="upload-status">姝e湪涓婁紶...</div>
+          <i v-if="!uploading1" slot="default" class="el-icon-plus"></i>
           <div slot="file" slot-scope="{file}">
-            <img
+            <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+            <video
+              v-if="file.url.includes('.mp4')"
               class="el-upload-list__item-thumbnail"
-              src="../../assets/401_images/401.gif"
-              alt=""
+              :src="file.url"
               style="width: 147px; height: 147px"
               fit="cover"
-            >
+            ></video>
+            <img v-else
+                 class="el-upload-list__item-thumbnail"
+                 src="../../assets/images/deviceLis.png"
+                 alt=""
+                 style="width: 147px; height: 147px"
+                 fit="cover">
+
             <span class="el-upload-list__item-actions">
-                <span
-                  v-if="isShow"
-                  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"
+               <span class="el-upload-list__item-name">{{ file.name }}</span>
+                    <span
+                      class="el-upload-list__item-preview"
+                      @click="handleFileCardPreview(file)"
+                    >
+                      <i class="el-icon-zoom-in"></i>
+                    </span>
+                    <span
 
-                >
-                  <i class="el-icon-download"></i>
-                </span>
-                <span
-                  v-if="isShow"
-                  class="el-upload-list__item-delete"
-                  @click="handleRemoveFile(file)"
-                >
-                  <i class="el-icon-delete"></i>
-                </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="handleRemoveFile(file)"
+                    >
+                      <i class="el-icon-delete"></i>
+                    </span>
               </span>
-
 
           </div>
 
 
         </el-upload>
+	 <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          v-if="btn"
+		          @click="fileUpload"
+		        >涓婁紶鍒版湇鍔″櫒</el-button>
+				<h4 class="form-header"> </h4>
 
         <el-form-item size="large">
           <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
@@ -185,7 +223,7 @@
       </el-form>
     </div>
     <el-dialog  :visible.sync="dialogVisible">
-      <img w-full :src="dialogImageUrl" alt="Preview Image" />
+      <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" />
     </el-dialog>
   </div>
 </template>
@@ -196,7 +234,8 @@
 import errorCode from "@/utils/errorCode";
 import {Message} from "element-ui";
 import { download,uploadPic} from "@/api/doctor/index";
-import {listHonor,updateHonor,getHonor} from "@/api/honor/index";
+import {updateHonor,getHonor,getCategory, listType} from "@/api/honor/index";
+import {updateCollection} from "@/api/collection";
 
 export default {
   components: {},
@@ -205,18 +244,27 @@
     return {
       cdi:"鑽h獕璇佷功璇︾粏淇℃伅",
       udi:"鑽h獕璇佷功淇℃伅璇︽儏",
-      fot:[".jpg",".jif","png"],
-      fileList:[
-      ],
-      fileListOther:[
+     // 鏁版嵁鑼冨洿閫夐」
+     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
 
-      ],
+      fileList:[],
+
+
+	  fileList1:[],
+	  uploadFileList:[],
+	  uploadFileList1:[],
+	  fileListOther:[],
+    	  fileListOther1:[],
       dsb:true,
       btn:false,
       isShow:true,
+      isEditing: false,
+      uploading: false,
+      uploading1: false,
       // 鑽h獕琛ㄦ牸鏁版嵁
       honorList: [],
-
+      typeList:[],
       formData: {
         //鑽h獕璇佷功璁板綍
         id:undefined,
@@ -229,8 +277,9 @@
         getDate:undefined,
         location:undefined,
         remark:undefined,
-        url: undefined,
+        url: '',
       },
+      desurl:'',
       dialogImageUrl: '',
       dialogVisible: false,
       disabled: false,
@@ -282,6 +331,13 @@
         }],
       },
       typeOptions: [],
+      newOption: undefined,
+      showInput: false,
+      typeOption:[
+        {value:'璇佷欢',label:'璇佷欢'},
+        {value:'鑽h獕',label:'鑽h獕'},
+        {value:'璧勮川',label:'璧勮川'},],
+      types:undefined
     }
   },
   computed: {},
@@ -289,63 +345,218 @@
   created() {
     const id = this.$route.params && this.$route.params.id;
     let jd;
+    if(this.formData.type == 0)
+      this.types = '璇佷欢'
+    else if(this.formData.type== 1)
+      this.types = '鑽h獕'
+    else
+      this.types = '璧勮川'
     if(this.$route.query.detail!=undefined)
     {
       jd =  this.$route.query.detail
       this.btn= jd
       this.dsb = !jd
       this.isShow=true
-      document.title = "淇敼鑽h獕璇佷功璇︾粏淇℃伅";
+      this.showInput=true
+      this.isEditing=true
+
+   //   document.title = "淇敼鑽h獕璇佷功璇︾粏淇℃伅";
       this.$route.meta.title = "淇敼鑽h獕璇佷功璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
     }
     else{
-      document.title = "鏌ョ湅鑽h獕璇佷功璇︾粏淇℃伅";
+    //  document.title = "鏌ョ湅鑽h獕璇佷功璇︾粏淇℃伅";
       this.$route.meta.title = "鏌ョ湅鑽h獕璇佷功璇︾粏淇℃伅";//鍒楄〃鐨勫悕绉�
       this.isShow=false
+      this.btn = false;
     }
 
     let _this = this
     if (id) {
       this.loading = true;
-      getHonor(id).then((response) => {
+      getHonor({id}).then((response) => {
         this.formData = response.data;
+      //    alert(this.formData.type)
         let paths = response.data.url.split(",");
         for(let i = 0; i < paths.length; i++)
         {
           if(paths[i]!="") {
 
-            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+              let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+          //	alert(pth)
+              if (_this.fot.includes(pth) === true)
+          	// {
+          	// 	if(paths[i][0]=="/")
+           //      _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+          	//   else
+          	//      _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+          	//   }
+            {
+              if(paths[i].includes(process.env.VUE_APP_BASE_TRUE_API)){
+                if(paths[i][0]=="/")
+                      _this.fileList.push({name:paths[i],url: paths[i].substr(1),res:false})
+                else
+                   _this.fileList.push({name:paths[i],url: paths[i],res:false})
+              }else{
+                if(paths[i][0]=="/")
+                      _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+                else
+                   _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+              }
 
-            if (_this.fot.includes(pth) === true)
-              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
-            else {
-              // alert(paths[i])
-              let nms = paths[i].split("\/")
-              let nm = nms[nms.length - 1]
-              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+              }
+              else {
+                // alert(paths[i])
+          	 // alert()
+                let nms = paths[i].split("\/")
+                let nm = nms[nms.length - 1]
+          	  if(paths[i][0]=="/")
+                _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+          		else
+          		_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+          	}
             }
-          }
         }
         this.loading = false;
       });
-      this.getCateInfor()
+      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.fetchData()
+      // this.getCateInfor()
 
     }
+    console.log(this.fileListOther,'this.fileListOtherthis.fileListOtherthis.fileListOther')
+
   },
   mounted() {},
   methods: {
+    getData(){
+      const id = this.$route.params && this.$route.params.id;
+      let _this = this
+      if (id) {
+        this.loading = true;
+        getHonor({id}).then((response) => {
+          this.formData = response.data;
+        //    alert(this.formData.type)
+          let paths = response.data.url.split(",");
+          for(let i = 0; i < paths.length; i++)
+          {
+            if(paths[i]!="") {
+
+                let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+            //	alert(pth)
+                if (_this.fot.includes(pth) === true)
+            	{
+              console.log()
+            	  }
+                else {
+                  // alert(paths[i])
+            	 // alert()
+                  let nms = paths[i].split("\/")
+                  let nm = nms[nms.length - 1]
+            	  if(paths[i][0]=="/")
+                  _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+            		else
+            		_this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+            	}
+              }
+          }
+          _this.fileListOther = _this.fileListOther1
+          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.fetchData()
+        // this.getCateInfor()
+
+      }
+    },
+    // 鑾峰彇鏁版嵁鏂规硶
+    fetchData(id) {
+      const url = 'https://47.93.189.255:8080/zHonor/id=${id}'; // 鎺ュ彛 URL'/zHonor/id='+query
+      fetch(url)
+        .then(response => response.json())
+        .then(data => {
+          this.formData = data; // 閫氳繃灏嗚繑鍥炴暟鎹祴缁欑粍浠跺睘鎬ф潵鏇存柊瑙嗗浘
+        })
+        .catch(error => {
+          console.error('Error:', error); // 澶勭悊閿欒
+        });
+    },
+    //绫诲埆
+    addNewOption() {
+      const newOption = this.newOption.trim();
+      if (newOption && !this.typeOptions.includes(newOption)) {
+        this.typeOptions.push(newOption);
+        this.$set(this.formData, 'name', 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;
+      }, []);
+
+    },
+    //绫诲埆閫夋嫨
+    getSrc1(type){
+      if(type===0){
+        return '璇佷欢'
+      }else if(type===1){
+        return '鑽h獕'
+      }else if(type===2){
+        return '璧勮川'
+      }
+    },
     /** 鏌ヨ绫诲埆淇℃伅 */
     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=>{
+        //   _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 });
+          })
       })
     },
     submitForm() {
+      if(this.types=='0')
+        this.formData.type = 0
+      else if(this.types == '1')
+        this.formData.type = 1
+      else if(this.types == '2')
+        this.formData.type = 2
+
       let ul = this.fileList.map(function (elem){
         return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
       }).join(",")
@@ -388,24 +599,93 @@
       })
     },
     handleRemoveFile(file) {
-      for(let i = 0; i < this.fileListOther.length; i++)
-      {
-        if(this.fileListOther[i].url==file.url)
-          this.$delete(this.fileListOther,i);
-      }
+      //鍒よ鏄惁鏄箣鍓嶇殑鍥剧墖
+        let res = false
+        for(let i = 0; i < this.fileListOther.length; i++)
+        {
+          if(this.fileListOther[i].url==file.url)
+      	{
+      		if(this.fileListOther[i].res==false)
+      			res = true
+      		else
+      		{
+      			this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
+      		}
+            this.$delete(this.fileListOther,i);
+
+      	}
+        }
+
+        let ul = ""
+        this.fileList.map(function (elem){
+        		if(elem.res==false)
+        			ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        })
+        let uls = ""
+        this.fileListOther.map(function (elem){
+          if(elem.res==false)
+        			uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        })
+        this.formData.url = ul+","+uls;
+      //  alert(this.formData.url)
+        if(res==true){
+      	  updateHonor(this.formData).then(response => {
+      		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      		// this.open = false;
+
+      	  });
+        }
     },
     handleRemove(file) {
-      for(let i = 0; i < this.fileList.length; i++)
-      {
-        if(this.fileList[i].url==file.url)
-          this.$delete(this.fileList,i);
-      }
+      //鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
+        let res = false
+      //  alert(this.fileList.length)
+        for(let i = 0; i < this.fileList.length; i++)
+        {
+          if(this.fileList[i].url==file.url)
+      	{
+      		//鍘熸潵鍥惧儚鏍囪涓篺alse
+      		//alert(this.fileList[i].res)
+      	  if(this.fileList[i].res==false)
+      		res = true
+      	  else
+      	  {
+      		//  alert(this.uploadFileList.length)
+      		//  alert(87)
+      		 this.$delete(this.uploadFileList, Math.abs(i - this.uploadFileList.length-1))
+      		 	//	  alert(this.uploadFileList.length)
+      		 }
+            this.$delete(this.fileList,i);
+
+        }
+        }
+        let ul = ""
+        this.fileList.map(function (elem){
+      	if(elem.res==false)
+      		ul = ul + ","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        })
+        let uls = ""
+        this.fileListOther.map(function (elem){
+          if(elem.res==false)
+      		uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        })
+        this.formData.url = ul+","+uls;
+        if(res==true){
+      	  updateHonor(this.formData).then(response => {
+      		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      	  });
+        }
+
     },
     handleFileCardPreview(file){
       this.dialogFileUrl = file.url;
+      if(this.dialogFileUrl.includes("47.93.189.255")==true)
+        this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com")
+
       const Base64 = require('js-base64').Base64
-      this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
-      myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+
+      this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
+      let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
     },
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
@@ -427,39 +707,129 @@
     handleEdit()
     {
       this.dsb = false
-      // this.btn = true
+      this.btn = true
       this.isShow=false
     },
-    requestUpload(params)
+//鑷畾涔変笂浼犳柟娉�
+    handleChange(file, fileList1) {
+       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+
+     // this.uploadFileList.push(file.raw);
+      console.log("=========5555=========")
+	  this.uploadFileList.push(file.raw);
+	   this.fileList.push({name:file.name,url:file.url,res:true})
+    },
+	//鑷畾涔変笂浼犳柟娉�
+	handleChange1(file, fileListOther1) {
+	       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+
+	     // this.uploadFileList.push(file.raw);
+		 this.uploadFileList1.push(file.raw);
+		  this.fileListOther.push({name:file.name,url:file.url,res:true})
+	      console.log("=========5555=========")
+	      //console.log(file)
+	    //  console.log(this.uploadFileList)
+		//  this.fileList = fileList
+	},
+	fileUpload(){
+	//	var file = params.file;
+
+		var formData = new FormData();
+		//this.$refs.upload1.submit();
+	//	alert(this.uploadFileList1.length)
+		// formData.append('uploadFile', file);
+		if(this.uploadFileList1.length==0){
+			  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+			  return}
+
+		this.uploadFileList1.forEach((elem)=>{
+			formData.append("files", elem)
+
+		})
+		console.log(this.uploadFileList1)
+		let _this = this
+
+		this.uploading = true;
+		uploadPic(formData).then(response => {
+		_this.uploadFileList1 = []
+		  _this.formData.url = _this.formData.url+","+response.fileNames
+		    updateHonor(_this.formData).then(response => {
+		      this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+		      // this.open = false;
+          this.getData()
+          this.fileListOther1=[]
+		    });
+		  })
+
+	},
+	picUpload()
+	{
+
+		var formData = new FormData();
+		//this.$refs.upload.submit();
+		//alert(this.uploadFileList.length)
+	if(this.uploadFileList.length==0){
+		  this.$modal.msgSuccess("鍥惧儚涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+		  return}
+
+		this.uploadFileList.forEach((elem)=>{
+			formData.append("files", elem)
+
+		})
+		let _this = this
+
+
+        uploadPic(formData).then(response => {
+			// console.log(response.originalFilenames)
+			// console.log(response.urls)
+			// console.log(response.fileNames)
+			// 		console.log(response.newFileNames)
+        // let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+        // _this.uploading1= false;
+        // console.log(_this.fot.includes(pth))
+        // // debugger
+        // if(_this.fot.includes(pth) === true)
+        // {
+        //   _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+        //   let ul = _this.fileList.map(function (elem){
+        //     return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        //   }).join(",")
+        //   let uls = _this.fileListOther.map(function (elem){
+        //     return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+        //   }).join(",")
+		//console.log(_this.fileList)
+	//	alert(response.fileNames)
+          _this.formData.url = _this.formData.url+","+response.fileNames
+		_this.uploadFileList = []
+         // alert(87)
+          updateHonor(_this.formData).then(response => {
+            _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+            // this.open = false;
+
+          });
+        // }
+        // else{
+        //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+        // }
+      });
+	},
+     requestUpload(params)
     {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
+   //  alert(124)
+//	 this.uploadFileList.push(params.file);
 
-      uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+     //alert(34)
 
-        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})
-
-        }
-      })
 
     },
-
-    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
-    handleExport() {
-      this.download('/zHonor/export', {
-        ...this.queryParams
-      }, `zfHonor_${new Date().getTime()}.xlsx`)
-    }
+    requestUpload1(params)
+    {
+	//	alert(123)
+   // this.uploadFileList1.push(params.file);
+  //  console.log("-----------")
+	//console.log(this.uploadFileList1)
+    },
 
   }
 }
@@ -484,4 +854,10 @@
   display: block;
   position: absolute;
 }
+.hide /deep/ .el-upload--picture-card {
+  display: none;
+}
+.form{
+  background:center/11% no-repeat url('../../assets/icons/form.png') ;
+}
 </style>

--
Gitblit v1.9.1