Merge branch 'develop/3.1.5' into test

src/mixin/index.js

@@ -37,16 +37,20 @@ const devModeMixin = {
     return {
       devModeOptions: [{
         value: 1,
-        label: '蓝牙'
+        label: '蓝牙',
+        disabled: false
       }, {
         value: 2,
-        label: 'WIFI'
+        label: 'WIFI',
+        disabled: false
       }, {
         value: 3,
-        label: '传统蓝牙'
+        label: '传统蓝牙',
+        disabled: false
       }, {
         value: 4,
-        label: '4G'
+        label: '4G',
+        disabled: false
       }]
     }
   }

src/views/device/class/detail.vue

@@ -182,7 +182,9 @@ export default {
     // 删除子表单
     getDelete(type, index) {
       this.form.typeList.splice(index, 1)
-      this.devModeOptions.find(i => i.value == type).disabled = false
+      if (type) {
+        this.devModeOptions.find(i => i.value == type).disabled = false
+      }
     },
 
     // 修改设备模式