Merge branch 'mergeBranch' into nextUpdateNext

src/components/normal-basic-layout/details/modules/task/index.vue

@@ -13,7 +13,9 @@
       </div>
       <div class="task_list__panel" v-for="item in list" :key="item.sys_taskid">
         <div class="flex-align-center flex-between">
-          <p class="task_title" @click="taskDetail(item)"><b>{{item.title}}</b></p>
+          <el-tooltip class="item" effect="dark" :content="item.title" placement="top-start">
+            <p class="task_title" @click="taskDetail(item)"><b>{{item.title}}</b></p>
+          </el-tooltip>
           <small>{{item.status}}</small>
           <small>{{item.starttime.split(' ')[0]}}</small>
         </div>
@@ -76,7 +78,7 @@
     margin-bottom: 0 !important;
   }
   .task_title{
-    width: 200px;
+    width: 160px;
     overflow: hidden;
     text-overflow:ellipsis;
     white-space: nowrap;

src/views/message/index.vue

@@ -20,7 +20,7 @@
           </div>
           <el-row style="margin-top: 10px">
             <el-col :span="14" >
-              <div style="margin-left: 14px">
+              <div style="margin-left: 16px;font-size: 14px">
                 总计：{{total}}
               </div>
             </el-col>