From 4b1fbea0d8099259ea7d0ef10bd7633c3bc62f2e Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 17 十二月 2024 17:43:08 +0800
Subject: [PATCH] 修改了对应的bug

---
 ruoyi-ui/src/views/self/memoInfo.vue |  113 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 103 insertions(+), 10 deletions(-)

diff --git a/ruoyi-ui/src/views/self/memoInfo.vue b/ruoyi-ui/src/views/self/memoInfo.vue
index dcb20c7..7b66dcf 100644
--- a/ruoyi-ui/src/views/self/memoInfo.vue
+++ b/ruoyi-ui/src/views/self/memoInfo.vue
@@ -120,12 +120,15 @@
           action=""
           :file-list="fileListOther"
           class="upload-demo"
+          ref="upload1"
           multiple
           list-type="picture-card"
           :on-preview="handleFileCardPreview"
           :on-remove="handleRemoveFile"
+          :on-change="handleChange1"
           :http-request="requestUpload1"
           :show-file-list="true"
+          :auto-upload="false"
           :disabled="!btn"
           :class="{ hide: !btn }"
         >
@@ -142,7 +145,7 @@
             ></video>
             <img v-else
                  class="el-upload-list__item-thumbnail"
-                 src="../../assets/401_images/401.gif"
+                 src="../../assets/images/deviceLis.png"
                  alt=""
                  style="width: 147px; height: 147px"
                  fit="cover">
@@ -175,12 +178,20 @@
 
 
         </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>
         </el-form-item>
       </el-form>
-    </div>
+</div>
     <el-dialog  :visible.sync="dialogVisible">
       <img w-full :src="dialogImageUrl"  style="width: 100%; height: 100%" alt="Preview Image" />
     </el-dialog>
@@ -209,6 +220,7 @@
       fileList:[],
       fileList1:[],
       fileListOther:[],
+      fileListOther1:[],
       uploadFileList:[],
       uploadFileList1:[],
       dsb:true,
@@ -288,7 +300,7 @@
     if (id) {
       this.loading = true;
       getNote({id}).then((response) => {
-console.log(response.data , '6666666666')
+      console.log(response.data , '6666666666')
         this.formData = response.data;
         let paths = this.formData.url.split(",");
         for(let i = 0; i < paths.length; i++)
@@ -298,12 +310,26 @@
                 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][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})
+            }
+
+            }
                 else {
                   // alert(paths[i])
         	 // alert()
@@ -326,6 +352,41 @@
   },
   mounted() {},
   methods: {
+    getData(){
+      const id = this.$route.params && this.$route.params.id;
+      let _this = this
+      if (id) {
+        this.loading = true;
+        getNote({id}).then((response) => {
+        // console.log(response.data , '6666666666')
+          this.formData = response.data;
+          let paths = this.formData.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)
+
+                  if (_this.fot.includes(pth) === true){
+                  console.log()
+                  } else {
+                    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;
+        });
+
+      }
+    },
+
     submitForm() {
       // let ul = this.fileList.map(function (elem){
       //   return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
@@ -488,7 +549,7 @@
     	   this.fileList.push({name:file.name,url:file.url,res:true})
         },
     	//鑷畾涔変笂浼犳柟娉�
-    	handleChange1(file, fileListOther1) {
+    	handleChange1(file, fileListOther12) {
     	       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
 
     	     // this.uploadFileList.push(file.raw);
@@ -499,6 +560,38 @@
     	    //  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
+      	    updateNote(_this.formData).then(response => {
+      	      this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
+      	      // this.open = false;
+              this.getData();
+              this.fileListOther1=[]
+      	    });
+      	  })
+        // this.getData();
+
+      },
     picUpload(){
     	var formData = new FormData();
     if(this.uploadFileList.length==0){

--
Gitblit v1.9.1