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

src/pages/index/index.js

@@ -114,7 +114,7 @@ if (COMPANY == 'xingxuan') {
 }
 
 
-function 沙悟净(data, sn) {
+function handler(data, sn) {
   console.log(data, 'dllmhjc');
   window._paq.push(['trackEvent', '点击', '登录', '登录账号'])
   axios.defaults.headers.common['Authorization'] = 'Bearer' + ' ' + data.token
@@ -234,19 +234,19 @@ router.beforeEach((to, form, next) => {
   const direction = to.query.direction
   if (direction) {
     const info = JSON.parse(decode(direction))
-    const 孙悟空 = { account: info.acount, password: info.pwd }
+    const account = { account: info.acount, password: info.pwd }
 
-    const 猪八戒 = res => {
+    const tentative = res => {
-      沙悟净(res.result, info.projectSn)
+      handler(res.result, info.projectSn)
       return next({ path: to.path })
     }
 
     if (LOGINTYPE == 1) {
-      loginApi(孙悟空).then(猪八戒)
+      loginApi(account).then(tentative)
     } else if (LOGINTYPE == 2) {
-      companyLoginApi(孙悟空).then(猪八戒)
+      companyLoginApi(account).then(tentative)
     } else if (LOGINTYPE == 3) {
-      projectLoginApi(孙悟空).then(猪八戒)
+      projectLoginApi(account).then(tentative)
     }
 
   } else {

src/views/projectAdmin/zjsj/command/center.vue

@@ -102,6 +102,7 @@ export default {
           font-weight: bold;
           .label {
             margin-right: 10px;
+            white-space: nowrap;
             color: #002636;
           }
 

src/views/projectAdmin/zjsj/command/leftFour.vue

@@ -342,24 +342,23 @@ export default {
   width: 100%;
   height: 100%;
   white-space: nowrap;
-  // transform: translateY(-15px);
 
   .item {
     display: inline-block;
     width: calc(100% / 2);
-    height: 100%;
+    height: 120%;
     color: transparent;
 
     &:nth-child(1) {
-      transform: translate(-24%, 0%);
+      transform: translate(-24%, -6%);
     }
 
     &:nth-child(2) {
-      transform: translate(-48%, 0%);
+      transform: translate(-48%, -6%);
     }
 
     &:nth-child(3) {
-      transform: translate(-75%, 0%);
+      transform: translate(-75%, -6%);
     }
   }
 }

src/views/projectAdmin/zjsj/command/rightFour.vue

@@ -99,7 +99,7 @@ export default {
       box-sizing: border-box;
       border-left: 4px solid #66d3d8;
       margin-bottom: 5px;
-      padding: 6px 0;
+      padding: 10px 0;
       width: 100%;
       background-image: linear-gradient(to right, #3b7589, #212c3e);
       font-size: 12px;

src/views/projectAdmin/zjsj/command/rightThree.vue

@@ -15,7 +15,7 @@
       <div class="right list">
         <el-row class="list-item" type="flex" justify="space-between" align="middle" v-for="(item, key) in rightList" :key="key">
           <el-col :span="6">
-            <img style="width: 16px; height: auto" :src="item.image" />
+            <img style="width: 18px;" :src="item.image" />
           </el-col>
           <el-col :span="8">
             <div class="label">{{ item.label }}</div>

src/views/projectAdmin/zjsj/command/rightTwo.vue

@@ -205,7 +205,7 @@ export default {
         box-sizing: border-box;
         border-left: 4px solid #66d3d8;
         margin-bottom: 5px;
-        padding: 5px 0;
+        padding: 7px 0;
         width: 100%;
         background-image: linear-gradient(to right, #3b7589, #212c3e);
         font-size: 12px;
@@ -215,7 +215,7 @@ export default {
         white-space: nowrap;
 
         &:hover {
-          padding: 10px 0;
+          padding: 15px 0;
           &::before {
             content: '';
             position: absolute;
@@ -229,11 +229,10 @@ export default {
             background-size: 100% 100%;
             transition: all .3s;
           }
-        }
+          .value {
-
-        &:hover .value {
             color: #c2805f;
           }
+        }
 
         &:last-child {
           margin-bottom: 0;

src/views/projectAdmin/zjsj/index.vue

@@ -1,5 +1,4 @@
 <template>
-  <vue-scroll>
   <div class="zjsj-large-screen">
     <div class="header">
       <div class="info">
@@ -36,7 +35,6 @@
       <router-view></router-view>
     </div>
   </div>
-  </vue-scroll>
 </template>
 
 <script>
@@ -59,10 +57,9 @@ export default {
 @import url("./style.less");
 .zjsj-large-screen {
   width: 100%;
-  // height: 100%;
+  height: 100%;
   color: #fff;
   background-color: #182337;
-  overflow-y: scroll;
   .header {
     width: 100%;
     height: 110px;
@@ -160,7 +157,7 @@ export default {
     box-sizing: border-box;
     padding: 12px 20px;
     width: 100%;
-    height: calc(1080px - 110px);
+    height: calc(100% - 110px);
   }
 }