diff --git a/public/js/config.js b/public/js/config.js index a502aab6..0608ac33 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'; //南昌地铁、衢州 @@ -12,7 +12,7 @@ // COMPANY = 'neimenggu'//内蒙古项目 // COMPANY = 'zjsj'//中建四局 // COMPANY = 'zjwj'//中建五局 -COMPANY = 'sccr'//四川成润 +// COMPANY = 'sccr'//四川成润 // COMPANY = 'pssh'//坪山沙湖项目 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 9583cfca..57726866 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,11 +84,11 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地 // 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://121.196.214.246/api/'//金林湾线上新 // 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://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:30001' //郭圣雄本地 diff --git a/src/views/projectAdmin/fourEngin/govComp/Col2.vue b/src/views/projectAdmin/fourEngin/govComp/Col2.vue index e860a202..9b819c49 100644 --- a/src/views/projectAdmin/fourEngin/govComp/Col2.vue +++ b/src/views/projectAdmin/fourEngin/govComp/Col2.vue @@ -49,6 +49,15 @@ export default { data() { return { contentList: [ + { + time: '2023-06-23', + question: 2, + utils: '广州市建设工程安全监督站', + safe: '卢位昌、张东莹、刘昊', + type: '安全', + position: '地上结构', + change: '否' + }, { time: '2023-05-29', question: 2, diff --git a/src/views/projectAdmin/fourEngin/govComp/Col4.vue b/src/views/projectAdmin/fourEngin/govComp/Col4.vue index f9404111..e4d74e3d 100644 --- a/src/views/projectAdmin/fourEngin/govComp/Col4.vue +++ b/src/views/projectAdmin/fourEngin/govComp/Col4.vue @@ -6,7 +6,7 @@
混凝土浇筑总量 - 25521.78m³ + 26054.78³
@@ -43,6 +43,26 @@ export default { data() { return { dataList: [ + { + date: '2023/6/16', + building: ' 七层核心筒梁板 ', + quantity: 31 + }, + { + date: '2023/6/16', + building: ' 七层核心筒梁板 ', + quantity: 31 + }, + { + date: '2023/6/16', + building: ' 六层核心筒墙柱 ', + quantity: 235.5 + }, + { + date: '2023/6/16', + building: ' 六层核心筒墙柱 ', + quantity: 235.5 + }, { date: '2023/6/13', building: ' 1-4轴×B-J轴及塔楼三层楼承板 ', @@ -885,7 +905,7 @@ export default { }, series: [ { - data: [3589, 311.5, 3007.5, 1683.28, 1205, 2575, 0, 0, 0, 0, 0, 0], + data: [3589, 311.5, 3007.5, 1683.28, 1205, 3108, 0, 0, 0, 0, 0, 0], type: 'line', smooth: true, color: '#f56c35' diff --git a/src/views/projectFront/contractManagement/basicInformation.vue b/src/views/projectFront/contractManagement/basicInformation.vue index 80971bf3..c897c2db 100644 --- a/src/views/projectFront/contractManagement/basicInformation.vue +++ b/src/views/projectFront/contractManagement/basicInformation.vue @@ -217,6 +217,7 @@ @@ -233,16 +234,20 @@ label-width="100px" > @@ -938,7 +943,7 @@ style="margin-left: -30px" > - + {{ @@ -326,8 +329,8 @@