Merge branch 'mhy' into 'master'

Mhy

See merge request !28

xichongSys/src/views/Core/KtTable.vue

@@ -15,7 +15,7 @@
           <kt-button icon="fa fa-edit" :label="$t('action.edit')" :perms="permsEdit" :size="size" @click="handleEdit(scope.$index, scope.row)" style="float: left"/>
           <el-switch
             class="statusSwitch"
-            style="display: block"
+            style="display: block;float: left;margin-left: 20px;width: 50px"
             v-model="scope.row.status==0?true:false"
             active-color="#13ce66"
             inactive-color="#ff4949"
@@ -173,25 +173,29 @@ export default {
 }
 </script>
 
-<style scoped>
+<style>
   .statusSwitch .el-switch__label {
     position: absolute;
     display: none;
     color: #fff;
   }
-  /*打开时文字位置设置*/
   .statusSwitch .el-switch__label--right {
     z-index: 2;
-    left: 92px;
+    left: 0px;
     bottom: 0px;
-    color: #000;
   }
-  /*关闭时文字位置设置*/
   .statusSwitch .el-switch__label--left {
     z-index: 2;
-    right: 22px;
+    right: 0px;
     bottom: 0px;
-    color: #fff;
+  }
+  .statusSwitch .el-switch__label--right.is-active{
+    z-index: 1111;
+    color: #000 !important;
+  }
+  .statusSwitch .el-switch__label--left.is-active{
+    z-index: 1111;
+    color: #fff !important;
   }
   /*显示文字*/
   .statusSwitch .el-switch__label.is-active {