diff --git "a/server/prototypeFile/\344\272\247\345\223\201\345\216\237\345\236\213\347\256\241\347\220\206\345\267\245\345\205\267.png" "b/server/prototypeFile/\344\272\247\345\223\201\345\216\237\345\236\213\347\256\241\347\220\206\345\267\245\345\205\267.png" new file mode 100644 index 0000000..bbcc780 Binary files /dev/null and "b/server/prototypeFile/\344\272\247\345\223\201\345\216\237\345\236\213\347\256\241\347\220\206\345\267\245\345\205\267.png" differ diff --git a/server/public/Category.json b/server/public/Category.json index 2788f68..f3a98df 100644 --- a/server/public/Category.json +++ b/server/public/Category.json @@ -1,45 +1,15 @@ { "category": [ { - "category_id": "1", - "category_name": "业务线1", - "category_create_time": "2020-06-22-09-00-00", + "category_id": "0001", + "category_name": "分类1", + "category_create_time": "2020-11-20-10-51-41", "category_is_delete": false }, { - "category_id": "2", - "category_name": "业务线2", - "category_create_time": "2020-06-22-08-00-00", - "category_is_delete": false - }, - { - "category_id": "3", - "category_name": "业务线3", - "category_create_time": "2020-06-22-07-00-00", - "category_is_delete": false - }, - { - "category_id": "4", - "category_name": "业务线4", - "category_create_time": "2020-06-23-07-00-00", - "category_is_delete": false - }, - { - "category_id": "5", - "category_name": "业务线5", - "category_create_time": "2020-06-24-07-00-00", - "category_is_delete": false - }, - { - "category_id": "6", - "category_name": "业务线2", - "category_create_time": "2020-06-24-07-00-00", - "category_is_delete": false - }, - { - "category_id": "7", - "category_name": "业务线7", - "category_create_time": "2020-5-28-21-24-31", + "category_id": "0002", + "category_name": "分类2", + "category_create_time": "2020-11-20-10-51-50", "category_is_delete": false } ] diff --git a/server/public/User.json b/server/public/User.json index 40aea52..32965da 100644 --- a/server/public/User.json +++ b/server/public/User.json @@ -1,9 +1,9 @@ { "user": [ { - "user_id": "1", + "user_id": "01", "user_name": "admin", - "password": "123456", + "password": "", "function_permission": [ 1, 2, @@ -21,14 +21,15 @@ 14, 15 ], - "user_create_time": "2020-06-27-14-00-00", + "user_create_time": "2020-11-20-10-53-17", "user_is_delete": false }, { - "user_id": "2", - "user_name": "admin2", - "password": "123456", + "user_id": "02", + "user_name": "admin02", + "password": "", "function_permission": [ + 1, 2, 3, 4, @@ -44,19 +45,7 @@ 14, 15 ], - "user_create_time": "2020-06-27-15-00-00", - "user_is_delete": false - }, - { - "user_id": "3", - "user_name": "liyinchi", - "password": "", - "function_permission": [ - 1, - 2, - 3 - ], - "user_create_time": "2020-5-28-21-25-51", + "user_create_time": "2020-11-20-10-53-32", "user_is_delete": false } ] diff --git a/src/components/Pages/Category.vue b/src/components/Pages/Category.vue index 6ace244..b708b59 100644 --- a/src/components/Pages/Category.vue +++ b/src/components/Pages/Category.vue @@ -231,7 +231,7 @@ tableData.slice((currentPage - 1) * PageSize, currentPage * PageSize) " style="width: 100%" - :default-sort="{ prop: 'category_name', order: 'descending' }" + :default-sort="{ prop: 'category_create_time', order: 'descending' }" > = 1 && month <= 9) { + month = "0" + month; + } + if (strDate >= 0 && strDate <= 9) { + strDate = "0" + strDate; + } + var currentDate1 = + date.getFullYear() + + "-" + + month + + "-" + + strDate + + "-" + + date.getHours() + + "-" + + date.getMinutes() + + "-" + + date.getSeconds(); + var currentDate2 = `${date.getFullYear()}${month}${strDate}${date.getHours()}${date.getMinutes()}${date.getSeconds()}`; + return currentDate1; }, }, watch: { diff --git a/src/components/Pages/Home.vue b/src/components/Pages/Home.vue index babf24f..f857ac2 100644 --- a/src/components/Pages/Home.vue +++ b/src/components/Pages/Home.vue @@ -319,7 +319,7 @@ tableData.slice((currentPage - 1) * PageSize, currentPage * PageSize) " style="width: 100%" - :default-sort="{ prop: 'prototype_data_id', order: 'descending' }" + :default-sort="{ prop: 'prototype_data_create_time', order: 'descending' }" > + = 1 && month <= 9) { + month = "0" + month; + } + if (strDate >= 0 && strDate <= 9) { + strDate = "0" + strDate; + } + var currentDate1 = + date.getFullYear() + + "-" + + month + + "-" + + strDate + + "-" + + date.getHours() + + "-" + + date.getMinutes() + + "-" + + date.getSeconds(); + var currentDate2 = `${date.getFullYear()}${month}${strDate}${date.getHours()}${date.getMinutes()}${date.getSeconds()}`; + return currentDate1; }, ChildByValueZipFileUpload(value) { this.prototype_data_form.prototype_data = value[2]; diff --git a/src/components/Pages/Username.vue b/src/components/Pages/Username.vue index 15ba3ec..c6b0118 100644 --- a/src/components/Pages/Username.vue +++ b/src/components/Pages/Username.vue @@ -246,7 +246,7 @@ tableData.slice((currentPage - 1) * PageSize, currentPage * PageSize) " style="width: 100%" - :default-sort="{ prop: 'user_name', order: 'descending' }" + :default-sort="{ prop: 'user_create_time', order: 'descending' }" > = 1 && month <= 9) { + month = "0" + month; + } + if (strDate >= 0 && strDate <= 9) { + strDate = "0" + strDate; + } + var currentDate1 = + date.getFullYear() + + "-" + + month + + "-" + + strDate + + "-" + + date.getHours() + + "-" + + date.getMinutes() + + "-" + + date.getSeconds(); + var currentDate2 = `${date.getFullYear()}${month}${strDate}${date.getHours()}${date.getMinutes()}${date.getSeconds()}`; + return currentDate1; }, formatter(row, column) { var array = row.function_permission;