Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into shenzhen-dev

# Conflicts: # src/assets/js/http.js
2023-07-11 09:38:01 +08:00 · 2023-07-11 09:38:01 +08:00 · e83f086d71
commit e83f086d71
parent c36ab4e06e 62f4a1037e
21 changed files with 576 additions and 345 deletions
--- 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,10 +10,11 @@ var COMPANY = ''; //通用
 // COMPANY = 'hengtong'//瑞士恒通
 // COMPANY = 'yunlian'//云联万物
 // COMPANY = 'neimenggu'//内蒙古项目
-// COMPANY = 'zjsj'//中建四局
+COMPANY = 'zjsj'//中建四局
 // COMPANY = 'zjwj'//中建五局
 // COMPANY = 'sccr'//四川成润
 // COMPANY = 'pssh'//坪山沙湖项目
+// COMPANY = 'jlw'//金林湾



@ -24,7 +25,6 @@ var PROJECT = {
    online_gxlt: 'gxlt', // 广西联通
 }

-// var publicPath='/jxjgd/' //金林湾部署统一加前缀


 var PROJECT_TYPE = PROJECT.local_test
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@ -39,7 +39,6 @@ if (process.env.NODE_ENV == 'development') {
  // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
  // tag: 本地
  // axios.defaults.baseURL = 'http://192.168.34.174:6023/'  // 老大本地
-  
  // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
  // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
  // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上（旧）地址
@ -90,20 +89,17 @@ if (process.env.NODE_ENV == 'development') {
  // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
  // 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:8070' //郭圣雄本地
+    axios.defaults.baseURL ='http://192.168.34.221:8188' //郭圣雄本地
    // axios.defaults.baseURL ='http://192.168.34.221:30001' //郭圣雄本地
    // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
    // axios.defaults.baseURL ='http://61.145.163.135:12345' //坪山沙湖
    // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
-
-
-
 } else if (process.env.NODE_ENV == 'debug') {
  axios.defaults.baseURL = 'https://www.ceshi.com'
 } else if (process.env.NODE_ENV == 'production') {
  let host = window.location.host
-  // axios.defaults.baseURL = window.location.protocol + '//' + host + '/api/'//金林湾地址
-  axios.defaults.baseURL = window.location.protocol + '//' + host + '/'
+  axios.defaults.baseURL = window.location.protocol + '//' + host + '/api/'//金林湾地址
+  // axios.defaults.baseURL = window.location.protocol + '//' + host + '/'
  // axios.defaults.baseURL ='http://192.168.34.216:6023/'
  // axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/"
  // axios.defaults.baseURL = 'http://zhgd.loganwy.com/`'
--- a/src/components/header.vue
+++ b/src/components/header.vue
@ -2,17 +2,56 @@
  <!--  v-if="headerShow" -->
  <div class="title flex">
    <div class="title_l flex">
-      <img v-if="systemInfo.platformLogo" :src="systemInfo.platformLogo" class="logo" height="25"/>
-      <img v-else-if="LOGO_white" :src="'./img/logo/'+LOGO_white+'.png'" class="logo" height="25"/>
+      <img
+        v-if="systemInfo.platformLogo"
+        :src="systemInfo.platformLogo"
+        class="logo"
+        height="25"
+      />
+      <img
+        v-else-if="LOGO_white"
+        :src="'./img/logo/' + LOGO_white + '.png'"
+        class="logo"
+        height="25"
+      />
      <!-- <span v-if="$route.path.indexOf('/firm/')!=-1">{{headerName}}</span> -->
      <!-- 南昌头部样式 -->
-      <span class="canClick" v-if="company=='nanchang'" @click="changeArea(-1)">{{titleName}}</span>
-      <span class="canClick" v-if="$route.path.indexOf('/firm/') == -1 && company == 'nanchang'" @click="changeArea(-1)">{{titleName?'':headerName}}</span>
+      <span
+        class="canClick"
+        v-if="company == 'nanchang'"
+        @click="changeArea(-1)"
+        >{{ titleName }}</span
+      >
+      <span
+        class="canClick"
+        v-if="$route.path.indexOf('/firm/') == -1 && company == 'nanchang'"
+        @click="changeArea(-1)"
+        >{{ titleName ? '' : headerName }}</span
+      >
      <!-- 以上南昌头部样式 -->

-      <span class="canClick" v-if="$route.path.indexOf('/firm/')!=-1 && company != 'nanchang'" @click="changeArea(-1)">{{systemInfo.platformName}}</span>
-      <span class="canClick" v-if="$route.path.indexOf('/firm/') == -1 && company != 'nanchang'" @click="changeArea(-1)">{{titleName?(systemInfo.platformName+' - '+titleName):headerName}}</span>
-      <span class="canClick" v-show="$route.path.indexOf('/firm/')!=-1 && company != 'nanchang'" v-for="(item,index) in $store.state.mapBackArr" :key="index" @click="changeArea(index)">>{{item.name}}</span>
+      <span
+        class="canClick"
+        v-if="$route.path.indexOf('/firm/') != -1 && company != 'nanchang'"
+        @click="changeArea(-1)"
+        >{{ systemInfo.platformName }}</span
+      >
+      <span
+        class="canClick"
+        v-if="$route.path.indexOf('/firm/') == -1 && company != 'nanchang'"
+        @click="changeArea(-1)"
+        >{{
+          titleName ? systemInfo.platformName + ' - ' + titleName : headerName
+        }}</span
+      >
+      <span
+        class="canClick"
+        v-show="$route.path.indexOf('/firm/') != -1 && company != 'nanchang'"
+        v-for="(item, index) in $store.state.mapBackArr"
+        :key="index"
+        @click="changeArea(index)"
+        >>{{ item.name }}</span
+      >
    </div>
    <div class="headerRight">
      <el-popover
@ -23,24 +62,28 @@
      >
        <div id="qrCode" ref="qrCodeDiv"></div>
        <el-button slot="reference" type="text" style="color: #fff; padding: 0"
-          >人员录入二维码 <i class="el-icon-arrow-down"></i></el-button
-        >
+          >人员录入二维码 <i class="el-icon-arrow-down"></i
+        ></el-button>
      </el-popover>
      <div class="audio-box" v-if="isShowAudio">
        <audio v-if="isLoop" autoplay loop controls>
          <!-- <source src="/doc/fireAlarm.mp3" type="audio/mpeg"> -->
-          <source :src="mp3Url" type="audio/mpeg">
+          <source :src="mp3Url" type="audio/mpeg" />
        </audio>
        <audio v-else autoplay controls style="display: none">
          <!-- <source src="/doc/fireAlarm.mp3" type="audio/mpeg"> -->
-          <source :src="mp3Url" type="audio/mpeg">
+          <source :src="mp3Url" type="audio/mpeg" />
        </audio>
        <div v-if="isLoop" class="close-btn" @click="closeAudio">
          <i class="el-icon-circle-close"></i>
        </div>
      </div>
      <p
-        v-show="$route.path.indexOf('firm/') != -1&&$store.state.userInfo.companyBigScreen==0 && company=='longguang'"
+        v-show="
+          $route.path.indexOf('firm/') != -1 &&
+          $store.state.userInfo.companyBigScreen == 0 &&
+          company == 'longguang'
+        "
        class="header-btn"
        @click="toOverview4()"
      >
@ -55,7 +98,13 @@
        龙光企业大屏
      </p> -->
      <p
-        v-show="$route.path.indexOf('firm/') != -1&&$store.state.userInfo.companyBigScreen==0&&company!='longguang' && company!=''"
+        v-show="
+          $route.path.indexOf('firm/') != -1 &&
+          $store.state.userInfo.companyBigScreen == 0 &&
+          company != 'longguang' &&
+          company != '' &&
+          company != 'jlw'
+        "
        class="header-btn"
        @click="toOverview3()"
      >
@ -64,7 +113,12 @@
      </p>
      <!-- 横琴大屏使用龙光大屏样式 -->
      <p
-        v-show="$route.path.indexOf('firm/') != -1&&$store.state.userInfo.companyBigScreen==0 && company==''"
+        v-show="
+          ($route.path.indexOf('firm/') != -1 &&
+            $store.state.userInfo.companyBigScreen == 0 &&
+            company == '') ||
+          (company == 'jlw' && $route.path.indexOf('/projectIndex') == -1)
+        "
        class="header-btn"
        @click="toOverview4()"
      >
@ -72,7 +126,10 @@
        综合监管大屏
      </p>
      <p
-        v-show="$route.path.indexOf('projectIndex') != -1&&$store.state.userInfo.projectKanban==0"
+        v-show="
+          $route.path.indexOf('projectIndex') != -1 &&
+          $store.state.userInfo.projectKanban == 0
+        "
        class="header-btn"
        @click="toOverview2()"
      >
@ -83,7 +140,9 @@
        v-for="(item, index) in $store.state.menuList"
        :key="index"
        v-if="
-          item.target == '_blank' && $route.path.indexOf('/projectIndex') == -1 && (item.menuName != 'LED大屏' || company != 'nanchang')
+          item.target == '_blank' &&
+          $route.path.indexOf('/projectIndex') == -1 &&
+          (item.menuName != 'LED大屏' || company != 'nanchang')
        "
        class="header-btn"
        @click="toOverview(item.path)"
@ -103,10 +162,7 @@
      <message @sendMsg="sendMessage"></message>
      <div
        class="title_r"
-        v-if="
-          showR &&
-          $route.path.indexOf('/equipmentCenter/') == -1
-        "
+        v-if="showR && $route.path.indexOf('/equipmentCenter/') == -1"
      >
        <!-- <changeTheme></changeTheme> -->
        <!-- <language></language> -->
@ -447,10 +503,8 @@ p {
  }
  .close-btn {
    cursor: pointer;
-    color: #F56C6C;
+    color: #f56c6c;
    margin-left: 6px;
  }
 }
-
-
 </style>
--- a/src/store/index.js
+++ b/src/store/index.js
@ -88,7 +88,7 @@ export default new Vuex.Store({
    // FILEURL: 'http://192.168.34.125:6023/image/',

    // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
-    // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式
+    // FILEURL:'http://'+"61.190.32.219:9050"+'/ima`ge/',//正式
    // 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/',//演示平台
@ -98,14 +98,14 @@ export default new Vuex.Store({
    // FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地
    // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古
    // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古
-    // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四
-    // FILEURL: 'http://42.194.144.62:8088/image/',//中建四   
+    UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四
+    FILEURL: 'http://42.194.144.62:8088/image/',//中建四   
    // UPLOADURL: 'http://182.90.224.147:15551/upload/image',//四川成润(内部线上)
    // FILEURL: 'http://182.90.224.147:15551/image/',//四川成润（内部线上）
    // UPLOADURL: 'http://118.121.198.147:23232/upload/image',//四川成润（正式）
    // FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式）
-    // UPLOADURL: 'http://192.168.34.221:30015/upload/image',//
-    // FILEURL: 'http://192.168.34.221:30015/image/',//
+    // UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾
+    // FILEURL: 'http://121.196.214.246/api/image/',//金林湾

    ACCOUNTTYPE: [
      "系统管理员",
--- a/src/views/companyAdmin/docManage.vue
+++ b/src/views/companyAdmin/docManage.vue
@ -331,7 +331,8 @@ export default {
      console.log(res)
      var json = {
        companySn: this.$store.state.userInfo.sn,
-        fileName: res.data[0].filename,
+        // fileName: res.data[0].filename,
+        fileName: res.data[0].fileInfo.originalFilename,
        filePath: res.data[0].imageUrl,
        userId: this.$store.state.userInfo.userId
      }
--- a/src/views/companyAdmin/longguang2/index.vue
+++ b/src/views/companyAdmin/longguang2/index.vue
@ -2953,10 +2953,19 @@ export default {
      return await $.getJSON(url)
    },
    toOverview2() {
+      //金林湾企业前台跳转项目大屏
+      if (this.COMPANY == 'jlw') {
+        let routeUrl = this.$router.resolve({
+          path: '/project/jlw/home'
+        })
+        window.open(routeUrl.href, '_self')
+
+      } else {
        let routeUrl = this.$router.resolve({
          path: '/project/dataBoard/index'
        })
        window.open(routeUrl.href, '_self')
+      }
      // 跳转后刷新此跳转页面
      location.reload()
    },
--- a/src/views/projectAdmin/fourEngin/assets/images/carbon/bimImg.png
+++ b/src/views/projectAdmin/fourEngin/assets/images/carbon/bimImg.png
--- a/src/views/projectAdmin/fourEngin/assets/images/carbon/ggImg.png
+++ b/src/views/projectAdmin/fourEngin/assets/images/carbon/ggImg.png
--- a/src/views/projectAdmin/fourEngin/assets/images/carbon/gjImg.png
+++ b/src/views/projectAdmin/fourEngin/assets/images/carbon/gjImg.png
--- a/src/views/projectAdmin/fourEngin/assets/images/carbon/hntImg.png
+++ b/src/views/projectAdmin/fourEngin/assets/images/carbon/hntImg.png
--- a/src/views/projectAdmin/fourEngin/assets/images/carbon/sjylImg.png
+++ b/src/views/projectAdmin/fourEngin/assets/images/carbon/sjylImg.png
--- a/src/views/projectAdmin/fourEngin/command/rightOne.vue
+++ b/src/views/projectAdmin/fourEngin/command/rightOne.vue
@ -1,42 +1,33 @@
 <template>
  <Card title="人员概况">
    <div class="contentBox">
-
      <div class="contentbut">
        <div class="lw">
-          <p>今日出勤</p>
-          <p class="number">{{ list.todayAtte||0}}</p>
-          <!-- <p class="number">269</p> -->
-        </div>
-        <div class="cq">
-          <p>在场</p>
+          <p>人员总数</p>
          <p class="number">{{ list.bePresent || 0 }}</p>
-          <!-- <p class="number">316</p> -->
+        </div>
+        <div class="cq">
+          <p>新进场人员</p>
+          <p class="number">{{ list.todayMobilization || 0 }}</p>
        </div>
        <div class="tc">
-          <p>今日出勤率</p>
-          <p class="number">{{ list.atteRatio ||0}}%</p>
-          <!-- <p class="number">85.1%</p> -->
+          <p>退场人员</p>
+          <p class="number">{{ list.todayExit || 0 }}</p>
        </div>
-       
      </div>
      <div class="contentbut">
        <div class="lw">
-          <p>现场</p>
-          <p class="number">{{ list.scene||0 }}</p>
-          <!-- <p class="number">253</p> -->
+          <p>工人出勤人数</p>
+          <p class="number">{{ list.todayWorkerAtte || 0 }}</p>
        </div>
        <div class="cq">
-          <p>今日进场</p>
-          <p class="number">{{ list.todayMobilization||0 }}</p>
-          <!-- <p class="number">0</p> -->
+          <p>出勤总人数</p>
+          <p class="number">{{ list.todayAtte || 0 }}</p>
        </div>
        <div class="tc">
-          <p>今日退场</p>
-          <p class="number">{{ list.todayExit||0}}</p>
-          <!-- <p class="number">0</p> -->
+          <p>出勤率</p>
+          <p class="number">{{ list.atteRatio || 0 }}%</p>
        </div>
-       
      </div>
    </div>
  </Card>
--- a/src/views/projectAdmin/fourEngin/security/centerBottom.vue
+++ b/src/views/projectAdmin/fourEngin/security/centerBottom.vue
@ -260,7 +260,7 @@
    </div>

    <!-- 深基坑 -->
-    <div class="list" v-if="tabIndex == 3">
+    <!-- <div class="list" v-if="tabIndex == 3">
      <div class="thead">
        <div class="row">
          <div class="td">监测项目</div>
@ -280,17 +280,17 @@
            <div class="td">{{ item.superControlNumber }}</div>
          </div>
        </vue-scroll>
-      </div>
+      </div> -->
      <!-- <div class="tbody">
        <div class="dataImg">
          <img src="@/assets/images/noData3.png" alt srcset />
          <p>{{ $t('message.dataBoard.nodata') }}</p>
        </div>
      </div> -->
-    </div>
+    <!-- </div> -->

    <!-- 云端建设工厂 -->
-    <div class="list" v-if="tabIndex == 4">
+    <div class="list" v-if="tabIndex == 3">
      <!-- <div class="thead">
        <div class="row">
          <div class="td">设备名称</div>
@ -326,7 +326,7 @@ export default {
  data() {
    return {
      tabIndex: 0,
-      tabs: ['临边防护', '塔机监测', '高支模监测', '深基坑', '云端建设工厂'],
+      tabs: ['临边防护', '塔机监测', '高支模监测', '云端建设工厂'],
      current: 1, //页数
      size: 100, //条数
      edgeList: [], //临边防护
--- a/src/views/projectAdmin/fourEngin/security/leftCenter.vue
+++ b/src/views/projectAdmin/fourEngin/security/leftCenter.vue
@ -3,36 +3,30 @@
    <div class="contentBox">
      <div class="contentbut">
        <div class="lw">
-          <p>今日出勤</p>
-          <p class="number">{{ list.todayAtte||0 }}</p>
-          <!-- <p class="number">269</p> -->
+          <p>人员总数</p>
+          <p class="number">{{ list.bePresent || 0 }}</p>
        </div>
        <div class="cq">
-          <p>在场</p>
-          <p class="number">{{ list.bePresent||0 }}</p>
-          <!-- <p class="number">316</p> -->
+          <p>新进场人员</p>
+          <p class="number">{{ list.todayMobilization || 0 }}</p>
        </div>
        <div class="tc">
-          <p>今日出勤率</p>
-          <p class="number">{{ list.atteRatio||0  }}%</p>
-          <!-- <p class="number">85.1%</p> -->
+          <p>退场人员</p>
+          <p class="number">{{ list.todayExit || 0 }}</p>
        </div>
      </div>
      <div class="contentbut">
        <div class="lw">
-          <p>现场</p>
-          <p class="number">{{ list.scene||0  }}</p>
-          <!-- <p class="number">253</p> -->
+          <p>工人出勤人数</p>
+          <p class="number">{{ list.todayWorkerAtte || 0 }}</p>
        </div>
        <div class="cq">
-          <p>今日进场</p>
-          <!-- <p class="number">0</p> -->
-          <p class="number">{{ list.todayMobilization||0 }}</p>
+          <p>出勤总人数</p>
+          <p class="number">{{ list.todayAtte || 0 }}</p>
        </div>
        <div class="tc">
-          <p>今日退场</p>
-          <!-- <p class="number">0</p> -->
-          <p class="number">{{ list.todayExit||0  }}</p>
+          <p>出勤率</p>
+          <p class="number">{{ list.atteRatio || 0 }}%</p>
        </div>
      </div>
    </div>
--- a/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue
+++ b/src/views/projectAdmin/fourEngin/sourse/leftCenter.vue
@ -15,8 +15,11 @@
        <div class="thead">
          <div class="row">
            <div class="td">材料类型</div>
-            <div class="td" style="margin-left: 100px">进场时间</div>
-            <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>
        <div class="tbody">
@ -30,12 +33,22 @@
              :class="{ active: nowIndex == index }"
            >
              <div class="td">{{ item.materialType }}</div>
-              <div class="td" style="margin-left: 100px">
+              <div class="td">
                {{ item.entryTime }}
              </div>
-              <div class="td" style="margin-left: 20px">
+              <div class="td">
+                {{ item.licensePlateNumber }}
+              </div>
+              <div class="td">
                {{ item.approachVolume }}
              </div>
+              <div class="td">
+                {{ item.appearanceVolume }}
+              </div>
+              <div class="td">
+                {{ item.netWeightVolume }}
+
+              </div>
            </div>
            <div class="row" v-if="tableData.length == 0">
              <div
@ -64,6 +77,8 @@
        <div>生产厂家：{{ tableDataTest.manufacturer }}</div>
        <div>进场量：{{ tableDataTest.approachVolume }}</div>
        <div>车牌号：{{ tableDataTest.licensePlateNumber }}</div>
+        <div>出场重量：{{ tableDataTest.appearanceVolume }}</div>
+        <div>净重量：{{ tableDataTest.netWeightVolume }}</div>
      </div>
    </div>
  </Card>
@ -450,7 +465,7 @@ export default {
      text-align: center;

      &:last-child {
-        flex: 1;
+        // flex: 1;
        margin: 0px 0 0 33px;
      }

@ -459,7 +474,7 @@ export default {
      }

      &:not(:last-child) {
-        width: 120px;
+        width: 90px;
        text-overflow: ellipsis;

        overflow: hidden;
--- a/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue
+++ b/src/views/projectAdmin/fourEngin/sourse/rightBottom.vue
@ -1,10 +1,35 @@
 <template>
  <Card title="主材累计消耗量">
    <div class="flexOutside">
+      <div class="leftIcon">
+        <div class="bimValue">
+          <img src="../assets/images/carbon/bimImg.png" alt="" />
+          <div>BIM模型用量</div>
+        </div>
+        <div class="bimValue" style="margin-top: 7%">
+          <img src="../assets/images/carbon/sjylImg.png" alt="" />
+          <div>实际用量</div>
+        </div>
+      </div>
+
+      <div class="box">
        <div v-for="(item, index) in list" :key="index">
          <div :style="'background-image:url(' + item.url + ')'" class="item">
            <div>{{ item.name }}</div>
-          <div class="consumeStyle">{{ item.consumeValue }}</div>
+            <div class="consumeStyle">{{ item.planValue }}</div>
+          </div>
+        </div>
+        <div class="item2">
+          <div>混凝土(m³)</div>
+          <div class="consumeStyle">{{ bottomHnt }}</div>
+        </div>
+        <div class="item3">
+          <div>钢筋（t）</div>
+          <div class="consumeStyle">{{ bottomGj }}</div>
+        </div>
+        <div class="item4">
+          <div>钢构（t）</div>
+          <div class="consumeStyle">{{ bottomGg }}</div>
        </div>
      </div>
    </div>
@ -35,38 +60,41 @@ export default {
        {
          name: "水泥",
          consumeValue: "100t",
-          url: require("../assets/images/carbon/top3.png"),
-        },
-         {
-          name: "钢构",
-          consumeValue: "200t",
          url: require("../assets/images/carbon/bottom4.png"),
        },
+        //  {
+        //   name: "钢构",
+        //   consumeValue: "200t",
+        //   url: require("../assets/images/carbon/bottom4.png"),
+        // },

-        {
-          name: "砂浆",
-          consumeValue: "600m³",
-          url: require("../assets/images/carbon/bottom1.png"),
-        },
-        {
-          name: "加砌块",
-          consumeValue: "5000m³",
-          url: require("../assets/images/carbon/bottom2.png"),
-        },
-        {
-          name: "瓷砖",
-          consumeValue: "200㎡",
-          url: require("../assets/images/carbon/bottom3.png"),
-        },
-         {
-          name: "幕墙",
-          consumeValue: "100㎡",
-          url: require("../assets/images/carbon/top4.png"),
-        },
+        // {
+        //   name: "砂浆",
+        //   consumeValue: "600m³",
+        //   url: require("../assets/images/carbon/bottom1.png"),
+        // },
+        // {
+        //   name: "加砌块",
+        //   consumeValue: "5000m³",
+        //   url: require("../assets/images/carbon/bottom2.png"),
+        // },
+        // {
+        //   name: "瓷砖",
+        //   consumeValue: "200㎡",
+        //   url: require("../assets/images/carbon/bottom3.png"),
+        // },
+        //  {
+        //   name: "幕墙",
+        //   consumeValue: "100㎡",
+        //   url: require("../assets/images/carbon/top4.png"),
+        // },

      ],
      sn: "",
      coplist: [],
+      bottomHnt: '',
+      bottomGj: '',
+      bottomGg: '',
    };
  },
  created() {
@ -80,10 +108,17 @@ export default {
      }).then((res) => {
        console.log("消耗数据", res);
        let data = res.result;
-
+        data.forEach(element => {
+          if (element.name == '混凝土(m³)') {
+            this.bottomHnt = element.consumeValue
+          } else if (element.name == '钢筋(t)') {
+            this.bottomGj = element.consumeValue
+          } else if (element.name == '钢构(t)') {
+            this.bottomGg = element.consumeValue
+          }
+        });
        for (let i = 1; i <= res.result.length; i++) {
          let dat = "";
-
          if (
            res.result[i - 1].name === "钢筋" ||
            res.result[i - 1].name === "水泥" ||
@ -103,9 +138,11 @@ export default {
            dat = "㎡";
          }
          this.list[i - 1].name = res.result[i - 1].name;
-          this.list[i - 1].consumeValue = res.result[i - 1].consumeValue + dat;
+          this.list[i - 1].planValue = res.result[i - 1].planValue + dat;
+          this.list[i - 1].consumeValue = res.result[i - 1].planValue + dat;
          this.coplist.push(this.list[i - 1]);
        }
+
      });
    },
  },
@ -115,14 +152,34 @@ export default {
 <style lang="less" scoped>
 .flexOutside {
  display: flex;
+}
+.leftIcon {
+  width: 25%;
+  .bimValue {
+    display: flex;
+    margin: 5% 0;
+    img {
+      width: 30%;
+      height: 70%;
+    }
+    div {
+      line-height: 80px;
+      font-size: 22px;
+      margin-left: 15px;
+    }
+  }
+}
+.box {
+  width: 80%;
+  display: flex;
  flex-wrap: wrap;
-  justify-content: space-evenly;
 }
 .consumeStyle:nth-child(2) {
  margin-left: 20px;
 }
+
 .item {
-  width: 280px;
+  width: 300px;
  height: 85px;
  background-repeat: no-repeat;
  background-size: 100%;
@ -131,12 +188,69 @@ export default {
  div:nth-child(1) {
    font-size: 14px;
    color: rgb(91, 183, 222);
-    padding: 18px 64px 0 0;
+    padding: 18px 35px 0 0;
  }
  div:nth-child(2) {
    font-size: 23px;
    font-weight: bold;
-    margin: 3px 50px 0 0;
+    margin: 3px 25px 0 0;
+  }
+}
+.item2 {
+  width: 300px;
+  height: 85px;
+  background: url('../assets/images/carbon/hntImg.png');
+  background-repeat: no-repeat;
+  background-size: 100%;
+  text-align: center;
+  margin-top: 20px;
+  div:nth-child(1) {
+    font-size: 14px;
+    color: #fac618;
+    padding: 18px 35px 0 0;
+  }
+  div:nth-child(2) {
+    font-size: 23px;
+    font-weight: bold;
+    margin: 3px 25px 0 0;
+  }
+}
+.item3 {
+  width: 300px;
+  height: 85px;
+  background: url('../assets/images/carbon/gjImg.png');
+  background-repeat: no-repeat;
+  background-size: 100%;
+  text-align: center;
+  margin-top: 20px;
+  div:nth-child(1) {
+    font-size: 14px;
+    color: #fac618;
+    padding: 18px 35px 0 0;
+  }
+  div:nth-child(2) {
+    font-size: 23px;
+    font-weight: bold;
+    margin: 3px 25px 0 0;
+  }
+}
+.item4 {
+  width: 300px;
+  height: 85px;
+  background: url('../assets/images/carbon/ggImg.png');
+  background-repeat: no-repeat;
+  background-size: 100%;
+  text-align: center;
+  margin-top: 20px;
+  div:nth-child(1) {
+    font-size: 14px;
+    color: #fac618;
+    padding: 18px 35px 0 0;
+  }
+  div:nth-child(2) {
+    font-size: 23px;
+    font-weight: bold;
+    margin: 3px 25px 0 0;
  }
 }
 </style>
--- a/src/views/projectAdmin/fourEngin/sourse/rightTop.vue
+++ b/src/views/projectAdmin/fourEngin/sourse/rightTop.vue
@ -281,6 +281,8 @@ export default {
            nameTextStyle: {
              color: '#fff'
            },
+            min: -10,
+            max: 10,
            position: 'right',
            splitLine: {
              show: false
@ -289,7 +291,7 @@ export default {
              textStyle: {
                color: '#fff'
              },
-              // formatter: function(value){ return (value*10)+'%'}
+              // formatter: function(value){ return (value)+'%'}
            
            },
            axisLine: {
--- a/src/views/projectAdmin/jlw/digitalSite/CenterBottom/index.vue
+++ b/src/views/projectAdmin/jlw/digitalSite/CenterBottom/index.vue
@ -64,6 +64,7 @@ import ExternalPlayer from './ExternalPlayer'
 import ExternalPlayerHk from './ExternalPlayerHk'

 import axios from 'axios'
+import bus from "@/util/eventBus.js";

 import Card from '../../components/Card'
 import CustomDialog from '../components/CustomDialog'
@ -113,11 +114,20 @@ export default {
    this.getList()
  },
  mounted() {
+    this.$EventBus.$on('showLifterDialog', (data) => {
+       if(data==true){
+        this.playerOpen = false
+       }else{
+        this.playerOpen = true
+       }
+      
+    })
    const windowHeight = document.body.clientHeight
    this.windowHeight = windowHeight
    // 设置弹窗的高度
    this.dialogContentHeight = windowHeight * 0.8

+       
    this.$nextTick(() => {
      // 设置轮播图的高度
      this.elCarouselHeight = this.$refs.container.clientHeight - 30 + 'px'
--- a/src/views/projectAdmin/jlw/digitalSite/centerTop.vue
+++ b/src/views/projectAdmin/jlw/digitalSite/centerTop.vue
@ -622,7 +622,7 @@
                        </template>
                        <div v-else style="text-align: center">
                          <img
-                            style="height: 150px; margin-top: 40px"
+                            style="height: 100px; margin-top: 40px"
                            src="@/assets/images/09b108269bb2491369b67686bd74c6a.png"
                          />
                          <p>
@ -744,7 +744,7 @@
                          </vue-scroll>
                          <div v-else style="text-align: center">
                            <img
-                              style="height: 150px; margin-top: 40px"
+                              style="height: 100px; margin-top: 40px"
                              src="@/assets/images/09b108269bb2491369b67686bd74c6a.png"
                            />
                            <p>
@ -876,9 +876,9 @@
                        </div>
                      </div>
                    </vue-scroll>
-                    <div v-else style="text-align: center">
+                    <div v-else style="text-align: center;margin-bottom: 50px;">
                      <img
-                        style="height: 130px; margin-bottom: 10px"
+                        style="height: 100px; margin-top: 50px"
                        src="@/assets/images/09b108269bb2491369b67686bd74c6a.png"
                      />
                      <p>
@ -887,6 +887,7 @@
                      </p>
                    </div>
                    <div
+                    style="margin-top:10px"
                      class="blockTitle blockTitle2"
                      v-if="company != 'longguang'"
                    >
@ -954,7 +955,7 @@
                      </vue-scroll>
                      <div v-else style="text-align: center">
                        <img
-                          style="height: 150px; margin-top: 100px"
+                          style="height: 100px; margin-top: 50px"
                          src="@/assets/images/09b108269bb2491369b67686bd74c6a.png"
                        />
                        <p>
@ -2506,6 +2507,7 @@
 </template>
 <script>
 import Card from '../components/Card.vue'
+import bus from "@/util/eventBus.js";

 import {
  getRealTimeDustNoiseDataApi,
@ -3078,6 +3080,8 @@ export default {
    },
    closeMap() {
      this.showTowerDialog = false
+      this.$EventBus.$emit('showLifterDialog',this.showTowerDialog)
+
      clearTimeout(this.svgTimer)
      this.afterAnalysisDataInfo = ''
      this.showBoltDetails = false
@ -3100,6 +3104,8 @@ export default {
    },
    closeTowerDialog() {
      this.showLifterDialog = false
+      this.$EventBus.$emit('showLifterDialog', this.showLifterDialog)
+
      this.showTowerDialog = false
      clearTimeout(this.svgTimer)
      this.showGantryCrane = false
@ -3391,9 +3397,9 @@ export default {
      switch (Number(item.devType)) {
        case 1:
          console.log(item)
-          this.carBoxPos.x = parseFloat(item.mapX) + 50 + 'px'
+          this.carBoxPos.x = parseFloat(item.mapX) + 80 + 'px'
          this.carBoxPos.y =
-            parseFloat(item.mapY) / this.imgWidthScale - 20 + 'px'
+            parseFloat(item.mapY) / this.imgWidthScale - 120 + 'px'
          this.carDetail.name = item.name
          this.getCarTotalList(item)
          this.showCarDialog2 = true
@ -3401,6 +3407,7 @@ export default {
        case 2:
          //塔吊
          this.showTowerDialog = true
+          this.$EventBus.$emit('showLifterDialog',this.showTowerDialog)
          if (this.company == 'longguang') {
            this.selectTowerHeight(item)
          }
@ -3413,6 +3420,7 @@ export default {
        case 3:
          //升降机
          this.showLifterDialog = true
+          this.$EventBus.$emit('showLifterDialog', this.showLifterDialog)
          this.getLifterDriverInfo(item.devSn)
          this.showHeight = 0
          break
@ -4781,7 +4789,7 @@ img {
 }
 .tower-time {
  position: absolute;
-  right: 0;
+  right: -65px;
  top: 0;
  font-size: 12px;
  line-height: 20px;
--- a/src/views/projectFront/dangerousBigProject/checkTable.vue
+++ b/src/views/projectFront/dangerousBigProject/checkTable.vue
@ -43,7 +43,7 @@
                      @mouseleave="name.visible = false"
                      >{{
                        name.classifyName.length > 9
-                          ? name.classifyName.substring(0, 8) + "..."
+                          ? name.classifyName.substring(0, 8) + '...'
                          : name.classifyName
                      }}</span
                    >
@ -116,7 +116,7 @@
                    >
                      {{
                        item.classifyName.length > 10
-                          ? item.classifyName.substring(0, 9) + "..."
+                          ? item.classifyName.substring(0, 9) + '...'
                          : item.classifyName
                      }}
                    </div>
@ -291,9 +291,10 @@
        <div
          class="pageTitle pageTitle2"
          @click="
-            loadRigthtList();
-            showItemDetails = false;
-          " style="display:inline-block;"
+            loadRigthtList()
+            showItemDetails = false
+          "
+          style="display: inline-block"
        >
          <i class="el-icon-back"></i>{{ dialogdata.tableName }}
        </div>
@ -337,7 +338,11 @@
            <el-table-column prop="tableName" label="检查结果" align="center">
              <template slot-scope="scope">
                <!-- {{JSON.parse(dialogdata.optionResult)}} -->
-                    <span v-for="item in JSON.parse(dialogdata.optionResult)" :key="item.value">{{item.name}}、</span>
+                <span
+                  v-for="item in JSON.parse(dialogdata.optionResult)"
+                  :key="item.value"
+                  >{{ item.name }}、</span
+                >
              </template>
            </el-table-column>
            <el-table-column prop="remark" label="备注" align="center">
@ -402,12 +407,15 @@
              v-model="addCheckTable.createTime"
              type="datetime"
              placeholder="选择日期时间"
-              value-format="yyyy-MM-dd HH:mm:ss">
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
            </el-date-picker>
          </el-form-item>
          <el-form-item label="选项结果" prop="optionResult">
-            <el-select v-model="addCheckTable.optionResult"
-             placeholder="请选择">
+            <el-select
+              v-model="addCheckTable.optionResult"
+              placeholder="请选择"
+            >
              <el-option
                v-for="item in resultList"
                :key="item.id"
@ -729,6 +737,9 @@ export default {
      let data = this.addCheckTable
      data.creatorUser = this.$store.state.userInfo.userId
      data.classifyId = this.leftId
+
+      this.$refs['addCheckTable'].validate(valid => {
+        if (valid) {
          addinspectTableApi(data).then((res) => {
            if (res.code == 200) {
              this.$message.success("添加成功！");
@ -736,6 +747,9 @@ export default {
            }
            this.addTable = false;
          })
+        }
+      })
+
    },
    downloadFn() {
      // console.loh(this.$http.defaults.baseURL)
--- a/src/views/projectFront/materialManage/materialMobilization.vue
+++ b/src/views/projectFront/materialManage/materialMobilization.vue
@ -42,7 +42,16 @@
          label="进场时间"
        ></el-table-column>
        
-
+        <el-table-column
+          align="center"
+          prop="appearanceVolume"
+          label="出场重量"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          prop="netWeightVolume"
+          label="净重量"
+        ></el-table-column>
        <!-- 操作 -->
        <el-table-column label="操作" width="220" align="center">
          <template slot-scope="scope">
@ -128,6 +137,18 @@
              >
              </el-date-picker>
            </el-form-item>
+            <el-form-item label="出场重量" prop="appearanceVolume">
+              <el-input
+                v-model="dialogdata.appearanceVolume"
+                placeholder="请输入"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="净重量" prop="netWeightVolume">
+              <el-input
+                v-model="dialogdata.netWeightVolume"
+                placeholder="请输入"
+              ></el-input>
+            </el-form-item>
          </el-form>
        </vue-scroll>
      </div>
@ -158,6 +179,8 @@ export default {
     licensePlateNumber:'',
      approachVolume:'',
      entryTime:'',
+      appearanceVolume:'',
+      netWeightVolume:'',
      },
      rules: {},
      pageNo: 1,