Merge remote-tracking branch 'origin/master'

src/components/belt_diagnosis/failure_pre/albox.vue

@@ -1,8 +1,9 @@
 <template>
   <div class="class1">
 
-  <el-select v-model="value" placeholder="请选择算法">
-    <el-option
+  <el-select v-model="value"  placeholder="请选择算法">
+    <el-option 
+        class="class2"
         v-for="item in options"
         :key="item.value"
         :label="item.label"
@@ -39,6 +40,14 @@ export default {
 <style scoped>
 .class1{
   column-rule-color: #13a0ec;
+  /* font-size: 18px; */
+
+}
+.class2{
+  column-rule-color: #f5e50d;
+  font-size: 18px;
+
+  /* font-size: 18px; */
 
 }
 

src/components/belt_diagnosis/failure_pre/index.vue

@@ -3,7 +3,15 @@
 
   <div class="title">故障预测</div>
  
-  <div class="title1">以下是各个故障发生的可能性       <albox style="margin-left: 400px;color: #021722"></albox> </div>
+  <div class="contour"> 
+    <span>
+     <el-button style="margin-left: -160px;">阈值设置</el-button>
+    </span>
+    <span><albox style="margin-left: 80px;color: #021722"></albox> 
+    </span>
+      
+    
+        </div>
  
    <div class="contour">
    <span> <PieChart :value="data.paopian" title="跑偏" size="180px" :totalValue="100" :fakeData="false"></PieChart></span>
@@ -127,9 +135,11 @@ export default {
   flex-flow: row wrap;
   height: 100%;
   widows: 100%;
+  margin-top: 30px;
   span {
     // float: left;
     // margin: 35px;
+   
     margin-bottom: -30px;
     color: #4adefe;
     display: flex;