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

This commit is contained in:
jiayu 2025-04-14 10:11:20 +08:00
commit 1275fcd343
5 changed files with 36 additions and 13 deletions

View File

@ -43,6 +43,8 @@ VITE_API_URL = 'http://101.43.164.214:11111'
# 四川网诚
# VITE_API_URL = 'http://jxj.zhgdyun.com:100'
# VITE_API_URL = 'http://jxj.zhgdyun.com:34568'
# 新能源智慧基建管理平台|中新建电力集团(外网)
VITE_API_URL = 'http://117.146.73.156:9820'
# 九柱集团
# VITE_API_URL = 'http://218.95.151.122:31004'
# 包头化工

View File

@ -47,7 +47,7 @@ VITE_API_URL = 'http://101.43.164.214:11111'
# 新能源智慧基建管理平台|中新建电力集团(内网)
# VITE_API_URL = 'http://10.30.102.4:9820'
# 新能源智慧基建管理平台|中新建电力集团(外网)
# VITE_API_URL = 'http://117.146.73.156:9820'
VITE_API_URL = 'http://117.146.73.156:9820'
# 国维科技
# VITE_API_URL = 'http://10.216.103.99:9820'
# 新能源智慧基建管理平台

View File

@ -53,7 +53,7 @@ export const COMPANY: string = "zsbf"; //中水北方
// export const COMPANY: string = "jzjt"; //九柱集团
// export const COMPANY: string = "whzt"; //武汉中铁
// export const COMPANY: string = "ztsyj"; // 中铁十一局
// export const COMPANY: string = "xnyzhjj"; // 新能源智慧基建管理平台|中新建
export const COMPANY: string = "xnyzhjj"; // 新能源智慧基建管理平台|中新建
// export const COMPANY: string = "gwkj"; // 国维科技
// export const COMPANY: string = "allxm"; // 安立路项目
// export const COMPANY: string = "hbla"; // 湖北龙澳

View File

@ -24,8 +24,8 @@ export const staticRouter: RouteRecordRaw[] = [
{
path: "/large",
name: "大屏",
component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版
// component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
// component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版
component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
// component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏
// component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏
// component: () => import("@/views/locationLive/locationL.vue"), //人员定位大屏

View File

@ -25,10 +25,10 @@
<div class="icon"><img src="@/assets/images/dustNoise/userIcon.png" /></div>
<div class="userName">{{ adminName }}</div>
</div>
<!-- <div class="loginOut" @click="jumpBgd">
<div v-if="COMPANY === 'xnyzhjj'" class="loginOut" @click="jumpBgd">
<div class="loginOutIcon"><img src="@/assets/images/dustNoise/jumpIcon.png" /></div>
<div class="userName">项目后台</div>
</div> -->
</div>
<div class="loginOut" @click="loginOut">
<div class="loginOutIcon"><img src="@/assets/images/dustNoise/loginOut.png" /></div>
<div class="userName">退出登录</div>
@ -45,10 +45,10 @@
<script lang="ts" setup>
import ScaleBox from "vue3-scale-box";
import { ref, reactive, onMounted, onBeforeUnmount } from "vue";
import { ref, reactive, onMounted, onBeforeUnmount, nextTick } from "vue";
import { useRouter } from "vue-router";
import { GlobalStore } from "@/stores";
import { jumpLargeUserInfoApi } from "@/api/modules/login";
import { jumpLargeUserInfoApi, jumpLargeByUserIdApi } from "@/api/modules/login";
import { COMPANY } from "@/config/config";
const BASEURL = import.meta.env.VITE_API_URL;
const store = GlobalStore();
@ -96,10 +96,6 @@ const navigateTo = (path, type) => {
}
};
onMounted(async () => {
if (COMPANY === "agjtCommand") {
// menuList.value = AGJTCommandMenu;
menuList.value = agjtCommandList.value;
}
//token
//
if (window.location.href.indexOf("token") != -1) {
@ -120,8 +116,30 @@ 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) {
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);
store.setAccountType(data.result.accountType);
store.setProjectDateAuth(data.menuAuthority);
}
if (COMPANY === "agjtCommand") {
// menuList.value = AGJTCommandMenu;
menuList.value = agjtCommandList.value;
}
// await getAllModelMenu();
navigateTo(menuList.value[0], 1);
nextTick(() => {
navigateTo(menuList.value[0], 1);
})
activeTab.value = menuList.value[0].modulePath;
itemList.value = menuList.value[0].menuList;
@ -191,6 +209,9 @@ function jumpBgd() {
if (COMPANY === "as") {
window.location.replace("http://182.90.224.237:15551/#/projectIndex"); //
}
if (COMPANY === "xnyzhjj") {
window.location.replace("http://117.146.73.156:9809/#/login?token=" + store.token);
}
if(COMPANY === "agjtCommand"){
window.location.replace("http://42.180.188.17:11211" + "/#/login?token=" + store.token);
}