flx:合并
This commit is contained in:
parent
456a256ee4
commit
4cef89a1bf
@ -4,11 +4,8 @@ NODE_ENV = 'development'
|
||||
# 本地环境接口地址(/api/index.ts文件中使用)
|
||||
# 后端本地
|
||||
# VITE_API_URL = 'http://192.168.34.155:19111'
|
||||
<<<<<<< HEAD
|
||||
# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
|
||||
=======
|
||||
# VITE_API_URL = 'http://192.168.34.221:19112' #雄哥本地
|
||||
>>>>>>> f4fb5a65f5b944ac4b0c6322d402ef9d078285b6
|
||||
# VITE_API_URL = 'http://192.168.34.221:28890' #雄哥本地
|
||||
# VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程
|
||||
# VITE_API_URL = 'http://192.168.34.221:28889'
|
||||
|
||||
@ -44,18 +44,15 @@ VITE_API_URL = 'http://1.13.185.209:8089'
|
||||
# VITE_API_URL = 'http://jxj.zhgdyun.com:18000'
|
||||
# 大连金笔
|
||||
# VITE_API_URL = 'http://101.43.164.214:11126'
|
||||
<<<<<<< HEAD
|
||||
# 新能源智慧基建管理平台|中新建电力集团(内网)
|
||||
# VITE_API_URL = 'http://10.30.102.4:9820'
|
||||
# 新能源智慧基建管理平台|中新建电力集团(外网)
|
||||
# VITE_API_URL = 'http://117.146.73.156:9820'
|
||||
# 国维科技
|
||||
# VITE_API_URL = 'http://10.216.103.99:9820'
|
||||
=======
|
||||
# 新能源智慧基建管理平台
|
||||
# VITE_API_URL = 'http://121.37.106.37:9820'
|
||||
# VITE_API_URL = 'http://121.37.106.37:9809'
|
||||
>>>>>>> f4fb5a65f5b944ac4b0c6322d402ef9d078285b6
|
||||
# 打包
|
||||
VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url='
|
||||
|
||||
|
||||
@ -2413,6 +2413,16 @@ export const JXWJJMenu: Array<any> = [
|
||||
},
|
||||
]
|
||||
},
|
||||
{
|
||||
moduleName: "绿色施工",
|
||||
modulePath: "/headNoise",
|
||||
menuList: [
|
||||
{
|
||||
menuName: "扬尘噪声",
|
||||
companyPath: "/headNoise"
|
||||
},
|
||||
]
|
||||
},
|
||||
{
|
||||
moduleName: "视频管理",
|
||||
modulePath: "/videoManagement"
|
||||
|
||||
@ -71,9 +71,6 @@
|
||||
<template v-if="EntityMap.Mapswitch">
|
||||
<div class="menuList">
|
||||
<div v-for="(item, index) in menuList" :key="index" class="menStyle">
|
||||
<<<<<<< HEAD
|
||||
<div class="subMenu" :index="item.modulePath" :class="{ active: activeTab === item.modulePath }">
|
||||
=======
|
||||
<div
|
||||
:index="item.modulePath"
|
||||
:class="{
|
||||
@ -82,7 +79,6 @@
|
||||
zsbf: COMPANY === 'zsbf'
|
||||
}"
|
||||
>
|
||||
>>>>>>> f4fb5a65f5b944ac4b0c6322d402ef9d078285b6
|
||||
<span @click="navigateTo(item, 1)">{{ item.moduleName }}</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -108,13 +104,7 @@
|
||||
<div class="contentDate">
|
||||
<span>
|
||||
自{{ projectTimeInfo.contractPeriodStartTime }}起开始计算，至今日{{ nowDate }}为
|
||||
<<<<<<< HEAD
|
||||
<span class="numColor">
|
||||
{{ projectPassDay }} </span
|
||||
>个日历天
|
||||
=======
|
||||
<span class="numColor"> {{ projectPassDay }} </span>个日历天
|
||||
>>>>>>> f4fb5a65f5b944ac4b0c6322d402ef9d078285b6
|
||||
</span>
|
||||
</div>
|
||||
<div class="dataBoardContent">
|
||||
@ -169,14 +159,11 @@ import {
|
||||
WHZTMenu,
|
||||
ZTSYJMenu,
|
||||
XNYZHJJMenu,
|
||||
<<<<<<< HEAD
|
||||
GWKJMenu,
|
||||
JXWJJMenu
|
||||
=======
|
||||
JXWJJMenu,
|
||||
ALLXMMenu,
|
||||
HBLAMenu,
|
||||
QYGMenu
|
||||
>>>>>>> f4fb5a65f5b944ac4b0c6322d402ef9d078285b6
|
||||
} from "@/config/staticMenu";
|
||||
import { COMPANY } from "@/config/config";
|
||||
|
||||
@ -505,254 +492,6 @@ let menuList = ref([]);
|
||||
// },
|
||||
// { moduleName: "BIM模型", modulePath: "/bImModel" }
|
||||
// ]);
|
||||
<<<<<<< HEAD
|
||||
let menuList = ref([
|
||||
{
|
||||
moduleName: "综合管理",
|
||||
modulePath: "/projectOverview",
|
||||
menuList: [
|
||||
{
|
||||
menuName: "工程概况",
|
||||
companyPath: "/projectOverview"
|
||||
},
|
||||
{
|
||||
menuName: "智慧党建",
|
||||
companyPath: "/smartPartyBuilding"
|
||||
}
|
||||
// {
|
||||
// menuName: "工程概况-1",
|
||||
// companyPath: "/projectOverviewer"
|
||||
// }
|
||||
]
|
||||
},
|
||||
{
|
||||
moduleName: "数字工地",
|
||||
modulePath: "/videoManagement",
|
||||
menuList: [
|
||||
{
|
||||
menuName: "视频管理",
|
||||
companyPath: "/videoManagement"
|
||||
},
|
||||
{
|
||||
menuName: "AI预警",
|
||||
companyPath: "/aIEarlyWarning"
|
||||
},
|
||||
{
|
||||
menuName: "地磅管理",
|
||||
companyPath: "/loadometerManage"
|
||||
},
|
||||
{
|
||||
menuName: "车辆管理",
|
||||
companyPath: "/vehicleManagement"
|
||||
},
|
||||
{
|
||||
menuName: "车辆测速",
|
||||
companyPath: "/vehicleManagspeed"
|
||||
},
|
||||
{
|
||||
menuName: "配电箱监测",
|
||||
companyPath: "/distributionMonitoring"
|
||||
},
|
||||
{
|
||||
menuName: "标养室监测",
|
||||
companyPath: "/standardCureRoom"
|
||||
},
|
||||
{
|
||||
menuName: "车辆定位",
|
||||
companyPath: "/carPosition"
|
||||
},
|
||||
{
|
||||
menuName: "机械设备定位",
|
||||
companyPath: "/equipmentPosition"
|
||||
},
|
||||
{
|
||||
menuName: "智能安全帽",
|
||||
companyPath: "/smartSafeHat"
|
||||
},
|
||||
{
|
||||
menuName: "新智能安全帽",
|
||||
companyPath: "/smartSafeHater"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
moduleName: "劳务管理",
|
||||
modulePath: "/laborManagement",
|
||||
menuList: [
|
||||
{
|
||||
menuName: "劳务管理",
|
||||
companyPath: "/laborManagement"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
moduleName: "安全管理",
|
||||
modulePath: "/securityManagement",
|
||||
menuList: [
|
||||
{
|
||||
menuName: "安全管理",
|
||||
companyPath: "/securityManagement"
|
||||
},
|
||||
{
|
||||
companyPath: "/foundationPitMonitor",
|
||||
menuName: "基坑监测"
|
||||
},
|
||||
{
|
||||
menuName: "隧道定位监测",
|
||||
companyPath: "/tunnelPosition"
|
||||
},
|
||||
{
|
||||
menuName: "临边防护网",
|
||||
companyPath: "/edgeProtection"
|
||||
},
|
||||
{
|
||||
menuName: "有毒气体监测",
|
||||
companyPath: "/toxicGasMonitor"
|
||||
},
|
||||
{
|
||||
menuName: "高支模监测",
|
||||
companyPath: "/highFormwork"
|
||||
},
|
||||
{
|
||||
menuName: "高边坡监测",
|
||||
companyPath: "/highSlope"
|
||||
},
|
||||
{
|
||||
menuName: "烟感监测",
|
||||
companyPath: "/smokeSensor"
|
||||
},
|
||||
{
|
||||
menuName: "安全教育",
|
||||
companyPath: "/safeEducation"
|
||||
},
|
||||
{
|
||||
menuName: "外墙脚手架",
|
||||
companyPath: "/wallScaffold2"
|
||||
},
|
||||
{
|
||||
menuName: "临边防护",
|
||||
companyPath: "/newEdgeProtection"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
moduleName: "质量管理",
|
||||
modulePath: "/qualityManagement",
|
||||
menuList: [
|
||||
{
|
||||
menuName: "质量管理",
|
||||
companyPath: "/qualityManagement"
|
||||
},
|
||||
{
|
||||
menuName: "混凝土测温",
|
||||
companyPath: "/concreteMonitor"
|
||||
},
|
||||
{
|
||||
menuName: "进度计划",
|
||||
companyPath: "/schedulePlan"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
moduleName: "绿色施工",
|
||||
modulePath: "/headNoise",
|
||||
menuList: [
|
||||
{
|
||||
menuName: "扬尘噪声",
|
||||
companyPath: "/headNoise"
|
||||
},
|
||||
{
|
||||
companyPath: "/electricityMonitor",
|
||||
menuName: "用电监测"
|
||||
},
|
||||
{
|
||||
companyPath: "/waterMonitor",
|
||||
menuName: "用水监测"
|
||||
},
|
||||
{
|
||||
companyPath: "/sewageMonitor",
|
||||
menuName: "污水监测"
|
||||
},
|
||||
{
|
||||
companyPath: "/rainfallMonitoring",
|
||||
menuName: "雨量监测"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
moduleName: "大型机械",
|
||||
modulePath: "/towerCraneMonitoring",
|
||||
menuList: [
|
||||
{
|
||||
menuName: "塔吊监测",
|
||||
companyPath: "/towerCraneMonitoring"
|
||||
},
|
||||
{
|
||||
menuName: "升降机监测",
|
||||
companyPath: "/elevatorMonitoring"
|
||||
},
|
||||
{
|
||||
menuName: "卸料平台",
|
||||
companyPath: "/unloadPlatform"
|
||||
},
|
||||
{
|
||||
menuName: "混凝土拌合站",
|
||||
companyPath: "/concreteMixingPlant"
|
||||
},
|
||||
{
|
||||
menuName: "龙门吊监测",
|
||||
companyPath: "/gantryCrane"
|
||||
},
|
||||
{
|
||||
companyPath: "/erectCrane",
|
||||
menuName: "架桥机"
|
||||
},
|
||||
{
|
||||
companyPath: "/hangBasket",
|
||||
menuName: "挂篮监测"
|
||||
},
|
||||
{
|
||||
companyPath: "/pressureTestMachine",
|
||||
menuName: "压力试验机"
|
||||
},
|
||||
{
|
||||
companyPath: "/universalTestMachine",
|
||||
menuName: "万能试验机"
|
||||
},
|
||||
{
|
||||
companyPath: "/compressionIntegrate",
|
||||
menuName: "抗压一体机"
|
||||
},
|
||||
{
|
||||
companyPath: "/asphaltMixer",
|
||||
menuName: "沥青拌合站"
|
||||
},
|
||||
{
|
||||
companyPath: "/waterStabilizedMixer",
|
||||
menuName: "水稳拌合站"
|
||||
},
|
||||
{
|
||||
companyPath: "/intelligentTension",
|
||||
menuName: "智能张拉"
|
||||
},
|
||||
{
|
||||
companyPath: "/intelligentGrout",
|
||||
menuName: "智能压浆"
|
||||
},
|
||||
{
|
||||
companyPath: "/roadPaving",
|
||||
menuName: "路面摊铺"
|
||||
},
|
||||
{
|
||||
companyPath: "/roadCompaction",
|
||||
menuName: "路面压实"
|
||||
}
|
||||
]
|
||||
},
|
||||
{ moduleName: "BIM模型", modulePath: "/bImModel" }
|
||||
]);
|
||||
=======
|
||||
>>>>>>> f4fb5a65f5b944ac4b0c6322d402ef9d078285b6
|
||||
const itemList = ref([]);
|
||||
const activeTab = ref(0);
|
||||
const activeTab2 = ref(0);
|
||||
@ -915,13 +654,12 @@ onMounted(async () => {
|
||||
if (COMPANY === "xnyzhjj") {
|
||||
menuList.value = XNYZHJJMenu;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
if (COMPANY === "gwkj") {
|
||||
menuList.value = GWKJMenu;
|
||||
}
|
||||
if(COMPANY === "jxwjj") {
|
||||
menuList.value = JXWJJMenu;
|
||||
=======
|
||||
}
|
||||
if (COMPANY === "allxm") {
|
||||
menuList.value = ALLXMMenu;
|
||||
}
|
||||
@ -930,7 +668,6 @@ onMounted(async () => {
|
||||
}
|
||||
if (COMPANY === "qyg") {
|
||||
menuList.value = QYGMenu;
|
||||
>>>>>>> f4fb5a65f5b944ac4b0c6322d402ef9d078285b6
|
||||
}
|
||||
console.log("配置菜单", menuList.value);
|
||||
console.log("当前跳转的路由", router.currentRoute.value);
|
||||
@ -1035,7 +772,6 @@ function jumpBgd() {
|
||||
window.location.replace("http://182.90.224.237:15551/#/login?token=" + store.token);
|
||||
} else if (COMPANY === "scwc") {
|
||||
window.location.replace("http://192.168.9.249:9809/#/login?token=" + store.token);
|
||||
<<<<<<< HEAD
|
||||
} else if (COMPANY === "jxwjj") {
|
||||
window.location.replace("http://183.249.224.118:9000/#/login?token=" + store.token); //嘉兴王江泾公用码头
|
||||
} else if (COMPANY === "xnyzhjj") {
|
||||
@ -1045,10 +781,8 @@ function jumpBgd() {
|
||||
window.location.replace("http://117.146.73.156:9809/#/login?token=" + store.token);
|
||||
} else if (COMPANY === "gwkj") {
|
||||
window.location.replace("http://10.216.103.99:9809/#/login?token=" + store.token);
|
||||
=======
|
||||
} else if (COMPANY === "xnyzhjj") {
|
||||
window.location.replace("http://121.37.106.37:9809/#/login?token=" + store.token);
|
||||
>>>>>>> f4fb5a65f5b944ac4b0c6322d402ef9d078285b6
|
||||
} else if (envList.includes(COMPANY)) {
|
||||
window.location.replace(BASEURL + "/#/login?token=" + store.token);
|
||||
} else {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user