Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/index.js

src/views/equipment-management/equipment-management/equipment-detail.vue

@@ -39,12 +39,12 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="负责人" >
-                  <el-input v-model="form.head" placeholder="请输入负责人名称" disabled style="width: 250px" />
+                  <el-input v-model="form.head" placeholder="暂无数据" disabled style="width: 250px" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="手机号" >
-                  <el-input v-model="form.phone" placeholder="请输入手机号" disabled style="width: 250px" />
+                  <el-input v-model="form.phone" placeholder="暂无数据" disabled style="width: 250px" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -233,7 +233,7 @@
                       v-model.trim="form.remark"
                       disabled
                       type="textarea"
-                      placeholder="请输入备注"
+                      placeholder="-"
                       maxlength="200"
                       style="width:1050px;"
                       :rows="4"