From 998b75f0d4aaed03001ec4246cd4f3b4b0743b7e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 23 Nov 2022 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/config/website.js | 2 +-
src/views/repairsorder/repairsorderDetail.vue | 2 +-
src/views/eventgm/eventgmDetail.vue | 2 +-
src/views/repairsorder/repairsorder.vue | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/config/website.js b/src/config/website.js
index d692fd3..fbdd395 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -43,7 +43,7 @@
// 第三方系统授权地址
authUrl: 'http://localhost/blade-auth/oauth/render',
// 报表设计器地址(cloud端口为8108,boot端口为80)
- reportUrl: 'http://localhost:8108/ureport',
+ reportUrl: 'http://localhost:80/ureport',
// 单点登录系统认证(blade-auth服务的地)
ssoUrl: 'http://localhost:8100/oauth/authorize?client_id=saber&response_type=code&redirect_uri=',
// 单点登录回调地址(Saber服务的地址)
diff --git a/src/views/eventgm/eventgmDetail.vue b/src/views/eventgm/eventgmDetail.vue
index fb2584b..152c265 100644
--- a/src/views/eventgm/eventgmDetail.vue
+++ b/src/views/eventgm/eventgmDetail.vue
@@ -124,7 +124,7 @@
></el-image>
<video
- v-for="(item) in videoUrls"
+ v-for="(item) in videoUrls" :key="item.id"
:src="item"
style="width: 145px; height: 145px; object-fit: fill; margin-right: 10px"
controls
diff --git a/src/views/repairsorder/repairsorder.vue b/src/views/repairsorder/repairsorder.vue
index d1a4773..fa027fa 100644
--- a/src/views/repairsorder/repairsorder.vue
+++ b/src/views/repairsorder/repairsorder.vue
@@ -223,7 +223,7 @@
this.selectionClear();
});
},
- uploadBefore(file, done, loading,column) {
+ uploadBefore(file, done, loading) {
if (["image","video"].includes(file.type.split("/")[0])){
done()
}else {
diff --git a/src/views/repairsorder/repairsorderDetail.vue b/src/views/repairsorder/repairsorderDetail.vue
index c6c83c1..b29adcc 100644
--- a/src/views/repairsorder/repairsorderDetail.vue
+++ b/src/views/repairsorder/repairsorderDetail.vue
@@ -101,7 +101,7 @@
></el-image>
<video
- v-for="(item) in videoUrls"
+ v-for="(item) in videoUrls" :key="item.id"
:src="item"
style="width: 145px; height: 145px; object-fit: fill; margin-right: 10px"
controls
--
Gitblit v1.9.3