diff --git a/public/js/config.js b/public/js/config.js index e82ee993..10d2e9e1 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,7 +10,7 @@ var COMPANY = ''; //通用 // COMPANY = 'hengtong'//瑞士恒通 // COMPANY = 'yunlian'//云联万物 // COMPANY = 'neimenggu'//内蒙古项目 -// COMPANY = 'zjsj'//中建四局 +COMPANY = 'zjsj'//中建四局 // COMPANY = 'zjwj'//中建五局 @@ -23,7 +23,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 537341c8..df85e7ae 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -80,12 +80,12 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地 // axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地 - axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地 // 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://42.194.144.62:8088/'//中建四局线上（新）地址 + axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址 // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上 } else if (process.env.NODE_ENV == 'debug') { diff --git a/src/store/index.js b/src/store/index.js index c323e00d..c2e7e314 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,12 +48,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 @@ -87,8 +87,8 @@ export default new Vuex.Store({ // FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式 // UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台 // FILEURL: 'http://182.90.224.147:100/image/',//演示平台 - UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地 - FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地 + // UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地 + // FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地 // UPLOADURL: 'http://192.168.34.221:30000/upload/image',//郭圣雄本地 // FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地 // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古 diff --git a/src/views/projectAdmin/fourEngin/govComp/Col2.vue b/src/views/projectAdmin/fourEngin/govComp/Col2.vue index a4df6030..d20b6a02 100644 --- a/src/views/projectAdmin/fourEngin/govComp/Col2.vue +++ b/src/views/projectAdmin/fourEngin/govComp/Col2.vue @@ -49,6 +49,42 @@ export default { data() { return { contentList: [ + { + time: '2023-05-01', + question: 2, + utils: '中国建筑第四工程局有限公司', + safe: '卢位昌', + type: '安全', + position: '地下室', + change: '否' + }, + { + time: '2023-04-29', + question: 2, + utils: '中国建筑第四工程局有限公司', + safe: '卢位昌', + type: '安全', + position: '地下室', + change: '否' + }, + { + time: '2023-04-27', + question: 1, + utils: '中国建筑第四工程局有限公司', + safe: '卢位昌', + type: '安全', + position: '地下室', + change: '是' + }, + { + time: '2023-04-10', + question: 2, + utils: '中国建筑第四工程局有限公司', + safe: '卢位昌', + type: '安全', + position: '地下室', + change: '否' + }, { time: '2023-04-02', question: 1, diff --git a/src/views/projectAdmin/fourEngin/govComp/Col4.vue b/src/views/projectAdmin/fourEngin/govComp/Col4.vue index e63d4084..fd45b634 100644 --- a/src/views/projectAdmin/fourEngin/govComp/Col4.vue +++ b/src/views/projectAdmin/fourEngin/govComp/Col4.vue @@ -6,7 +6,7 @@
混凝土浇筑总量 - 21187.78m³ + 21741.78m³
@@ -43,6 +43,26 @@ export default { data() { return { dataList: [ + { + date: '2023/4/29', + building: '三层核心筒梁板 ', + quantity: 30 + }, + { + date: '2023/4/29', + building: '三层核心筒梁板 ', + quantity: 30 + }, + { + date: '2023/4/29', + building: '二层核心筒剪力墙柱 ', + quantity: 247 + }, + { + date: '2023/4/29', + building: '二层核心筒剪力墙柱 ', + quantity: 247 + }, { date: '2023/4/18', building: '二层核心筒梁板 ', @@ -724,7 +744,7 @@ export default { }, series: [ { - data: [3589, 311.5, 3007.5, 1129.28, 0, 0, 0, 0, 0, 0, 0, 0], + data: [3589, 311.5, 3007.5, 1683.28, 0, 0, 0, 0, 0, 0, 0, 0], type: 'line', smooth: true, color: '#f56c35' diff --git a/src/views/projectAdmin/fourEngin/govComp/leftMiddle.vue b/src/views/projectAdmin/fourEngin/govComp/leftMiddle.vue index 92a100a6..5e4af6ee 100644 --- a/src/views/projectAdmin/fourEngin/govComp/leftMiddle.vue +++ b/src/views/projectAdmin/fourEngin/govComp/leftMiddle.vue @@ -11,15 +11,15 @@
-
17
+
21
下发整改通知书
-
54
+
63
累计监督签到人数
-
17
+
21
已整改
diff --git a/src/views/projectAdmin/fourEngin/progress/uav.vue b/src/views/projectAdmin/fourEngin/progress/uav.vue index 717c88f8..f125862a 100644 --- a/src/views/projectAdmin/fourEngin/progress/uav.vue +++ b/src/views/projectAdmin/fourEngin/progress/uav.vue @@ -78,22 +78,16 @@ export default { if (val) { data = val } - console.log('获取无人机列表数据 :时间参数 -- ', val) getUavVideoApi({ projectSn: this.$store.state.projectSn, shootingDate: data }).then((res) => { - console.log('无人机res', res) this.uavList = res.result - this.uavList.forEach((item) => { - this.videoUrl = item.videoUrl - }) - console.log('this.videoUrl', this.videoUrl) + this.videoUrl=this.uavList[0].videoUrl }) }, //切换视频 checkM(item) { - console.log('点击切换', item) this.videoUrl = item.videoUrl } } diff --git a/src/views/projectAdmin/fourEngin/quality/rightBottom.vue b/src/views/projectAdmin/fourEngin/quality/rightBottom.vue index 60aead68..29241def 100644 --- a/src/views/projectAdmin/fourEngin/quality/rightBottom.vue +++ b/src/views/projectAdmin/fourEngin/quality/rightBottom.vue @@ -49,7 +49,7 @@ export default { temperature: 0, }, searchSn: "", - devSn: "", + devSn: "AXJD000000000009", dustData_24: [], humidityList:[],//湿度 temperatureList:[],//温度 @@ -62,7 +62,8 @@ export default { if (this.$store.state.projectSn) { this.searchSn = this.$store.state.projectSn; this.$nextTick(() => { - this.getDevList(); + // this.getDevList(); + this.selectDustNoiseData() this.getRealTimeData(); }); } else { @@ -298,9 +299,8 @@ export default { console.log("列表", result); this.devList = result.result; if (result.result.length > 0) { - this.devSn = result.result[0].devSn; + // this.devSn = result.result[0].devSn; this.getRealTimeData(); - this.selectDustNoiseData() } }); @@ -319,7 +319,7 @@ export default { this.personnelTypeChart.clear(); } - this.getDevList(); + // this.getDevList(); }, }, }; @@ -349,7 +349,7 @@ export default { display: flex; align-items: center; margin-top: 80px; - + margin-left: 2px; .icon { width: 40px; height: 40px;