Browse Source

Merge branch 'master' of http://192.168.50.233:3000/rui.jiang/performance-test

rui.jiang 1 year ago
parent
commit
f901ee90d8
4 changed files with 7 additions and 3 deletions
  1. 4 0
      src/components/HeaderCom.vue
  2. 1 1
      src/styles/global.scss
  3. 1 1
      src/themes/blue.scss
  4. 1 1
      src/themes/green.scss

+ 4 - 0
src/components/HeaderCom.vue

@@ -41,6 +41,7 @@
               >
                 <span style="float: left">{{ item.lable }}</span>
                 <el-color-picker
+                  disabled
                   v-model="item.color"
                   size="mini"
                   style="float: right"
@@ -190,4 +191,7 @@ export default {
 .el-divider--horizontal {
   margin: 5px 0;
 }
+::v-deep .el-color-picker__mask {
+  background-color: rgba(255, 255, 255, 0) !important;
+}
 </style>

+ 1 - 1
src/styles/global.scss

@@ -13,7 +13,7 @@
 }
 
 .el-table th.el-table__cell {
-  background-color: var(--background-color) !important;
+  background-color: var(--background-color);
   color: var(--text-color);
 }
 .el-pager li.active {

+ 1 - 1
src/themes/blue.scss

@@ -1,5 +1,5 @@
 $primary-color: #409eff;
-$background-color: #ffffff;
+$background-color: #409eff;
 $text-color: #ffffff;
 
 :root {

+ 1 - 1
src/themes/green.scss

@@ -1,5 +1,5 @@
 $primary-color: #008080;
-$background-color: #ffffff;
+$background-color: #008080;
 $text-color: #ffffff;
 
 :root {