From 996bd1317933bd5185731fb8c632aa98ecd0d70a Mon Sep 17 00:00:00 2001
From: 23688nl <329261568@qq.com>
Date: Fri, 9 Sep 2022 11:00:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4:=20=E9=A1=B9=E7=9B=AE=20?=
=?UTF-8?q?=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80=E6=8B=BC=E6=8E=A5=20?=
=?UTF-8?q?=E5=8E=BB=E6=8E=89=20/prod-api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/hciot.js | 3 +--
src/views/iot/video/site/index.vue | 18 +++++++++++-------
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/utils/hciot.js b/src/utils/hciot.js
index 2c1a7d42..f9ec4290 100644
--- a/src/utils/hciot.js
+++ b/src/utils/hciot.js
@@ -164,8 +164,7 @@ export function getIotFileUrl(importUrl) {
if (importUrl.indexOf('http') === 0 || importUrl.indexOf('https') === 0) {
return importUrl;
} else if (importUrl.indexOf('/profile/upload/') === 0 || importUrl.indexOf('/profile/avatar/') === 0) {
- console.log('baseUrl:', baseHref + baseURL + importUrl);
- return baseHref + baseURL + importUrl;
+ return baseHref + importUrl;
} else if (importUrl.indexOf('data:image/') === 0 || importUrl.indexOf('/static/') === 0) {
return importUrl;
}
diff --git a/src/views/iot/video/site/index.vue b/src/views/iot/video/site/index.vue
index 3a19aa3f..43d3d962 100644
--- a/src/views/iot/video/site/index.vue
+++ b/src/views/iot/video/site/index.vue
@@ -72,7 +72,7 @@
@selection-change="handleSelectionChange"
>
-
+
-
+
+
+ {{ scope.row.siteAddress || '--'}}
+
+
@@ -92,8 +96,8 @@
-
-
+
+
@@ -310,11 +314,11 @@
-
+
@@ -500,7 +504,7 @@ export default {
// 表单校验
rules: {
devId: [
- { required: true, message: "设备ID不能为空", trigger: "blur" },
+ { required: true, message: "站点通道不能为空", trigger: "blur" },
{
pattern: /^[0-9]{20}$/,
message: "格式不正确; 纯数字 组合20个字符",