wangpeng
/
integrated_traffic_vue
forked from integrated_whb/integrated_whb_vue
1
0
Fork 0
Code Pull Requests Activity

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

dev
xiepeng 2024-04-18 17:50:38 +08:00
parent a0780144ca 2be771dd52
commit 6e324752fe
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/assets/css/common.scss
View File

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

2
src/assets/css/element.scss
View File

@ -6,7 +6,7 @@
--el-text-color-regular: #fff !important; --el-text-color-regular: #fff !important;
--el-fill-color-light: #0e1d44 !important; //hover背景色 --el-fill-color-light: #0e1d44 !important; //hover背景色
--el-color-check: #14affe !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-input-bg-color: #081435 !important;
--el-fill-color-blank: #081435 !important; // 背景色 --el-fill-color-blank: #081435 !important; // 背景色
--el-border-color-lighter: var(--el-border-color) !important; --el-border-color-lighter: var(--el-border-color) !important;

6
src/components/learning_train_type/index.vue
View File

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