Merge remote-tracking branch 'origin/master'

src/components/ImageUpload/imgUploadForBanner.vue

@@ -54,7 +54,7 @@
             <div class="parent-container">
               <img
                 class="inner_style"
-                :src="baseURL+'/tmt-pic/business/888cc34012a64d40a0cec2974c9b7943-jiazaishibai.png'"
+                :src="baseURL+'/tmt-pic/pet-pc/888cc34012a64d40a0cec2974c9b7943-jiazaishibai.png'"
                 alt="加载失败"
               >
               <div>加载失败</div>

src/components/ImageUpload/index.vue

@@ -54,7 +54,7 @@
             <div class="parent-container">
               <img
                 class="inner_style"
-                :src="baseURL+'/tmt-pic/business/888cc34012a64d40a0cec2974c9b7943-jiazaishibai.png'"
+                :src="baseURL+'/tmt-pic/pet-pc/888cc34012a64d40a0cec2974c9b7943-jiazaishibai.png'"
                 alt="加载失败"
               >
               <div>加载失败</div>

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

@@ -127,10 +127,9 @@
         <el-table-column label="权重" min-width="55" prop="articleWeight" show-overflow-tooltip />
         <el-table-column
           label="创建日期"
-          min-width="80"
           prop="articleCreateTime"
           show-overflow-tooltip
-          width="180"
+          min-width="120"
         >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.articleCreateTime, '{y}/{m}/{d}') }}</span>
@@ -143,7 +142,7 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column class-name="small-padding fixed-width" label="操作" width="205">
+        <el-table-column class-name="small-padding fixed-width" label="操作" min-width="160px">
           <template slot-scope="scope">
             <div style="display: flex;">
               <div style="padding-right: 10px;">
@@ -166,7 +165,7 @@
                   type="primary"
                   @click="handleUpdate(scope.row)"
                 >
-                  <svg-icon icon-class="liebiao_icon_bianji" style="font-size: 11px;vertical-align: top;" />
+                  <svg-icon icon-class="liebiao_icon_bianji" style="font-size: 0.7rem;margin-top: 0;margin-right: -3px;vertical-align: top" />
                   编辑
                 </el-button>
               </div>

src/views/banner_management/banner_management.vue

@@ -85,19 +85,19 @@
           </template>
         </el-table-column>
         <el-table-column label="标题" prop="title" show-overflow-tooltip />
-        <el-table-column label="轮播图" prop="img" show-overflow-tooltip width="100px">
+        <el-table-column label="轮播图" prop="img" show-overflow-tooltip min-width="60px">
           <template slot-scope="scope">
             {{ scope.row.img ? '已上传':'未上传' }}
           </template>
         </el-table-column>
-        <el-table-column label="跳转地址" prop="url" show-overflow-tooltip>
+        <el-table-column label="跳转地址" prop="url" show-overflow-tooltip min-width="80px">
           <template slot-scope="scope">
             <span>{{ scope.row.url || '-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="权重" prop="sort" width="80" />
-        <el-table-column label="创建日期" prop="createTime" width="120" />
-        <el-table-column label="状态" prop="status" width="100">
+        <el-table-column label="权重" prop="sort" min-width="40px" />
+        <el-table-column label="创建日期" prop="createTime" min-width="120px" />
+        <el-table-column label="状态" prop="status" min-width="80px">
           <template slot-scope="scope">
             <span :style="scope.row.status === '1' ? 'color: #67C23A' : 'color: #f5aa6c'">
               {{ scope.row.status === '1' ? '• 已上架':'• 已下架' }}</span>
@@ -128,7 +128,7 @@
                   type="primary"
                   @click="handleUpdate(scope.row)"
                 >
-                  <svg-icon icon-class="liebiao_icon_bianji" style="font-size: 11px;vertical-align: top;margin-right: 2px" />编辑
+                  <svg-icon icon-class="liebiao_icon_bianji" style="font-size: 0.7rem;margin-top: 0;margin-right: 2px;vertical-align: top" />编辑
                 </el-button>
               </div>
               <div v-if="scope.row.status==='2'">

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

@@ -516,9 +516,9 @@ export default {
     handleSortChange(column) {
       console.log('更换排序', column)
       // 查询字段是表格中字段名字
-      if (column.prop.orderByColumn === 'hospitalName' ||
-        column.prop.orderByColumn === 'hospitalAddress' ||
-        column.prop.orderByColumn === 'contactPerson') {
+      if (column.prop === 'hospitalName' ||
+        column.prop === 'hospitalAddress' ||
+        column.prop === 'contactPerson') {
         this.queryParams.orderByColumn = column.prop + 'Sort'
       } else {
         this.queryParams.orderByColumn = column.prop