Browse Source

feat ✨ 添加默认列表排序

wenjianzhang 4 years ago
parent
commit
767992421f

+ 8 - 3
src/views/admin/sys-api/index.vue

@@ -343,12 +343,17 @@ export default {
     handleSortChang(column, prop, order) {
       prop = column.prop
       order = column.order
+      if (this.order !== '' && this.order !== prop + 'Order') {
+        this.queryParams[this.order] = undefined
+      }
       if (order === 'descending') {
-        this.queryParams[prop + '_order'] = 'desc'
+        this.queryParams[prop + 'Order'] = 'desc'
+        this.order = prop + 'Order'
       } else if (order === 'ascending') {
-        this.queryParams[prop + '_order'] = 'asc'
+        this.queryParams[prop + 'Order'] = 'asc'
+        this.order = prop + 'Order'
       } else {
-        this.queryParams[prop + '_order'] = undefined
+        this.queryParams[prop + 'Order'] = undefined
       }
       this.getList()
     },

+ 3 - 3
src/views/admin/sys-oper-log/index.vue

@@ -166,7 +166,7 @@
               <el-col :span="12">
                 <el-form-item label="操作状态:">
                   <div v-if="form.status === '2'">正常</div>
-                  <div v-else-if="form.status === '1'">失败</div>
+                  <div v-else-if="form.status === '1'">关闭</div>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -268,13 +268,13 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const operIds = row.id || this.ids
+      const operIds = (row.id && [row.id]) || this.ids
       this.$confirm('是否确认删除日志编号为"' + operIds + '"的数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        return delSysOperlog(operIds)
+        return delSysOperlog({ 'ids': operIds })
       }).then(() => {
         this.getList()
         this.msgSuccess('删除成功')

+ 12 - 0
src/views/admin/sys-role/index.vue

@@ -481,6 +481,18 @@ export default {
       this.title = '添加角色'
       this.isEdit = false
     },
+    handleSortChang(column, prop, order) {
+      prop = column.prop
+      order = column.order
+      if (order === 'descending') {
+        this.queryParams[prop + 'Order'] = 'desc'
+      } else if (order === 'ascending') {
+        this.queryParams[prop + 'Order'] = 'asc'
+      } else {
+        this.queryParams[prop + 'Order'] = undefined
+      }
+      this.getList()
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()

+ 15 - 5
src/views/admin/sys-user/index.vue

@@ -127,7 +127,12 @@
                   />
                 </template>
               </el-table-column>
-              <el-table-column label="创建时间" prop="createdAt" sortable="custom" width="155">
+              <el-table-column
+                label="创建时间"
+                prop="createdAt"
+                sortable="custom"
+                width="155"
+              >
                 <template slot-scope="scope">
                   <span>{{ parseTime(scope.row.createdAt) }}</span>
                 </template>
@@ -418,7 +423,7 @@ export default {
     this.getDicts('sys_user_sex').then(response => {
       this.sexOptions = response.data
     })
-    this.getConfigKey('sys.user.initPassword').then(response => {
+    this.getConfigKey('sys_user_initPassword').then(response => {
       this.initPassword = response.data.configValue
     })
   },
@@ -464,12 +469,17 @@ export default {
     handleSortChang(column, prop, order) {
       prop = column.prop
       order = column.order
+      if (this.order !== '' && this.order !== prop + 'Order') {
+        this.queryParams[this.order] = undefined
+      }
       if (order === 'descending') {
-        this.queryParams[prop + '_order'] = 'desc'
+        this.queryParams[prop + 'Order'] = 'desc'
+        this.order = prop + 'Order'
       } else if (order === 'ascending') {
-        this.queryParams[prop + '_order'] = 'asc'
+        this.queryParams[prop + 'Order'] = 'asc'
+        this.order = prop + 'Order'
       } else {
-        this.queryParams[prop + '_order'] = undefined
+        this.queryParams[prop + 'Order'] = undefined
       }
       this.getList()
     },