Merge branch 'master' of http://10.8.230.114:3000/wangbin/log-server-web

src/view/gameTask/centralControlConfList.vue

@@ -279,13 +279,29 @@ const resolutionOptions = ref([
         label: '270x480(dpi120)'
     },
     {
+        value: '540x960(dpi160)',
+        label: '540x960(dpi160)'
+    },
+    {
+        value: '540x960(dpi240)',
+        label: '540x960(dpi240)'
+    },
+    {
         value: '720x1280(dpi240)',
         label: '720x1280(dpi240)'
     },
     {
         value: '720x1280(dpi320)',
         label: '720x1280(dpi320)'
-    }
+    },
+    {
+        value: '1080x1920(dpi480)',
+        label: '1080x1920(dpi480)'
+    },
+    {
+        value: '1920x1080(dpi280)',
+        label: '1920x1080(dpi280)'
+    },
 ])
 
 const zoomOptions = ref([