diff --git a/fir_client/src/components/FirSuperSignBase.vue b/fir_client/src/components/FirSuperSignBase.vue index 9886e5a..8ee71e8 100644 --- a/fir_client/src/components/FirSuperSignBase.vue +++ b/fir_client/src/components/FirSuperSignBase.vue @@ -330,7 +330,7 @@ placeholder:"", codeactiveVisible:false, pagination:{"currentPage":1,"total":0,"pagesize":10}, - developer_used_info:{}, + developer_used_info:{"all_usable_number":0,"other_used_sum":0,"all_use_number":0}, percentage:0, } @@ -481,12 +481,13 @@ if(data.code === 1000){ this.app_developer_lists = data.data; this.pagination.total=data.count; - this.developer_used_info=data.use_num; - if(this.developer_used_info.all_usable_number ===0){ - this.percentage=0 - }else { - this.percentage=parseInt(this.developer_used_info.flyapp_used_sum*100/this.developer_used_info.all_usable_number); + if(data.use_num){ + this.developer_used_info=data.use_num; + if(this.developer_used_info.all_usable_number !==0){ + this.percentage=parseInt(this.developer_used_info.flyapp_used_sum*100/this.developer_used_info.all_usable_number); + } } + if(this.dialogaddDeveloperVisible){ this.canceledit(); this.$message.success("操作成功"); diff --git a/fir_ser/api/utils/storage/storage.py b/fir_ser/api/utils/storage/storage.py index 242db91..7597b66 100644 --- a/fir_ser/api/utils/storage/storage.py +++ b/fir_ser/api/utils/storage/storage.py @@ -71,9 +71,9 @@ class Storage(object): return self.get_default_storage(user) def get_default_storage(self,user): - admin_storage = UserInfo.objects.filter(is_superuser=True).order_by('pk').first().storage - if admin_storage: - return self.get_storage(UserInfo) + admin_obj = UserInfo.objects.filter(is_superuser=True).order_by('pk').first() + if admin_obj and admin_obj.storage: + return self.get_storage(admin_obj) else: storage_lists = THIRD_PART_CONFIG.get('storage') for storage in storage_lists: diff --git a/fir_ser/sqlite-autoconf-3310100.tar.gz b/fir_ser/sqlite-autoconf-3310100.tar.gz new file mode 100644 index 0000000..4c98048 Binary files /dev/null and b/fir_ser/sqlite-autoconf-3310100.tar.gz differ