From c7790a80c27d9afb934d19754d889df1e6251232 Mon Sep 17 00:00:00 2001 From: jxj_yjl <1490736767@qq.com> Date: Wed, 26 Jul 2023 13:50:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA=E5=9B=9B=E5=B1=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A4=A9=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/index.js | 16 ++-- .../projectAdmin/fourEngin/govComp/Col4.vue | 94 ++++++++++++++++++- 2 files changed, 100 insertions(+), 10 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index c97a1ed4..8ce8f04b 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -51,12 +51,12 @@ export default new Vuex.Store({ BASEURL: baseUrl ? baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境 - // UPLOADURL: - // window.location.protocol + - // "//" + - // window.location.host + - // "/upload/image", //正式环境 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + UPLOADURL: + window.location.protocol + + "//" + + window.location.host + + "/upload/image", //正式环境 + FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl @@ -107,8 +107,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:30012/upload/image',//郭圣雄本地 - FILEURL: 'http://192.168.34.221:30012/image/',//郭圣雄本地 + // UPLOADURL: 'http://192.168.34.221:30012/upload/image',//郭圣雄本地 + // FILEURL: 'http://192.168.34.221:30012/image/',//郭圣雄本地 ACCOUNTTYPE: [ "系统管理员", diff --git a/src/views/projectAdmin/fourEngin/govComp/Col4.vue b/src/views/projectAdmin/fourEngin/govComp/Col4.vue index e4570542..3cddebf2 100644 --- a/src/views/projectAdmin/fourEngin/govComp/Col4.vue +++ b/src/views/projectAdmin/fourEngin/govComp/Col4.vue @@ -6,7 +6,7 @@
混凝土浇筑总量 - 30470.78³ + 32954.78³
@@ -43,6 +43,96 @@ export default { data() { return { dataList: [ + { + date: '2023/7/24', + building: '十四层核心筒梁板', + quantity: 24.5 + }, + { + date: '2023/7/24', + building: '十四层核心筒梁板', + quantity: 24.5 + }, + { + date: '2023/7/24', + building: '十三层核心筒剪力墙柱', + quantity: 241 + }, + { + date: '2023/7/24', + building: '十三层核心筒剪力墙柱', + quantity: 241 + }, + { + date: '2023/7/24', + building: '5-7轴×E-J轴八层楼承板', + quantity: 145 + }, + { + date: '2023/7/24', + building: '5-7轴×E-J轴八层楼承板', + quantity: 145 + }, + { + date: '2023/7/23', + building: '5-7轴×E-J轴六至七层钢管柱', + quantity: 45 + }, + { + date: '2023/7/23', + building: '5-7轴×E-J轴六至七层钢管柱', + quantity: 45 + }, + { + date: '2023/7/21', + building: '2-4轴×B-J轴七层楼承板', + quantity: 180 + }, + { + date: '2023/7/21', + building: '2-4轴×B-J轴七层楼承板', + quantity: 180 + }, + { + date: '2023/7/20', + building: '4-7轴×F轴往南3.15米-J轴七层楼承板', + quantity: 156 + }, + { + date: '2023/7/20', + building: '4-7轴×F轴往南3.15米-J轴七层楼承板', + quantity: 156 + }, + { + date: '2023/7/20', + building: '十三层核心筒梁板', + quantity: 24.5 + }, + { + date: '2023/7/20', + building: '十三层核心筒梁板', + quantity: 24.5 + }, + { + date: '2023/7/19', + building: '十二层核心筒剪力墙柱', + quantity: 241.5 + }, + { + date: '2023/7/19', + building: '十二层核心筒剪力墙柱', + quantity: 241.5 + }, + { + date: '2023/7/19', + building: '4-7轴×B-F轴往南3.15米七层楼承板', + quantity: 184.5 + }, + { + date: '2023/7/19', + building: '4-7轴×B-F轴往南3.15米七层楼承板', + quantity: 184.5 + }, { date: '2023/7/15', building: '十二层核心筒梁板', @@ -1040,7 +1130,7 @@ export default { }, series: [ { - data: [3589, 311.5, 3007.5, 1683.28, 1205, 3508, 4016, 0, 0, 0, 0, 0], + data: [3589, 311.5, 3007.5, 1683.28, 1205, 3508, 6500, 0, 0, 0, 0, 0], type: 'line', smooth: true, color: '#f56c35'