Merge remote-tracking branch 'origin/master'

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

@@ -14,7 +14,7 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="设备名称" prop="deviceName">
-                  <el-input v-model.trim="form.deviceName" placeholder="请输入设备名称" style="width: 250px" maxlength="20"/>
+                  <el-input v-model.trim="form.deviceName" placeholder="请输入设备名称" class="inputWidth" maxlength="20"/>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -106,11 +106,11 @@
                     :min="0"
                     :max="20"
                     controls-position="right"
-                    style="width: 220px"
+                    class="inputNumber_Width"
                     @blur="handleuseNum"
                     @keydown.native="keydown($event)"
                   />
-                  <span style="margin-left: 15px">{{ "次" }}</span>
+                  <span class="text">{{ "次" }}</span>
                 </el-form-item>
               </el-col>
 
@@ -230,7 +230,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="设备状态" prop="status">
-                  <el-select v-model="form.status" placeholder="请选择设备状态" style="width: 250px">
+                  <el-select v-model="form.status" placeholder="请选择设备状态"  class="inputWidth">
                     <el-option
                       v-for="dict in dict.type.device_status"
                       :key="dict.value"
@@ -251,7 +251,7 @@
                       type="textarea"
                       placeholder="请输入备注（2~200字）"
                       maxlength="200"
-                      style="width:705%;"
+                     class="remark_with"
                       :rows="4"
                     />
                   </el-form-item>
@@ -860,10 +860,19 @@ export default {
    background: #f6fcf5;
  }
 .address{
-  width: 570px;
+  width: 520px;
 }
 .inputWidth{
-  width: 250px;
+  width: 300px;
+}
+.inputNumber_Width{
+  width: 270px;
+}
+.text{
+  margin-left: 10px;
+}
+.remark_with{
+  width: 1360px;
 }
 ::v-deep.el-input-number.is-without-controls .el-input__inner {
   //width: 100px;

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

@@ -96,7 +96,7 @@
                     placeholder="暂无数据"
                     maxlength="40"
                     clearable
-                    style="width: 263%"
+                    class="address"
                     disabled
                   />
                 </el-form-item>
@@ -111,9 +111,9 @@
                     disabled
                     placeholder="暂无数据"
                     controls-position="right"
-                    style="width: 220px"
+                    class="inputNumber_Width"
                   />
-                  <span style="margin-left: 15px">{{ "次" }}</span>
+                  <span class="text">{{ "次" }}</span>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -254,7 +254,7 @@
                       type="textarea"
                       placeholder="暂无数据"
                       maxlength="200"
-                      style="width:705%;"
+                      class="remark_with"
                       :rows="4"
                     />
                   </el-form-item>
@@ -268,7 +268,7 @@
                   <el-input
                     v-model.trim="form.serviceAreaText"
                     type="textarea"
-                    style="width:705%;;"
+                    class="remark_with"
                     :row="4"
                     disabled
                   />
@@ -282,7 +282,7 @@
                   <el-input
                     v-model.trim="form.checkTypeText"
                     type="textarea"
-                    style="width:705%;"
+                    class="remark_with"
                     pacehpl
                     :row="4"
                     placeholder="暂无数据"
@@ -295,7 +295,7 @@
           <div class="title-paragraph">
             <div style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;">使用信息</div>
           </div>
-          <el-table :data="useList" :header-cell-style="{ background:'#E8E9E8'}" border>
+          <el-table :data="useList" :header-cell-style="{ background:'#F4F4F4'}" border>
             <el-table-column label="检查项目" align="center" prop="checkItemsName" show-overflow-tooltip />
             <el-table-column label="宠物昵称" align="center" prop="petNickname" show-overflow-tooltip />
             <el-table-column label="宠主姓名" align="center" prop="nickname" show-overflow-tooltip />
@@ -408,7 +408,7 @@
                     placeholder="请输入详细地址地址(街道、楼牌号等)"
                     maxlength="40"
                     clearable
-                    style="width: 263%"
+                    class="address"
                   />
                 </el-form-item>
               </el-col>
@@ -419,11 +419,11 @@
                     :min="0"
                     :max="20"
                     controls-position="right"
-                    style="width: 220px"
+                    class="inputNumber_Width"
                     @blur="handleuseNum"
                     @keydown.native="keydown($event)"
                   />
-                  <span style="margin-left: 15px">{{ "次" }}</span>
+                  <span class="text">{{ "次" }}</span>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -561,7 +561,7 @@
                       type="textarea"
                       placeholder="请输入备注（2~200字）"
                       maxlength="200"
-                      style="width:705%;"
+                      class="remark_with"
                       :rows="4"
                     />
                   </el-form-item>
@@ -1236,6 +1236,21 @@ export default {
   line-height: 50px;
   padding-left: 45px;
 }
+.address{
+  width: 520px;
+}
+.inputWidth{
+  width: 300px;
+}
+.inputNumber_Width{
+  width: 270px;
+}
+.text{
+  margin-left: 10px;
+}
+.remark_with{
+  width: 1360px;
+}
 
 /*表格内容选中后的样式*/
 ::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td .el-table__cell {

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

@@ -128,7 +128,7 @@
       </el-col>
     </el-row>
 
-    <el-table ref="table" v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#E8E9E8'}" :row-key="getRowKeys" @selection-change="handleSelectionChange">
+    <el-table ref="table" v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#F4F4F4'}" :row-key="getRowKeys" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="47" align="center" :reserve-selection="true" />
       <el-table-column type="index" label="序号" width="50" />
       <el-table-column label="设备名称" align="left" prop="deviceName" show-overflow-tooltip />