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
@ -34,12 +34,11 @@ if (process.env.NODE_ENV == 'development') {
  // axios.defaults.baseURL = 'http://14.29.220.211:6023/'
  // axios.defaults.baseURL = 'https://zhgd.loganwy.com/' //龙光
  // axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/'
-  //   axios.defaults.baseURL = 'http://36.137.53.203:9090/' // 南昌地铁   17512009894    123456789   gdjt   87654321
+  // axios.defaults.baseURL = 'http://36.137.53.203:9090/' // 南昌地铁   17512009894    123456789   gdjt   87654321
  // axios.defaults.baseURL = 'http://192.168.34.125:6023/'
  // 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
@ -1,46 +1,89 @@
 <template>
-<!--  v-if="headerShow" -->
+  <!--  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
        placement="bottom"
        width="200"
-        v-show="showQrCode&&$store.state.userInfo.inputQrCode==0"
+        v-show="showQrCode && $store.state.userInfo.inputQrCode == 0"
        trigger="click"
      >
        <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
-        >
+        <el-button slot="reference" type="text" style="color: #fff; padding: 0"
+          >人员录入二维码 <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">
+        <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>
+          <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,14 +140,16 @@
        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)"
      >
-<!--        绿色施工-->
+        <!--        绿色施工-->
        <img src="@/assets/images/icon-bigData.png" />
-        {{ item.menuName}}
+        {{ item.menuName }}
      </p>
      <!-- <p v-if="$route.path.indexOf('/project/towerCrane') != -1"
        class="header-btn" 
@ -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> -->
@ -126,55 +182,55 @@ export default {
  data() {
    return {
      headerShow,
-      LOGO_white:LOGO_white,
-      headerName:'',
+      LOGO_white: LOGO_white,
+      headerName: '',
      isShowAudio: false,
-      loginData:{},
-      systemInfo:{
-            "loginBackgroundImage": "",
-            "loginLogo": "",
-            "platformLogo": "",
-            "platformName": "智慧工地云平台"
-        },
-        showQrCode: false,
-        uid:this.$store.state.uid, //是否是免码登录 true 第三方免码登录  免码登录不回显退出按钮
-        company:'',
-        mp3Url: '',
-        isLoop: true,
-        timer: null
+      loginData: {},
+      systemInfo: {
+        "loginBackgroundImage": "",
+        "loginLogo": "",
+        "platformLogo": "",
+        "platformName": "智慧工地云平台"
+      },
+      showQrCode: false,
+      uid: this.$store.state.uid, //是否是免码登录 true 第三方免码登录  免码登录不回显退出按钮
+      company: '',
+      mp3Url: '',
+      isLoop: true,
+      timer: null
    };
  },
-  components: { language, account, changeTheme,message },
+  components: { language, account, changeTheme, message },

  watch: {
    $route: {
      handler(newVal) {
-        if(newVal.path == '/project/labor/personManage'){
+        if (newVal.path == '/project/labor/personManage') {
          this.showQrCode = true;
          this.bindQRCode();
-        }else{
+        } else {
          this.showQrCode = false
        }
      },
    },

  },
-  created(){
+  created() {

    this.company = COMPANY;
-    console.log('this.company',this.company)
-     console.log('COMPANY',COMPANY)
+    console.log('this.company', this.company)
+    console.log('COMPANY', COMPANY)
    this.loginData = JSON.parse(localStorage.getItem('systemInfo'))
    // console.log('信息',this.loginData)
-    
+
  },
  mounted() {
-    
-    if(localStorage.getItem('systemInfo')){
-      this.systemInfo=JSON.parse(localStorage.getItem('systemInfo'))
+
+    if (localStorage.getItem('systemInfo')) {
+      this.systemInfo = JSON.parse(localStorage.getItem('systemInfo'))
    }
    this.headerName = this.systemInfo.platformName
-    if(this.$route.path.indexOf('equipmentCenter/')!=-1){
+    if (this.$route.path.indexOf('equipmentCenter/') != -1) {
      this.headerName += ' - 设备中台'
    }
    if (this.$store.state.currentProDetail) {
@ -187,47 +243,47 @@ export default {
      }
    };

-    if(this.$route.path == '/project/labor/personManage'){
-          this.showQrCode = true;
-          this.bindQRCode();
-        }else{
-          this.showQrCode = false
-        }
-    
+    if (this.$route.path == '/project/labor/personManage') {
+      this.showQrCode = true;
+      this.bindQRCode();
+    } else {
+      this.showQrCode = false
+    }
+
  },

  methods: {
-    closeAudio(){
+    closeAudio() {
      this.isShowAudio = false
    },
-    sendMessage(val){
+    sendMessage(val) {
      this.isShowAudio = false
-      console.log(val,this.isShowAudio)
+      console.log(val, this.isShowAudio)
      // let url = "https://dss2.bdstatic.com/6Ot1bjeh1BF3odCf/it/u=2746545937,1203007354&fm=218&app=92&f=PNG?w=121&h=75&s=B59079335D03484B4CD997F10300C027"
-      if(this.$store.state.userInfo.accountType == 5 || this.$store.state.userInfo.accountType == 6){
+      if (this.$store.state.userInfo.accountType == 5 || this.$store.state.userInfo.accountType == 6) {
        console.log(localStorage.getItem('soundList'))
-        if(localStorage.getItem('soundList')){
+        if (localStorage.getItem('soundList')) {
          let arr = JSON.parse(localStorage.getItem('soundList'))
-          arr.forEach(item=>{
-            if(item.type == val.type && val.type != '8'){
-              console.log(1,item)
+          arr.forEach(item => {
+            if (item.type == val.type && val.type != '8') {
+              console.log(1, item)
              clearTimeout(this.timer)
-              this.mp3Url = this.$store.state.FILEURL+item.fileUrl
-              this.isLoop = item.playType==2 ? true:false
+              this.mp3Url = this.$store.state.FILEURL + item.fileUrl
+              this.isLoop = item.playType == 2 ? true : false
              let _this = this
-              this.timer = setTimeout(()=>{
+              this.timer = setTimeout(() => {
                _this.isShowAudio = true
-              },500)
+              }, 500)
            }
-            if(item.type == val.type && val.type == '8' && (val.itemType == '0' || val.itemType == '1' || val.itemType == '2')){
-              console.log(2,item)
+            if (item.type == val.type && val.type == '8' && (val.itemType == '0' || val.itemType == '1' || val.itemType == '2')) {
+              console.log(2, item)
              clearTimeout(this.timer)
-              this.mp3Url = this.$store.state.FILEURL+item.fileUrl
-              this.isLoop = item.playType == 2 ? true:false
+              this.mp3Url = this.$store.state.FILEURL + item.fileUrl
+              this.isLoop = item.playType == 2 ? true : false
              let _this = this
-              this.timer = setTimeout(()=>{
+              this.timer = setTimeout(() => {
                _this.isShowAudio = true
-              },500)
+              }, 500)
              console.log(this.isShowAudio)
              console.log(this.mp3Url)
            }
@ -247,7 +303,7 @@ export default {
      let userId = this.$store.state.userInfo.userId;
      let projectSn = this.$store.state.projectSn;
      new QRCode(this.$refs.qrCodeDiv, {
-        text:  httpUrl+'/doc/h5/index.html?userId='+userId+'&projectSn='+projectSn,
+        text: httpUrl + '/doc/h5/index.html?userId=' + userId + '&projectSn=' + projectSn,
        width: 200,
        height: 200,
        colorDark: "#333333", //二维码颜色
@ -259,7 +315,7 @@ export default {
    changeArea(index) {
      var accountType = this.$store.state.userInfo.accountType
      if (this.$route.path.indexOf("/firm/") != -1) {
-        if((accountType!=2&&index == -1)||(accountType>3&&index == 0)||(accountType==7&&index < 2)){
+        if ((accountType != 2 && index == -1) || (accountType > 3 && index == 0) || (accountType == 7 && index < 2)) {
          return false
        }
        if (index == -1) {
@ -269,20 +325,20 @@ export default {
          arr = arr.splice(0, index + 1);
          this.$store.commit("setMapBackArr", arr);
        }
-      }else if (window.location.href.indexOf("equipmentCenter.html") != -1) {
+      } else if (window.location.href.indexOf("equipmentCenter.html") != -1) {
        console.log(window.location.href)
-        if(COMPANY == 'nanchang') {
+        if (COMPANY == 'nanchang') {
          window.open('/index.html#/firm/projectManage', "_self");
-        }else {
+        } else {
          window.open('/#/firm/projectManage', "_self");
        }
-      }else {
+      } else {
        // 点击左上角会跳转到首页
-        if((accountType!=2 && index == -1 && accountType!=7 && accountType!=3 && accountType!=4)){
+        if ((accountType != 2 && index == -1 && accountType != 7 && accountType != 3 && accountType != 4)) {
          return false
        }
        this.$store.commit("setIsShowBackIndex", false);
-        this.$store.commit("setMenuList",this.$store.state.projectManageMenuList)
+        this.$store.commit("setMenuList", this.$store.state.projectManageMenuList)
        let routeUrl = this.$router.resolve({
          path: "/firm/projectManage",
        });
@ -296,10 +352,10 @@ export default {
      let routeUrl = this.$router.resolve({
        path: url,
      });
-      if(COMPANY != 'longguang' && url != '/project/bigSiteVisualization'){
+      if (COMPANY != 'longguang' && url != '/project/bigSiteVisualization') {
        window.open(routeUrl.href, "_blank");
-        
-      }else {
+
+      } else {
        window.location.href = routeUrl.href + '?COMPANY=' + COMPANY
        // window.open('#/project/dataBoard/environment?COMPANY=' + COMPANY, "_blank");
      }
@ -307,14 +363,14 @@ export default {
    toOverview2() {
      //看看项目看板内有没有菜单
      let arr = this.$store.state.userInfo.menuAuthority.moduleList
-      let arr2=[]
+      let arr2 = []
      arr.forEach(element => {
-        if(element.moduleType==4){
+        if (element.moduleType == 4) {
          arr2.push(element)
          return
        }
      });
-      
+
      // 如果数组为空表示该用户没有权限访问
      if (!arr2.length) {
        return this.$message.warning('暂无权限');
@ -324,16 +380,16 @@ export default {
        path: arr2[0].modulePath,
      });
      window.location.href = routeUrl.href
-      window._paq.push(['trackEvent', '点击', '数据看板','进入数据看板' ])
+      window._paq.push(['trackEvent', '点击', '数据看板', '进入数据看板'])
      // window.open(routeUrl.href, "_blank");
    },
    toOverview3() {
-      if(COMPANY=='shenbai'){
+      if (COMPANY == 'shenbai') {
        let routeUrl = this.$router.resolve({
          path: "/companyAdmin/shenbaiBigScreen",
        });
        // window.open(routeUrl.href, "_blank");
-      } else if (COMPANY=='henan') {
+      } else if (COMPANY == 'henan') {
        let routeUrl = this.$router.resolve({
          path: "/companyAdmin/heNanBigScreen",
        });
@ -360,10 +416,10 @@ export default {
      //   path: "/companyAdmin/heNanBigScreen",
      // });
      window.open(routeUrl.href, "_self");
-      window._paq.push(['trackEvent', '点击', '龙光企业大屏','进入企业大屏' ])
+      window._paq.push(['trackEvent', '点击', '龙光企业大屏', '进入企业大屏'])
    },

-    toOverview5(val){
+    toOverview5(val) {
      let routeUrl = this.$router.resolve({
        path: val,
      });
@ -438,19 +494,17 @@ p {
  border: 1px solid rgba(58, 123, 255, 0.33);
  color: #fff;
 }
-.audio-box{
+.audio-box {
  display: flex;
  align-items: center;
  position: relative;
-  audio{
+  audio {
    height: 30px;
  }
-  .close-btn{
+  .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
@ -1076,7 +1076,7 @@ export default {
    this.getALLProjectSnAndInfo()
    this.companyType = COMPANY
  },
-  beforeMount() {},
+  beforeMount() { },
  mounted() {
    this.picCharts()
    // this.regCountsBar()
@ -1660,7 +1660,7 @@ export default {
      this.Bool = false
      console.log(
        this.company.filter((x) => x.name === this.clickAreaName).length > 0 &&
-          this.accountType === 2
+        this.accountType === 2
      )
      this.bool = false
      if (this.accountType === 2) {
@ -1747,7 +1747,7 @@ export default {
      }
    },
    initDate() {
-      ;(this.attendancePersonNumList = []), //出勤人数列表
+      ; (this.attendancePersonNumList = []), //出勤人数列表
        (this.totalPersonNumList = []),
        (this.attendanceRateListItem = []), //今日出勤图表类目
        (this.rate = 0), //出勤率
@ -2953,10 +2953,19 @@ export default {
      return await $.getJSON(url)
    },
    toOverview2() {
-      let routeUrl = this.$router.resolve({
-        path: '/project/dataBoard/index'
-      })
-      window.open(routeUrl.href, '_self')
+      //金林湾企业前台跳转项目大屏
+      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()
    },
@ -3377,7 +3386,7 @@ export default {
        } else if (
          arr.indexOf(params.name) == -1 &&
          that.company.filter((x) => x.name === that.clickAreaName).length <=
-            0 &&
+          0 &&
          that.accountType === 7
        ) {
        }
@ -3571,7 +3580,7 @@ export default {
          console.log(that.companyPlace)
          if (
            that.companyPlace.filter((x) => x.name === params.name).length !==
-              0 &&
+            0 &&
            that.accountType === 2
          ) {
            console.log('2')
@ -3644,7 +3653,7 @@ export default {
          )
          if (
            that.companyPlace.filter((x) => x.name === params.name).length !==
-              0 &&
+            0 &&
            that.accountType === 3 &&
            SecondCompanyPlace.length > 0
          ) {
@ -3716,7 +3725,7 @@ export default {
          if (
            allInfoList.length > 0 &&
            that.allProjectInfo.filter((x) => x.name === params.name).length !==
-              0 &&
+            0 &&
            that.accountType === 4
          ) {
            console.log(123)
@ -4062,7 +4071,7 @@ export default {
      console.log(options)
      echart.setOption(options, true)
    },
-    async getCity() {},
+    async getCity() { },
    picCharts() {
      let myChart = echarts.init(this.$refs.picCharts)
      myChart.setOption({
--- 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> -->
+          <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">{{ 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>
@ -49,28 +40,28 @@ export default {
  components: { Card },
  data() {
    return {
-    list:{
-      todayAtte:'',//今日出勤
-      bePresent:'',//在场
-      atteRatio:'',//今日出勤率
-      scene:'',//现场
-      todayMobilization:'',//今日进场
-      todayExit:'',//今日退场
-    },
-    projectSn:'',
+      list: {
+        todayAtte: '',//今日出勤
+        bePresent: '',//在场
+        atteRatio: '',//今日出勤率
+        scene: '',//现场
+        todayMobilization: '',//今日进场
+        todayExit: '',//今日退场
+      },
+      projectSn: '',
    };
  },
  created() {
    this.projectSn = this.$store.state.projectSn
-   this.getList()
+    this.getList()
  },
-  methods:{
-     /** 查询人员概况 */
-     getList() {
-    
+  methods: {
+    /** 查询人员概况 */
+    getList() {
+
      getworkerInfoApi({ projectSn: this.projectSn }).then(res => {
        console.log('人员概况: ', res);
-        this.list=res.result
+        this.list = res.result
      })
    },
  }
@ -83,7 +74,7 @@ export default {
  box-sizing: border-box;
  // padding-top: 20px;
  padding-bottom: 10px;
- 
+
  .contentbut {
    display: flex;
    justify-content: center;
--- 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 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="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.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: "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: "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"),
+        // },
+
      ],
      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;
-  flex-wrap: wrap;
-  justify-content: space-evenly;
 }
-.consumeStyle:nth-child(2){
+.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;
+}
+.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
@ -313,7 +313,7 @@
            width="95%"
            top="0vh"
          >
-            <div class="liferDialog pointDialog_l" v-if="showLifterDialog">
+          <div class="liferDialog pointDialog_l" v-if="showLifterDialog">
              <i class="closeBtn el-icon-error" @click="closeTowerDialog"></i>
              <div class="pointDialogContent">
                <div class="left fullHeight">
@ -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,
@ -2734,8 +2736,8 @@ export default {
    this.countBoxSize()
  },
  computed: {
-    changVideoSize() {},
-    closeVideo() {},
+    changVideoSize() { },
+    closeVideo() { },
    transformTimestamp() {
      return function (timestamp) {
        let a = new Date(timestamp).getTime()
@ -3002,7 +3004,7 @@ export default {
            .line(
              (item.relatedX - this.minX).toFixed(2),
              Number((Number(item.relatedY) - this.minY).toFixed(2)) +
-                Number(item.posteriorArmLength),
+              Number(item.posteriorArmLength),
              (item.relatedX - this.minX).toFixed(2),
              (item.relatedY - this.minY - item.forearmLength).toFixed(2)
            )
@ -3037,7 +3039,7 @@ export default {
            .text(
              (Number(item.relatedX) - this.minX).toFixed(2) - 6,
              (Number(item.relatedY) - this.minY).toFixed(2) -
-                item.forearmLength / 2,
+              item.forearmLength / 2,
              [
                this.$t('message.dataBoard.forearmLong') + ':',
                item.forearmLength ? item.forearmLength : '0',
@ -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
@ -3499,7 +3507,7 @@ export default {
            )
            if (
              this.gantryCraneInfo.ratedSpan <
-                res.result.smallCraneMainHookHeight ||
+              res.result.smallCraneMainHookHeight ||
              res.result.smallCraneMainHookHeight < 0
            ) {
              // 当前高度参数错误
@ -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
@ -1,5 +1,5 @@
 <template>
-<!-- 检查表页面 -->
+  <!-- 检查表页面 -->
  <div class="fullHeight">
    <div class="block fullHeight">
      <div class="system-left">
@ -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,21 +291,22 @@
        <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>
        <el-button
-              type="primary"
-              plain
-              size="small"
-              style="float: right; margin: -2px 30px 0 0"
-              @click="addCheckitems"
-            >
-              新增检查项
-            </el-button>
+          type="primary"
+          plain
+          size="small"
+          style="float: right; margin: -2px 30px 0 0"
+          @click="addCheckitems"
+        >
+          新增检查项
+        </el-button>
        <div class="table_box" style="margin: 13px">
          <el-table height="652px" :data="itemDetailsData" class="tables">
            <el-table-column
@ -315,9 +316,9 @@
              align="center"
            ></el-table-column>
            <el-table-column prop="checkItem" label="检查项" align="center">
-                <template slot-scope="scope">
-                    {{scope.row.checkItem}}
-                </template>
+              <template slot-scope="scope">
+                {{ scope.row.checkItem }}
+              </template>
            </el-table-column>
            <el-table-column
              prop="checkContent"
@ -330,15 +331,19 @@
              label="检查具体内容"
              align="center"
            >
-            <template slot-scope="scope">
-                    {{scope.row.checkDetailContent}}
-                </template>
+              <template slot-scope="scope">
+                {{ scope.row.checkDetailContent }}
+              </template>
            </el-table-column>
            <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>
-                </template>
+              <template slot-scope="scope">
+                <!-- {{JSON.parse(dialogdata.optionResult)}} -->
+                <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">
            </el-table-column>
@ -402,13 +407,16 @@
              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-option 
+            <el-select
+              v-model="addCheckTable.optionResult"
+              placeholder="请选择"
+            >
+              <el-option
                v-for="item in resultList"
                :key="item.id"
                :label="item.value"
@ -641,7 +649,7 @@ export default {
      threeData: [],
      //   editId: "",
      title: "",
-      itemTitle:"",
+      itemTitle: "",
      dialogdata: {
        code: "",
        remark: "",
@ -668,32 +676,32 @@ export default {
      leftId: "",
      showItemDetails: false,
      itemDetailsData: [],
-      TableCheckItem:{},
+      TableCheckItem: {},
      TableCheckDialog: false,
-      tableId:'',
-      TableCheckItemRules:{
-          checkItem: [{ required: true, message: "必填", trigger: "blur" }],
-          checkContent: [{ required: true, message: "必填", trigger: "blur" }],
-          checkDetailContent: [{ required: true, message: "必填", trigger: "blur" }],
+      tableId: '',
+      TableCheckItemRules: {
+        checkItem: [{ required: true, message: "必填", trigger: "blur" }],
+        checkContent: [{ required: true, message: "必填", trigger: "blur" }],
+        checkDetailContent: [{ required: true, message: "必填", trigger: "blur" }],
      },
-      addCheckTable:{},
-      addTable:false,
-      resultList:[
+      addCheckTable: {},
+      addTable: false,
+      resultList: [
        {
-          id:1,
-          value:'1-符合'
+          id: 1,
+          value: '1-符合'
        },
        {
-          id:2,
-          value:'2-基本符合'
+          id: 2,
+          value: '2-基本符合'
        },
        {
-          id:3,
-          value:'3-不符合'
+          id: 3,
+          value: '3-不符合'
        },

      ],
-      addCheckTableRules:{
+      addCheckTableRules: {
        checkItem: [{ required: true, message: "必填", trigger: "blur" }],
        createTime: [{ required: true, message: "必填", trigger: "blur" }],
      }
@ -720,22 +728,28 @@ export default {
      }
    },
    // 新增检查表 
-    addChecklist(){
+    addChecklist() {
      this.addTable = true;
-      this.addCheckTable= {}
+      this.addCheckTable = {}
    },
    // 确定按钮
-    addCheckTableSave(){
+    addCheckTableSave() {
      let data = this.addCheckTable
      data.creatorUser = this.$store.state.userInfo.userId
      data.classifyId = this.leftId
-      addinspectTableApi(data).then((res)=>{
-        if(res.code == 200 ){
-          this.$message.success("添加成功！");
-          this.loadRigthtList()
+
+      this.$refs['addCheckTable'].validate(valid => {
+        if (valid) {
+          addinspectTableApi(data).then((res) => {
+            if (res.code == 200) {
+              this.$message.success("添加成功！");
+              this.loadRigthtList()
+            }
+            this.addTable = false;
+          })
        }
-        this.addTable = false;
      })
+
    },
    downloadFn() {
      // console.loh(this.$http.defaults.baseURL)
@ -834,10 +848,10 @@ export default {
      this.tableId = data.id
      this.dialogdata = data;
      this.showItemDetails = true;
-      this.$nextTick(()=>{
-          this.getCheckItem();
+      this.$nextTick(() => {
+        this.getCheckItem();
      })
-      
+
    },
    edit1(data, type) {
      data = JSON.parse(JSON.stringify(data));
@ -873,9 +887,9 @@ export default {
    del1(obj) {
      this.$confirm(
        this.$t("message.personnelPosition.beaconManage.table.confirmText") +
-          "【" +
-          obj.classifyName +
-          "】?",
+        "【" +
+        obj.classifyName +
+        "】?",
        this.$t("message.personnelPosition.beaconManage.table.Tips"),
        {
          confirmButtonText: this.$t(
@ -898,9 +912,9 @@ export default {
    del2(obj) {
      this.$confirm(
        this.$t("message.personnelPosition.beaconManage.table.confirmText") +
-          "【" +
-          obj.tableName +
-          "】?",
+        "【" +
+        obj.tableName +
+        "】?",
        this.$t("message.personnelPosition.beaconManage.table.Tips"),
        {
          confirmButtonText: this.$t(
@ -991,12 +1005,12 @@ export default {
        }
      );
    },
-    delCheckItem(obj){
-        this.$confirm(
+    delCheckItem(obj) {
+      this.$confirm(
        this.$t("message.personnelPosition.beaconManage.table.confirmText") +
-          "【" +
-          obj.checkItem +
-          "】?",
+        "【" +
+        obj.checkItem +
+        "】?",
        this.$t("message.personnelPosition.beaconManage.table.Tips"),
        {
          confirmButtonText: this.$t(
@ -1017,38 +1031,38 @@ export default {
      });
    },
    // 添加检查项
-    addCheckitems(){
+    addCheckitems() {
      this.TableCheckDialog = true;
      this.itemTitle = '添加检查项';
      this.TableCheckItem = {}
    },
    // 编辑检查项
-    editCheckItem(item){
-        this.TableCheckItem=item;
-        this.TableCheckDialog=true;
-        this.itemTitle = '编辑检查项'
+    editCheckItem(item) {
+      this.TableCheckItem = item;
+      this.TableCheckDialog = true;
+      this.itemTitle = '编辑检查项'
    },
    editTableCheckSave(formName) {
      this.$refs[formName].validate((valid) => {
        if (valid) {
-          if(this.itemTitle =='添加检查项'){
-            let data  = this.TableCheckItem
+          if (this.itemTitle == '添加检查项') {
+            let data = this.TableCheckItem
            data.tableId = this.tableId
-            addTableItemListApi(data).then((res)=>{
-              if(res.code == 200){
+            addTableItemListApi(data).then((res) => {
+              if (res.code == 200) {
                this.$message.success("新增成功！");
                this.getCheckItem()
              }
              this.TableCheckDialog = false;
            })
-          }else{
+          } else {
            editTableCheckItemListApi(this.TableCheckItem).then((res) => {
-                // this.isloading = false;
-                this.TableCheckDialog = false;
-                this.getCheckItem();
-                this.$message.success("更新成功！");
-              });
-          }   
+              // this.isloading = false;
+              this.TableCheckDialog = false;
+              this.getCheckItem();
+              this.$message.success("更新成功！");
+            });
+          }
        } else {
          console.log("error submit!!");
          return false;
@ -1153,13 +1167,13 @@ export default {
    }
  }
 }
-.pageTitle2{
-    cursor: pointer;
-    &::before{
-        display: none;
-    }
-    .el-icon-back{
-        font-size: 16px;
-    }
+.pageTitle2 {
+  cursor: pointer;
+  &::before {
+    display: none;
+  }
+  .el-icon-back {
+    font-size: 16px;
+  }
 }
 </style>
--- 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,