From aca439876a31a549e5ba20e3a2130a4953342c11 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Mon, 18 Dec 2023 11:05:46 +0800
Subject: [PATCH] update

---
 src/utils/devSever.ts                         | 4 ++--
 src/views/Offsite/child/childContent/left.vue | 2 ++
 src/views/index.vue                           | 6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/utils/devSever.ts b/src/utils/devSever.ts
index 8bb2b03..7e27765 100644
--- a/src/utils/devSever.ts
+++ b/src/utils/devSever.ts
@@ -9,8 +9,8 @@
  */
 
 // export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://192.168.3.97:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"}
-export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://8.130.165.100:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/screen/image/"}
-export const production={xhr:process.env.VUE_APP_BASE_API,ws:"ws://8.130.165.100:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/screen/image/"}
+export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://8.130.165.100:9018/",imgxhr:process.env.VUE_APP_BASE_API}
+export const production={xhr:process.env.VUE_APP_BASE_API,ws:"ws://8.130.165.100:9018/",imgxhr:process.env.VUE_APP_BASE_API}
 //拼接图片url路径
 export function imgurlAddXhr(img){
     let src=null
diff --git a/src/views/Offsite/child/childContent/left.vue b/src/views/Offsite/child/childContent/left.vue
index af4b6ea..ffad4a6 100644
--- a/src/views/Offsite/child/childContent/left.vue
+++ b/src/views/Offsite/child/childContent/left.vue
@@ -91,6 +91,8 @@ val.citylist.forEach(res=>{
 let a = [...new Set(imagedata)]
 //删除图片后处理
 imagedata=[]
+
+console.log(a,'111');
 a.forEach((res,index)=>{
   imagedata.push({image:res,id:index})
 })
diff --git a/src/views/index.vue b/src/views/index.vue
index 39b1315..f783301 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -43,6 +43,7 @@ import { useI18n } from "vue-i18n";
 import { getStoredLanguage, saveStoredLanguage } from "@/utils/languageStorage";
 import { useRoute } from 'vue-router'
 import { getScreenByHash } from "@/http/rule/index"
+import {imgurlAddXhr} from "@/utils/devSever"
 let langicon = require("@/assets/svg/language.svg")
 let route = useRoute()
 window.document.title = "大屏物联管理系统";
@@ -315,15 +316,18 @@ async function reqScreenByHash() {
   if (res.code === 200) {
     let {data} = res
     routerList.value = data.map((item:any) => {
+      const regex = /^(http|https):\/\/[^ "]+$/;
+      let isTrue = regex.test(item.img);
       return {
         id: item.id,
         isLink: false,
         path: item.path,
         title: item.title,
-        url: item.img,
+        url: isTrue?item.img:imgurlAddXhr(item.img),
         hash: hash
       }
     })
+    
   }
 
 }