Merge remote-tracking branch 'origin/master'

src/components/InputTips/InputTips.vue

@@ -2,8 +2,8 @@
   <el-tooltip :content="text" placement="top-start" :disabled="tipDisabled">
     <el-input
       v-model="text"
-      readonly="true"
-      disabled="true"
+      readonly
+      disabled
       :style="{width: width}"
       @mouseover.native="inputOnMouseOver($event)"
     />

src/components/imageCropper/index.vue

@@ -16,9 +16,11 @@
         :auto-crop-height="autoCropHeight"
         :auto-crop="true"
         :fixed="false"
-        :fixed-box="false"
+        :fixed-box="true"
         :output-size="1"
         output-type="png"
+        :centerBox="true"
+        :canScale="true"
       />
       <template #footer>
         <span class="dialog-footer">

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

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