中建四局页面修改

src/router/largeScreen/forth.js

@@ -9,7 +9,7 @@ export default {
       },
       {
         path: 'cim',
-        name: 'CIM+',
+        name: 'BIM协同管理',
         component: () => import('@/views/projectAdmin/fourEngin/cim')
       },
       {

src/store/index.js

@@ -48,9 +48,9 @@ export default new Vuex.Store({
     BASEURL: baseUrl
       ? baseUrl
       : window.location.protocol + "//" + window.location.host + "/", //
-    UPLOADURL:
+    // UPLOADURL:
-      window.location.protocol + "//" + window.location.host + "/upload/image", //
+    //   window.location.protocol + "//" + window.location.host + "/upload/image", //
-    FILEURL: window.location.protocol + "//" + window.location.host + "/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',
+    UPLOADURL: 'http://124.71.67.160:8088/upload/image',
-    // FILEURL: 'http://124.71.67.160:8088/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/',

src/views/projectAdmin/fourEngin/command/leftOne.vue

@@ -9,7 +9,7 @@
             <div>建设单位:{{ list.constructionUnit}}</div>
             <div>监理单位:{{ list.supervisorUnit}}</div>
             <div>设计单位:德国gmp建筑师事务所 (方案设计)</div>
-            <p style="margin-left:70px">中国建筑第四工程局有限公司 (施工图设计)</p>
+            <p style="margin-left:70px;margin-top:5px">中国建筑第四工程局有限公司 (施工图设计)</p>
             <div style="margin-top:5px">总包单位:{{ list.bidWinner}}</div>
           </div>
         </div>

src/views/projectAdmin/fourEngin/command/leftThree.vue

@@ -7,16 +7,17 @@
             <img src="../assets/images/common/quality.gif" alt="">
             <div class="value">
               <span class="number">{{ pollingData.constructionRatio || 0 }}</span>
-              <span class="unit">%</span>
+              <!-- <span class="unit">%</span> -->
             </div>
           </div>
         </div>
-        <div class="bottom">
+        <!-- <div class="bottom">
           <span class="label">施工天数/总工期</span>
           <div class="value">
             <span class="number">{{ pollingData.constructionDay || 0 }}</span>/<span class="number">{{ pollingData.totalDuration || 0 }}</span>
           </div>
-        </div>
+        </div> -->
+
       </div>
       <div class="right">
         <div class="content">
@@ -38,6 +39,12 @@
           </div>
         </div>
       </div>
+      <div class="count1">
+        施工天数<span>{{ pollingData.constructionDay || 0 }}</span>天
+      </div>
+      <div class="count2">
+        总工期<span>{{ pollingData.totalDuration || 0 }}</span>天
+      </div>
     </div>
   </Card>
 </template>
@@ -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;
+  }
 }
 </style>

src/views/projectAdmin/fourEngin/command/leftTwo.vue

@@ -2,27 +2,29 @@
   <Card title="项目目标">
     <div class="contentBox">
       <div class="security-list">
-        <div class="thead">
+        <!-- <div class="thead">
           <div class="row">
             <div class="td" style="font-size: 16px">目标类型</div>
             <div class="td" style="margin: 10px 0 0 120px; font-size: 16px">
               目标名称
             </div>
           </div>
-        </div>
+        </div> -->
         <div class="tbody">
           <vue-scroll style="width: 95%">
             <div class="row">
               <div class="td">绿色建筑</div>
               <div class="td">智慧建筑</div>
               <div class="td">装配式建筑</div>
-              <div class="td">质量安全</div>
+              <div class="td">质量</div>
+              <div class="td">安全</div>
             </div>
             <div class="row1">
               <div class="td">近零能耗建筑 绿建三星 LEED金级 WELL金级</div>
               <div class="td">省级智慧建造试点项目</div>
               <div class="td">AAA装配式建筑</div>
-              <div class="td">鲁班奖 全国建设工程施工安全生产标准化工地</div>
+              <div class="td">鲁班奖</div>
+              <div class="td">全国建设工程施工安全生产标准化工地</div>
             </div>
           </vue-scroll>
         </div>
@@ -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 {

src/views/projectAdmin/fourEngin/sourse/leftBottom.vue

@@ -1,8 +1,8 @@
 <template>
-  <Card title="材料进场记录">
+  <Card title="地磅监控">
-    <!-- <VideoModule  class="playVideoBox"
+    <VideoModule  class="playVideoBox"
     style="height:200px;width:600px"
-    :type="'1x1'"
+    :type="'1x2'"
         :value="selectList"
         :displayBottomMod="false"
         :winNumBer="9"
@@ -11,66 +11,7 @@
         :showControl="false"
         :showPlayback="false"
         :xxx="7"
-      ></VideoModule> -->
+      ></VideoModule> 
-    <div class="box">
-      <div class="security-list">
-        <div class="thead">
-          <div class="row">
-            <div class="td">材料类型</div>
-            <div class="td" style="margin-left: 100px">进场时间</div>
-            <div class="td">进场量</div>
-          </div>
-        </div>
-        <div class="tbody">
-          <vue-scroll style="width: 95%; height: 160px">
-            <div
-              class="row"
-              v-for="(item, index) in tableData"
-              :key="index"
-              @click="showBtn(index)"
-              @mouseleave="mouseLeave"
-              :class="{ active: nowIndex == index }"
-            >
-              <div class="td">{{ item.nameType }}</div>
-              <div class="td" style="margin-left: 100px">
-                {{ item.dateTime }}
-              </div>
-              <div class="td" style="margin-left: 20px">
-                {{ item.mobilization }}
-              </div>
-            </div>
-            <div class="row" v-if="tableData.length == 0">
-              <div
-                style="
-                  font-size: 14px;
-                  color: #999;
-                  text-align: center;
-                  width: 100%;
-                  line-height: 200px;
-                "
-              >
-                暂无数据
-              </div>
-            </div>
-          </vue-scroll>
-        </div>
-      </div>
-    </div>
-
-    <!-- 列表点击弹框 -->
-    <div class="informationDialog" v-show="isShow">
-      <div class="titleText" >
-        材料进场记录
-      </div>
-      <div class="content">
-        <div>进场时间：{{tableDataTest.showTime}}</div>
-       <div>材料类型：{{tableDataTest.showType}}</div>
-       <div>生产厂家：{{tableDataTest.showManufactor}}</div>
-       <div>进场量：{{tableDataTest.showVolume}}</div>
-       <div>车牌号：{{tableDataTest.showLicensePlate}}</div>
-      </div>
-       
-    </div>
   </Card>
 </template>
 
@@ -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 => {
+      getReceiptOrIssueRecord({ projectSn: this.sn }).then(res => {
-      //   this.selectList = res.result
+        this.selectList = res.result
-      //   console.log('this.carList ',this.selectList);
+        console.log('this.carList ',this.selectList);
-      // })
+      })
 
       getComapnyStatisticsListApi({
         sn: this.sn,

src/views/projectAdmin/fourEngin/sourse/leftTop.vue

@@ -23,7 +23,7 @@
       <div class="carbonEmission">
       <div class="photovoltaicOne">
         <div class="textKwh">{{messageList.planValue||0}}</div>
-        <div class="textBottom">计划用量</div>
+        <div class="textBottom">BIM模型用量</div>
       </div>
       <div class="photovoltaicTwo">
         <div class="textKwh">{{messageList.passValue||0}}</div>
@@ -31,7 +31,7 @@
       </div>
       <div class="photovoltaicThree">
         <div class="textKwh">{{messageList.consumeValue||0}}</div>
-        <div class="textBottom">消耗量</div>
+        <div class="textBottom">实际用量</div>
       </div>
       <div class="photovoltaicFour">
         <div class="textKwh">{{messageList.stockValue||0}}</div>

src/views/projectAdmin/fourEngin/sourse/rightBottom.vue

@@ -37,11 +37,12 @@ export default {
           consumeValue: "100t",
           url: require("../assets/images/carbon/top3.png"),
         },
-        {
+         {
-          name: "幕墙",
+          name: "钢构",
-          consumeValue: "100㎡",
+          consumeValue: "200t",
-          url: require("../assets/images/carbon/top4.png"),
+          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: "钢构",
+          name: "幕墙",
-          consumeValue: "200t",
+          consumeValue: "100㎡",
-          url: require("../assets/images/carbon/bottom4.png"),
+          url: require("../assets/images/carbon/top4.png"),
         },
+       
       ],
       sn: "",
       coplist: [],

src/views/projectAdmin/fourEngin/sourse/rightTop.vue

@@ -1,5 +1,5 @@
 <template>
-  <Card title="主材料计划和进场对比图">
+  <Card title="主材BIM模型量和实际用量对比图">
     <div class="typedata">
       <div class="containbox">
         <div class="typeName">材料类别</div>
@@ -85,14 +85,14 @@ export default {
           label: "日",
         },
       ],
-      legend: ["计划用量", "进场量", "偏差比例"],
+      legend: ["BIM模型用量", "消耗量", "偏差比例"],
       value1: "1",
       value2: "1",
       grid: ["18%", "2%", "2%", "2%"],
       xData: new Array(12).fill("破产倒闭").map((v, i) => i + 1 + "月"),
       series: [
         {
-          name: "计划用量",
+          name: "BIM模型用量",
           type: "bar",
           data: [],
           itemStyle: {
@@ -103,7 +103,7 @@ export default {
           },
         },
         {
-          name: "进场量",
+          name: "消耗量",
           type: "bar",
           data: [],
           itemStyle: {