Merge remote-tracking branch 'origin/master'

device-manager-ui/admin/src/views/device/module/distribute/dialogshow.vue

@@ -53,6 +53,9 @@
                 ],
                 // 表单校验
                 rules: {
+                    productId: [
+                        {required: true,message: "请选择产品", trigger: "blur" },
+                    ],
                     imageResolution: [
                         {required: true,message: "请输入分辨率", trigger: "blur" },
                         {max: 256,message: "最多只能录入256个字符",trigger: "blur",},

device-manager-ui/admin/src/views/system/resource/dialogshow.vue

@@ -191,6 +191,9 @@ export default {
 
       rules: {
         name: [{ required: true, message: "请输入名称", trigger: "blur" }],
+        url: [
+          {required: true, message: '地址不能为空', trigger: 'blur'}
+        ]
       },
     };
   },

device-manager-ui/admin/src/views/system/resource/show.vue

@@ -89,6 +89,9 @@ export default {
       rules: {
         name: [
           { required: true, message: '请输入名称', trigger: 'blur' },
+        ],
+        url: [
+          {required: true, message: '地址不能为空', trigger: 'blur'}
         ]
       },
     }