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

Merge branch 'master' of http://10.0.0.60/dhp/zhgdyun into dev-xiaole

Browse Source
This commit is contained in:
骆乐 2022-07-06 18:26:59 +08:00
commit 2c3bec4b46
6 changed files with 126 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/config.js
View File

@ -5,7 +5,7 @@ var COMPANY = ''; //通用
// var COMPANY='longguang'; //龙光地产
// var COMPANY='zhengwu'
// var COMPANY='shenbai'; //沈白高铁
// COMPANY = 'henan'
// COMPANY = 'henan' // 河南
// COMPANY = 'xingxuan'
var headerShow = true; // 是否显示头部

9
src/assets/js/http.js
View File

@ -39,11 +39,9 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://36.137.53.203:9090/'; // 南昌地铁 17512009894 123456789 gdjt 123456789
// axios.defaults.baseURL = 'http://124.71.178.44:100/'
// axios.defaults.baseURL = 'http://192.168.34.148:6023/' //张志鹏本地
axios.defaults.baseURL = 'http://124.71.178.44:100/'
// tag: 本地
axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1
// axios.defaults.baseURL = 'http://139.9.66.234:40001/'; //南昌二期
// axios.defaults.baseURL = 'http://192.168.88.220:6023/'; //本地 http/1.1
// axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇
// axios.defaults.baseURL = 'http://120.196.217.6:7000/';
// axios.defaults.baseURL = 'http://139.9.66.234:8/';
@ -78,9 +76,6 @@ else if (process.env.NODE_ENV == 'debug') {
let host = window.location.host;
axios.defaults.baseURL = window.location.protocol + "//" + host + "/"
// axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/"
// axios.defaults.baseURL = 'http://192.168.34.125:6023/';
// axios.defaults.baseURL = 'http://139.9.66.234:8/'
// axios.defaults.baseURL = 'http://192.168.34.148:6023/
// axios.defaults.baseURL = 'http://zhgd.loganwy.com/'
}

89
src/components/closePage.vue
View File

@ -1,52 +1,57 @@
<template>
<el-tooltip class="closeBtn" effect="dark" content="关闭页面" placement="bottom">
<!-- <a href="javascript:window.opener=null;window.close();">
<el-tooltip class="closeBtn" effect="dark" content="关闭页面" placement="bottom">
<!-- <a href="javascript:window.opener=null;window.close();">
<img src="@/assets/images/carOverview/close.png" alt="">
</a> -->
<a @click="closePage">
<img src="../assets/images/dataBoard/blueTheme2/close.png" alt="" v-if="enabledProjectV2==4">
<img src="@/assets/images/carOverview/close.png" alt="" v-else>
</a>
</el-tooltip>
<a @click="closePage">
<img style="width: 100%" src="../assets/images/dataBoard/blueTheme2/close.png" alt="" v-if="enabledProjectV2==4">
<img style="width: 100%" src="@/assets/images/carOverview/close.png" alt="" v-else>
</a>
</el-tooltip>
</template>
<script>
export default {
data() {
return{
enabledProjectV2: 2
}
},
methods:{
closePage(){
// console.log(this.$route.path)
// getDockingUrlApi().then((res)=>{
// console.log('路径',res)
// })
// if(this.$route.path.indexOf('/project/dataBoard') != -1 || this.$route.path.indexOf('/project/videoOverview') != -1 || this.$route.path.indexOf('/project/environmentalOverview') != -1 || this.$route.path.indexOf('/project/projectSummary') != -1 || this.$route.path.indexOf('/project/imgRanging') != -1 || this.$route.path.indexOf('/project/warningManage') != -1){
// // console.log(window.location.href.split('#/')[0]+'#/projectIndex')
// // window.location.href = window.location.href.split('#/')[0] + '#/projectIndex' //注释
// } else{
// window.history.back()
// }
}
},
mounted() {
this.enabledProjectV2 = enabledProjectV2;
data() {
return {
enabledProjectV2: 2
}
},
methods: {
closePage() {
// this.$router.back()
// console.log(this.$route.path)
// getDockingUrlApi().then((res)=>{
// console.log('路径',res)
// })
if (this.$route.path.indexOf('/project/dataBoard') != -1 || this.$route.path.indexOf('/project/videoOverview') != -1 || this.$route.path.indexOf('/project/environmentalOverview') != -1 || this.$route.path.indexOf('/project/projectSummary') != -1 || this.$route.path.indexOf('/project/imgRanging') != -1 || this.$route.path.indexOf('/project/warningManage') != -1) {
console.log(window.location.href.split('#/')[0] + '#/projectIndex')
window.location.href = window.location.href.split('#/')[0] + '#/projectIndex' //注释
} else {
window.history.back()
}
}
},
mounted() {
this.enabledProjectV2 = enabledProjectV2;
}
}
</script>
<style scoped>
.closeBtn{
width: 25px;
height: 25px;
position: absolute;
right: 6px;
top: 6px;
z-index: 9999;
}
a{
outline: none;
}
</style>
.closeBtn {
width: 16px;
height: 16px;
position: absolute;
right: 6px;
top: 6px;
z-index: 9999;
cursor: pointer;
}
a {
outline: none;
}
</style>

139
src/router/index.js
View File

@ -1455,76 +1455,75 @@ const routes2 = [
component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'),
}
]
// 中建四局的看板
// children: [{
// path: 'index',
// name: '数据看板-首页概览',
// component: () => import('@/views/projectAdmin/dataBoardTwo/index.vue'),
// }, {
// path: 'digitalSite',
// name: '数据看板-数字工地',
// component: () => import('@/views/projectAdmin/dataBoardTwo/digitalSite'),
// }, {
// path: 'laborManage',
// name: '数据看板-劳务管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/laborManage.vue'),
// }, {
// path: 'environment',
// name: '数据看板-环境监测',
// component: () => import('@/views/projectAdmin/dataBoardTwo/environment.vue'),
// },
// {
// path: 'material',
// name: '数据看板-材料管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/material.vue'),
// },
// {
// path: 'plan',
// name: '数据看板-进度计划',
// component: () => import('@/views/projectAdmin/dataBoardTwo/plan.vue'),
// },
// {
// path: 'secure',
// name: '数据看板-安全管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/secure.vue'),
// },
// {
// path: 'quality',
// name: '数据看板-质量管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/quality.vue'),
// },
// {
// path: 'SixHundred',
// name: '数据看板-六个百分百',
// component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysisCopy.vue'),
// },
// {
// path: 'AiAnalysis',
// name: '数据看板-AI数据分析',
// component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysis.vue'),
// },
// {
// path: 'contractManage',
// name: '数据看板-合约管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/contractManage.vue'),
// },
// {
// path: 'doublecManage',
// name: '数据看板-双碳管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/doublecManage.vue'),
// },
// {
// path: 'bigScreen',
// name: '数据看板-监控大屏',
// component: () => import('@/views/projectAdmin/dataBoardTwo/bigScreen.vue'),
// },
// {
// path: 'cimManage',
// name: '数据看板-CIM+',
// component: () => import('@/views/projectAdmin/dataBoardTwo/cimManage.vue'),
// }
// ]
// 中建四局的看板
// children: [{
// path: 'index',
// name: '数据看板-首页概览',
// component: () => import('@/views/projectAdmin/dataBoardTwo/index.vue'),
// }, {
// path: 'digitalSite',
// name: '数据看板-数字工地',
// component: () => import('@/views/projectAdmin/dataBoardTwo/digitalSite'),
// }, {
// path: 'laborManage',
// name: '数据看板-劳务管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/laborManage.vue'),
// }, {
// path: 'environment',
// name: '数据看板-环境监测',
// component: () => import('@/views/projectAdmin/dataBoardTwo/environment.vue'),
// },
// {
// path: 'material',
// name: '数据看板-材料管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/material.vue'),
// },
// {
// path: 'plan',
// name: '数据看板-进度计划',
// component: () => import('@/views/projectAdmin/dataBoardTwo/plan.vue'),
// },
// {
// path: 'secure',
// name: '数据看板-安全管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/secure.vue'),
// },
// {
// path: 'quality',
// name: '数据看板-质量管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/quality.vue'),
// },
// {
// path: 'SixHundred',
// name: '数据看板-六个百分百',
// component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysisCopy.vue'),
// },
// {
// path: 'AiAnalysis',
// name: '数据看板-AI数据分析',
// component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysis.vue'),
// },
// {
// path: 'contractManage',
// name: '数据看板-合约管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/contractManage.vue'),
// },
// {
// path: 'doublecManage',
// name: '数据看板-双碳管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/doublecManage.vue'),
// },
// {
// path: 'bigScreen',
// name: '数据看板-监控大屏',
// component: () => import('@/views/projectAdmin/dataBoardTwo/bigScreen.vue'),
// },
// {
// path: 'cimManage',
// name: '数据看板-CIM+',
// component: () => import('@/views/projectAdmin/dataBoardTwo/cimManage.vue'),
// }
// ]
},
{
path: '/equipmentCenter/',

1
src/store/index.js
View File

@ -51,6 +51,7 @@ export default new Vuex.Store({
// tag: 部署河南项目时，需要打开这两行代码
// UPLOADURL: 'http://124.71.178.44:100/upload/image',
// FILEURL: 'http://124.71.178.44:100/image/',
/* 2022-06-06 */ // tag: 本地测试接口
// UPLOADURL: 'http://192.168.34.125:6023/upload/image',
// FILEURL: 'http://192.168.34.125:6023/image/',

9
src/views/projectAdmin/dataBoard/dataBoard.vue
View File

@ -9,6 +9,7 @@
>
<div class="headerBox">
<img
v-if="company == ''"
style="
width: auto;
height: 42px;
@ -31,9 +32,11 @@
<span v-if="company != 'longguang'">
<!-- 智慧工地云平台 -->
<!-- {{ $t('message.dataBoard.headerTitle') }} -->
<p>中建四局数字建造管控平台</p>
<p style="font-size:24px">科创大厦项目</p>
<p v-if="company == 'henan'">{{ $t('message.dataBoard.headerTitle') }}</p>
<div v-else>
<p>中建四局数字建造管控平台</p>
<p style="font-size:24px">科创大厦项目</p>
</div>
</span>
<span v-else style="color: #fff; margin-top: 15px">
<!-- 龙光智慧工地平台 -->