bug修改

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

@@ -139,19 +139,19 @@
       @select-all="selectChange"
     >
       <el-table-column type="selection" width="47" align="center" />
-      <el-table-column align="left" label="序号" min-width="60" show-overflow-tooltip prop="index">
+      <el-table-column align="left" label="序号" min-width="40" show-overflow-tooltip prop="index">
         <template slot-scope="scope">
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="设备名称" align="left" prop="deviceName" show-overflow-tooltip />
-      <el-table-column label="设备ID" align="left" prop="deviceCode" show-overflow-tooltip />
+      <el-table-column label="设备名称" align="left" min-width="120" prop="deviceName" show-overflow-tooltip />
+      <el-table-column label="设备ID" align="left" min-width="80" prop="deviceCode" show-overflow-tooltip />
       <el-table-column label="负责人" align="left" prop="head" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.head || "-" }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="手机号" align="left" prop="phone" show-overflow-tooltip>
+      <el-table-column label="手机号" min-width="100" align="left" prop="phone" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.phone || "-" }}</span>
         </template>
@@ -164,20 +164,20 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column v-if=" userType=== '00'" label="平台自有设备" align="left" prop="isPrivate">
+      <el-table-column v-if=" userType=== '00'" label="平台自有设备" min-width="100" align="left" prop="isPrivate">
         <template slot-scope="scope">
           <span v-if="scope.row.isPrivate === '0'">是</span>
           <span v-else-if="scope.row.isPrivate === '1'">否</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="userType=== '3'" label="医院自有设备" align="left" prop="isPrivate">
+      <el-table-column v-if="userType=== '3'" label="医院自有设备" min-width="100" align="left" prop="isPrivate">
         <template slot-scope="scope">
           <span v-if="scope.row.isPrivate === '1'">是</span>
           <span v-else-if="scope.row.isPrivate === '0'">否</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="服务地点" align="left" show-overflow-tooltip>
+      <el-table-column label="服务地点" min-width="120" align="left" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.addressText + scope.row.address || "-" }}</span>
         </template>
@@ -224,7 +224,7 @@
         </template>
 
       </el-table-column>
-      <el-table-column label="操作" align="left" min-width="150" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" min-width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             v-hasPermi="['business:device:edit']"

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

 <template>
   <div>
-    <div style="background-color: #fff;height: 100%;margin-top: 20px;">
-      <div style=" text-align: center;padding-top: 35px;height: 100px;">
+    <div style="background-color: #fff;height: 100%;">
+      <div style=" text-align: center;padding-top: 35px;height: 90px;">
         <span style="font-size: 24px;font-weight: bold; color: #333333;line-height: 20px;">详情</span>
       </div>
-      <div style="display: flex; padding-left: 20px;padding-bottom: 10px;">
-        <div class="tip1" />
-        <div style="padding-top: 3px;padding-left: 15px;font-size: 16px;font-weight: bold;color: #333333;">当前设备信息</div>
+      <div style=" display: flex;position: relative;left: 32px;padding-bottom: 20px;">
+        <div class="title-paragraph">
+          <span class="title-text">当前设备信息</span>
+        </div>
+
       </div>
       <div style="width: 90%">
-        <el-form :model="form" label-width="150px">
+        <el-form :model="form" label-width="105px">
+
           <el-row>
             <el-col :span="8">
               <el-form-item label="设备名称" prop="deviceName">
@@ -17,7 +20,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="设备ID" prop="ruleId">
+              <el-form-item label="设备ID" prop="ruleId" abel-width="150px">
                 <el-input v-model="form.deviceCode" :disabled="true" placeholder="-" />
               </el-form-item>
             </el-col>
@@ -159,9 +162,12 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <div style=" display: flex;position: relative;left: 20px;padding-bottom: 20px;">
-            <div class="tip1" />
-            <div style="padding-top: 3px;padding-left: 15px;font-size: 16px;font-weight: bold;color: #333333;">宠物信息</div>
+          <div style=" display: flex;position: relative;left: 32px;padding-bottom: 20px;">
+            <div class="title-paragraphTwo">
+              <span class="title-text">宠物信息</span>
+            </div>
+            <!--            <div class="tip1" />-->
+            <!--            <div style="padding-top: 3px;padding-left: 15px;font-size: 16px;font-weight: bold;color: #333333;">宠物信息</div>-->
           </div>
           <el-row>
             <el-col :span="8">
@@ -258,9 +264,12 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <div style="display: flex;position: relative;left: 20px;padding-bottom: 20px;">
-            <div class="tip1" />
-            <div style="padding-top: 3px;padding-left: 15px;font-size: 16px;font-weight: bold;color: #333333;">宠主信息</div>
+          <div style=" display: flex;position: relative;left: 32px;padding-bottom: 20px;">
+            <div class="title-paragraphTwo">
+              <span class="title-text">宠主信息</span>
+            </div>
+            <!--            <div class="tip1" />-->
+            <!--            <div style="padding-top: 3px;padding-left: 15px;font-size: 16px;font-weight: bold;color: #333333;">宠主信息</div>-->
           </div>
           <el-row>
             <el-col :span="8">
@@ -280,9 +289,12 @@
             </el-col>
           </el-row>
 
-          <div style="display: flex;position: relative;left: 20px;padding-bottom: 20px;">
-            <div class="tip1" />
-            <div style="padding-top: 3px;padding-left: 15px;font-size: 16px;font-weight: bold;color: #333333;">设备使用信息</div>
+          <div style=" display: flex;position: relative;left: 32px;padding-bottom: 20px;">
+            <div class="title-paragraphTwo">
+              <span class="title-text">设备使用信息</span>
+            </div>
+            <!--            <div class="tip1" />-->
+            <!--            <div style="padding-top: 3px;padding-left: 15px;font-size: 16px;font-weight: bold;color: #333333;">设备使用信息</div>-->
           </div>
           <el-row>
             <el-col :span="8">
@@ -320,12 +332,14 @@
                 <el-input v-model="checkTime" :disabled="true" placeholder="-" />
               </el-form-item>
             </el-col>
+            <el-col class="sbuButton">
+              <el-button icon="el-icon-back" class="resetBtn" @click="cancel">返 回</el-button>
+            </el-col>
           </el-row>
+
         </el-form>
       </div>
-      <div style="padding-left: 150px;width: 90%;padding-bottom: 20px;">
-        <el-button icon="el-icon-back" class="resetBtn" @click="cancel">返 回</el-button>
-      </div>
+
     </div>
   </div>
 </template>
@@ -567,10 +581,27 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 ::v-deep.app-container {
 
 }
+.title-paragraph {
+  margin-bottom: 20px;
+  border-left: 5px solid #5FB54B;
+
+  .title-text {
+    margin-left: 10px;
+  }
+}
+.title-paragraphTwo {
+  margin-top: 30px;
+  margin-bottom: 20px;
+  border-left: 5px solid #5FB54B;
+
+  .title-text {
+    margin-left: 10px;
+  }
+}
 
 .half__-5px {
   width: calc(50% - 5px) !important;
@@ -588,4 +619,10 @@ export default {
 ::v-deep.el-select {
   width: 100% !important;
 }
+.sbuButton{
+  display: flex;
+  justify-content: left;
+  margin: 30px 0 50px 32px
+
+}
 </style>

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

@@ -90,42 +90,42 @@
 
     <el-table ref="table" v-loading="loading" :data="userList" :row-key="getRowKeys" :header-cell-style="{background:'#F4F4F4'}" @selection-change="handleSelectionChange">
       <el-table-column type="selection" min-width="50" align="center" :reserve-selection="true" />
-      <el-table-column align="left" label="序号" min-width="60" show-overflow-tooltip prop="index" >
+      <el-table-column align="left" label="序号" min-width="30" show-overflow-tooltip prop="index">
         <template slot-scope="scope">
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="设备名称" align="left" prop="deviceName" min-width="80" :show-overflow-tooltip="true">
+      <el-table-column label="设备名称" align="left" prop="deviceName" min-width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ scope.row.deviceName || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="设备ID" align="left" prop="deviceCode" min-width="80" :show-overflow-tooltip="true">
+      <el-table-column label="设备ID" align="left" prop="deviceCode" min-width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ scope.row.deviceCode || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="检查项目" align="left" prop="checkItemsName" min-width="80" :show-overflow-tooltip="true">
+      <el-table-column label="检查项目" align="left" prop="checkItemsName" min-width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ scope.row.checkItemsName || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="宠物昵称" align="left" prop="petNickname" min-width="80" :show-overflow-tooltip="true">
+      <el-table-column label="宠物昵称" align="left" prop="petNickname" min-width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ scope.row.petNickname || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="宠物保险" align="left" prop="insure" min-width="80" :show-overflow-tooltip="true">
+      <el-table-column label="宠物保险" align="left" prop="insure" min-width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" />
         </template>
       </el-table-column>
-      <el-table-column label="宠主姓名" align="left" prop="ownerNikename" :show-overflow-tooltip="true">
+      <el-table-column label="宠主姓名" align="left" prop="ownerNikename" min-width="120" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ scope.row.ownerNickname || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="宠主手机号" align="left" prop="phoneNumber">
+      <el-table-column label="宠主手机号" align="left" min-width="120" prop="phoneNumber">
         <template slot-scope="scope">
           <span>{{ scope.row.ownerPhone || '-' }}</span>
         </template>
@@ -161,7 +161,7 @@
           >{{ showStatus(scope.row.status) || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" min-width="150">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" min-width="120">
         <template slot-scope="scope">
           <el-button
             v-hasPermi="['business:use:query']"