diff --git a/src/api/student/index.js b/src/api/student/index.js index c2de7b0..186e3ed 100644 --- a/src/api/student/index.js +++ b/src/api/student/index.js @@ -30,7 +30,7 @@ export function index(params,isLoading = false) { }) } -export function indexStudy(params,isLoading = false) { +export function indexStudy(params,isLoading = true) { return request({ method: "get", url: "/api/admin/users/study", diff --git a/src/views/course/apply.vue b/src/views/course/apply.vue index c420720..7fa911e 100644 --- a/src/views/course/apply.vue +++ b/src/views/course/apply.vue @@ -48,7 +48,7 @@ @click="toApply(scope.row,'')"> {{scope.row.course_signs_count}} -
0
+
0
@@ -57,7 +57,7 @@ @@ -68,7 +68,7 @@ @click="toApply(scope.row,2)"> {{scope.row.sign_fault_total}} -
0
+
0
@@ -79,7 +79,7 @@ @click="toApply(scope.row,0)"> {{scope.row.sign_wait_total}} -
0
+
0
diff --git a/src/views/course/apply_list.vue b/src/views/course/apply_list.vue index a195dbb..cae490b 100644 --- a/src/views/course/apply_list.vue +++ b/src/views/course/apply_list.vue @@ -6,67 +6,76 @@
-
+
+
-
- -
-
- -
-
- -
-
- - - - -
-
- - - - -
+ + + + -
- - - - -
-
- - - - -
-
- - - - -
-
- - - - -
-
- - - - -
查询 重置 @@ -161,11 +170,11 @@ company_type: '', company_industry: '', education: '', - + type:'', status: '', page: 1, - page_size: 10, - sort_type: 'ASC' + page_size: 10, + sort_type:'ASC' }, selectids: [], list: [], @@ -281,7 +290,8 @@ this.select.company_area = '' this.select.company_type = '' this.select.company_industry = '' - this.select.education = '' + this.select.education = '' + this.select.type = '' this.select.status = '' this.select.page = 1 this.getList() @@ -297,7 +307,8 @@ company_area: this.select.company_area, company_type: this.select.company_type, company_industry: this.select.company_industry, - education: this.select.education, + education: this.select.education, + type:this.select.type, sort_name: 'score', sort_type: this.select.sort_type, filter: [{ @@ -380,7 +391,8 @@ company_area: this.select.company_area, company_type: this.select.company_type, company_industry: this.select.company_industry, - education: this.select.education, + education: this.select.education, + type:this.select.type, sort_name: 'score', sort_type: this.select.sort_type, export_fields: _export, @@ -421,7 +433,7 @@ align-items: center; flex-wrap: wrap; - &>div { + &>div,.selected-wrap { display: flex; align-items: center; // margin-bottom: 10px; diff --git a/src/views/course/components/addCourse.vue b/src/views/course/components/addCourse.vue index 1d2c1a6..2a6192e 100644 --- a/src/views/course/components/addCourse.vue +++ b/src/views/course/components/addCourse.vue @@ -502,6 +502,7 @@ }, // 发布 saveSubmit(){ + this.form.id = this.id this.form.status = 1 save({ ...this.form @@ -532,10 +533,10 @@ this.$emit('refresh') this.isShow = false }else{ - this.showTips = true } }else{ + this.form.id = this.id this.form.status = 0 save({ ...this.form diff --git a/src/views/course/txl.vue b/src/views/course/txl.vue index 7304491..c4a5e50 100644 --- a/src/views/course/txl.vue +++ b/src/views/course/txl.vue @@ -8,57 +8,58 @@
-
-
- -
-
- -
-
- -
-
- - - - -
-
- - - - -
+
+ + + -
- - - - -
-
- - - - -
-
- - - - -
-
查询 重置 @@ -358,7 +359,8 @@ company_area: this.select.company_area, company_type: this.select.company_type, company_industry: this.select.company_industry, - education: this.select.education, + education: this.select.education, + type:this.select.type, export_fields: _export, filter: [{ key: 'course_id', @@ -396,7 +398,7 @@ } } - .searchwrap { + .searchwrap,.selected-wrap { display: flex; align-items: center; flex-wrap: wrap; diff --git a/src/views/student/index.vue b/src/views/student/index.vue index ecc7f8a..82cc667 100644 --- a/src/views/student/index.vue +++ b/src/views/student/index.vue @@ -11,126 +11,134 @@
-
- -
-
- - -
-
- - - - -
-
- - - - -
-
- -
-
- - -
-
- -
-
- -
-
- - - - -
-
- - - - -
-
- - - - -
-
- - - - -
+ + + +
查询 @@ -530,11 +538,9 @@ display: flex; align-items: center; flex-wrap: wrap; - - &>div { + &>div,.selected-wrap { display: flex; align-items: center; - // margin-bottom: 10px; flex-wrap: wrap; &>div { diff --git a/src/views/student/search.vue b/src/views/student/search.vue index 0f59f2c..99454bb 100644 --- a/src/views/student/search.vue +++ b/src/views/student/search.vue @@ -11,126 +11,134 @@
-
- -
-
- - -
-
- - - - -
-
- - - - -
-
- -
-
- - -
-
- -
-
- -
-
- - - - -
-
- - - - -
-
- - - - -
-
- - - - -
+ + + -
- - - - -
-
- - - - -
-
- - - - - -
@@ -538,7 +546,7 @@ align-items: center; flex-wrap: wrap; - &>div { + &>div,.selected-wrap { display: flex; align-items: center; // margin-bottom: 10px;