Эх сурвалжийг харах

APP设备类型表icon字段存文件路径

locky 3 жил өмнө
parent
commit
62dae8d09a

+ 2 - 1
AdminController/DeviceManagementController.py

@@ -354,7 +354,8 @@ class DeviceManagement(View):
             app_bundle_qs = AppBundle.objects.filter(app_bundle_id=app_bundle_id,
                                                      app_device_type__devicenamelanguage__lang=lang).annotate(
                 model=F('app_device_type__model'), type=F('app_device_type__type'), icon=F('app_device_type__icon'),
-                name=F('app_device_type__devicenamelanguage__name'), sort=F('app_device_type__devicenamelanguage__sort')).values('model', 'type', 'icon', 'name', 'sort')
+                name=F('app_device_type__devicenamelanguage__name'),
+                sort=F('app_device_type__devicenamelanguage__sort')).values('model', 'type', 'icon', 'name', 'sort')
             dvr_list = [app_bundle for app_bundle in app_bundle_qs if app_bundle['model'] == 1]
             ipc_list = [app_bundle for app_bundle in app_bundle_qs if app_bundle['model'] == 2]
             print(dvr_list, ipc_list)

+ 1 - 1
Model/models.py

@@ -1695,7 +1695,7 @@ class AppDeviceType(models.Model):
     id = models.AutoField(primary_key=True)
     model = models.SmallIntegerField(default=0, verbose_name='设备类型')  # 1:DVR, 2:IPC
     type = models.IntegerField(default=0, verbose_name='设备型号')
-    icon = models.CharField(default='', max_length=32, verbose_name='文件名')
+    icon = models.CharField(default='', max_length=200, verbose_name='图标文件路径')
 
     class Meta:
         db_table = 'app_device_type'