From 4d4d832aef81b4ad4ec1ab779393d1c654258679 Mon Sep 17 00:00:00 2001 From: jxj_yjl <1490736767@qq.com> Date: Mon, 31 Jul 2023 09:14:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA=E5=9B=9B=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/config.js | 6 +- src/assets/js/http.js | 4 +- src/store/index.js | 4 +- .../projectAdmin/fourEngin/govComp/Col4.vue | 60 +++++++++++++++++++ 4 files changed, 67 insertions(+), 7 deletions(-) diff --git a/public/js/config.js b/public/js/config.js index b5181dcb..e8cdafb1 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -10,9 +10,9 @@ // COMPANY = 'hengtong'//瑞士恒通 // COMPANY = 'yunlian'//云联万物 // COMPANY = 'neimenggu'//内蒙古项目 -// COMPANY = 'zjsj'//中建四局 +COMPANY = 'zjsj'//中建四局 // COMPANY = 'zjwj'//中建五局 -COMPANY = 'sccr'//四川成润 +// COMPANY = 'sccr'//四川成润 // COMPANY = 'pssh'//坪山沙湖项目 // COMPANY = 'jlw'//金林湾 // COMPANY = 'shzj'//上海张江 @@ -28,7 +28,7 @@ var PROJECT = { -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 10a4abea..133bde3c 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -70,14 +70,14 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上 // axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上 // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新 - // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址 + axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址 // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上 // 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:8188' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:30001' //郭圣雄本地 - axios.defaults.baseURL ='http://192.168.34.221:30002' //郭圣雄本地 + // axios.defaults.baseURL ='http://192.168.34.221:30002' //郭圣雄本地 // 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/' //金林湾测试线上 diff --git a/src/store/index.js b/src/store/index.js index 24983d4f..8ce8f04b 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -44,8 +44,8 @@ export default new Vuex.Store({ state: { PAGESIZRS: [10, 20, 30, 50], - UPLOADURL:'http://192.168.34.221:30001/upload/image/',// 郭圣雄 - FILEURL:'http://192.168.34.221:30001/image/',//郭圣雄 + UPLOADURL:'http://192.168.34.221:12360/upload/image',// 郭圣雄 + FILEURL:'http://192.168.34.221:12360/image/',//郭圣雄 // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 BASEURL: baseUrl diff --git a/src/views/projectAdmin/fourEngin/govComp/Col4.vue b/src/views/projectAdmin/fourEngin/govComp/Col4.vue index 3cddebf2..3c835bbf 100644 --- a/src/views/projectAdmin/fourEngin/govComp/Col4.vue +++ b/src/views/projectAdmin/fourEngin/govComp/Col4.vue @@ -43,6 +43,66 @@ export default { data() { return { dataList: [ + { + date: '2023/7/28', + building: '十五层核心筒梁板', + quantity: 24.5 + }, + { + date: '2023/7/28', + building: '十五层核心筒梁板', + quantity: 24.5 + }, + { + date: '2023/7/28', + building: '十四层核心筒剪力墙柱', + quantity: 241 + }, + { + date: '2023/7/28', + building: '十四层核心筒剪力墙柱', + quantity: 241 + }, + { + date: '2023/7/28', + building: '4-5轴×E-J轴八层楼承板', + quantity: 125 + }, + { + date: '2023/7/28', + building: '4-5轴×E-J轴八层楼承板', + quantity: 125 + }, + { + date: '2023/7/27', + building: '2-4轴×B-J轴八层楼承板', + quantity: 130 + }, + { + date: '2023/7/27', + building: '2-4轴×B-J轴八层楼承板', + quantity: 130 + }, + { + date: '2023/7/26', + building: '4-7轴×B-D轴及4轴×E-H轴六至七层钢管柱', + quantity: 66.5 + }, + { + date: '2023/7/26', + building: '4-7轴×B-D轴及4轴×E-H轴六至七层钢管柱', + quantity: 66.5 + }, + { + date: '2023/7/26', + building: '4-5轴×B-J轴及5-7轴×B-E轴八层楼承板', + quantity: 210 + }, + { + date: '2023/7/26', + building: '4-5轴×B-J轴及5-7轴×B-E轴八层楼承板', + quantity: 210 + }, { date: '2023/7/24', building: '十四层核心筒梁板',