Merge branch 'master' of https://gitee.com/qinnamin/large_screen

src/store/index.js

@@ -5,7 +5,7 @@ Vue.use(Vuex)
 
 export default new Vuex.Store({
   state: {
-    websocketIP: "10.170.39.226:8081",
+    websocketIP: "localhost:8081",
 
   },
   mutations: {

src/views/mining/machines/index.vue

@@ -3,11 +3,11 @@
     <div class="title">
       <p style="color:#4adefe;">三机监控</p>
     </div>
-    <img style="width: 1300px;margin-left:100px" src="./top.png" />
+    <img style="width: 1300px;margin-left:100px" src="./顶部.png" />
     <div style="height: 50px"></div>
     <div class="row">
       <div class="square">
-        <img class="img" src="./sc.png" />
+        <img class="img" src="./刮板机.png" />
         <div class="inf">
           <div style="height: 20%;font-size: 20px;color: #4adefe;">刮板机 运行状态</div>
           <div class="details">
@@ -60,7 +60,7 @@
         </div>
       </div>
       <div class="square">
-        <img class="img" src="./breaker.png" />
+        <img class="img" src="./破碎机.png" />
         <div class="inf">
           <div style="height: 20%;font-size: 20px;color: #4adefe;">破碎机 运行状态</div>
           <div class="details">
@@ -113,7 +113,7 @@
         </div>
       </div>
       <div class="square">
-        <img class="img" src="./tr.png" />
+        <img class="img" src="./转载机.png" />
         <div class="inf">
           <div style="height: 20%; font-size: 20px; color: #4adefe;">转载机 运行状态</div>
           <div class="details">
@@ -212,10 +212,10 @@ export default {
   position: relative;
   .title {
     position: relative;
-    height: 6%;
+    height: 5%;
     p {
       color: #fff;
-      font-size: 40px;
+      font-size: 30px;
       margin: 0;
       position: absolute;
       left: 50%;
@@ -228,7 +228,7 @@ export default {
     border-color: #302b33;
     margin-left: 200px;
     margin-bottom: 20px;
-    margin-top: -20px
+    margin-top: -25px
   }
   .container {
     display: grid;