Merge branch 'master' of http://49.233.37.222:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

ruoyi-ui/src/views/login.vue

@@ -285,6 +285,7 @@ export default {
   color: #fff;
   font-size: 20px;
   font-weight: 500;
+  cursor: pointer;
 }
 .aaa {
   width: 248px;

ruoyi-ui/src/views/tableMange/index.vue

@@ -446,6 +446,7 @@ import {
   getInfoBySqlKey,
   addTableData,
 } from "@/api/tablelist/commonTable";
+import { getDicts } from "@/api/system/dict/data";
 import {
   getFormName,
   getListName,
@@ -765,7 +766,12 @@ export default {
         databaseType: this.databaseType,
       };
       let res = await getFormName(data);
-      this.tableList = res.data;
+
+      const baseTable = await this.getDicts('base_table')
+
+      this.tableList = res.data.filter(item => {
+        return !baseTable.data.some(value => value.dictValue.toLowerCase() == item.tableName.toLowerCase())
+      })
     },
     //处理表格行拖拽
     initDragTable() {