diff --git a/src/assets/images/carPosition/新增.png b/src/assets/images/carPosition/add.png similarity index 100% rename from src/assets/images/carPosition/新增.png rename to src/assets/images/carPosition/add.png diff --git a/src/assets/js/api/waterMixStation.js b/src/assets/js/api/waterMixStation.js new file mode 100644 index 00000000..9e5c8685 --- /dev/null +++ b/src/assets/js/api/waterMixStation.js @@ -0,0 +1,25 @@ +/** + * api接口统一管理 + */ +import { post, get } from '../http' + +//水稳拌合站 —— 设备信息 +export const stableWaterMixDevAdd = data => post('xmgl/stableWaterMixStationDev/add', data) //添加 +export const stableWaterMixDevEdit = data => post('xmgl/stableWaterMixStationDev/edit', data) //编辑 +export const stableWaterMixDevDelete = data => post('xmgl/stableWaterMixStationDev/delete', data) //删除 +export const stableWaterMixDevPage = data => get('xmgl/stableWaterMixStationDev/page', data) //查询列表数据 + +//查询设备列表（下拉） +export const stableWaterMixDevList = data => get('xmgl/stableWaterMixStationDev/list', data) + +// 获取负责人 +export const getCrewListDataApi = data => post('xmgl/systemUser/getProjectChilderSystemUserList', data) // 查询 所有整改人员 + +//分页列表查询水稳拌合站 数据信息 +export const stableWaterMixDataPage = data => get('xmgl/stableWaterMixStationData/page', data) + +//分页列表查询水稳拌合站 原材数据信息 +export const stableWaterMixMaterialDataPage = data => get('xmgl/stableWaterMixStationRawMaterialData/page', data) + +//分页列表查询水稳拌合站 盘次数据信息 +export const stableWaterMixSetDataPage = data => get('xmgl/stableWaterMixStationSetData/page', data) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index ae467580..82d899bb 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -82,11 +82,12 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上 // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） - // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.221:30002/' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:30012/' //郭圣雄本地 + // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 - axios.defaults.baseURL ='http://101.43.164.214:11111/' //广西百色项目 + axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 diff --git a/src/assets/style/dialog.less b/src/assets/style/dialog.less index e8078a9b..e78857ac 100644 --- a/src/assets/style/dialog.less +++ b/src/assets/style/dialog.less @@ -5,7 +5,7 @@ font-size: 24px; } .el-dialog__title,.pageTitle{ - font-size: 15px; + font-size: 16px; font-weight: 500; position: relative; padding-left: 13px; diff --git a/src/components/account.vue b/src/components/account.vue index e08aa817..bd1bc1eb 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -314,6 +314,7 @@ export default { const query = '?&headquartersSn=' + this.$store.state.userInfo.headquartersSn; // 设置要拼接的参数 const loginUrl = `${baseUrl}/login${query}`; // 拼接登录地址 window.open(loginUrl, '_self') + this.$router.go(); } // this.$router.push('/') window._paq.push(['trackEvent', '点击', '退出登录', '退出登录']) diff --git a/src/components/header.vue b/src/components/header.vue index 47c8b786..eccff4b0 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -129,10 +129,13 @@ import account from './account' import changeTheme from './changeTheme' import message from './message' import QRCode from 'qrcodejs2' +import { getProjectDetail } from "@/assets/js/api/baseInfo.js"; + export default { props: ['titleName', 'showR'], data() { return { + newBigScreenUrl: null, headerShow, LOGO_white: LOGO_white, headerName: '', @@ -167,10 +170,15 @@ export default { } } }, + beforeDestroy() { + this.newBigScreen = null + console.log("当前数据看板地址",this.newBigScreen) + }, created() { this.company = COMPANY console.log('this.company', this.company) console.log('COMPANY', COMPANY) + this.getProjectDetail() this.loginData = JSON.parse(localStorage.getItem('systemInfo')) // console.log('信息',this.loginData)\ }, @@ -179,7 +187,6 @@ export default { this.systemInfo = JSON.parse(localStorage.getItem('systemInfo')) } console.log('进入页面显示的企业头部名称', this.systemInfo) - this.headerName = this.systemInfo.platformName if (this.$route.path.indexOf('equipmentCenter/') != -1) { this.headerName += ' - 设备中台' @@ -203,6 +210,19 @@ export default { }, methods: { + //获取项目详细(数据看板跳转地址) + getProjectDetail() { + this.newBigScreen = null + let data = { + projectSn: this.$store.state.projectSn, + }; + getProjectDetail(data).then((res) => { + if (res.result) { + this.newBigScreen = res.result.newBigScreen + console.log("数据看板地址",this.newBigScreen) + } + }); + }, closeAudio() { this.isShowAudio = false }, @@ -313,17 +333,12 @@ export default { } }, toOverview2() { - if (this.company == 'syhy') { + if (this.newBigScreen != null) { + console.log("当前跳转链接",this.newBigScreen) //-------------------- 跳转新版七参数 this.jumpToken = localStorage.getItem('jumpToken') - window.open('http://101.43.164.214:45022/#/large?token=' + this.jumpToken, '_self') //沈阳和盈 + window.open(this.newBigScreen + '?token=' + this.jumpToken, '_self') // window.open('http://192.168.34.226:8081/#/large?token=' + this.jumpToken, "_self")//这里是后台跳到大屏的操作，携带token过去 - } else if (this.company == 'jxwjj') { - this.jumpToken = localStorage.getItem('jumpToken') - window.open('http://183.249.224.118:9003/#/large?token=' + this.jumpToken, '_self') //嘉兴王江泾公用码头项目 - } else if (this.company == 'gxbs') { - this.jumpToken = localStorage.getItem('jumpToken') - window.open('http://101.43.164.214:11113/#/large?token=' + this.jumpToken, '_self') //广西百色项目 } else { //--------------------原版项目后台跳转数据看板 @@ -346,6 +361,39 @@ export default { window.location.href = routeUrl.href window._paq.push(['trackEvent', '点击', '数据看板', '进入数据看板']) } + // if (this.company == 'syhy') { + // //-------------------- 跳转新版七参数 + // this.jumpToken = localStorage.getItem('jumpToken') + // window.open('http://101.43.164.214:45022/#/large?token=' + this.jumpToken, '_self') //沈阳和盈 + // // window.open('http://192.168.34.226:8081/#/large?token=' + this.jumpToken, "_self")//这里是后台跳到大屏的操作，携带token过去 + // } else if (this.company == 'jxwjj') { + // this.jumpToken = localStorage.getItem('jumpToken') + // window.open('http://183.249.224.118:9003/#/large?token=' + this.jumpToken, '_self') //嘉兴王江泾公用码头项目 + // } else if (this.company == 'gxbs') { + // this.jumpToken = localStorage.getItem('jumpToken') + // window.open('http://101.43.164.214:11113/#/large?token=' + this.jumpToken, '_self') //广西百色项目 + // } else { + // //--------------------原版项目后台跳转数据看板 + + // //看看项目看板内有没有菜单 + // let arr = this.$store.state.userInfo.menuAuthority.moduleList + // let arr2 = [] + // arr.forEach(element => { + // if (element.moduleType == 4) { + // arr2.push(element) + // return + // } + // }) + // // 如果数组为空表示该用户没有权限访问 + // if (!arr2.length) { + // return this.$message.warning('暂无权限') + // } + // let routeUrl = this.$router.resolve({ + // path: arr2[0].modulePath + // }) + // window.location.href = routeUrl.href + // window._paq.push(['trackEvent', '点击', '数据看板', '进入数据看板']) + // } }, toOverview3() { if (COMPANY == 'shenbai') { diff --git a/src/router/index.js b/src/router/index.js index b3149f76..6fae6237 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2238,6 +2238,56 @@ const routes2 = [ '@/views/projectFront/waterMixStation/productData.vue', ], resolve), }, + + // 智慧梁场 + { + path: '/project/smartBeamField/planManage', + name: '智慧梁场-计划管理', + component: (resolve) => + require([ + '@/views/projectFront/smartBeamField/planManage.vue', + ], resolve), + }, + { + path: '/project/smartBeamField/beamManage', + name: '智慧梁场-梁管理', + component: (resolve) => + require([ + '@/views/projectFront/smartBeamField/beamManage.vue', + ], resolve), + }, + { + path: '/project/smartBeamField/storageAreaManage', + name: '智慧梁场-存梁区管理', + component: (resolve) => + require([ + '@/views/projectFront/smartBeamField/storageAreaManage.vue', + ], resolve), + }, + { + path: '/project/smartBeamField/pedestalManage', + name: '智慧梁场-副梁台座管理', + component: (resolve) => + require([ + '@/views/projectFront/smartBeamField/pedestalManage.vue', + ], resolve), + }, + { + path: '/project/smartBeamField/processList', + name: '智慧梁场-工序列表', + component: (resolve) => + require([ + '@/views/projectFront/smartBeamField/processList.vue', + ], resolve), + }, + { + path: '/project/smartBeamField/productManage', + name: '智慧梁场-生产管理', + component: (resolve) => + require([ + '@/views/projectFront/smartBeamField/productManage.vue', + ], resolve), + }, ], }, diff --git a/src/store/index.js b/src/store/index.js index 1201a67d..0ba1e36d 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -104,8 +104,8 @@ export default new Vuex.Store({ // FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式） // UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾 // FILEURL: 'http://121.196.214.246/api/image/',//金林湾 - // UPLOADURL: 'http://192.168.34.221:28888/upload/image',//郭圣雄本地 - // FILEURL: 'http://192.168.34.221:28888/image/',//郭圣雄本地 + // UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地 + // FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地 // UPLOADURL: 'http://101.43.164.214:45011/upload/image',//上海优益 // FILEURL: 'http://101.43.164.214:45011/image/',//上海优益 diff --git a/src/views/projectFront/smartBeamField/beamManage.vue b/src/views/projectFront/smartBeamField/beamManage.vue new file mode 100644 index 00000000..1788826f --- /dev/null +++ b/src/views/projectFront/smartBeamField/beamManage.vue @@ -0,0 +1,436 @@ + + + diff --git a/src/views/projectFront/smartBeamField/pedestalManage.vue b/src/views/projectFront/smartBeamField/pedestalManage.vue new file mode 100644 index 00000000..30f763c1 --- /dev/null +++ b/src/views/projectFront/smartBeamField/pedestalManage.vue @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/src/views/projectFront/smartBeamField/planManage.vue b/src/views/projectFront/smartBeamField/planManage.vue new file mode 100644 index 00000000..f3254384 --- /dev/null +++ b/src/views/projectFront/smartBeamField/planManage.vue @@ -0,0 +1,471 @@ + + + diff --git a/src/views/projectFront/smartBeamField/processList.vue b/src/views/projectFront/smartBeamField/processList.vue new file mode 100644 index 00000000..e9e712b9 --- /dev/null +++ b/src/views/projectFront/smartBeamField/processList.vue @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/src/views/projectFront/smartBeamField/productManage.vue b/src/views/projectFront/smartBeamField/productManage.vue new file mode 100644 index 00000000..c4a27657 --- /dev/null +++ b/src/views/projectFront/smartBeamField/productManage.vue @@ -0,0 +1,5 @@ + + + diff --git a/src/views/projectFront/smartBeamField/storageAreaManage.vue b/src/views/projectFront/smartBeamField/storageAreaManage.vue new file mode 100644 index 00000000..a17c69d3 --- /dev/null +++ b/src/views/projectFront/smartBeamField/storageAreaManage.vue @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/src/views/projectFront/waterMixStation/devManagement.vue b/src/views/projectFront/waterMixStation/devManagement.vue index 5e1629a0..22cf13b6 100644 --- a/src/views/projectFront/waterMixStation/devManagement.vue +++ b/src/views/projectFront/waterMixStation/devManagement.vue @@ -4,7 +4,7 @@ - + - + - - - + + + - + - + - + - +
- - - - - - + + + + + +