Merge remote-tracking branch 'origin/dev' into dev

src/assets/css/common.scss

@@ -127,10 +127,9 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 .layout-container {
-  background-color: #11214e;
+  background-color: #051a55;
   min-height: 100vh;
-  //background-image: url("/src/assets/images/public/bg.jpg");
-  //background-repeat: no-repeat;
+
 }
 
 a {

src/assets/css/element.scss

@@ -6,7 +6,7 @@
   --el-text-color-regular: #fff !important;
   --el-fill-color-light: #0e1d44 !important; //hover背景色
   --el-color-check: #14affe !important; //hover、选中 文字颜色
-  --el-aside-bg-color: #1d3065 !important;
+  --el-aside-bg-color: #08277e !important;
   --el-input-bg-color: #081435 !important;
   --el-fill-color-blank: #081435 !important; // 背景色
   --el-border-color-lighter: var(--el-border-color) !important;

src/components/learning_train_type/index.vue

@@ -93,16 +93,16 @@ const getCurrentNode = () => {
   if (props.type !== "industryType") {
     if (data.value.length === 0) return {};
     for (let i = 0; i < data.value.length; i++) {
-      if (data.value[i][keys[props.type]] === props.modelValue) {
+      if (data.value[i][keys[props.type]] === modelValue.value) {
         return data.value[i];
       }
     }
   }
   return treeSelectRef.value.getCurrentNode();
 };
-const getNode = (value = getCurrentNode()) => {
+const getNode = () => {
   if (props.type !== "industryType") return "";
-  return treeSelectRef.value.getNode(getCurrentNode(value));
+  return treeSelectRef.value.getNode(getCurrentNode() || modelValue.value);
 };
 const getIndustryTypeCurrentCheckAll = () => {
   const name = [];