合并分支 'thy' 到 'master'

src/components/reportAssess/reportAssess.vue

@@ -33,13 +33,13 @@
                             <div class="snack">
                                 <el-row :gutter="24" style="padding:15px 0" >
                                     <el-col :span="8">
-                                        <div>系统名称：<span>{{this.sysName}}</span> </div>
+                                        <div><span style="float:left;line-height: 40px;">系统名称：</span><span class="nmmsl" style="overflow:hidden; float:lfet;">{{this.sysName}}</span> </div>
                                     </el-col>
 
                                     <el-col :span="8">
                                         <div>
                                             语言：
-                                            <span>
+                                            <span class="nmmsl">
                                             {{ this.language === 1?
                                                 'java' : this.language === 2 ?
                                             'js' : this.language  === 3 ?
@@ -55,20 +55,20 @@
                                     </el-col>
 
                                     <el-col :span="8">
-                                        <div>适配预算：<span>{{sumAmount1}} <i style="color:#333;">万</i></span>  </div>
+                                        <div>适配预算：<span class="nmmsl">{{sumAmount1}} <i style="color:#333;">万</i></span>  </div>
                                     </el-col>
 
                                 </el-row>
                                 <el-row :gutter="24" style="padding-bottom: 15px;">
                                     <el-col :span="8">
                                         <div>
-                                            难度系数：<span>{{ this.difficulty === -1 ? this.difficulty = '-': this.difficulty}}</span>
+                                            难度系数：<span class="nmmsl">{{ this.difficulty === -1 ? this.difficulty = '-': this.difficulty}}</span>
                                         </div>
                                     </el-col>
                                     <el-col :span="8">
                                         <div>
                                             架构：
-                                            <span >
+                                            <span  class="nmmsl">
                                             <!--{{this.framework}}-->
 
                                            {{    this.framework === 1 ?
@@ -79,12 +79,12 @@
                                         </div>
                                     </el-col>
                                     <el-col :span="8">
-                                        <div>评估时间：<span>{{timeFilter(this.time)}}</span> </div>
+                                        <div>评估时间：<span class="nmmsl">{{timeFilter(this.time)}}</span> </div>
                                     </el-col>
                                 </el-row>
                                 <el-row>
                                     <el-col :span="8">
-                                        <div style="padding-left:35px;"> 建议：<span >
+                                        <div style="padding-left:35px;"> 建议：<span  class="nmmsl">
                                             {{ this.type === 1 ?
                                             '修改' : (this.type === 2 && this.language ===1 &&this.framework ===1) ? '修改': '重构' }}
                                         </span>
@@ -1415,7 +1415,10 @@ export default {
     .snack div {
         color: #666;
     }
-    .snack div span {
+      .snack div .nmsl{
+          float: left;
+      }
+    .snack div .nmmsl {
         color: #333;
 
         display: inline-block;