Переглянути джерело

:bug: Fixing a bug.修复element版本定义错误,修复角色管理授权后存在的报错问题
:art: Improving structure / format of the code.调整文件管理代码格式,修复文件管理存在的部分问题

lishangbu 6 роки тому
батько
коміт
abf1910415

+ 1 - 1
package.json

@@ -16,7 +16,7 @@
     "clipboard": "^2.0.4",
     "crypto-js": "^3.1.9-1",
     "echarts": "^4.2.1",
-    "element-ui": "2.8.2",
+    "element-ui": "~2.8.2",
     "js-cookie": "^2.2.0",
     "net": "^1.0.2",
     "nprogress": "^0.2.0",

+ 5 - 5
src/api/admin/sys-file.js

@@ -19,7 +19,7 @@ import request from '@/router/axios'
 
 export function fetchList(query) {
   return request({
-    url: '/admin/sysfile/page',
+    url: '/admin/sys-file/page',
     method: 'get',
     params: query
   })
@@ -27,7 +27,7 @@ export function fetchList(query) {
 
 export function addObj(obj) {
   return request({
-    url: '/admin/sysfile',
+    url: '/admin/sys-file',
     method: 'post',
     data: obj
   })
@@ -35,21 +35,21 @@ export function addObj(obj) {
 
 export function getObj(id) {
   return request({
-    url: '/admin/sysfile/' + id,
+    url: '/admin/sys-file/' + id,
     method: 'get'
   })
 }
 
 export function delObj(id) {
   return request({
-    url: '/admin/sysfile/' + id,
+    url: '/admin/sys-file/' + id,
     method: 'delete'
   })
 }
 
 export function putObj(obj) {
   return request({
-    url: '/admin/sysfile',
+    url: '/admin/sys-file',
     method: 'put',
     data: obj
   })

+ 0 - 3
src/const/crud/admin/sys-file.js

@@ -22,9 +22,6 @@ export const tableOption = {
   stripe: true,
   menuAlign: 'center',
   align: 'center',
-  editBtn: false,
-  delBtn: false,
-  addBtn: false,
   viewBtn:true,
   column: [
 	  /*{

+ 1 - 1
src/const/crud/daemon/sys-job.js

@@ -192,7 +192,7 @@ export const tableOption = {
           [{
             required: true,
             max: 200,
-            message: '请输入2cron表达式',
+            message: '请输入cron表达式',
             trigger: 'change'
           }]
     },

+ 129 - 139
src/views/admin/file/index.vue

@@ -15,155 +15,145 @@
   - Author: lengleng (wangiegie@gmail.com)
   -->
 <template>
-    <div class="execution">
-        <basic-container>
-            <avue-crud ref="crud"
-                       :page="page"
-                       :data="tableData"
-                       :permission="permissionList"
-                       :table-loading="tableLoading"
-                       :option="tableOption"
-                       @on-load="getList"
-                       @search-change="searchChange"
-                       @refresh-change="refreshChange"
-                       @row-update="handleUpdate"
-                       @row-save="handleSave"
-                       @row-del="rowDel">
-            </avue-crud>
-        </basic-container>
-    </div>
+  <div class="execution">
+    <basic-container>
+      <avue-crud ref="crud"
+                 :page="page"
+                 :data="tableData"
+                 :permission="permissionList"
+                 :table-loading="tableLoading"
+                 :option="tableOption"
+                 @on-load="getList"
+                 @search-change="searchChange"
+                 @refresh-change="refreshChange"
+                 @row-update="handleUpdate"
+                 @row-save="handleSave"
+                 @row-del="rowDel">
+      </avue-crud>
+    </basic-container>
+  </div>
 </template>
 
 <script>
-    import {
-        fetchList,
-        getObj,
-        addObj,
-        putObj,
-        delObj
-    } from '@/api/admin/sys-file'
-    import {
-        tableOption
-    } from '@/const/crud/admin/sys-file'
-    import {
-        mapGetters
-    } from 'vuex'
+  import { addObj, delObj, fetchList, putObj } from '@/api/admin/sys-file'
+  import { tableOption } from '@/const/crud/admin/sys-file'
+  import { mapGetters } from 'vuex'
 
-    export default {
-        name: 'sysfile',
-        data() {
-            return {
-                tableData: [],
-                page: {
-                    total: 0, // 总页数
-                    currentPage: 1, // 当前页数
-                    pageSize: 20 // 每页显示多少条
-                },
-                tableLoading: false,
-                tableOption: tableOption
-            }
+  export default {
+    name: 'sys-file',
+    data() {
+      return {
+        tableData: [],
+        page: {
+          total: 0, // 总页数
+          currentPage: 1, // 当前页数
+          pageSize: 20 // 每页显示多少条
         },
+        tableLoading: false,
+        tableOption: tableOption
+      }
+    },
     created() {
     },
-    mounted: function () {
+    mounted: function() {
     },
-        computed: {
-            ...mapGetters(['permissions']),
-            permissionList() {
-                return {
-                    addBtn: this.vaildData(this.permissions.admin_sysfile_add, false),
-                    delBtn: this.vaildData(this.permissions.admin_sysfile_del, true),
-                    editBtn: this.vaildData(this.permissions.admin_sysfile_edit, true)
-                };
-            }
-        },
-        methods: {
-            getList(page, params) {
-                this.tableLoading = true
-                fetchList(Object.assign({
-                    current: page.currentPage,
-                    size: page.pageSize
-                }, params)).then(response => {
-                    this.tableData = response.data.data.records
-                    this.page.total = response.data.data.total
-                    this.tableLoading = false
-                }).catch(() => {
-                    this.tableLoading=false
-                })
-            },
-            rowDel: function (row, index) {
-                var _this = this
-                this.$confirm('是否确认删除ID为' + row.id, '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                }).then(function () {
-                    return delObj(row.id)
-                }).then(data => {
-                    _this.tableData.splice(index, 1)
-                    _this.$message({
-                        showClose: true,
-                        message: '删除成功',
-                        type: 'success'
-                    })
-                    this.getList(this.page)
-                })
-            },
-            /**
-             * @title 数据更新
-             * @param row 为当前的数据
-             * @param index 为当前更新数据的行数
-             * @param done 为表单关闭函数
-             *
-             **/
-            handleUpdate: function (row, index, done,loading) {
-                putObj(row).then(data => {
-                    this.tableData.splice(index, 1, Object.assign({}, row))
-                    this.$message({
-                        showClose: true,
-                        message: '修改成功',
-                        type: 'success'
-                    })
-                    done()
-                    this.getList(this.page)
-                }).catch(() => {
-                    loading();
-                });
-            },
-            /**
-             * @title 数据添加
-             * @param row 为当前的数据
-             * @param done 为表单关闭函数
-             *
-             **/
-            handleSave: function (row, done,loading) {
-                addObj(row).then(data => {
-                    this.tableData.push(Object.assign({}, row))
-                    this.$message({
-                        showClose: true,
-                        message: '添加成功',
-                        type: 'success'
-                    })
-                    done()
-                    this.getList(this.page)
-                }).catch(() => {
-                    loading();
-                });
-            },
-            /**
-             * 搜索回调
-             */
-            searchChange(form) {
-                this.getList(this.page,  this.filterForm(form))
-            },
-            /**
-             * 刷新回调
-             */
-            refreshChange() {
-                this.getList(this.page)
-            }
+    computed: {
+      ...mapGetters(['permissions']),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permissions.sys_file_add, false),
+          delBtn: this.vaildData(this.permissions.sys_file_del, false),
+          editBtn: this.vaildData(this.permissions.sys_file_edit, false)
         }
+      }
+    },
+    methods: {
+      getList(page, params) {
+        this.tableLoading = true
+        fetchList(Object.assign({
+          current: page.currentPage,
+          size: page.pageSize
+        }, params)).then(response => {
+          this.tableData = response.data.data.records
+          this.page.total = response.data.data.total
+          this.tableLoading = false
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+      rowDel: function(row, index) {
+        var _this = this
+        this.$confirm('是否确认删除ID为' + row.id, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(function() {
+          return delObj(row.id)
+        }).then(data => {
+          _this.tableData.splice(index, 1)
+          _this.$message({
+            showClose: true,
+            message: '删除成功',
+            type: 'success'
+          })
+          this.getList(this.page)
+        })
+      },
+      /**
+       * @title 数据更新
+       * @param row 为当前的数据
+       * @param index 为当前更新数据的行数
+       * @param done 为表单关闭函数
+       *
+       **/
+      handleUpdate: function(row, index, done, loading) {
+        putObj(row).then(data => {
+          this.tableData.splice(index, 1, Object.assign({}, row))
+          this.$message({
+            showClose: true,
+            message: '修改成功',
+            type: 'success'
+          })
+          done()
+          this.getList(this.page)
+        }).catch(() => {
+          loading()
+        })
+      },
+      /**
+       * @title 数据添加
+       * @param row 为当前的数据
+       * @param done 为表单关闭函数
+       *
+       **/
+      handleSave: function(row, done, loading) {
+        addObj(row).then(data => {
+          this.tableData.push(Object.assign({}, row))
+          this.$message({
+            showClose: true,
+            message: '添加成功',
+            type: 'success'
+          })
+          done()
+          this.getList(this.page)
+        }).catch(() => {
+          loading()
+        })
+      },
+      /**
+       * 搜索回调
+       */
+      searchChange(form) {
+        this.getList(this.page, this.filterForm(form))
+      },
+      /**
+       * 刷新回调
+       */
+      refreshChange() {
+        this.getList(this.page)
+      }
     }
+  }
 </script>
 
 <style lang="scss" scoped>

+ 1 - 1
src/views/admin/role/index.vue

@@ -298,7 +298,7 @@ export default {
             return fetchRoleTree(roleId)
           })
           .then(response => {
-            this.checkedKeys = response.data
+            this.checkedKeys = response.data.data
             this.$notify({
               title: '成功',
               message: '修改成功',