Merge remote-tracking branch 'origin/master'

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

@@ -6,7 +6,7 @@
           <span class="topTitleText">新增</span>
         </div>
         <div style="width: 100%">
-          <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+          <el-form ref="form" :model="form" :rules="rules" label-width="7.82rem">
               <div class="title-paragraph">
                 <span class="title-text">基本信息</span>
               </div>

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

@@ -6,7 +6,7 @@
           <div class="topTitle">
             <span class="topTitleText">详情</span>
           </div>
-          <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+          <el-form ref="form" :model="form" :rules="rules" label-width="7.82rem">
             <div class="title-paragraph">
               <div class="title-text">
                 基本信息
@@ -341,7 +341,7 @@
           <div class="topTitle">
             <span class="topTitleText">编辑</span>
           </div>
-          <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+          <el-form ref="form" :model="form" :rules="rules" label-width="7.82rem">
 
             <div class="title-paragraph">
               <div class="title-text">

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

@@ -156,11 +156,11 @@
           <span>{{ scope.row.phone || "-" }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="设备类型" align="left" prop="deviceType" min-width="100"  show-overflow-tooltip>
+      <el-table-column label="设备类型" align="left" prop="deviceType" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
           <span v-if="scope.row.deviceType=== null||scope.row.deviceType=== '' ">{{ "-" }}</span>
           <span v-else>
-            <dict-tag :options="dict.type.device_type" :value="scope.row.deviceType " />
+            <span>{{ selectDictLabel(dict.type.device_type,scope.row.deviceType) }}</span>
           </span>
         </template>
       </el-table-column>
@@ -278,7 +278,7 @@
 import { regionData } from 'element-china-area-data'
 import { listDevice, delDevice } from '@/api/business/device'
 import { getInfo } from '@/api/login'
-import { parseTime } from '@/utils/ruoyi'
+import { parseTime, selectDictLabel } from '@/utils/ruoyi'
 import { mapGetters } from 'vuex'
 import { listItem } from '@/api/business/item'
 import { signHospitalMessage } from '@/api/business/hospital'
@@ -370,6 +370,7 @@ export default {
         }
 
       ],
+      dictdata: '设备类型超长字符测试啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊',
       // 预约方式
       options: [{
         value: '1',
@@ -509,6 +510,7 @@ export default {
     this.getUserInfo()
   },
   methods: {
+    selectDictLabel,
     // 获取登陆人信息
     getUserInfo() {
       getInfo().then(res => {