瑞士恒通页面字样调整

src/components/account.vue

@@ -12,13 +12,20 @@
         <div class="flex2" v-show="$store.state.userInfo.accountType != 1">
           <!-- <i class="el-icon-user-solid"></i> -->
           <el-avatar size="large" icon="el-icon-user-solid"></el-avatar>
-          <div style="margin-left:10px">
+          <div style="margin-left: 10px">
             <p>{{ $store.state.userInfo.companyName }}</p>
             <!-- 横琴和鹤洲不需要客服电话-->
-            <p v-if="projectType == 'common' || projectType=='zjsj'">客服电话：{{$store.state.userInfo.customerServicePhone}}</p>
+            <p v-if="projectType == 'common' || projectType == 'zjsj'">
+              客服电话：{{ $store.state.userInfo.customerServicePhone }}
+            </p>
             <p
-              v-if="projectType == 'hengqin' && $store.state.currentProDetail != null "
+              v-if="
-            >入场码：{{$store.state.currentProDetail.placeCode}}</p>
+                projectType == 'hengqin' &&
+                $store.state.currentProDetail != null
+              "
+            >
+              入场码：{{ $store.state.currentProDetail.placeCode }}
+            </p>
           </div>
         </div>
         <!-- <div class="flex2" style="margin-top:20px">
@@ -34,20 +41,21 @@
           <div
             class="width_100"
             @click="goto5()"
-            v-if="($route.path.indexOf('/firm/projectManage') == -1 && 
+            v-if="
+              $route.path.indexOf('/firm/projectManage') == -1 &&
               $store.state.userInfo.accountType != 5 &&
               $store.state.userInfo.accountType != 6
-                ) "
+            "
           >
             <img src="@/assets/images/xmht.png" width="15px" height="15px" />
-            <span>{{enterpriseFront}}</span>
+            <span>{{ enterpriseFront }}</span>
           </div>
           <!-- // 企业后台 -->
           <div
             class="width_100"
             @click="goto2"
             v-if="
-            ($route.path.indexOf('/companyAdmin/companyDiagram') == -1) &&
+              $route.path.indexOf('/companyAdmin/companyDiagram') == -1 &&
               $store.state.userInfo.accountType != 5 &&
               $store.state.userInfo.accountType != 6
             "
@@ -62,28 +70,30 @@
             class="width_100"
             @click="goProjectBackstage"
             v-if="
-              ( $route.path.indexOf('/projectIndex') == -1 || 
+              $route.path.indexOf('/projectIndex') == -1 ||
-                $route.path.indexOf('/equipmentCenterIndx') == -1 &&
+              ($route.path.indexOf('/equipmentCenterIndx') == -1 &&
                 $store.state.userInfo.accountType != 5 &&
-                $store.state.userInfo.accountType != 6&&$store.state.userInfo.enterProjectBackType==0) 
+                $store.state.userInfo.accountType != 6 &&
+                $store.state.userInfo.enterProjectBackType == 0)
             "
           >
             <img src="@/assets/images/xmht.png" width="15px" height="15px" />
             <!--  $t("message.companyDiagram.projectBackEnd") -->
-            <span>{{projectBackground}}</span>
+            <span>{{ projectBackground }}</span>
           </div>
           <!--  设备中台 -->
           <div
             class="width_100"
             @click="goDevcenter"
-            v-if="($route.path.indexOf('/equipmentCenterIndx') == -1 ) ||
+            v-if="
-            ($route.path.indexOf('/equipmentCenterIndx') == -1 ) &&
+              $route.path.indexOf('/equipmentCenterIndx') == -1 ||
-            ($route.path.indexOf('/projectIndex') == -1 )
+              ($route.path.indexOf('/equipmentCenterIndx') == -1 &&
+                $route.path.indexOf('/projectIndex') == -1)
             "
           >
             <img src="@/assets/images/xmht.png" width="15px" height="15px" />
             <!-- <span>{{ $t("message.companyDiagram.devCenter") }}</span> -->
-            <span>{{equipmentChina}}</span>
+            <span>{{ equipmentChina }}</span>
           </div>
 
           <!-- <div
@@ -106,15 +116,21 @@
           </div>
         </div>
 
-        <div class="flex2 logout" @click="loginOut">{{ $t("message.login.logout") }}</div>
+        <div class="flex2 logout" @click="loginOut">
+          {{ $t('message.login.logout') }}
+        </div>
       </div>
       <span slot="reference" class="flex3">
         <div style="margin-right: 8px">
-          <p class="color_fff" style="margin-bottom: 0">{{ $store.state.userInfo.account }}</p>
+          <p class="color_fff" style="margin-bottom: 0">
+            {{ $store.state.userInfo.account }}
+          </p>
           <!-- <p class="color_fff">{{$store.state.ACCOUNTTYPE[$store.state.userInfo.accountType-1]}}</p> -->
-          <p class="color_fff">
+          <p class="color_fff" v-if="COMPANY == 'hengtong'">
-            <!-- {{ $store.state.userInfo.menuAuthority.roleName }} -->
+            {{ $store.state.userInfo.menuAuthority.roleName }}
-            {{headerConfiguration}}
+          </p>
+          <p class="color_fff" v-else>
+            {{ headerConfiguration }}
           </p>
         </div>
         <i class="el-icon-arrow-down" style="color: #fff"></i>
@@ -126,82 +142,83 @@
 export default {
   data() {
     return {
-      projectType: "",
+      COMPANY: COMPANY,
-      loginData: "",
+      projectType: '',
-      dataCenter1: "",
+      loginData: '',
-      projectBackground: "项目后台",
+      dataCenter1: '',
-      enterpriseBackground: "企业后台",
+      projectBackground: '项目后台',
-      headerConfiguration: "公司管理员", //标头配置
+      enterpriseBackground: '企业后台',
-      enterpriseFront: "企业前台", //企业前台
+      headerConfiguration: '公司管理员', //标头配置
-      equipmentChina: "设备中台", //设备中台
+      enterpriseFront: '企业前台', //企业前台
-      dataCenter: "资料中心" //资料中心
+      equipmentChina: '设备中台', //设备中台
-    };
+      dataCenter: '资料中心' //资料中心
+    }
   },
   created() {
-    this.projectType = PROJECT_TYPE;
+    this.projectType = PROJECT_TYPE
   },
   mounted() {
-    this.seeEquipment = this.$store.state.userInfo.seeEquipment;
+    this.seeEquipment = this.$store.state.userInfo.seeEquipment
-    this.loginData = JSON.parse(localStorage.getItem("systemInfo"));
+    this.loginData = JSON.parse(localStorage.getItem('systemInfo'))
-    console.log(" this.loginData", this.loginData);
+    console.log(' this.loginData===================', this.loginData)
-    if (this.loginData.headerConfiguration != "") {
+    if (this.loginData.headerConfiguration != '') {
-      this.headerConfiguration = this.loginData.headerConfiguration;
+      this.headerConfiguration = this.loginData.headerConfiguration
     }
-    if (this.loginData.projectBackground != "") {
+    if (this.loginData.projectBackground != '') {
-      this.projectBackground = this.loginData.projectBackground;
+      this.projectBackground = this.loginData.projectBackground
     }
-    if (this.loginData.enterpriseBackground != "") {
+    if (this.loginData.enterpriseBackground != '') {
-      this.enterpriseBackground = this.loginData.enterpriseBackground;
+      this.enterpriseBackground = this.loginData.enterpriseBackground
     }
-    if (this.loginData.equipmentChina != "") {
+    if (this.loginData.equipmentChina != '') {
-      this.equipmentChina = this.loginData.equipmentChina;
+      this.equipmentChina = this.loginData.equipmentChina
     }
-    if (this.loginData.dataCenter != "") {
+    if (this.loginData.dataCenter != '') {
-      this.dataCenter1 = this.loginData.dataCenter;
+      this.dataCenter1 = this.loginData.dataCenter
     }
     // console.log('项目后台',this.projectBackground)
     // console.log('企业后台',this.enterpriseBackground)
   },
   methods: {
     sendMsg2() {
-      this.$EventBus.$emit("controlVideoShowOrHide", "show");
+      this.$EventBus.$emit('controlVideoShowOrHide', 'show')
     },
     sendMsg() {
-      this.$EventBus.$emit("controlVideoShowOrHide", "hide");
+      this.$EventBus.$emit('controlVideoShowOrHide', 'hide')
     },
     goto2() {
-      let menuList = [];
+      let menuList = []
-      var half = this.$store.state.userInfo.menuAuthority.moduleList;
+      var half = this.$store.state.userInfo.menuAuthority.moduleList
-      half.forEach(element => {
+      half.forEach((element) => {
         if (element.moduleType == 3) {
-          menuList.push(element);
+          menuList.push(element)
         }
-      });
+      })
       if (menuList.length > 0) {
-        this.$store.commit("setIsShowBackIndex", false);
+        this.$store.commit('setIsShowBackIndex', false)
         // let routeUrl = this.$router.resolve({
         //   path: menuList[0].modulePath,
         // });
-        var url = window.location.href;
+        var url = window.location.href
-        let routeUrl = "";
+        let routeUrl = ''
         // 判断当前页面是不是设备中台
-        if (url.indexOf("equipmentCenter.html") != -1) {
+        if (url.indexOf('equipmentCenter.html') != -1) {
-          window.open("/#" + menuList[0].modulePath, "_self");
+          window.open('/#' + menuList[0].modulePath, '_self')
           // 南昌项目打开的是/index.html#/ 的页面
-          if (COMPANY == "nanchang") {
+          if (COMPANY == 'nanchang') {
-            window.open("/index.html#" + menuList[0].modulePath, "_self");
+            window.open('/index.html#' + menuList[0].modulePath, '_self')
           } else {
-            window.open("/#" + menuList[0].modulePath, "_self");
+            window.open('/#' + menuList[0].modulePath, '_self')
           }
         } else {
           routeUrl = this.$router.resolve({
             path: menuList[0].modulePath
-          });
+          })
         }
-        window.open(routeUrl.href, "_self");
+        window.open(routeUrl.href, '_self')
-        window._paq.push(["trackEvent", "点击", "企业后台", "进入企业后台"]);
+        window._paq.push(['trackEvent', '点击', '企业后台', '进入企业后台'])
       } else {
-        this.$message.warning("您没有企业后台的权限！");
+        this.$message.warning('您没有企业后台的权限！')
       }
     },
     goto3() {
@@ -209,108 +226,108 @@ export default {
       // let routeUrl = this.$router.resolve({
       //   path: "/fileCenter",
       // });
-      var url = window.location.href;
+      var url = window.location.href
-      let routeUrl = "";
+      let routeUrl = ''
       // 判断当前页面是不是设备中台
-      if (url.indexOf("equipmentCenter.html") != -1) {
+      if (url.indexOf('equipmentCenter.html') != -1) {
         // 南昌项目打开的是/index.html#/ 的页面
-        if (COMPANY == "nanchang") {
+        if (COMPANY == 'nanchang') {
-          window.open("/index.html#/fileCenter", "_self");
+          window.open('/index.html#/fileCenter', '_self')
         } else {
-          window.open("/#/fileCenter", "_self");
+          window.open('/#/fileCenter', '_self')
         }
       } else {
         routeUrl = this.$router.resolve({
-          path: "/fileCenter"
+          path: '/fileCenter'
-        });
+        })
       }
-      window.open(routeUrl.href, "_self");
+      window.open(routeUrl.href, '_self')
-      window._paq.push(["trackEvent", "点击", "资料中心", "进入资料中心"]);
+      window._paq.push(['trackEvent', '点击', '资料中心', '进入资料中心'])
     },
     goto4() {
-      window.open("/equipmentCenter.html#/equipmentCenterIndx", "_blank");
+      window.open('/equipmentCenter.html#/equipmentCenterIndx', '_blank')
     },
     goto5() {
-      window.open("/index.html#/firm/projectManage", "_self");
+      window.open('/index.html#/firm/projectManage', '_self')
     },
     loginOut() {
-      this.$store.commit("setUserInfo", null);
+      this.$store.commit('setUserInfo', null)
-      this.$store.commit("setMapBackArr", []);
+      this.$store.commit('setMapBackArr', [])
-      this.$store.commit("setMoudle", null);
+      this.$store.commit('setMoudle', null)
-      this.$store.commit("setProDetail", null);
+      this.$store.commit('setProDetail', null)
-      window.localStorage.removeItem("isIframe");
+      window.localStorage.removeItem('isIframe')
-      window.localStorage.removeItem("soundList");
+      window.localStorage.removeItem('soundList')
       let json = {
-        name: "工作站",
+        name: '工作站',
         id: 1,
-        url: "/projectV2/taskList",
+        url: '/projectV2/taskList',
         menuList: [
           {
             id: 100000,
-            menuName: "任务清单",
+            menuName: '任务清单',
-            path: "/projectV2/taskList"
+            path: '/projectV2/taskList'
           },
           {
             id: 100001,
-            menuName: "通知公告",
+            menuName: '通知公告',
-            path: "/projectV2/noticeList"
+            path: '/projectV2/noticeList'
           },
           {
             id: 100002,
-            menuName: "工作日程",
+            menuName: '工作日程',
-            path: "/projectV2/workerSchedule"
+            path: '/projectV2/workerSchedule'
           }
         ]
-      };
+      }
-      this.$store.commit("setCurModule", json);
+      this.$store.commit('setCurModule', json)
       // sessionStorage.clear();
       // this.$router.push('/login')
-      if (COMPANY == "nanchang" || COMPANY == "") {
+      if (COMPANY == 'nanchang' || COMPANY == '') {
-        window.open("/index.html#/login", "_self");
+        window.open('/index.html#/login', '_self')
       } else {
-        window.open("/#/login", "_self");
+        window.open('/#/login', '_self')
       }
       // this.$router.push('/')
-      window._paq.push(["trackEvent", "点击", "退出登录", "退出登录"]);
+      window._paq.push(['trackEvent', '点击', '退出登录', '退出登录'])
     },
 
     //去项目后台
     goProjectBackstage() {
-      var url = window.location.href;
+      var url = window.location.href
-      let routeUrl = "";
+      let routeUrl = ''
-      let type = this.$store.state.userInfo.accountType;
+      let type = this.$store.state.userInfo.accountType
       // 判断当前页面是不是设备中台
-      if (url.indexOf("equipmentCenter.html") != -1) {
+      if (url.indexOf('equipmentCenter.html') != -1) {
         // 南昌项目打开的是/index.html#/ 的页面
-        if (COMPANY == "nanchang") {
+        if (COMPANY == 'nanchang') {
-          window.open("/index.html#/projectList", "_self");
+          window.open('/index.html#/projectList', '_self')
         } else {
-          window.open("/#/projectList", "_self");
+          window.open('/#/projectList', '_self')
         }
       }
       if (type == 5 || type == 6) {
-        window.open("/index.html#/projectIndex", "_self");
+        window.open('/index.html#/projectIndex', '_self')
       } else {
         routeUrl = this.$router.resolve({
-          path: "/projectList"
+          path: '/projectList'
-        });
+        })
       }
-      window.open(routeUrl.href, "_self");
+      window.open(routeUrl.href, '_self')
-      window._paq.push(["trackEvent", "点击", "项目后台", "进入项目后台"]);
+      window._paq.push(['trackEvent', '点击', '项目后台', '进入项目后台'])
     },
     //去设备中台
     goDevcenter(value) {
-       let routeUrl = "";
+      let routeUrl = ''
-      let type = this.$store.state.userInfo.accountType;
+      let type = this.$store.state.userInfo.accountType
       //  this.$store.commit("setProjectSn", value.projectSn);
       if (type == 5 || type == 6) {
-        window.open("/equipmentCenter.html#/equipmentCenterIndx", "_self");
+        window.open('/equipmentCenter.html#/equipmentCenterIndx', '_self')
-        window._paq.push(["trackEvent", "点击", "设备中台", "进入设备中台"]);
+        window._paq.push(['trackEvent', '点击', '设备中台', '进入设备中台'])
       } else {
         routeUrl = this.$router.resolve({
-          path: "/projectList"
+          path: '/projectList'
-        });
+        })
-        window.open(routeUrl.href, "_self");
+        window.open(routeUrl.href, '_self')
       }
     }
     // 去设备中台
@@ -335,7 +352,7 @@ export default {
     //   window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ])
     // }
   }
-};
+}
 </script>
 <style lang="less" scoped>
 .accountBox {

src/views/companyAdmin/bigScreen/header.vue

@@ -1,54 +1,83 @@
 <template>
-    <div class="header-wrap">
+  <div class="header-wrap2" v-if="COMPANY == 'hengtong'">
     <div class="left-text">Smart construction site</div>
     <div class="nav-list">
-            <div class="nav-item" :class="{'nav-active': pageIndex == 1}" @click="changeNav(1)">集团中心</div>
+      <div
-            <div class="nav-item right-nav" :class="{'nav-active': pageIndex == 2}" >视频中心</div>
+        class="nav-item"
+        :class="{ 'nav-active': pageIndex == 1 }"
+        @click="changeNav(1)"
+      >
+        集团中心
+      </div>
+      <div class="nav-item right-nav" :class="{ 'nav-active': pageIndex == 2 }">
+        视频中心
+      </div>
     </div>
     <div class="right-box">
-            <span>{{nowDate}}</span>
+      <span>{{ nowDate }}</span>
       <div class="close-btn" @click="closeFn">
-                <img src="./../../../assets/images/bigScreen/icon-close.png">
+        <img src="./../../../assets/images/bigScreen/icon-close.png" />
+      </div>
+    </div>
+  </div>
+  <div class="header-wrap" v-else>
+    <div class="left-text">Smart construction site</div>
+    <div class="nav-list">
+      <div
+        class="nav-item"
+        :class="{ 'nav-active': pageIndex == 1 }"
+        @click="changeNav(1)"
+      >
+        集团中心
+      </div>
+      <div class="nav-item right-nav" :class="{ 'nav-active': pageIndex == 2 }">
+        视频中心
+      </div>
+    </div>
+    <div class="right-box">
+      <span>{{ nowDate }}</span>
+      <div class="close-btn" @click="closeFn">
+        <img src="./../../../assets/images/bigScreen/icon-close.png" />
       </div>
     </div>
-
   </div>
 </template>
 
 <script>
-import moment from 'moment';
+import moment from 'moment'
 export default {
-    naem: "headers",
+  naem: 'headers',
-    data(){
+  data() {
-        return{
+    return {
       pageIndex: 1,
       nowDate: '',
-            timer: null
+      timer: null,
+      COMPANY: COMPANY
     }
   },
-    mounted(){
+  mounted() {
-        this.timer = setInterval(()=>{
+    this.timer = setInterval(() => {
       let date = new Date()
       this.nowDate = moment(date).format('YYYY年MM月DD日 HH:mm:ss')
-        },1000)
+    }, 1000)
   },
-    beforeDestroy(){
+  beforeDestroy() {
     this.timer = null
   },
   methods: {
-        changeNav(val){
+    changeNav(val) {
       this.pageIndex = val
       this.$emit('changeType', val)
     },
-        closeFn(){
+    closeFn() {
-            window.close();
+      window.close()
     }
   }
 }
 </script>
 
 <style lang="less" scoped>
-.header-wrap{
+.header-wrap {
   width: 100%;
   height: 50px;
   text-align: center;
@@ -56,17 +85,37 @@ export default {
   top: 0;
   left: 0;
   z-index: 10;
-    background: url("./../../../assets/images/bigScreen/header-bg.png") center no-repeat;
+  background: url('./../../../assets/images/bigScreen/header-bg.png') center
+    no-repeat;
   background-size: 100%;
-    .left-text{
+  .left-text {
-        color: #02FBE2;
+    color: #02fbe2;
     position: absolute;
     left: 48px;
     line-height: 32px;
     font-size: 10px;
   }
 }
-.nav-list{
+.header-wrap2 {
+  width: 100%;
+  height: 45px;
+  text-align: center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 10;
+  background: url('./../../../assets/images/bigScreen/hengTong_title.png')
+    center no-repeat;
+  background-size: 103%;
+  .left-text {
+    color: #02fbe2;
+    position: absolute;
+    left: 48px;
+    line-height: 32px;
+    font-size: 10px;
+  }
+}
+.nav-list {
   color: #fff;
   font-size: 16px;
   position: absolute;
@@ -79,18 +128,18 @@ export default {
   justify-content: space-between;
   align-items: center;
 }
-.nav-item{
+.nav-item {
   padding: 0 40px;
   height: 40px;
   line-height: 36px;
   position: relative;
   cursor: pointer;
 }
-.nav-active{
+.nav-active {
-    color: #02FBE2;
+  color: #02fbe2;
 }
-.nav-active::after{
+.nav-active::after {
-    content: "";
+  content: '';
   border-bottom: 1px dashed rgba(2, 251, 226, 1);
   position: absolute;
   bottom: 8px;
@@ -99,31 +148,34 @@ export default {
   display: block;
   width: 73px;
   transform: translateX(-50%);
-    background: linear-gradient(to top, rgba(2, 251, 226,0.7), rgba(2, 251, 226,0));
+  background: linear-gradient(
+    to top,
+    rgba(2, 251, 226, 0.7),
+    rgba(2, 251, 226, 0)
+  );
 }
-.right-box{
+.right-box {
-    color: #02FBE2;
+  color: #02fbe2;
   line-height: 32px;
   font-size: 10px;
   display: flex;
   position: absolute;
   right: 0;
   top: 0;
-    span{
+  span {
     margin-right: 16px;
   }
-    .close-btn{
+  .close-btn {
     margin-left: 70px;
     margin-right: 12px;
     width: 20px;
     height: 20px;
     margin-top: 10px;
     cursor: pointer;
-        img{
+    img {
       width: 100%;
       height: 100%;
     }
   }
 }
-
 </style>

src/views/companyAdmin/longguang2/index.vue

@@ -5,7 +5,8 @@
         <img src="../../../assets/images/longguang/cutimage/close.png" class="close" @click="close">
       </a> -->
     <div class="header" v-if="companyType == 'longguang'"></div>
-    <div class="header2" v-else></div>
+    <div class="header2" v-else-if="COMPANY == 'hengtong'"></div>
+    <div class="header3" v-else></div>
     <close-page class="close"></close-page>
     <div class="left" v-show="checkedTab == 0">
       <!-- <img src="@/assets/images/longguang/demo/zl_l.png" class="demo"/> -->
@@ -850,6 +851,7 @@ import bigImgVue from './components/childrenComponents/bigImg.vue'
 export default {
   data() {
     return {
+      COMPANY: COMPANY,
       sn: '',
       videoSn: '',
       video: false,
@@ -5885,5 +5887,16 @@ export default {
     left: 0;
     z-index: 100;
   }
+  .header3 {
+    width: 100%;
+    height: 70px;
+    background: url('../../../assets/images/longguang/cutimage/header_bg.png')
+      no-repeat;
+    background-size: auto;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 100;
+  }
 }
 </style>

src/views/home/login_v1.vue

@@ -52,7 +52,9 @@
         />
         <div class="loginContent" v-if="COMPANY == 'hengtong'">
           <div>
-            欢迎进入<span style="color: orange; font-size: 70px">智建宝</span
+            <span style="font-size: 3.8vw">欢</span>迎进入<span
+              style="color: orange"
+              >智建宝</span
             >云平台
           </div>
         </div>
@@ -875,9 +877,9 @@ export default {
   height: 300px;
   /* background-color: palevioletred; */
   position: absolute;
-  right: 45%;
+  right: 42%;
   /* font-weight: bold; */
-  font-size: 65px;
+  font-size: 3.6vw;
   color: #fff;
   top: 40%;
 }