Merge branch 'joke' into 'master'

杭州-故障列表页面样式优化，同时调整故障报告页面查询span圆角

杭州-故障列表页面样式优化，同时调整故障报告页面查询span圆角

See merge request !229

@@ -3,7 +3,7 @@
         <el-col :span="6">
         <el-col :span="6">
             <div class="search-input margin-30 flex-div-start">
             <div class="search-input margin-30 flex-div-start">
                 <el-input v-model="input" placeholder="故障诊断" class="fault-book-input-text" />
                 <el-input v-model="input" placeholder="故障诊断" class="fault-book-input-text" />
-                <span class="search-text">搜索</span>
+                <span class="search-text" style="border-radius: 4px">搜索</span>
             </div>
             </div>
 
 
         </el-col>
         </el-col>

 <div class="container" :style="{'height':height+'px','max-height':height+'px'}">
 <div class="container" :style="{'height':height+'px','max-height':height+'px'}">
     <div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}">
     <div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}">
         <div class="search">
         <div class="search">
-            <div class="condition">
+            <div class="condition fault-book-input-text" style="width: 250px">
                 <el-form-item>
                 <el-form-item>
                     <el-input v-model="searchForm.keyword" placeholder="输入关键字"
                     <el-input v-model="searchForm.keyword" placeholder="输入关键字"
-                              @keydown.enter.native="getPage"></el-input>
+                              @keydown.enter.native="getPage" class="fault-book-input-text"></el-input>
                 </el-form-item>
                 </el-form-item>
                 <!--<el-form-item>
                 <!--<el-form-item>
                     <el-select v-model="searchForm.category" placeholder="故障分类">
                     <el-select v-model="searchForm.category" placeholder="故障分类">
@@ -13,7 +13,7 @@
                     </el-select>
                     </el-select>
                 </el-form-item>-->
                 </el-form-item>-->
             </div>
             </div>
-            <div class="btns">
+            <div class="btns" style="justify-content: left;padding-left: 0px">
                 <el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="getPage">搜索</el-button>
                     <el-button type="primary" @click="getPage">搜索</el-button>
                 </el-form-item>
                 </el-form-item>