From f468170d79dee3f8efb75705c7e23a1b53e54e91 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 29 七月 2025 22:08:02 +0800
Subject: [PATCH] 修改了内容

---
 ruoyi-ui/src/views/pet/noteInfo.vue |  178 ++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 127 insertions(+), 51 deletions(-)

diff --git a/ruoyi-ui/src/views/pet/noteInfo.vue b/ruoyi-ui/src/views/pet/noteInfo.vue
index 5139ebd..883fa48 100644
--- a/ruoyi-ui/src/views/pet/noteInfo.vue
+++ b/ruoyi-ui/src/views/pet/noteInfo.vue
@@ -114,7 +114,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">
@@ -182,21 +182,21 @@
       // 鏁版嵁鑼冨洿閫夐」
       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,
       uploading: false,
       formData: {
-
         type: undefined,
         title: undefined,
         location: undefined,
@@ -270,21 +270,46 @@
         this.formData = response.data;
         let paths = response.data.url.split(",");
         for(let i = 0; i < paths.length; i++)
-        {
-          if(paths[i]!="") {
+    {
+      if(paths[i]!="") {
 
-            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
-
-            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]})
-            }
-          }
+        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})
         }
+
+        }
+        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.fileList1 = _this.fileList
+    }
         this.loading = false;
       });
 
@@ -292,14 +317,51 @@
   },
   mounted() {},
   methods: {
+    getData(){
+          const id = this.$route.params && this.$route.params.id;
+          let _this = this
+          if (id) {
+            this.loading = true;
+            getPetnoteList(id).then((response) => {
+              this.formData = response.data;
+              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;
+            });
+
+          }
+    },
     submitForm() {
-      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(",")
-      this.formData.url = ul+","+uls
+      // 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(",")
+      // this.formData.url = ul+","+uls
 
       this.$refs['elForm'].validate(valid => {
 
@@ -322,10 +384,18 @@
       this.$refs['elForm'].resetFields()
     },
     handleFileCardPreview(file){
-      this.dialogFileUrl = file.url;
-      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.dialogFileUrl = file.url;
+	  if(this.dialogFileUrl.includes("47.93.189.255")==true)
+	    this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com")
+	  //alert(this.dialogFileUrl)
+	  const Base64 = require('js-base64').Base64
+
+	  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');
+
+
+
     },
     handlePreview(file)
     {
@@ -354,10 +424,10 @@
       			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)
@@ -374,7 +444,7 @@
       	  updatenotePet(this.formData).then(response => {
       		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
       		// this.open = false;
-      	  
+
       	  });
         }
     },
@@ -398,7 +468,7 @@
      		 	//	  alert(this.uploadFileList.length)
      		 }
            this.$delete(this.fileList,i);
-        
+
        }
        }
        let ul = ""
@@ -409,9 +479,10 @@
        let uls = ""
        this.fileListOther.map(function (elem){
          if(elem.res==false)
-     		elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+     		uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
        })
        this.formData.url = ul+","+uls;
+       console.log(this.formData,'formDataformDataformDataformDataformDataformDataformData')
        if(res==true){
      	  updatenotePet(this.formData).then(response => {
      		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
@@ -451,16 +522,16 @@
    //鑷畾涔変笂浼犳柟娉�
        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) {
+   	handleChange1(file, fileListOther12) {
    	       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-   	
+
    	     // this.uploadFileList.push(file.raw);
    		 this.uploadFileList1.push(file.raw);
    		  this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -471,7 +542,7 @@
    	},
    	fileUpload(){
    	//	var file = params.file;
-   
+
    		var formData = new FormData();
    		//this.$refs.upload1.submit();
    	//	alert(this.uploadFileList1.length)
@@ -479,42 +550,47 @@
    		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;
+		// alert(234)
    		uploadPic(formData).then(response => {
    		_this.uploadFileList1 = []
    		  _this.formData.url = _this.formData.url+","+response.fileNames
+		  // alert(2346)
    		    updatenotePet(_this.formData).then(response => {
    		      this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
    		      // this.open = false;
+            this.uploading = 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)
@@ -541,12 +617,12 @@
              updatenotePet(_this.formData).then(response => {
                _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
                // this.open = false;
-   
+
              });
            // }
            // else{
            //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-   
+
            // }
          });
    	},
@@ -554,10 +630,10 @@
        {
       //  alert(124)
    //	 this.uploadFileList.push(params.file);
-   
+
         //alert(34)
-    
-   	
+
+
        },
        requestUpload1(params)
        {

--
Gitblit v1.9.1