From 7af9f4e5dbdbc4f6b1fad7e218e73799d140e2a0 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 26 九月 2024 18:07:16 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/dream_web
---
.env.development | 2 +-
src/layout/components/Navbar.vue | 9 +++++++--
src/utils/graphql.js | 4 ++--
src/views/student/components/upload-student.vue | 4 ++--
.env.production | 2 +-
public/favicon.ico | 0
src/App.vue | 4 ++--
7 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/.env.development b/.env.development
index 46e640e..58bea65 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = '/dream_test'
+VUE_APP_BASE_API = '/dream'
diff --git a/.env.production b/.env.production
index 3ca9f4f..6f5cc51 100644
--- a/.env.production
+++ b/.env.production
@@ -2,5 +2,5 @@
ENV = 'production'
# base api
-VUE_APP_BASE_API = '/dream_test'
+VUE_APP_BASE_API = '/dream'
diff --git a/public/favicon.ico b/public/favicon.ico
index 34b63ac..50ecc33 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/App.vue b/src/App.vue
index 6bb22ac..eebe177 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -20,8 +20,8 @@
mounted() {
// 鍏抽棴娴忚鍣ㄧ獥鍙ｇ殑鏃跺�欐竻绌烘祻瑙堝櫒缂撳瓨鍦╨ocalStorage鐨勬暟鎹�
window.onbeforeunload = function (e) {
- var storage = window.localStorage;
- storage.clear()
+ // var storage = window.localStorage;
+ // storage.clear()
}
},
methods: {
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 6330837..96c35b5 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -13,7 +13,7 @@
<div class="right-menu">
<el-dropdown trigger="click" ref="eldrop" style="margin-right: 20px">
<div class="avatar-wrapper" style="font-size: 20px">
- {{ selectStaff.org.name }}
+ {{ selectStaff.org.name }}-{{ selectStaff.role.name }}
<i class="el-icon-caret-bottom"></i>
</div>
<el-dropdown-menu slot="dropdown" align="center">
@@ -22,7 +22,7 @@
@click.native="changeStaff(item)"
:key="item.id"
>
- {{ item.org.name }}
+ {{ item.org.name }}-{{ item.role.name }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -178,4 +178,9 @@
}
}
}
+
+.el-dropdown-menu {
+ max-height: 400px; /*璁剧疆鑿滃崟楂樺害涓�200px*/
+ overflow-y: auto; /*璁剧疆婊氬姩鏉�*/
+}
</style>
diff --git a/src/utils/graphql.js b/src/utils/graphql.js
index 319754f..8019fde 100644
--- a/src/utils/graphql.js
+++ b/src/utils/graphql.js
@@ -6,8 +6,8 @@
// export default apolloClient;
// 瀹氫箟涓嶅悓璇锋眰鍦板潃
-const EFORMURI = "/dream_test/graphql";
-const IOTURI = "/dream_test/graphql";
+const EFORMURI = "/dream/graphql";
+const IOTURI = "/dream/graphql";
// import ApolloClient from 'apollo-boost' //寮曞叆apollo-boost鎻掍欢
import { ApolloClient } from "apollo-client";
import { createHttpLink } from "apollo-link-http";
diff --git a/src/views/student/components/upload-student.vue b/src/views/student/components/upload-student.vue
index 5545545..6814ed9 100644
--- a/src/views/student/components/upload-student.vue
+++ b/src/views/student/components/upload-student.vue
@@ -9,7 +9,7 @@
:staffId="parseInt(staffId)"
@fileSuccess="fatherMethod"
:type="'AUDIENCE'"
- :action="'/dream_test/player/importPlayer'"
+ :action="'/dream/player/importPlayer'"
>
<div class="uploading-btn-to">
<i class="iconfont iconAdd"></i> 涓婁紶
@@ -58,7 +58,7 @@
} else if (res.falseLst.length >= 1) {
let errortips = "";
res.falseLst.map((item) => {
- errortips += `${item.cause} \r\n`;
+ errortips += (`${item.playerRoll}`+`${item.cause} \r\n`).replace('[]','');
});
this.$message({
message: `瀵煎叆鏁版嵁鎴愬姛瀵煎叆${res.successNum}鏉�,閿欒淇℃伅:${errortips}`,
--
Gitblit v1.8.0