diff --git a/src/components/menuTree/index.vue b/src/components/menuTree/index.vue
new file mode 100644
index 0000000..648e2f8
--- /dev/null
+++ b/src/components/menuTree/index.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
diff --git a/src/setting.js b/src/setting.js
index 8e8af79..3427890 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -12,7 +12,7 @@ if (isDev) {
host = 'http://121.37.12.51/'
// host = 'https://huorantech.cn/'
host = 'http://192.168.31.151:9000/'// 榕
- // host = 'http://192.168.31.137:9000/'// 赓
+ host = 'http://192.168.31.137:9000/'// 赓
} else if (isPro) {
jumpPath = 'https://www.huorantech.cn/judgmentPoint/'
}
diff --git a/src/store/index.js b/src/store/index.js
index 0755484..5b67a2b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -24,7 +24,8 @@ const store = new Vuex.Store({
customerPage: 1,
matchPage: 1,
platformSource: 0,
- columnId: ''
+ columnId: '',
+ tabId: '1'
},
actions: {
setSystemId({ state,commit },systemId) {
@@ -95,6 +96,9 @@ const store = new Vuex.Store({
setColumnId: (state, columnId) => {
state.columnId = columnId
},
+ setInfoTab: (state, tabId) => {
+ state.tabId = tabId
+ },
}
});
diff --git a/src/utils/api.js b/src/utils/api.js
index e1f9848..6b7e8bb 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -148,18 +148,20 @@ export default {
// 理论课程
- delTheoreticalCourse: `occupationlab/theoreticalCourse/batchDeletion`,
- findTheoreticalCourse: `occupationlab/theoreticalCourse/findById`,
- listTheoreticalCourse: `occupationlab/theoreticalCourse/pageConditionalQueryCourse`,
- saveTheoreticalCourse: `occupationlab/theoreticalCourse/save`,
- updateTheoreticalCourse: `occupationlab/theoreticalCourse/update`,
+ delTheoreticalCourse: `occupationlab/occupationlab/theoreticalCourse/batchDeletion`,
+ findTheoreticalCourse: `occupationlab/occupationlab/theoreticalCourse/findById`,
+ listTheoreticalCourse: `occupationlab/occupationlab/theoreticalCourse/pageConditionalQueryCourse`,
+ saveTheoreticalCourse: `occupationlab/occupationlab/theoreticalCourse/save`,
+ updateTheoreticalCourse: `occupationlab/occupationlab/theoreticalCourse/update`,
+ disabledTheoreticalCourse: `occupationlab/occupationlab/theoreticalCourse/disabledEvents`,
+ checkRepeatTheoreticalCourse: `occupationlab/occupationlab/theoreticalCourse/checkRepeat`,
// 理论课程分类管理
- checkRepeatClassification: `occupationlab/theoreticalCourseClassification/checkRepeat`,
- delClassification: `occupationlab/theoreticalCourseClassification/delete`,
- findClassification: `occupationlab/theoreticalCourseClassification/findById`,
- listClassification: `occupationlab/theoreticalCourseClassification/pagingQuery`,
- saveClassification: `occupationlab/theoreticalCourseClassification/save`,
- updateClassification: `occupationlab/theoreticalCourseClassification/update`,
+ checkRepeatClassification: `occupationlab/occupationlab/theoreticalCourseClassification/checkRepeat`,
+ delClassification: `occupationlab/occupationlab/theoreticalCourseClassification/delete`,
+ findClassification: `occupationlab/occupationlab/theoreticalCourseClassification/findById`,
+ listClassification: `occupationlab/occupationlab/theoreticalCourseClassification/pagingQuery`,
+ saveClassification: `occupationlab/occupationlab/theoreticalCourseClassification/save`,
+ updateClassification: `occupationlab/occupationlab/theoreticalCourseClassification/update`,
// 栏目管理
addColumn: `${host1}occupationlab/occupationlab/information/column/addColumn`,
diff --git a/src/views/course/AddCurriculum.vue b/src/views/course/AddCurriculum.vue
index a945795..49e12ec 100644
--- a/src/views/course/AddCurriculum.vue
+++ b/src/views/course/AddCurriculum.vue
@@ -296,6 +296,7 @@
+ systemChange(val, { systemId: projects[0].systemId })">
-
projectChange(val, item)">
@@ -449,7 +450,8 @@ export default {
projectKeyword: '',
checkedKeyword: '',
checkeds: [],
- checkedAll: []
+ checkedAll: [],
+ checkAll: false
};
},
watch: {
@@ -622,6 +624,7 @@ export default {
// }
})
this.systems = result
+ this.checkAll = !!checked.find(n => n.systemId == result[0].systemId) // 因为默认显示第一个系统的项目,所以如果系统默认选中,则全选也勾选上
result.length && this.getProject(result[0])
}).catch(err => {})
},
@@ -663,11 +666,13 @@ export default {
checkeds.push(e)
}
})
+ if (item.systemId == this.curSystem) this.checkAll = true
} else {
res.map(e => {
const i = checkeds.findIndex(n => n.projectId == e.projectId && n.systemId == e.systemId)
i === -1 || checkeds.splice(i, 1)
})
+ if (item.systemId == this.curSystem) this.checkAll = false
}
this.checkedAll = JSON.parse(JSON.stringify(checkeds)) // 全部已选项目,另外保存
}).catch(err => {})
@@ -685,6 +690,7 @@ export default {
})
this.checkeds.splice(i, 1)
}
+ this.checkAll = !this.projects.find(e => !e.check)
this.checkedAll = JSON.parse(JSON.stringify(this.checkeds)) // 全部已选项目,另外保存
},
// 已选择项目模糊查询
diff --git a/src/views/information/addArticle/index.vue b/src/views/information/addArticle/index.vue
index 4cebe9c..42bc855 100644
--- a/src/views/information/addArticle/index.vue
+++ b/src/views/information/addArticle/index.vue
@@ -45,7 +45,7 @@
- 确定
+ 确定
@@ -55,17 +55,15 @@