Merge branches 'master' and 'master' of git.mes123.com:zhouyx/mes-ui

pages/basicData/calendar/class/index.vue

@@ -172,13 +172,13 @@ export default {
     }
   },
   created(){
-    this.tableHeight = window.innerHeight - 220
+    this.tableHeight = window.innerHeight - 230
   },
   mounted() {
     window.onresize = () => {///浏览器窗口大小变化
         return (() => {
           window.screenHeight = window.innerHeight
-          this.tableHeight = window.screenHeight - 220
+          this.tableHeight = window.screenHeight - 230
         })()
       }
   },

pages/basicData/calendar/holiday/index.vue

@@ -171,14 +171,14 @@ export default {
     }
   },
   created(){
-    this.tableHeight = window.innerHeight - 220
+    this.tableHeight = window.innerHeight - 230
   },
   mounted() {
     // console.log(this)
     window.onresize = () => {///浏览器窗口大小变化
         return (() => {
           window.screenHeight = window.innerHeight
-          this.tableHeight = window.screenHeight - 220
+          this.tableHeight = window.screenHeight - 230
         })()
       }
   },

pages/basicData/calendar/overtime/index.vue

@@ -196,14 +196,14 @@ export default {
   },
   created() {
     this.getWeekTypeListFn()
-    this.tableHeight = window.innerHeight - 220
+    this.tableHeight = window.innerHeight - 230
   },
   mounted() {
     window.onresize = () => {
       ///浏览器窗口大小变化
       return (() => {
         window.screenHeight = window.innerHeight
-        this.tableHeight = window.screenHeight - 220
+        this.tableHeight = window.screenHeight - 230
       })()
     }
   },

pages/basicData/calendar/work/index.vue

@@ -69,7 +69,7 @@ export default {
       deletelMore: false,
       curId: 0,
       columns: [
-        { type: 'selection', width: 70, align: 'center'},
+        // { type: 'selection', width: 70, align: 'center'},
         { key: 'id', title: this.l('id'), hide: true, align: 'left' },
         {
           key: 'creationTime',
@@ -184,13 +184,13 @@ export default {
     }
   },
   created(){
-    this.tableHeight = window.innerHeight - 220
+    this.tableHeight = window.innerHeight - 230
   },
   mounted() {
     window.onresize = () => {///浏览器窗口大小变化
         return (() => {
           window.screenHeight = window.innerHeight
-          this.tableHeight = window.screenHeight - 220
+          this.tableHeight = window.screenHeight - 230
         })()
       }
   },