admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'zmml-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into zmml-dev

Browse Source
This commit is contained in:
jiayu 2024-09-13 09:12:56 +08:00
commit ef2feb1388
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.development
View File

@ -48,7 +48,8 @@ NODE_ENV = 'development'
# 大连金笔 # 大连金笔
# VITE_API_URL = 'http://101.43.164.214:11126' # VITE_API_URL = 'http://101.43.164.214:11126'
# 中煤木垒 # 中煤木垒
VITE_API_URL = 'http://101.43.164.214:11111' # VITE_API_URL = 'http://101.43.164.214:11111'
VITE_API_URL = 'http://222.80.185.228:6090'
# 上传 # 上传
VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

3
.env.production
View File

@ -44,7 +44,8 @@ NODE_ENV = "production"
# 大连金笔 # 大连金笔
# VITE_API_URL = 'http://101.43.164.214:11126' # VITE_API_URL = 'http://101.43.164.214:11126'
# 中煤木垒 # 中煤木垒
VITE_API_URL = 'http://101.43.164.214:11111' # VITE_API_URL = 'http://101.43.164.214:11111'
VITE_API_URL = 'http://222.80.185.228:6090'
# 打包 # 打包
VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url=' VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url='

7
src/views/sevenLargeScreen/indexL.vue
View File

@ -524,10 +524,13 @@ onMounted(async () => {
if (window.location.href.indexOf("userId") != -1) { if (window.location.href.indexOf("userId") != -1) {
console.log("免登录跳转进来了吗----", window.location.href.indexOf("userId")); console.log("免登录跳转进来了吗----", window.location.href.indexOf("userId"));
const newUserId = window.location.href.split("userId=")[1].split("&")[0]; const newUserId = window.location.href.split("userId=")[1].split("&")[0];
const projectSn = window.location.href.split("sn=")[1].split("&")[0];
const data: any = await jumpLargeByUserIdApi({ userId: newUserId }); const data: any = await jumpLargeByUserIdApi({ userId: newUserId });
console.log("跳转请求的数据----", data.result); console.log("跳转请求的数据----", data.result);
if (data.result.sn) { if (data.result.sn) {
store.setSN(data.result.sn); const accountTypeList = [2, 3, 4, 7];
const sn = accountTypeList.includes(data.result.accountType) ? projectSn : data.result.sn;
store.setSN(sn);
} }
store.setToken(data.result.token); store.setToken(data.result.token);
store.setAccount(data.result.account); store.setAccount(data.result.account);
@ -673,7 +676,7 @@ function loginOut() {
} }
//跳转后台 //跳转后台
function jumpBgd() { function jumpBgd() {
const envList = ["agjt", "zkax", "zkjc", "hfqc", "cpgs", "cqna", "jzjt", "tj", "scwc", "bthg"]; // 环境标识 const envList = ["agjt", "zkax", "zkjc", "hfqc", "cpgs", "cqna", "jzjt", "tj", "scwc", "bthg", "zmml"]; // 环境标识
// 标准版——跳转演示平台项目后台 // 标准版——跳转演示平台项目后台
if (COMPANY == "") { if (COMPANY == "") {
window.location.replace("http://jxj.zhgdyun.com:100/#/login?token=" + store.token); window.location.replace("http://jxj.zhgdyun.com:100/#/login?token=" + store.token);

1
src/views/sevenLargeScreen/videoManagement/index.vue
View File

@ -14,6 +14,7 @@
children: 'list' children: 'list'
}" }"
node-key="id" node-key="id"
default-expand-all
@node-click="checkVideo" @node-click="checkVideo"
empty-text="" empty-text=""
> >