liuqiao 2 years ago
parent
commit
3d4826492d

+ 5 - 1
src/assets/css/theme/0000ff/index.css

@@ -20,4 +20,8 @@
   .custom-0000ff .tabsel{
   .custom-0000ff .tabsel{
     border-bottom:1px solid  #d3d1e5;
     border-bottom:1px solid  #d3d1e5;
   }
   }
-  
+  .custom-0000ff .el-button--primary:focus, .custom-0000ff .el-button--primary:hover{
+    background: #8883a5;
+    border-color: #8883a5;
+    color: #fff;
+  }

+ 3 - 0
src/assets/css/theme/00a598/index.css

@@ -168,6 +168,9 @@ background-color: #757070;
 .custom-00a598 .el-button--primary{
 .custom-00a598 .el-button--primary{
   background-color: #535353;
   background-color: #535353;
   border-color: #fff;
   border-color: #fff;
+}
+.custom-00a598 .real .real-content .status{
+  color: #d5d5d5 !important;
 }
 }
     /* .el-tabs{
     /* .el-tabs{
     border-bottom: 1px solid #666;
     border-bottom: 1px solid #666;

+ 2 - 2
src/views/home/real/index.vue

@@ -345,7 +345,7 @@
         </div>
         </div>
         <div v-if="realStatus == 3" class="btn">
         <div v-if="realStatus == 3" class="btn">
           <el-button
           <el-button
-            type="danger"
+            type="primary"
             size="small"
             size="small"
             class="next-btn"
             class="next-btn"
             @click.native.prevent="Next"
             @click.native.prevent="Next"
@@ -686,7 +686,7 @@ export default {
       margin: 20px auto 0;
       margin: 20px auto 0;
       font-size: 14px;
       font-size: 14px;
       line-height: 20px;
       line-height: 20px;
-      color: $color_3;
+     // color: $color_3;
       white-space: nowrap;
       white-space: nowrap;
       .result-item {
       .result-item {
         @include flex(flex-start, flex-start);
         @include flex(flex-start, flex-start);

+ 14 - 8
src/views/index/index.vue

@@ -684,13 +684,21 @@ let params = {
       },
       },
       websocketonmessage(e){ //数据接收
       websocketonmessage(e){ //数据接收
      
      
-      // this.loadingopen();
-    console.log(e);
-        // setTimeout(() => {
-       //  this.loadingend(this.loadingopen());
+       this.loadingopen();
+        //       setTimeout(() => {
+        // this.loadingend(this.loadingopen());
         //  // loading.close();
         //  // loading.close();
-        // }, 30000);
+        // }, 3000);
+    console.log(e);
+    console.log(111);
+    // if(e==){
 
 
+    // }else{
+    //     setTimeout(() => {
+    //     this.loadingend(this.loadingopen());
+    //      // loading.close();
+    //     }, 3000);
+    // }
         try{
         try{
             const redata = JSON.parse(e.data);   
             const redata = JSON.parse(e.data);   
            if(redata.hasOwnProperty("img")){
            if(redata.hasOwnProperty("img")){
@@ -732,7 +740,6 @@ let params = {
                    this.$refs.hcfd.addparam();
                    this.$refs.hcfd.addparam();
               }
               }
             }
             }
-            
           }else if(redata.action=='SliceDisplayUpdate'){
           }else if(redata.action=='SliceDisplayUpdate'){
             let datadisplayupdate=JSON.parse(redata.paramJson);
             let datadisplayupdate=JSON.parse(redata.paramJson);
             console.log(datadisplayupdate)
             console.log(datadisplayupdate)
@@ -752,7 +759,6 @@ let params = {
         }catch(error){
         }catch(error){
           this.loadingend(this.loadingopen());
           this.loadingend(this.loadingopen());
           return false;
           return false;
-
         }
         }
       },
       },
       websocketsend(Data){//数据发送
       websocketsend(Data){//数据发送
@@ -763,7 +769,7 @@ let params = {
             type: "error",
             type: "error",
             message: "websock断开连接",
             message: "websock断开连接",
           });
           });
-        
+           this.loadingend(this.loadingopen());
       
       
       },
       },