diff --git a/src/router/largeScreen/forth.js b/src/router/largeScreen/forth.js index c9dd4ab3..bc00f3ae 100644 --- a/src/router/largeScreen/forth.js +++ b/src/router/largeScreen/forth.js @@ -9,7 +9,7 @@ export default { }, { path: 'cim', - name: 'CIM+', + name: 'BIM协同管理', component: () => import('@/views/projectAdmin/fourEngin/cim') }, { diff --git a/src/store/index.js b/src/store/index.js index 9e62e2f9..0980a4b4 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,9 +48,9 @@ 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/", //测试 // tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/', /* 2022-05-16 */ // tag: 部署河南项目时,需要打开这两行代码 @@ -63,8 +63,8 @@ export default new Vuex.Store({ // BASEURL:'http://192.168.34.116:6023/', // UPLOADURL: 'http://192.168.34.116:6023/upload/image', // FILEURL: 'http://192.168.34.116:6023/image/', - // UPLOADURL: 'http://124.71.67.160:8088/upload/image', - // FILEURL: 'http://124.71.67.160:8088/image/', + UPLOADURL: 'http://124.71.67.160:8088/upload/image', + FILEURL: 'http://124.71.67.160:8088/image/', //--- // UPLOADURL: 'http://192.168.34.125:6023/upload/image', // FILEURL: 'http://192.168.34.125:6023/image/', diff --git a/src/views/projectAdmin/fourEngin/command/leftOne.vue b/src/views/projectAdmin/fourEngin/command/leftOne.vue index f53532d2..63762574 100644 --- a/src/views/projectAdmin/fourEngin/command/leftOne.vue +++ b/src/views/projectAdmin/fourEngin/command/leftOne.vue @@ -9,7 +9,7 @@
建设单位:{{ list.constructionUnit}}
监理单位:{{ list.supervisorUnit}}
设计单位:德国gmp建筑师事务所 (方案设计)
-

中国建筑第四工程局有限公司 (施工图设计)

+

中国建筑第四工程局有限公司 (施工图设计)

总包单位:{{ list.bidWinner}}
diff --git a/src/views/projectAdmin/fourEngin/command/leftThree.vue b/src/views/projectAdmin/fourEngin/command/leftThree.vue index 40282d99..5ecc63a0 100644 --- a/src/views/projectAdmin/fourEngin/command/leftThree.vue +++ b/src/views/projectAdmin/fourEngin/command/leftThree.vue @@ -7,16 +7,17 @@
{{ pollingData.constructionRatio || 0 }} - % +
-
+ +
@@ -38,6 +39,12 @@
+
+ 施工天数{{ pollingData.constructionDay || 0 }}天 +
+
+ 总工期{{ pollingData.totalDuration || 0 }}天 +
@@ -130,7 +137,7 @@ export default { align-items: center; width: 50%; - height: 100%; + height: 77%; .top { display: flex; @@ -191,7 +198,7 @@ export default { display: grid; place-items: center; width: 50%; - height: 100%; + height: 75%; .content { box-sizing: border-box; @@ -242,5 +249,36 @@ export default { } } } + .count1, + .count2 { + width: 300px; + padding-top: 175px; + font-size: 16px; + color: rgba(110, 228, 240, 0.85); + display: flex; + align-items: center; + position: absolute; + + // margin-left: -300px; + // margin: 0 322px 0 -413px; + span { + width: 90px; + height: 40px; + line-height: 40px; + text-align: center; + font-size: 20px; + color: #fff; + background: url(../assets/images/sourse/bg-car-count.png) no-repeat; + background-size: 100% 100%; + margin-right: 10px; + margin-left: 10px; + } + } + .count1 { + margin: 5px 0 0 10px; + } + .count2 { + margin: 5px 0 0 260px; + } } diff --git a/src/views/projectAdmin/fourEngin/command/leftTwo.vue b/src/views/projectAdmin/fourEngin/command/leftTwo.vue index 17970e8b..ce838767 100644 --- a/src/views/projectAdmin/fourEngin/command/leftTwo.vue +++ b/src/views/projectAdmin/fourEngin/command/leftTwo.vue @@ -2,27 +2,29 @@
-
+
绿色建筑
智慧建筑
装配式建筑
-
质量安全
+
质量
+
安全
近零能耗建筑 绿建三星 LEED金级 WELL金级
省级智慧建造试点项目
AAA装配式建筑
-
鲁班奖 全国建设工程施工安全生产标准化工地
+
鲁班奖
+
全国建设工程施工安全生产标准化工地
@@ -109,7 +111,7 @@ export default { overflow: hidden; white-space: nowrap; - margin: 14px 0 0 0; + margin: 20px 0 0 0; } img { @@ -147,7 +149,7 @@ export default { overflow: hidden; white-space: nowrap; - margin: 14px 0 0 0; + margin: 20px 0 0 0; } img { diff --git a/src/views/projectAdmin/fourEngin/sourse/leftBottom.vue b/src/views/projectAdmin/fourEngin/sourse/leftBottom.vue index 7df91416..9d1a8d05 100644 --- a/src/views/projectAdmin/fourEngin/sourse/leftBottom.vue +++ b/src/views/projectAdmin/fourEngin/sourse/leftBottom.vue @@ -1,8 +1,8 @@ @@ -82,11 +23,11 @@ import { getComapnyVideoListApi, getComapnyParentNameApi, } from "@/assets/js/api/company/project"; -// import VideoModule from "@/components/videoModule/videoModule.vue"; +import VideoModule from "@/components/videoModule/videoModule.vue"; export default { components: { Card, - // VideoModule + VideoModule }, data() { return { @@ -113,386 +54,23 @@ export default { label: "9屏", }, ], - tableData: [ - { - nameType: "韶钢 HRB400E 螺纹钢", - dateTime: "2023-02-07", - mobilization: 10.262, - }, - { - nameType: "韶钢 HRB400E 螺纹钢", - dateTime: "2023-02-07", - mobilization: 22.774, - }, - { - nameType: "韶钢 HRB400E 螺纹钢", - dateTime: "2023-02-07", - mobilization: 12.862, - }, - { - nameType: "韶钢 HRB400E 螺纹钢", - dateTime: "2023-02-07", - mobilization: 10.31, - }, - { - nameType: "韶钢 HRB400E 螺纹钢", - dateTime: "2023-02-07", - mobilization: 10.604, - }, - { - nameType: "西林 HRB400E 螺纹钢", - dateTime: "2023-02-07", - mobilization: 32.78, - }, - { - nameType: "西林 HRB400E 螺纹钢", - dateTime: "2023-02-03", - mobilization: 31.21, - }, - { - nameType: "韶钢 HRB400E 螺纹钢", - dateTime: "2023-02-03", - mobilization: 32.958, - }, - { - nameType: "韶钢 HRB400E 螺纹钢", - dateTime: "2023-01-10", - mobilization: 10.87, - }, - { - nameType: "韶钢 HRB400E 螺纹钢", - dateTime: "2023-01-10", - mobilization: 21.94, - }, - { - nameType: "韶钢 HRB400E 螺纹钢", - dateTime: "2023-01-10", - mobilization: 32.36, - }, - { - nameType: "桂鑫 HRB400E 螺纹钢", - dateTime: "2023-01-07", - mobilization: 11.34, - }, - { - nameType: "桂鑫 HRB400E 螺纹钢", - dateTime: "2023-01-07", - mobilization: 9.21, - }, - { - nameType: "桂鑫 HRB400E 螺纹钢", - dateTime: "2023-01-07", - mobilization: 5.66, - }, - { - nameType: "桂鑫 HRB400E 螺纹钢", - dateTime: "2023-01-07", - mobilization: 7.01, - }, - { - nameType: "西林 HRB400E 螺纹钢", - dateTime: "2023-01-06", - mobilization: 34.65, - }, - { - nameType: "西林 HRB400E 螺纹钢", - dateTime: "2023-01-06", - mobilization: 34.6, - }, - { - nameType: "西林 HRB400E 螺纹钢", - dateTime: "2023-01-05", - mobilization: 11.69, - }, - { - nameType: "西林 HRB400E 螺纹钢", - dateTime: "2023-01-05", - mobilization: 10.06, - }, - { - nameType: "西林 HRB400E 螺纹钢", - dateTime: "2023-01-05", - mobilization: 10.59, - }, - { - nameType: "西林 HRB400E 螺纹钢", - dateTime: "2023-01-04", - mobilization: 32.12, - }, - { - nameType: "西林 HRB400E 螺纹钢", - dateTime: "2023-01-04", - mobilization: 13.89, - }, - { - nameType: "西林 HRB400E 螺纹钢", - dateTime: "2023-01-04", - mobilization: 17.46, - }, - { - nameType: "桂万 HRB400E 螺纹钢", - dateTime: "2023-01-02", - mobilization: 32.8, - }, - { - nameType: "桂万 HRB400E 螺纹钢", - dateTime: "2023-01-02", - mobilization: 25.54, - }, - { - nameType: "桂万 HRB400E 螺纹钢", - dateTime: "2023-01-02", - mobilization: 7.64, - }, - { - nameType: "桂万 HRB400E 螺纹钢", - dateTime: "2023-01-01", - mobilization: 32.53, - }, - { - nameType: "桂万 HRB400E 螺纹钢", - dateTime: "2023-01-01", - mobilization: 32.45, - }, - { - nameType: "桂万 HRB400E 螺纹钢", - dateTime: "2023-01-01", - mobilization: 33.11, - }, - ], + nowIndex: -1, isShow:false, tableDataTest: {}, - tableDataShow:[ - { - showTime:'2023-02-07', - showType:'韶钢 HRB400E 螺纹钢', - showManufactor:'广东韶钢松山股份有限公司', - showVolume:10.262, - showLicensePlate:'粤F07667', - }, - { - showTime:'2023-02-07', - showType:'韶钢 HRB400E 螺纹钢', - showManufactor:'广东韶钢松山股份有限公司', - showVolume:22.774, - showLicensePlate:'粤F07667', - }, - { - showTime:'2023-02-07', - showType:'韶钢 HRB400E 螺纹钢', - showManufactor:'广东韶钢松山股份有限公司', - showVolume:12.862, - showLicensePlate:'粤F20148', - }, - { - showTime:'2023-02-07', - showType:'韶钢 HRB400E 螺纹钢', - showManufactor:'广东韶钢松山股份有限公司', - showVolume:10.31, - showLicensePlate:'粤F20148', - }, - { - showTime:'2023-02-07', - showType:'韶钢 HRB400E 螺纹钢', - showManufactor:'广东韶钢松山股份有限公司', - showVolume:10.604, - showLicensePlate:'粤F20148', - }, - { - showTime:'2023-02-07', - showType:'西林 HRB400E 螺纹钢', - showManufactor:'建龙西林钢铁有限公司', - showVolume:32.78, - showLicensePlate:'粤ADY795', - }, - { - showTime:'2023-02-03', - showType:'西林 HRB400E 螺纹钢', - showManufactor:'建龙西林钢铁有限公司', - showVolume:31.21, - showLicensePlate:'粤ACQ953', - }, - { - showTime:'2023-02-03', - showType:'韶钢 HRB400E 螺纹钢', - showManufactor:'广东韶钢松山股份有限公司', - showVolume:32.958, - showLicensePlate:'粤F69281', - }, - { - showTime:'2023-01-10', - showType:'韶钢 HRB400E 螺纹钢', - showManufactor:'广东韶钢松山股份有限公司', - showVolume:10.87, - showLicensePlate:'粤F99916', - }, - { - showTime:'2023-01-10', - showType:'韶钢 HRB400E 螺纹钢', - showManufactor:'广东韶钢松山股份有限公司', - showVolume:21.94, - showLicensePlate:'粤F26801', - }, - { - showTime:'2023-01-10', - showType:'韶钢 HRB400E 螺纹钢', - showManufactor:'广东韶钢松山股份有限公司', - showVolume:32.36, - showLicensePlate:'桂BG6735', - }, - { - showTime:'2023-01-07', - showType:'桂鑫 HRB400E 螺纹钢', - showManufactor:'广西桂鑫钢铁集团有限公司', - showVolume:11.34, - showLicensePlate:'桂J27861', - }, - { - showTime:'2023-01-07', - showType:'桂鑫 HRB400E 螺纹钢', - showManufactor:'广西桂鑫钢铁集团有限公司', - showVolume:9.21, - showLicensePlate:'桂J27861', - }, - { - showTime:'2023-01-07', - showType:'桂鑫 HRB400E 螺纹钢', - showManufactor:'广西桂鑫钢铁集团有限公司', - showVolume:5.66, - showLicensePlate:'桂J27861', - }, - { - showTime:'2023-01-07', - showType:'桂鑫 HRB400E 螺纹钢', - showManufactor:'广西桂鑫钢铁集团有限公司', - showVolume:7.01, - showLicensePlate:'桂J27861', - }, - { - showTime:'2023-01-06', - showType:'西林 HRB400E 螺纹钢', - showManufactor:'建龙西林钢铁有限公司', - showVolume:34.65, - showLicensePlate:'桂BY5369', - }, - { - showTime:'2023-01-06', - showType:'西林 HRB400E 螺纹钢', - showManufactor:'建龙西林钢铁有限公司', - showVolume:34.60, - showLicensePlate:'桂BY2375', - }, - { - showTime:'2023-01-05', - showType:'西林 HRB400E 螺纹钢', - showManufactor:'建龙西林钢铁有限公司', - showVolume:11.69, - showLicensePlate:'粤AFP290', - }, - { - showTime:'2023-01-05', - showType:'西林 HRB400E 螺纹钢', - showManufactor:'建龙西林钢铁有限公司', - showVolume:10.06, - showLicensePlate:'粤AFP290', - }, - { - showTime:'2023-01-05', - showType:'西林 HRB400E 螺纹钢', - showManufactor:'建龙西林钢铁有限公司', - showVolume:10.59, - showLicensePlate:'粤AFP290', - }, - { - showTime:'2023-01-04', - showType:'西林 HRB400E 螺纹钢', - showManufactor:'建龙西林钢铁有限公司', - showVolume:32.12, - showLicensePlate:'粤AFP290', - }, - { - showTime:'2023-01-04', - showType:'西林 HRB400E 螺纹钢', - showManufactor:'建龙西林钢铁有限公司', - showVolume:13.89, - showLicensePlate:'粤ABW785', - }, - { - showTime:'2023-01-04', - showType:'西林 HRB400E 螺纹钢', - showManufactor:'建龙西林钢铁有限公司', - showVolume:17.46, - showLicensePlate:'粤ABW785', - }, - { - showTime:'2023-01-02', - showType:'桂万 HRB400E 螺纹钢', - showManufactor:'广西盛隆冶金有限公司', - showVolume:32.80, - showLicensePlate:'粤AHN951', - }, - - { - showTime:'2023-01-02', - showType:'桂万 HRB400E 螺纹钢', - showManufactor:'广西盛隆冶金有限公司', - showVolume:25.54, - showLicensePlate:'粤AFD410', - }, - { - showTime:'2023-01-02', - showType:'桂万 HRB400E 螺纹钢', - showManufactor:'广西盛隆冶金有限公司', - showVolume:7.64, - showLicensePlate:'粤AFD410', - }, - { - showTime:'2023-01-01', - showType:'桂万 HRB400E 螺纹钢', - showManufactor:'广西盛隆冶金有限公司', - showVolume:32.53, - showLicensePlate:'粤BLU118', - }, - { - showTime:'2023-01-01', - showType:'桂万 HRB400E 螺纹钢', - showManufactor:'广西盛隆冶金有限公司', - showVolume:32.45, - showLicensePlate:'粤BLM700', - }, - { - showTime:'2023-01-01', - showType:'桂万 HRB400E 螺纹钢', - showManufactor:'广西盛隆冶金有限公司', - showVolume:33.11, - showLicensePlate:'粤BMT161', - }, - ] }; }, mounted() { - // this.getList() + this.getList() }, methods: { - //点击列表 - showBtn(index) { - this.nowIndex = index; - this.isShow=true - this.tableDataTest = this.tableDataShow[index] - }, - //鼠标移出关闭弹框 - mouseLeave(){ - this.isShow=false - }, - //查询监控 getList() { this.sn = this.$store.state.projectSn; - // getReceiptOrIssueRecord({ projectSn: this.sn }).then(res => { - // this.selectList = res.result - // console.log('this.carList ',this.selectList); - // }) + getReceiptOrIssueRecord({ projectSn: this.sn }).then(res => { + this.selectList = res.result + console.log('this.carList ',this.selectList); + }) getComapnyStatisticsListApi({ sn: this.sn, diff --git a/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue b/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue index d3759d06..11750c6b 100644 --- a/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue +++ b/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue @@ -1,513 +1,597 @@ + diff --git a/src/views/projectAdmin/fourEngin/sourse/leftTop.vue b/src/views/projectAdmin/fourEngin/sourse/leftTop.vue index 8f562711..a6045dec 100644 --- a/src/views/projectAdmin/fourEngin/sourse/leftTop.vue +++ b/src/views/projectAdmin/fourEngin/sourse/leftTop.vue @@ -23,7 +23,7 @@
{{messageList.planValue||0}}
-
计划用量
+
BIM模型用量
{{messageList.passValue||0}}
@@ -31,7 +31,7 @@
{{messageList.consumeValue||0}}
-
消耗量
+
实际用量
{{messageList.stockValue||0}}
diff --git a/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue b/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue index e1f1a935..3d7dcadd 100644 --- a/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue +++ b/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue @@ -37,11 +37,12 @@ export default { consumeValue: "100t", url: require("../assets/images/carbon/top3.png"), }, - { - name: "幕墙", - consumeValue: "100㎡", - url: require("../assets/images/carbon/top4.png"), + { + name: "钢构", + consumeValue: "200t", + url: require("../assets/images/carbon/bottom4.png"), }, + { name: "砂浆", consumeValue: "600m³", @@ -57,11 +58,12 @@ export default { consumeValue: "200㎡", url: require("../assets/images/carbon/bottom3.png"), }, - { - name: "钢构", - consumeValue: "200t", - url: require("../assets/images/carbon/bottom4.png"), + { + name: "幕墙", + consumeValue: "100㎡", + url: require("../assets/images/carbon/top4.png"), }, + ], sn: "", coplist: [], diff --git a/src/views/projectAdmin/fourEngin/sourse/rightTop.vue b/src/views/projectAdmin/fourEngin/sourse/rightTop.vue index 2e7a5852..644260c5 100644 --- a/src/views/projectAdmin/fourEngin/sourse/rightTop.vue +++ b/src/views/projectAdmin/fourEngin/sourse/rightTop.vue @@ -1,5 +1,5 @@