From 06f800e569e7f135624a8706c482f068198083e5 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Wed, 11 Sep 2024 14:12:44 +0800 Subject: [PATCH] =?UTF-8?q?flx:=E4=BF=AE=E5=A4=8D=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=B1=95=E5=BC=80=20=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 ++- .env.production | 3 ++- src/views/sevenLargeScreen/indexL.vue | 7 +++++-- src/views/sevenLargeScreen/videoManagement/index.vue | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.env.development b/.env.development index bdcd4f0..24310f4 100644 --- a/.env.development +++ b/.env.development @@ -48,7 +48,8 @@ NODE_ENV = 'development' # 大连金笔 # 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=' diff --git a/.env.production b/.env.production index 1686101..6006a93 100644 --- a/.env.production +++ b/.env.production @@ -44,7 +44,8 @@ NODE_ENV = "production" # 大连金笔 # 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=' diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index f9292f3..9771b01 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -524,10 +524,13 @@ onMounted(async () => { if (window.location.href.indexOf("userId") != -1) { console.log("免登录跳转进来了吗----", window.location.href.indexOf("userId")); 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 }); console.log("跳转请求的数据----", data.result); 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.setAccount(data.result.account); @@ -673,7 +676,7 @@ function loginOut() { } //跳转后台 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 == "") { window.location.replace("http://jxj.zhgdyun.com:100/#/login?token=" + store.token); diff --git a/src/views/sevenLargeScreen/videoManagement/index.vue b/src/views/sevenLargeScreen/videoManagement/index.vue index 4e7fa4c..1acaa01 100644 --- a/src/views/sevenLargeScreen/videoManagement/index.vue +++ b/src/views/sevenLargeScreen/videoManagement/index.vue @@ -14,6 +14,7 @@ children: 'list' }" node-key="id" + default-expand-all @node-click="checkVideo" empty-text="" >