Merge branch 'master' of http://101.36.160.140:21044/csc/csc-szls-vue

shanXiPlatform/src/layout/components/Sidebar/index.vue

@@ -94,10 +94,12 @@ export default {
 }
 .el-submenu__title {
   background-color: #037d41 !important;
+  font-size:16px !important;
 }
 
 .el-menu-item {
   background: #037d41 !important;
+  font-size:16px !important;
 }
 .el-submenu.is-active.is-opened .el-submenu__title {
   background: #006734 !important;

shanXiPlatform/src/utils/request.js

@@ -2,7 +2,8 @@ import axios from 'axios'
 import { MessageBox, Message } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
-import { closenewWebSocket,newWebSocket } from '@/api/sendMessageSocket'
+import { closenewWebSocket, newWebSocket } from '@/api/sendMessageSocket'
+
 
 // create an axios instance
 const service = axios.create({
@@ -89,7 +90,7 @@ service.interceptors.response.use(
 
     // 走框架接口，会先在这里拿到服务器返回的数据，如果出现请求超时，或者token获取，或者一些公共错误，可以在这里判断拦截，然后在返回
 
-  
+
 
     // if the custom code is not 20000, it is judged as an error.
     // if (res.code !== 20000) {
@@ -99,18 +100,18 @@ service.interceptors.response.use(
     //     duration: 5 * 1000
     //   })
 
-      // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
-      if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
-        // to re-login
-        MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
-          confirmButtonText: 'Re-Login',
-          cancelButtonText: 'Cancel',
-          type: 'warning'
-        }).then(() => {
-          store.dispatch('user/resetToken').then(() => {
-            location.reload()
-          })
+    // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
+    if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
+      // to re-login
+      MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', {
+        confirmButtonText: 'Re-Login',
+        cancelButtonText: 'Cancel',
+        type: 'warning'
+      }).then(() => {
+        store.dispatch('user/resetToken').then(() => {
+          location.reload()
         })
+      })
       // }
       return Promise.reject(new Error(res.message || 'Error'))
     } else {
@@ -119,7 +120,7 @@ service.interceptors.response.use(
   },
   error => {
     // console.log(JSON.stringify(error), "mmmmm")
-  
+
     // Message({
     //   message: error.message,
     //   type: 'error',
@@ -127,21 +128,40 @@ service.interceptors.response.use(
     // })
     // return Promise.reject(error)
 
-    if (error.response.status == 401&& store.state.isAuthority) {
+    // if (error.response.status == 401&& store.state.isAuthority) {
+    //   store.state.isAuthority = false;
+    //   MessageBox.confirm('身份失效，请重新登录', '确认退出', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning'
+    //   }).then(() => {
+    //     store.dispatch('user/resetToken').then(() => {
+    //       location.reload()
+    //     })
+    //     closenewWebSocket(JSON.parse(getUser()).uid)
+    //   })
+    // }
+
+    if (error.response.status == 401 && store.state.isAuthority) {
+     
       store.state.isAuthority = false;
-      MessageBox.confirm('身份失效，请重新登录', '确认退出', {
+    
+      MessageBox.alert('身份失效，请重新登录', '确认退出', {
         confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        store.dispatch('user/resetToken').then(() => {
-          location.reload()
-        })
-        closenewWebSocket(JSON.parse(getUser()).uid)
+        callback:()=>{
+          
+          store.dispatch('user/resetToken')
+          .then(() => {
+            location.reload()
+          })
+          closenewWebSocket(JSON.parse(getUser()).uid)
+          console.log("我到这儿le.....s")
+        }
+
       })
-    }else if(error.response.status == 666&& store.state.isAuthority){
+    }else if (error.response.status == 666 && store.state.isAuthority) {
       this.$message.error('服务器神游中!');
-    }else if(error.response.status == 504&& store.state.isAuthority){
+    } else if (error.response.status == 504 && store.state.isAuthority) {
       this.$message.error('请求超时，请稍后再试');
     }
   }

shanXiPlatform/src/views/home/staff.vue

@@ -85,7 +85,7 @@
           style="
             float: left;
             position: relative;
-            height: 524px;
+            height: 580px;
             border-radius: 5px;
             border: 1px solid #d8dce5;
           "
@@ -247,11 +247,11 @@
               <!-- <div v-if="item.coordinate && !item.storageStatus" :style="{position:'absolute',width:'20px',height:'20px',backgroundColor:'blue',borderRadius:'50%',opacity:0.4,top:item.coordinate.split(',')[1]-10+ 'px',left:item.coordinate.split(',')[0]-10+ 'px'}"></div> -->
             </span>
           </map>
-          <div style="height: 64px; line-height: 64px">
+          <div style="height: 120px; line-height: 120px">
             <img
               src="../../assets/images/zt.png"
               alt=""
-              style="position: absolute; left: 10px"
+              style="position: absolute; left: 17px; bottom: 26px;"
             />
             <div
               v-if="!housestatusshow"
@@ -260,7 +260,7 @@
                 height: 18px;
                 line-height: 18px;
                 right: 30px;
-                bottom: 12px;
+                bottom: 29px;
                 cursor: pointer;
               "
               @click="housestatusshowFn(1)"
@@ -283,7 +283,7 @@
                 height: 18px;
                 line-height: 18px;
                 right: 30px;
-                bottom: 12px;
+                bottom: 29px;
                 cursor: pointer;
               "
               @click="housestatusshowFn(2)"
@@ -334,16 +334,17 @@
               :interval="5000"
               arrow="always"
               height="200px"
+              
               indicator-position="none"
             >
               <el-carousel-item
                 v-for="item in bodyContentFooterOneData"
                 :key="item.imgSrc"
-              >
-                <img :src="item.imgSrc" alt="" height="200px" width="350px" />
-                <div class="footerText">
+                style="text-align:center;width:320px">
+                <img :src="item.imgSrc" alt="" height="100%" />
+                <!-- <div class="footerText">
                   <span>{{ item.title }}</span>
-                </div>
+                </div> -->
               </el-carousel-item>
             </el-carousel>
           </div>
@@ -548,7 +549,7 @@ export default {
                 name: "圆环图系列名称", // 系列名称
                 type: "pie", // 系列类型
                 center: ["50%", "50%"], // 饼图的中心（圆心）坐标，数组的第一项是横坐标，第二项是纵坐标。[ default: ['50%', '50%'] ]
-                radius: ["20%", "35%"], // 饼图的半径，数组的第一项是内半径，第二项是外半径。[ default: [0, '75%'] ]
+                radius: ["28%", "55%"], // 饼图的半径，数组的第一项是内半径，第二项是外半径。[ default: [0, '75%'] ]
                 hoverAnimation: true, // 是否开启 hover 在扇区上的放大动画效果。[ default: true ]
                 color: ["#44a64b", "#f3c800", "#ff7800"], // 圆环图的颜色
                 label: {
@@ -625,6 +626,7 @@ export default {
             {
               data: grainvalue,
               type: "bar",
+              barWidth:"30%",
               itemStyle: {
                 normal: {
                   label: {
@@ -802,7 +804,7 @@ export default {
   width: 100%;
   /* height: calc(100vh - 124px); */
   /* overflow-y: scroll; */
-  height: 1151px;
+  height: 1207px;
   padding: 10px 10px 41px 10px;
   background-color: #f3f3f3;
 }
@@ -828,7 +830,7 @@ export default {
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
 }
 .bodyContent {
-  height: 844px;
+  height: 900px;
   margin-top: 10px;
   background-color: #ffffff;
   margin-bottom: 40px;
@@ -839,15 +841,15 @@ export default {
   padding-left: 10px;
 }
 .bodyContentMiddle {
-  height: 524px;
+  height: 580px;
   padding: 0 10px;
   /* border-bottom: 1px solid #d8dce5; */
   /* box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04); */
 }
 .bodyContentMiddleText {
   width: calc(100% - 830px);
-  height: 524px;
-  max-height: 524px;
+  height: 580px;
+  max-height: 580px;
   padding: 10px;
   overflow-y: auto;
   border: 1px solid #d8dce5;