Merge remote-tracking branch 'origin/master'

src/views/system/role.vue

@@ -1,6 +1,6 @@
 <!--  -->
 <template>
-    <div class="hc-layout-box">
+    <div class="hc-layout-box role-page">
         <hc-card :scrollbar="false" action-size="lg">
             <template #header>
                 <el-button color="#20C98B" type="primary" @click="addClick">
@@ -233,4 +233,10 @@ const data = [
     height: 100%;
     width: 100%;
 }
+</style>
+
+<style>
+.role-page .el-table {
+   color:black
+}
 </style>

src/views/system/user.vue

@@ -1,6 +1,6 @@
 <!--  -->
 <template>
-    <div class="hc-layout-box">
+    <div class="hc-layout-box user-page">
         <hc-card :scrollbar="false" action-size="lg">
             <template #header>
                 <el-button color="#20C98B" type="primary" @click="addClick">
@@ -21,6 +21,13 @@
                     <span class="text-white">导出</span>
                 </el-button>
             </template>
+            <template #extra>
+                <el-input v-model="searchForm.queryValue" placeholder="请输入" clearable />
+                <el-button color=" #4b4b4b" type="primary" class="ml-2">
+                    <hc-icon name="search" class="text-white" />
+                    <span class="text-white">搜索</span>
+                </el-button>
+            </template>
             <hc-table 
                 is-check
                 :column="tableColumn"
@@ -188,4 +195,10 @@ const roleOptions = ref([ {
     height: 100%;
     width: 100%;
 }
+</style>
+
+<style>
+.user-page .el-table {
+   color:black
+}
 </style>