Merge remote-tracking branch 'origin/master'

gassafety-web/src/views/workOrder/detail/index.vue

@@ -81,7 +81,7 @@
             </el-form-item>
             <el-form-item label="设备名称:" prop="deviceName" style="margin-bottom: 0px;">
               <font v-if="form.orderType != 1">{{form.deviceName}}</font>
-              <el-tree :data="deviceOptions" :props="defaultProps" :expand-on-click-node="false" ref="tree"
+              <el-tree style="margin-top: 5px;margin-left: 70px;" :data="deviceOptions" :props="defaultProps" :expand-on-click-node="false" ref="tree"
                 @node-click="handleNodeClick" v-if="form.orderType == 1" />
             </el-form-item>
             <el-form-item label="设备位置:" v-if="form.orderType != 1" style="margin-bottom: 0px;">
@@ -650,11 +650,6 @@
     padding: 5px 20px 20px 20px;
   }
 
-  .el-tree {
-    margin-top: 5px;
-    margin-left: 70px;
-  }
-
   .avatar-uploader {
     width: 25%;
     float: left;