解决冲突

shanXiPlatform/src/views/facilitiesEquipment/equipmentManagement/deviceManagement/steps.vue

@@ -247,6 +247,7 @@
       </div>
     </div>
   </div>
+  </div>
 </template>
 <script>
 //时间格式的转化
@@ -1232,7 +1233,7 @@ export default {
       display: inline-block;
     }
     .tf_title_right {
-      display: inline-block;
+      // display: inline-block;
       float: right;
     }
     // .el-steps {