From 045d5fc24b4f49d73d86c7440464ce8bafd6b918 Mon Sep 17 00:00:00 2001 From: jxj_yjl <1490736767@qq.com> Date: Fri, 7 Jul 2023 13:53:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E6=9E=97=E6=B9=BE=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=EF=BC=88=E5=A4=A7=E5=B1=8F=E9=A1=B5=E9=9D=A2bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=EF=BC=89/=E4=B8=AD=E5=BB=BA=E5=9B=9B=E5=B1=80?= =?UTF-8?q?=EF=BC=88=E5=A4=A7=E5=B1=8F=E9=9C=80=E6=B1=82=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/config.js | 8 +- src/assets/js/http.js | 12 +- src/components/header.vue | 260 +++++++++++------- src/store/index.js | 22 +- src/views/companyAdmin/docManage.vue | 3 +- src/views/companyAdmin/longguang2/index.vue | 33 ++- .../fourEngin/assets/images/carbon/bimImg.png | Bin 0 -> 22116 bytes .../fourEngin/assets/images/carbon/ggImg.png | Bin 0 -> 91675 bytes .../fourEngin/assets/images/carbon/gjImg.png | Bin 0 -> 93449 bytes .../fourEngin/assets/images/carbon/hntImg.png | Bin 0 -> 92329 bytes .../assets/images/carbon/sjylImg.png | Bin 0 -> 17870 bytes .../fourEngin/command/rightOne.vue | 65 ++--- .../fourEngin/security/centerBottom.vue | 10 +- .../fourEngin/security/leftCenter.vue | 30 +- .../fourEngin/sourse/leftCenter.vue | 27 +- .../fourEngin/sourse/rightBottom.vue | 194 ++++++++++--- .../fourEngin/sourse/rightTop.vue | 4 +- .../jlw/digitalSite/CenterBottom/index.vue | 10 + .../jlw/digitalSite/centerTop.vue | 36 ++- .../dangerousBigProject/checkTable.vue | 196 +++++++------ .../materialManage/materialMobilization.vue | 25 +- 21 files changed, 583 insertions(+), 352 deletions(-) create mode 100644 src/views/projectAdmin/fourEngin/assets/images/carbon/bimImg.png create mode 100644 src/views/projectAdmin/fourEngin/assets/images/carbon/ggImg.png create mode 100644 src/views/projectAdmin/fourEngin/assets/images/carbon/gjImg.png create mode 100644 src/views/projectAdmin/fourEngin/assets/images/carbon/hntImg.png create mode 100644 src/views/projectAdmin/fourEngin/assets/images/carbon/sjylImg.png diff --git a/public/js/config.js b/public/js/config.js index 0608ac33..7e00fc93 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -1,4 +1,4 @@ -var COMPANY = ''; //通用 +// var COMPANY = ''; //通用 // var COMPANY='zhongjian'; //中建,和沃尔对接的插件版用这个企业 // var COMPANY='hezhan'; //合展-宿迁 // var COMPANY='nanchang'; //南昌地铁、衢州 @@ -10,10 +10,11 @@ var COMPANY = ''; //通用 // COMPANY = 'hengtong'//瑞士恒通 // COMPANY = 'yunlian'//云联万物 // COMPANY = 'neimenggu'//内蒙古项目 -// COMPANY = 'zjsj'//中建四局 +COMPANY = 'zjsj'//中建四局 // COMPANY = 'zjwj'//中建五局 // COMPANY = 'sccr'//四川成润 // COMPANY = 'pssh'//坪山沙湖项目 +// COMPANY = 'jlw'//金林湾 @@ -24,10 +25,9 @@ var PROJECT = { online_gxlt: 'gxlt', // 广西联通 } -// var publicPath='/jxjgd/' //金林湾部署统一加前缀 -var PROJECT_TYPE = PROJECT.local_test +var PROJECT_TYPE = PROJECT.online_zjsj var headerShow = true; // 是否显示头部 var tabsShow = true; // 是否显示tabs diff --git a/src/assets/js/http.js b/src/assets/js/http.js index a1ac1e48..1fc6cceb 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -34,12 +34,11 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://14.29.220.211:6023/' // axios.defaults.baseURL = 'https://zhgd.loganwy.com/' //龙光 // axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/' - // axios.defaults.baseURL = 'http://36.137.53.203:9090/' // 南昌地铁 17512009894 123456789 gdjt 87654321 + // axios.defaults.baseURL = 'http://36.137.53.203:9090/' // 南昌地铁 17512009894 123456789 gdjt 87654321 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 - // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地 // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上(旧)地址 @@ -90,20 +89,17 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1) // axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式 // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ - axios.defaults.baseURL ='http://192.168.34.221:8079' //郭圣雄本地 + axios.defaults.baseURL ='http://192.168.34.221:8188' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:30001' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地 // axios.defaults.baseURL ='http://61.145.163.135:12345' //坪山沙湖 // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上 - - - } else if (process.env.NODE_ENV == 'debug') { axios.defaults.baseURL = 'https://www.ceshi.com' } else if (process.env.NODE_ENV == 'production') { let host = window.location.host - // axios.defaults.baseURL = window.location.protocol + '//' + host + '/api/'//金林湾地址 - axios.defaults.baseURL = window.location.protocol + '//' + host + '/' + axios.defaults.baseURL = window.location.protocol + '//' + host + '/api/'//金林湾地址 + // axios.defaults.baseURL = window.location.protocol + '//' + host + '/' // axios.defaults.baseURL ='http://192.168.34.216:6023/' // axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/" // axios.defaults.baseURL = 'http://zhgd.loganwy.com/`' diff --git a/src/components/header.vue b/src/components/header.vue index abe06fab..804eb4d6 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -1,46 +1,89 @@