diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 847ad78..4ed5e05 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -315,9 +315,6 @@ li {
font-size: 16px;
font-weight: normal;
}
-#app .el-select{
- display: unset;
-}
/*flex*/
.flex-center{
diff --git a/src/utils/api.js b/src/utils/api.js
index f96f436..c7e7354 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -238,4 +238,5 @@ export default {
logManagementList: `nakadai/log/logManagementList`,
platformLogList: `nakadai/log/platformLogList`,
listUpdate: `nakadai/log/update`,
+ checkRepeat: `${host1}/nakadai/log/checkRepeat`,
};
\ No newline at end of file
diff --git a/src/views/course/contentSettings.vue b/src/views/course/contentSettings.vue
index 7d58b63..3be1904 100644
--- a/src/views/course/contentSettings.vue
+++ b/src/views/course/contentSettings.vue
@@ -13,7 +13,7 @@
添加章节
- 编辑顺序
+ 编辑顺序
取消
diff --git a/src/views/data/Framework.vue b/src/views/data/Framework.vue
index b8d4c82..fd5b254 100644
--- a/src/views/data/Framework.vue
+++ b/src/views/data/Framework.vue
@@ -5,7 +5,7 @@
-
+
{{ node.label }}
@@ -65,7 +65,7 @@
- {
// 递归赋值,同时添加层级标识
function handleId(data,level = 0){
@@ -232,6 +234,7 @@ export default {
}
handleId(res)
this.typeList = res
+ this.loadingType = false
// 如果是删除或者新增编辑分类后调的重新查询分类,则不用默认选中第一个子级,只有页面一加载完成才需要默认选中第一个子级,addEd就是操作完分类后的标识
if (!this.addEd) {
if(res[0].children.length){ // 如果有孙级节点,则选中孙级节点,否则选中子级
@@ -520,9 +523,8 @@ export default {
},
// 导入数据
batchImport(){
- this.importLoading = Loading.service({
- background: 'rgba(255, 255, 255, .5)'
- })
+ this.importLoading = true
+ this.importVisible = true
// 这里查的是原始分类,跟其他任何地方查分类的接口都不一样,不要混淆,如果要改这个地方,要跟后端沟通
this.$post(this.api.originalList).then(res => {
// 处理id和label。因为这个树形要同时展示分类和表,所以name的key统一用label(分类和表的name的key不一样)
@@ -567,14 +569,13 @@ export default {
Promise.all(this.tablePromises).then(_ => {
handleDisabled(res)
this.importTypeList = res
- this.importLoading.close()
- this.importVisible = true
+ this.importLoading = false
})
}).catch(res => {
- this.importLoading.close()
+ this.importLoading = false
})
}).catch(res => {
- this.importLoading.close()
+ this.importLoading = false
})
},
// 查询表的字段
@@ -738,6 +739,7 @@ export default {