diff --git a/src/components/message.vue b/src/components/message.vue index 9f548931..b386cc3a 100644 --- a/src/components/message.vue +++ b/src/components/message.vue @@ -387,7 +387,7 @@ export default { // height: 200px; // border-radius: 3px; box-shadow: 0 4px 6px 0px #606e9a; - z-index: 2; + z-index: 99; background-color: #343d5f; ul { margin: 8px 15px; diff --git a/src/router/index.js b/src/router/index.js index 9b2a3d93..bce8a48e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2754,6 +2754,13 @@ const routes2 = [{ component: () => import ("@/views/projectFront/carViolation/warningList.vue"), }, + // 违章再教育 + { + path: "/project/carViolation/violationReeducation", + name: "车辆违规管理_违章再教育", + component: () => + import ("@/views/projectFront/carViolation/violationReeducation.vue"), + }, { path: "/project/aiAnalysis/warningList", name: "AI预警中心_预警列表", diff --git a/src/views/projectFront/guidancePartyBuilding/organizationalBuild.vue b/src/views/projectFront/guidancePartyBuilding/organizationalBuild.vue index 653ded04..cb9c8721 100644 --- a/src/views/projectFront/guidancePartyBuilding/organizationalBuild.vue +++ b/src/views/projectFront/guidancePartyBuilding/organizationalBuild.vue @@ -615,11 +615,6 @@ export default { workerInfo: {}, } }, - watch: { - classificationName(val) { - this.$refs.tree.filter(val) - } - }, created() { this.projectSn = this.$store.state.projectSn; this.projectInfo = isJSON(localStorage.getItem("projectInfo")) ? JSON.parse(localStorage.getItem("projectInfo")) : {}; @@ -651,7 +646,17 @@ export default { getOrganizationConstructionTreeApi(data).then((res) => { if (res.code == 200) { if (res.result.length > 0) { - this.listData = res.result + if (this.classificationName) { + this.listData = res.result; + this.getCheckedNode(this.listData[0]); + } else { + this.listData = [{ + id: "", + children: [], + classificationName: "全部", + }, ...res.result]; + this.getCheckedNode(this.listData[0]); + } } else { this.listData = [] } @@ -681,6 +686,7 @@ export default { }, //左边节点 输入筛选 filterNode(value, data) { + console.log(value, data); if (!value) return true return data.classificationName.indexOf(value) !== -1 }, @@ -1050,6 +1056,9 @@ export default { this.getWorkerInfo(); }, // immediate: true + }, + classificationName(val) { + this.$refs.tree.filter(val) } }, computed: { diff --git a/src/views/projectFront/quality/qualityProblems/qualityProblemBank.vue b/src/views/projectFront/quality/qualityProblems/qualityProblemBank.vue index 3bb89eb8..ef955c67 100644 --- a/src/views/projectFront/quality/qualityProblems/qualityProblemBank.vue +++ b/src/views/projectFront/quality/qualityProblems/qualityProblemBank.vue @@ -288,7 +288,17 @@ export default { getQualityCommonProblemLibraryTreeApi(data).then((res) => { if (res.code == 200) { if (res.result.length > 0) { - this.listData = res.result + if (this.qualityCommonProblemName) { + this.listData = res.result; + this.getCheckedNode(this.listData[0]); + } else { + this.listData = [{ + id: "", + children: [], + qualityCommonProblemName: "全部", + }, ...res.result]; + this.getCheckedNode(this.listData[0]); + } } else { this.listData = [] }