From 3910b79b0549b583387ff96ef5a21a2ad5313631 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 15 十一月 2024 10:43:02 +0800
Subject: [PATCH] 修改了相关bug

---
 ruoyi-ui/src/views/device/equipmentInfo.vue |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/views/device/equipmentInfo.vue b/ruoyi-ui/src/views/device/equipmentInfo.vue
index fcc3ff6..147e1f9 100644
--- a/ruoyi-ui/src/views/device/equipmentInfo.vue
+++ b/ruoyi-ui/src/views/device/equipmentInfo.vue
@@ -146,7 +146,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">
@@ -318,7 +318,6 @@
       this.btn = false;
       this.isShow=false
     }
-
     let _this = this
     if (id) {
       this.loading = true;
@@ -337,12 +336,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()
@@ -427,6 +440,15 @@
           if (this.formData.id != undefined) {
             updateEquipment(this.formData).then(response => {
               this.$modal.msgSuccess("淇敼鎴愬姛");
+			  console.log(this.$route)
+			     this.$tab.closePage({ path: "/familymodel/zfDevice" })
+			//	this.$store.dispatch("tagsView/delView",{ path: "/familymodel/zfDevice" }); //鍏抽棴褰撳墠椤�
+				//this.$store.dispatch('tagsView/addView', {  title:"ZfDevice",path: "/familymodel/zfDevice" })
+				//this.$store.dispatch('tagsView/addIframeView', { title:"ZfDevice",ZfDevicepath: "/familymodel/zfDevice" })
+				//    this.$tab.refreshPage({ path: "/familymodel/zfDevice" });
+				// this.$router.replace({ path: "/familymodel/zfDevice?cache=true" });
+		//	this.$router.push("/familymodel/zfDevice");
+				window.location.url="https://localhost:80/familymodel/zfDevice"
               // this.open = false;
               if(this.formData.status==1)
                 this.formData.status = '鏄�'

--
Gitblit v1.9.1