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='longguang'; //龙光地产
// var COMPANY='zhengwu' // var COMPANY='zhengwu'
// var COMPANY='shenbai'; //沈白高铁 // var COMPANY='shenbai'; //沈白高铁
// COMPANY = 'henan' // COMPANY = 'henan' // 河南
// COMPANY = 'xingxuan' // COMPANY = 'xingxuan'
var headerShow = true; // 是否显示头部 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://36.137.53.203:9090/'; // 南昌地铁 17512009894 123456789 gdjt 123456789
// axios.defaults.baseURL = 'http://124.71.178.44:100/' axios.defaults.baseURL = 'http://124.71.178.44:100/'
// axios.defaults.baseURL = 'http://192.168.34.148:6023/' //张志鹏本地
// tag: 本地 // tag: 本地
axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1 // axios.defaults.baseURL = 'http://192.168.88.220:6023/'; //本地 http/1.1
// axios.defaults.baseURL = 'http://139.9.66.234:40001/'; //南昌二期
// axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇 // axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇
// axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // axios.defaults.baseURL = 'http://120.196.217.6:7000/';
// axios.defaults.baseURL = 'http://139.9.66.234:8/'; // 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; let host = window.location.host;
axios.defaults.baseURL = window.location.protocol + "//" + host + "/" axios.defaults.baseURL = window.location.protocol + "//" + host + "/"
// axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/" // 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/' // axios.defaults.baseURL = 'http://zhgd.loganwy.com/'
} }

89
src/components/closePage.vue
View File

@ -1,52 +1,57 @@
<template> <template>
<el-tooltip class="closeBtn" effect="dark" content="关闭页面" placement="bottom"> <el-tooltip class="closeBtn" effect="dark" content="关闭页面" placement="bottom">
<!-- <a href="javascript:window.opener=null;window.close();"> <!-- <a href="javascript:window.opener=null;window.close();">
<img src="@/assets/images/carOverview/close.png" alt=""> <img src="@/assets/images/carOverview/close.png" alt="">
</a> --> </a> -->
<a @click="closePage"> <a @click="closePage">
<img src="../assets/images/dataBoard/blueTheme2/close.png" alt="" v-if="enabledProjectV2==4"> <img style="width: 100%" src="../assets/images/dataBoard/blueTheme2/close.png" alt="" v-if="enabledProjectV2==4">
<img src="@/assets/images/carOverview/close.png" alt="" v-else> <img style="width: 100%" src="@/assets/images/carOverview/close.png" alt="" v-else>
</a> </a>
</el-tooltip> </el-tooltip>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return{ return {
enabledProjectV2: 2 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;
} }
},
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> </script>
<style scoped> <style scoped>
.closeBtn{ .closeBtn {
width: 25px; width: 16px;
height: 25px; height: 16px;
position: absolute; position: absolute;
right: 6px; right: 6px;
top: 6px; top: 6px;
z-index: 9999; z-index: 9999;
} cursor: pointer;
a{ }
outline: none;
} a {
</style> outline: none;
}
</style>

139
src/router/index.js
View File

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

1
src/store/index.js
View File

@ -51,6 +51,7 @@ export default new Vuex.Store({
// tag: 部署河南项目时，需要打开这两行代码 // tag: 部署河南项目时，需要打开这两行代码
// UPLOADURL: 'http://124.71.178.44:100/upload/image', // UPLOADURL: 'http://124.71.178.44:100/upload/image',
// FILEURL: 'http://124.71.178.44:100/image/', // FILEURL: 'http://124.71.178.44:100/image/',
/* 2022-06-06 */ // tag: 本地测试接口 /* 2022-06-06 */ // tag: 本地测试接口
// UPLOADURL: 'http://192.168.34.125:6023/upload/image', // UPLOADURL: 'http://192.168.34.125:6023/upload/image',
// FILEURL: 'http://192.168.34.125:6023/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"> <div class="headerBox">
<img <img
v-if="company == ''"
style=" style="
width: auto; width: auto;
height: 42px; height: 42px;
@ -31,9 +32,11 @@
<span v-if="company != 'longguang'"> <span v-if="company != 'longguang'">
<!-- 智慧工地云平台 --> <!-- 智慧工地云平台 -->
<!-- {{ $t('message.dataBoard.headerTitle') }} --> <p v-if="company == 'henan'">{{ $t('message.dataBoard.headerTitle') }}</p>
<p>中建四局数字建造管控平台</p> <div v-else>
<p style="font-size:24px">科创大厦项目</p> <p>中建四局数字建造管控平台</p>
<p style="font-size:24px">科创大厦项目</p>
</div>
</span> </span>
<span v-else style="color: #fff; margin-top: 15px"> <span v-else style="color: #fff; margin-top: 15px">
<!-- 龙光智慧工地平台 --> <!-- 龙光智慧工地平台 -->