Merge remote-tracking branch 'origin/master'

src/assets/styles/element-ui.scss

@@ -629,3 +629,32 @@ input::-webkit-input-placeholder {
 .el-table {
   cursor: pointer;
 }
+.el-loading-mask.is-fullscreen{
+  .el-loading-spinner .circular {
+    display: none;
+  }
+  .el-loading-spinner i{
+    display: none;
+
+  }
+  .el-loading-spinner {
+    width: 56px;
+    height: 56px;
+    top: 50%;
+    left: 50%;
+    transform: translate(-28px, -28px);
+    background: url("../images/loading.png");
+    background-size: 100% 100%;
+    animation: loading-rotate 2s linear infinite;
+    @keyframes loading-rotate {
+      0% {
+        transform: rotate(0deg);
+
+      }
+      100% {
+        transform: rotate(360deg);
+
+      }
+    }
+  }
+}

src/components/ImagePreview/index.vue

@@ -70,7 +70,7 @@ export default {
 .el-image {
   border-radius: 5px;
   background-color: #ebeef5;
-  box-shadow: 0 0 5px 1px #ccc;
+  //box-shadow: 0 0 5px 1px #ccc;
   ::v-deep .el-image__inner {
     transition: all 0.3s;
     cursor: pointer;

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

@@ -2,12 +2,12 @@
   <!--  文章详情页-->
   <div class="pet-owner-detail">
       <!--   头部标题-->
-      <div style="padding-top:30px;text-align: center;">
+      <div class="topTitle">
         <span
           class="top-title-style"
         >详情</span>
       </div>
-      <div style="padding: 30px 20px 20px 20px;">
+      <div class="box-card">
         <div style="display: flex">
           <!--  文章信息 -->
           <div class="tip-green" />
@@ -25,7 +25,6 @@
               :rules="rules"
               label-width="6.8rem"
               label-position="right"
-              style="padding-left: 13px"
             >
               <el-form-item label="文章标题" prop="articleTitle" style="padding-top: 32px">
                 <el-input v-model="form.articleTitle" disabled placeholder="暂无数据" />
@@ -58,13 +57,17 @@
                   </div>
                 </div>
               </el-form-item>
-              <el-form-item label="文章内容" prop="articleCover">
-                <!--   0-- 文章信息的页面--文章封面 -->
-                <editor v-model="form.articleContent" read-only />
-              </el-form-item>
-              <el-form-item label="" prop="">
-                <el-button class="resetBtn" icon="el-icon-back" @click="goBack">返 回</el-button>
-              </el-form-item>
+              <div class="lastRow">
+                <el-form-item label="文章内容" prop="articleCover">
+                  <!--   0-- 文章信息的页面--文章封面 -->
+                  <editor v-model="form.articleContent" read-only />
+                </el-form-item>
+              </div>
+              <div class="lastRow footerButton">
+                <el-form-item label="" prop="">
+                  <el-button class="resetBtn" icon="el-icon-back" @click="goBack">返 回</el-button>
+                </el-form-item>
+              </div>
             </el-form>
           </div>
         </div>
@@ -178,9 +181,12 @@ export default {
 <style lang="scss" scoped>
 //整个页面整体布局
 .pet-owner-detail {
+  min-height: calc(100vh - 100px);
   //最外层嵌套卡片的样式
   .box-card {
-    min-height: calc(100vh - 100px);
+    //padding: 30px 20px 20px 20px;
+    padding-left: 32px;
+    padding-right: 32px;
   }
   background-color: #fff;
   //模块tip样式--绿色
@@ -271,4 +277,17 @@ export default {
 ::v-deep .ql-snow {
   border-color: #e5e5e5 !important;
 }
+.topTitle {
+  padding-top: 30px;
+  padding-bottom: 30px;
+  text-align: center;
+}
+.lastRow {
+  ::v-deep .el-form-item {
+    margin-bottom: 0;
+  }
+}
+.footerButton {
+  margin-top: 30px;
+}
 </style>

src/views/article-management/article-edit.vue

@@ -2,12 +2,12 @@
   <!--  文章详情页-->
   <div class="pet-owner-detail">
       <!--   头部标题-->
-      <div style="padding-top:30px;text-align: center;">
+    <div class="topTitle">
         <span
           class="top-title-style"
         >编辑</span>
-      </div>
-      <div style="padding: 30px 20px 20px 20px;">
+    </div>
+    <div class="box-card">
         <div style="display: flex">
           <!--   0-- 文章信息--标签头 -->
           <div class="tip-green" />
@@ -46,21 +46,25 @@
                   </div>
                 </div>
               </el-form-item>
-              <el-form-item label="文章内容" prop="articleContent">
-                <editor v-model="form.articleContent" min-height="200" />
-              </el-form-item>
-              <el-form-item>
-                <div>
-                  <el-button class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
-                  <BackBtn
-                    :button-class="'resetBtn'"
-                    :button-icon="'el-icon-back'"
-                    :click-action="goBack"
-                    button-text="返回"
-                    is-show-confirm="true"
-                  />
-                </div>
-              </el-form-item>
+              <div class="lastRow">
+                <el-form-item label="文章内容" prop="articleContent">
+                  <editor v-model="form.articleContent" min-height="200" />
+                </el-form-item>
+              </div>
+              <div class="lastRow footerButton">
+                <el-form-item>
+                  <div>
+                    <el-button class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
+                    <BackBtn
+                      :button-class="'resetBtn'"
+                      :button-icon="'el-icon-back'"
+                      :click-action="goBack"
+                      button-text="返回"
+                      is-show-confirm="true"
+                    />
+                  </div>
+                </el-form-item>
+              </div>
             </el-form>
           </div>
         </div>
@@ -253,9 +257,12 @@ export default {
 <style lang="scss" scoped>
 //整个页面整体布局
 .pet-owner-detail {
+  min-height: calc(100vh - 100px);
   //最外层嵌套卡片的样式
   .box-card {
-    //margin: 20px 20px 20px 20px;
+    //padding: 30px 20px 20px 20px;
+    padding-left: 32px;
+    padding-right: 32px;
   }
   background-color: #ffffff;
   //模块tip样式--绿色
@@ -299,9 +306,8 @@ export default {
     color: #666666;
     //display: grid !important;
     //grid-template-columns: repeat(3, auto);
-    margin-top: 20px;
+    margin-top: 30px;
     margin-bottom: 20px;
-    margin-left: 13px;
   }
 
   //表格内容选中后的样式-all
@@ -335,4 +341,17 @@ export default {
 ::v-deep .ql-snow {
   border-color: #e5e5e5 !important;
 }
+.topTitle {
+  padding-top: 30px;
+  padding-bottom: 30px;
+  text-align: center;
+}
+.lastRow {
+  ::v-deep .el-form-item {
+    margin-bottom: 0;
+  }
+}
+.footerButton {
+  margin-top: 30px;
+}
 </style>

src/views/article-management/article-insert.vue

@@ -2,12 +2,12 @@
   <!--  文章详情页-->
   <div class="pet-owner-detail">
       <!--   头部标题-->
-      <div style="padding-top:30px;text-align: center;">
+      <div class="topTitle">
         <span
           class="top-title-style"
         >新增</span>
       </div>
-      <div style="padding: 30px 20px 20px 20px;">
+      <div class="box-card">
         <div style="display: flex">
           <!--   0-- 文章信息--标签头 -->
           <div class="tip-green" />
@@ -50,25 +50,29 @@
                   </div>
                 </div>
               </el-form-item>
-              <el-form-item label="文章内容" prop="articleContent">
-                <editor
-                  v-model.trim="form.articleContent"
-                  min-height="200"
-                  @change="changeQuillEditor('articleContent')"
-                />
-              </el-form-item>
-              <el-form-item>
-                <div>
-                  <el-button :loading="submitLoading" class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
-                  <BackBtn
-                    :button-class="'resetBtn'"
-                    :button-icon="'el-icon-back'"
-                    :click-action="goBack"
-                    button-text="返回"
-                    is-show-confirm="true"
+              <div class="lastRow">
+                <el-form-item label="文章内容" prop="articleContent">
+                  <editor
+                    v-model.trim="form.articleContent"
+                    min-height="200"
+                    @change="changeQuillEditor('articleContent')"
                   />
-                </div>
-              </el-form-item>
+                </el-form-item>
+              </div>
+              <div class="lastRow footerButton">
+                <el-form-item>
+                  <div>
+                    <el-button :loading="submitLoading" class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
+                    <BackBtn
+                      :button-class="'resetBtn'"
+                      :button-icon="'el-icon-back'"
+                      :click-action="goBack"
+                      button-text="返回"
+                      is-show-confirm="true"
+                    />
+                  </div>
+                </el-form-item>
+              </div>
             </el-form>
           </div>
         </div>
@@ -226,7 +230,9 @@ export default {
   background-color: #ffffff;
   //最外层嵌套卡片的样式
   .box-card {
-    //margin: 20px 20px 20px 20px;
+    //padding: 30px 20px 20px 20px;
+    padding-left: 32px;
+    padding-right: 32px;
   }
 
   //模块tip样式--绿色
@@ -260,11 +266,8 @@ export default {
   //1--基本信息--模块内信息整体样式
   .base-msg {
     color: #666666;
-    //display: grid !important;
-    //grid-template-columns: repeat(3, auto);
-    margin-top: 20px;
+    margin-top: 30px;
     margin-bottom: 20px;
-    margin-left: 13px;
   }
 
   //表格内容选中后的样式-all
@@ -306,6 +309,11 @@ export default {
   font-weight: bold;
   color: #333333;
 }
+.topTitle {
+  padding-top: 30px;
+  padding-bottom: 30px;
+  text-align: center;
+}
 .dialog-footer{
   margin-bottom: 20px;
   margin-top: 60px;
@@ -313,4 +321,12 @@ export default {
 ::v-deep .ql-snow {
   border-color: #e5e5e5 !important;
 }
+.lastRow {
+  ::v-deep .el-form-item {
+    margin-bottom: 0;
+  }
+}
+.footerButton {
+  margin-top: 30px;
+}
 </style>

src/views/data-statistics/echars-components/china-map-bigger.vue

@@ -31,7 +31,7 @@ export default {
           text: _this.title,
           left: 'left',
           textStyle: {
-            fontSize: 12,
+            fontSize: 14,
             fontFamily: 'Microsoft YaHei',
             fontWeight: 'bold',
             color: '#333333'

src/views/data-statistics/echars-components/china-map.vue

@@ -31,7 +31,7 @@ export default {
           text: _this.title,
           left: 'left',
           textStyle: {
-            fontSize: 12,
+            fontSize: 14,
             fontFamily: 'Microsoft YaHei',
             fontWeight: 'bold',
             color: '#333333'

src/views/data-statistics/echars-components/columnarChart.vue

@@ -31,7 +31,7 @@ export default {
           left: 'left',
           text: _this.title,
           textStyle: {
-            fontSize: 12,
+            fontSize: 14,
             fontFamily: 'Microsoft YaHei',
             fontWeight: 'bold',
             color: '#333333'

src/views/data-statistics/echars-components/crosswiseColumnarChart.vue

@@ -28,7 +28,7 @@ export default {
           left: 'left',
           text: _this.title,
           textStyle: {
-            fontSize: 12,
+            fontSize: 14,
             fontFamily: 'Microsoft YaHei',
             fontWeight: 'bold',
             color: '#333333'

src/views/data-statistics/echars-components/crosswiseColumnarChartOneLine.vue

@@ -28,7 +28,7 @@ export default {
           left: 'left',
           text: _this.title,
           textStyle: {
-            fontSize: 12,
+            fontSize: 14,
             fontFamily: 'Microsoft YaHei',
             fontWeight: 'bold',
             color: '#333333'

src/views/data-statistics/echars-components/oneLineChart.vue

@@ -39,7 +39,7 @@ export default {
           left: 'left',
           text: '诊治次数统计',
           textStyle: {
-            fontSize: 12,
+            fontSize: 14,
             fontFamily: 'Microsoft YaHei',
             fontWeight: 'bold',
             color: '#333333'

src/views/data-statistics/echars-components/radar-chart-for-hospital.vue

@@ -31,7 +31,7 @@ export default {
           left: 'left',
           text: '医院评级分布',
           textStyle: {
-            fontSize: 12,
+            fontSize: 14,
             fontFamily: 'Microsoft YaHei',
             fontWeight: 'bold',
             color: '#333333'

src/views/data-statistics/echars-components/radar-chart-for-petowner-hospital.vue

@@ -25,7 +25,7 @@ export default {
           left: 'left',
           text: '宠主宠物数量分析',
           textStyle: {
-            fontSize: 12,
+            fontSize: 14,
             fontFamily: 'Microsoft YaHei',
             fontWeight: 'bold',
             color: '#333333'

src/views/data-statistics/echars-components/radar-chart-for-petowner-platfrom.vue

@@ -27,7 +27,7 @@ export default {
           left: 'left',
           text: '宠主年消费额分析',
           textStyle: {
-            fontSize: 12,
+            fontSize: 14,
             fontFamily: 'Microsoft YaHei',
             fontWeight: 'bold',
             color: '#333333'

src/views/data-statistics/echars-components/radar-chart-one-line-bigger.vue

@@ -25,7 +25,7 @@ export default {
           left: 'left',
           text: _this.title,
           textStyle: {
-            fontSize: 12,
+            fontSize: 14,
             fontFamily: 'Microsoft YaHei',
             fontWeight: 'bold',
             color: '#333333'

src/views/data-statistics/echars-components/radar-chart-one-linel.vue

@@ -26,7 +26,7 @@ export default {
           left: 'left',
           text: _this.title,
           textStyle: {
-            fontSize: 12,
+            fontSize: 14,
             fontFamily: 'Microsoft YaHei',
             fontWeight: 'bold',
             color: '#333333'

src/views/data-statistics/echars-components/twoLineChart.vue

@@ -65,7 +65,7 @@ export default {
           left: 'left',
           text: _this.title,
           textStyle: {
-            fontSize: 12,
+            fontSize: 14,
             fontFamily: 'Microsoft YaHei',
             fontWeight: 'bold',
             color: '#333333'

src/views/data-statistics/echars-components/twoLineChartYNoUnit.vue

@@ -70,7 +70,7 @@ export default {
           left: 'left',
           text: _this.title,
           textStyle: {
-            fontSize: 12,
+            fontSize: 14,
             fontFamily: 'Microsoft YaHei',
             fontWeight: 'bold',
             color: '#333333'

src/views/data-statistics/hospital-data-statistics/hospital-data-statistics.vue

@@ -74,7 +74,7 @@
             当前有效状态医院占比
           </div>
           <div class="youxiao_percent">
-            <el-progress type="circle" :percentage="hospitalPercentInfo ? hospitalPercentInfo.effectivePercent:0" width="90" stroke-width="9" />
+            <el-progress type="circle" :percentage="hospitalPercentInfo ? hospitalPercentInfo.effectivePercent:0" width="100" stroke-width="9" />
             <progressColor style="width: 0;height: 0;" />
           </div>
         </div>
@@ -85,7 +85,7 @@
             当前长期授权医院占比
           </div>
           <div class="changqi_percent">
-            <el-progress type="circle" :percentage="hospitalPercentInfo ? hospitalPercentInfo.longtimePercent:0" width="90" stroke-width="9" />
+            <el-progress type="circle" :percentage="hospitalPercentInfo ? hospitalPercentInfo.longtimePercent:0" width="100" stroke-width="9" />
             <progressColor style="width: 0;height: 0;" />
           </div>
         </div>
@@ -96,7 +96,7 @@
             当前预储值医院占比
           </div>
           <div class="yuchuzhi_percent">
-            <el-progress type="circle" :percentage="hospitalPercentInfo ? hospitalPercentInfo.prestoredPercent:0" width="90" stroke-width="9" />
+            <el-progress type="circle" :percentage="hospitalPercentInfo ? hospitalPercentInfo.prestoredPercent:0" width="100" stroke-width="9" />
             <progressColor style="width: 0;height: 0;" />
           </div>
         </div>
@@ -111,7 +111,7 @@
       </el-col>
       <el-col :span="8">
         <div class="cardDiv">
-          <div class="cardTitle" style="margin-bottom: 29px">
+          <div class="cardTitle">
             医院累计预储值排行
           </div>
           <div class="rankInnerDiv">
@@ -146,7 +146,7 @@
       </el-col>
       <el-col :span="4">
         <div class="cardDiv">
-          <div class="cardTitle" style="margin-bottom: 29px">
+          <div class="cardTitle">
             医院入驻时间排行
           </div>
           <div class="rankInnerDiv">
@@ -247,7 +247,7 @@
     </el-row>
     <el-row class="row2">
       <el-col :span="24">
-        <div class="cardDiv">
+        <div class="cardDiv tableDiv">
           <div class="cardTitle">
             医院授权到期信息
           </div>
@@ -257,7 +257,7 @@
             :data="hospitalList"
             @sort-change="handleSortChange"
           >
-            <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>
@@ -304,7 +304,7 @@
                 <span :style="showStatus(scope.row.authorizationExpirationDate) === '• 过期' ? 'color: #F8CA96' : 'color: #67C23A'">{{ showStatus(scope.row.authorizationExpirationDate) || '-' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -565,7 +565,7 @@ export default {
   text-align: center;
   //padding-bottom: 10px;
   .cardTitle {
-    margin-bottom: 10px;
+    margin-bottom: 20px;
   }
 }
 .cardDiv {
@@ -847,6 +847,7 @@ export default {
   margin-bottom: 24px;
 }
 .rankInnerDiv {
+  margin-top: 44px;
   //height: 389px;
 }
 .emptyDiv {
@@ -893,4 +894,7 @@ export default {
     }
   }
 }
+.tableDiv {
+  padding-bottom: 50px;
+}
 </style>

src/views/data-statistics/other-components/emptyTool.vue

@@ -8,7 +8,7 @@
         <div>
           <img src="../../../assets/data_statistics/guahao_img_wushuju.png">
         </div>
-        <div>暂无数据</div>
+        <div class="emptyText">暂无数据</div>
       </div>
     </div>
   </div>
@@ -48,4 +48,7 @@ export default {
   color: #AFAFAF;
   display:flex;
 }
+.emptyText {
+  margin-top: 10px;
+}
 </style>

src/views/data-statistics/other-components/percentTool.vue

@@ -4,7 +4,7 @@
       <div class="noRotateProgress">
         <el-progress
           type="circle"
-          width="110"
+          width="100"
           :percentage="percentReal"
           :stroke-width="strokeWidth"
           :format="formatPercent"
@@ -17,7 +17,7 @@
         <el-progress
           style="transform: rotateY(180deg);"
           type="circle"
-          width="110"
+          width="100"
           :percentage="percentReal"
           :stroke-width="strokeWidth"
           :format="formatPercent"

src/views/data-statistics/other-components/progress-color.vue

@@ -56,16 +56,6 @@
 
 <script>
 export default {
-  // props: {
-  //   startColor: {
-  //     type: String,
-  //     default: 'rgb(2, 0, 255)'
-  //   },
-  //   endColor: {
-  //     type: String,
-  //     default: 'rgb(0, 200, 255)'
-  //   }
-  // },
   name: 'ProgressColor'
 }
 </script>

src/views/data-statistics/pet-data-statistics/pet-data-statistics.vue

@@ -75,7 +75,7 @@
               活跃客户占比
             </div>
             <div class="activeUser_percent">
-              <el-progress type="circle" :percentage="customerStatistics.activeCustomers" width="90" stroke-width="9" />
+              <el-progress type="circle" :percentage="customerStatistics.activeCustomers" width="100" stroke-width="9" />
               <progressColor style="width: 0;height: 0;" />
             </div>
           </div>
@@ -86,7 +86,7 @@
               会员客户占比
             </div>
             <div class="vip_percent">
-              <el-progress type="circle" :percentage="customerStatistics.memberCustomers" width="90" stroke-width="9" />
+              <el-progress type="circle" :percentage="customerStatistics.memberCustomers" width="100" stroke-width="9" />
               <progressColor style="width: 0;height: 0;" />
             </div>
           </div>
@@ -97,7 +97,7 @@
               复购客户占比
             </div>
             <div class="repurchase_percent">
-              <el-progress type="circle" :percentage="customerStatistics.repurchaseCustomers" width="90" stroke-width="9" />
+              <el-progress type="circle" :percentage="customerStatistics.repurchaseCustomers" width="100" stroke-width="9" />
               <progressColor style="width: 0;height: 0;" />
             </div>
           </div>
@@ -118,7 +118,7 @@
         </el-col>
         <el-col :span="8">
           <div class="cardDiv">
-            <div v-if="petOwnerConsumeRank.length > 0" class="cardTitle" style="margin-bottom: 29px">
+            <div v-if="petOwnerConsumeRank.length > 0" class="cardTitle">
               宠主累计消费排行
             </div>
             <div v-if="petOwnerConsumeRank.length > 0" class="rankInnerDiv">
@@ -146,7 +146,7 @@
         </el-col>
         <el-col :span="4">
           <div class="cardDiv">
-            <div v-if="petOwnerTimeRank.length > 0" class="cardTitle" style="margin-bottom: 29px">
+            <div v-if="petOwnerTimeRank.length > 0" class="cardTitle">
               宠主注册天数排行
             </div>
             <div v-if="petOwnerTimeRank.length > 0" class="rankInnerDiv">
@@ -231,7 +231,7 @@
       </el-row>
       <el-row class="row2">
         <el-col :span="24">
-          <div class="cardDiv">
+          <div class="cardDiv tableDiv">
             <div class="cardTitle">
               宠主注册信息
             </div>
@@ -385,7 +385,7 @@
               会员客户占比
             </div>
             <div class="activeUser_percent">
-              <el-progress type="circle" :percentage="parseInt(customerStatistics.memberCustomers || 0)" width="90" stroke-width="9" />
+              <el-progress type="circle" :percentage="parseInt(customerStatistics.memberCustomers || 0)" width="100" stroke-width="9" />
               <progressColor style="width: 0;height: 0;" />
             </div>
           </div>
@@ -396,7 +396,7 @@
               复购客户占比
             </div>
             <div class="vip_percent">
-              <el-progress type="circle" :percentage="parseInt(customerStatistics.repurchaseCustomers || 0)" width="90" stroke-width="9" />
+              <el-progress type="circle" :percentage="parseInt(customerStatistics.repurchaseCustomers || 0)" width="100" stroke-width="9" />
               <progressColor style="width: 0;height: 0;" />
             </div>
           </div>
@@ -407,7 +407,7 @@
               续费会员占比
             </div>
             <div class="repurchase_percent">
-              <el-progress type="circle" :percentage="parseInt(customerStatistics.renewalCustomers || 0)" width="90" stroke-width="9" />
+              <el-progress type="circle" :percentage="parseInt(customerStatistics.renewalCustomers || 0)" width="100" stroke-width="9" />
               <progressColor style="width: 0;height: 0;" />
             </div>
           </div>
@@ -529,13 +529,13 @@
       </el-row>
       <el-row class="row2">
         <el-col :span="24">
-          <div class="cardDiv">
+          <div class="cardDiv tableDiv">
             <div class="cardTitle">
               会员卡余额信息
             </div>
             <el-divider class="dividerLine" />
             <el-table ref="balanceList" :data="balanceList" style="width: 100%" @sort-change="balanceSortChange">
-              <el-table-column align="left" label="序号" min-width="60" show-overflow-tooltip prop="index">
+              <el-table-column align="left" label="序号" min-width="30px" show-overflow-tooltip prop="index">
                 <template slot-scope="scope">
                   <span>{{ scope.$index + 1 }}</span>
                 </template>
@@ -887,7 +887,7 @@ export default {
   height: 181px;
   text-align: center;
   .cardTitle {
-    margin-bottom: 10px;
+    margin-bottom: 20px;
   }
 }
 .cardTitle {
@@ -1198,7 +1198,7 @@ export default {
   margin-bottom: 24px;
 }
 .rankInnerDiv {
-   //height: 389px;
+  margin-top: 44px;
  }
 
 .crosswiseNull {
@@ -1255,4 +1255,7 @@ export default {
     }
   }
 }
+.tableDiv {
+  padding-bottom: 50px;
+}
 </style>

src/views/data-statistics/service-statistics/service-statistics.vue

@@ -119,7 +119,7 @@
       <el-row :gutter="24" class="row2 autoRow3_3">
         <el-col :span="6">
           <div class="cardDiv">
-            <div v-if="orderRank.length > 0" class="cardTitle" style="margin-bottom: 29px">
+            <div v-if="orderRank.length > 0" class="cardTitle">
               平台服务项目预约次数排行
             </div>
             <div v-if="orderRank.length > 0" class="rankInnerDiv">
@@ -149,7 +149,7 @@
         </el-col>
         <el-col :span="6">
           <div class="cardDiv">
-            <div v-if="deviceRank.length > 0" class="cardTitle" style="margin-bottom: 29px">
+            <div v-if="deviceRank.length > 0" class="cardTitle">
               平台服务设备服务次数排行
             </div>
             <div v-if="deviceRank.length > 0" class="rankInnerDiv">
@@ -214,7 +214,7 @@
       </el-row>
       <el-row class="row2">
         <el-col :span="24">
-          <div class="cardDiv">
+          <div class="cardDiv tableDiv">
             <div class="cardTitle">
               服务项目预约记录
             </div>
@@ -622,7 +622,7 @@
             </div>
             <el-divider class="dividerLine" />
             <el-table class="tableClass" :data="checkProjectRank">
-              <el-table-column label="排名" min-width="60px" align="center" show-overflow-tooltip type="index">
+              <el-table-column label="排名" min-width="60px" align="left" show-overflow-tooltip type="index">
                 <template slot-scope="scope">
                   <div v-if="scope.$index + 1 <= 3">
                     <img v-if="scope.$index + 1 === 1" src="../../../assets/data_statistics/caiwu_icon_paiming1.png" height="24" width="24">
@@ -691,13 +691,13 @@
       </el-row>
       <el-row :gutter="24" class="row2">
         <el-col :span="24">
-          <div class="cardDiv">
+          <div class="cardDiv tableDiv">
             <div class="cardTitle">
               病历记录
             </div>
             <el-divider class="dividerLine" />
             <el-table :data="recordTableData" style="width: 100%">
-              <el-table-column align="left" min-label="序号" width="60" show-overflow-tooltip prop="index">
+              <el-table-column align="left" label="序号" min-width="40px" show-overflow-tooltip prop="index">
                 <template slot-scope="scope">
                   <span>{{ scope.$index + 1 }}</span>
                 </template>
@@ -1451,7 +1451,7 @@ export default {
   color: #6db45d !important;
 }
 .rankInnerDiv {
-  //height: 389px;
+  margin-top: 44px;
 }
 .tableClass {
   //::v-deep .el-table__cell {
@@ -1498,4 +1498,7 @@ export default {
     }
   }
 }
+.tableDiv {
+  padding-bottom: 50px;
+}
 </style>

src/views/document-management/about-us/about-us.vue

@@ -20,7 +20,7 @@
     </el-form>
     <el-row v-show="isEdit">
       <el-col style="display: flex;justify-content: left;margin: 8px 0 0 148px">
-        <el-button class="queryBtn" @click="submit">提 交</el-button>
+        <el-button icon="el-icon-check" class="queryBtn" @click="submit">提 交</el-button>
       </el-col>
     </el-row>
   </div>

src/views/document-management/privacy-policy/privacy-policy.vue

@@ -20,7 +20,7 @@
     </el-form>
     <el-row v-show="isEdit">
       <el-col style="display: flex;justify-content: left;margin: 8px 0 0 148px">
-        <el-button class="queryBtn" @click="submit">提 交</el-button>
+        <el-button icon="el-icon-check" class="queryBtn" @click="submit">提 交</el-button>
       </el-col>
     </el-row>
   </div>

src/views/document-management/user-protocol/user-protocol.vue

@@ -20,7 +20,7 @@
     </el-form>
     <el-row v-show="isEdit">
       <el-col style="display: flex;justify-content: left;margin: 8px 0 0 148px">
-        <el-button class="queryBtn" @click="submit">提 交</el-button>
+        <el-button icon="el-icon-check" class="queryBtn" @click="submit">提 交</el-button>
       </el-col>
     </el-row>
   </div>

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']"

src/views/medical-record-management/medical-edit.vue

@@ -564,7 +564,7 @@ color: #333333;"
                         v-model.trim="scope.row.recipelNum"
                         controls-position="right"
                         :min="0"
-                        :max="10"
+                        :max="9999"
                         placeholder="-"
                       />
                       <span class="unit-text plus">{{ scope.row.normsUnit }}</span>
@@ -1550,7 +1550,7 @@ export default {
         ],
         recipelNum: [
           { required: true, message: '请输入处方数量', trigger: 'blur' },
-          { pattern: /^[1-9]\d*$/, message: '仅支持正整数', trigger: 'blur' }
+          { pattern: /^[1-9]\d*$/, message: '处方数量仅支持正整数', trigger: 'blur' }
         ],
         remark: [
           { required: true, message: '请输入用法', trigger: 'blur' }

src/views/medical-record-management/medical-record-management.vue

@@ -41,9 +41,9 @@
             >
               <el-option
                 v-for="item in doctorNameList"
-                :key="item.doctorId"
+                :key="item.ruleId"
                 :label="item.doctorName"
-                :value="item.doctorName"
+                :value="item.ruleId"
               />
             </el-select>
           </el-form-item>