natasha hai 1 ano
pai
achega
f98f9fd825

+ 30 - 5
src/views/content_manage/course_manage/LiveCourse.vue

@@ -37,6 +37,8 @@
                     class="search-table"
                     :data="tableData"
                     style="width: 100%"
+                    @sort-change="handleSort"
+                    :default-sort = dataSort
                     :max-height="tableHeight">
                     <el-table-column
                         type="index"
@@ -53,7 +55,7 @@
                     <el-table-column
                         prop="teacher_name_desc"
                         label="教师"
-                        width="80"
+                        width="150"
                         sortable="custom">
                     </el-table-column>
                     <el-table-column
@@ -80,7 +82,7 @@
                     <el-table-column
                         prop="creator_name"
                         label="创建人"
-                        min-width="80"
+                        width="100"
                         sortable="custom">
                     </el-table-column>
                     <el-table-column
@@ -95,7 +97,7 @@
                     <el-table-column
                         fixed="right"
                         label="操作"
-                        width="220">
+                        width="150">
                         <template slot-scope="scope">
                             <el-button
                                 @click.native.prevent="handleEdit(scope.row)"
@@ -204,7 +206,8 @@ export default {
         pageSize: window.localStorage.getItem('pageSize')?Number(window.localStorage.getItem('pageSize')):10, 
         pageNumber: window.localStorage.getItem('pageNumber')?Number(window.localStorage.getItem('pageNumber')):1,
         tableHeight: "", // 表格高度
-        total_count: 0
+        total_count: 0,
+        dataSort: {}
     }
   },
   //计算属性 类似于data概念
@@ -215,17 +218,39 @@ export default {
   watch: {},
   //方法集合
   methods: {
+    handleSort(value){
+        let dataSort = {
+            prop: value.prop,
+            order: value.order
+        }
+        this.dataSort = dataSort
+        this.getList()
+    },
     // 查询列表
     getList(page){
         if(page){
             this.pageNumber = page
         }
         let MethodName = "/CourseServer/Manager/PageQuery/PageQueryZBCourseList";
+        let order_column_list = []
+        if(this.dataSort != {}){
+            if(this.dataSort.order=='descending'){
+                order_column_list = [this.dataSort.prop + ':desc']
+            }else if(this.dataSort.order=='ascending'){
+                // 升序不传值
+                order_column_list = [this.dataSort.prop]
+            }else{
+                order_column_list = ['create_time:desc']
+            }
+        }else{
+            order_column_list = ['create_time:desc']
+        }
         let data = {
             search_content: this.searchInput.trim(),
             status: this.searchStatus,
             page_capacity:this.pageSize,
-            cur_page:this.pageNumber
+            cur_page:this.pageNumber,
+            order_column_list: order_column_list
         }
         getLogin(MethodName, data)
         .then((res) => {

+ 29 - 4
src/views/content_manage/course_manage/RecordedCourse.vue

@@ -59,6 +59,8 @@
                     class="search-table"
                     :data="tableData"
                     style="width: 100%"
+                    @sort-change="handleSort"
+                    :default-sort = dataSort
                     :max-height="tableHeight">
                     <el-table-column
                         type="index"
@@ -75,7 +77,7 @@
                     <el-table-column
                         prop="teacher_name_desc"
                         label="教师"
-                        width="80"
+                        width="120"
                         sortable="custom">
                     </el-table-column>
                     <el-table-column
@@ -134,7 +136,7 @@
                     <el-table-column
                         fixed="right"
                         label="操作"
-                        width="220">
+                        width="150">
                         <template slot-scope="scope">
                             <el-button
                                 @click.native.prevent="handleEdit(scope.row)"
@@ -259,7 +261,8 @@ export default {
         pageSize: window.localStorage.getItem('pageSize')?Number(window.localStorage.getItem('pageSize')):10, 
         pageNumber: window.localStorage.getItem('pageNumber')?Number(window.localStorage.getItem('pageNumber')):1,
         tableHeight: "", // 表格高度
-        total_count: 0
+        total_count: 0,
+        dataSort: {}
     }
   },
   //计算属性 类似于data概念
@@ -270,19 +273,41 @@ export default {
   watch: {},
   //方法集合
   methods: {
+    handleSort(value){
+        let dataSort = {
+            prop: value.prop,
+            order: value.order
+        }
+        this.dataSort = dataSort
+        this.getList()
+    },
     // 查询列表
     getList(page){
         if(page){
             this.pageNumber = page
         }
         let MethodName = "/CourseServer/Manager/PageQuery/PageQueryLBCourseList";
+        let order_column_list = []
+        if(this.dataSort != {}){
+            if(this.dataSort.order=='descending'){
+                order_column_list = [this.dataSort.prop + ':desc']
+            }else if(this.dataSort.order=='ascending'){
+                // 升序不传值
+                order_column_list = [this.dataSort.prop]
+            }else{
+                order_column_list = ['create_time:desc']
+            }
+        }else{
+            order_column_list = ['create_time:desc']
+        }
         let data = {
             search_content: this.searchInput.trim(),
             study_phase: this.searchStudy,
             status: this.searchStatus,
             type: this.searchType,
             page_capacity:this.pageSize,
-            cur_page:this.pageNumber
+            cur_page:this.pageNumber,
+            order_column_list: order_column_list
         }
         getLogin(MethodName, data)
         .then((res) => {

+ 6 - 4
src/views/organize_manage/PersonList.vue

@@ -82,7 +82,8 @@
                         @selection-change="handleSelectionChange">
                         <el-table-column
                             type="selection"
-                            width="40">
+                            width="40"
+                            fixed>
                         </el-table-column>
                         <el-table-column
                             prop="user_name"
@@ -117,7 +118,7 @@
                             prop="email"
                             label="邮箱"
                             sortable="custom"
-                            min-width="223">
+                            min-width="180">
                         </el-table-column>
                         <el-table-column
                             prop="phone"
@@ -207,7 +208,8 @@
                         @selection-change="handleSelectionChange">
                         <el-table-column
                             type="selection"
-                            width="40">
+                            width="40"
+                            fixed>
                         </el-table-column>
                         <el-table-column
                             prop="user_name"
@@ -234,7 +236,7 @@
                             prop="email"
                             label="邮箱"
                             sortable="custom"
-                            min-width="223">
+                            min-width="180">
                         </el-table-column>
                         <el-table-column
                             prop="phone"

+ 1 - 1
src/views/organize_manage/index.vue

@@ -125,7 +125,7 @@
                     </el-table-column>
                     <el-table-column
                         prop="effective_date_end"
-                        label="到期时间"
+                        label="到期日期"
                         sortable="custom"
                         width="165">
                     </el-table-column>