Просмотр исходного кода

增加转换盒apk上传,修改设备注册时mac地址的限制

LAPTOP-LIQ71VDD\m 3 лет назад
Родитель
Сommit
58bb1501b2

+ 5 - 0
src/views/dashboard/calling-admin/partInfoSetting.vue

@@ -49,6 +49,11 @@
           <app-version-manager :part-id="part_id" :device-type="104"></app-version-manager>
         </keep-alive>
       </el-tab-pane>
+      <el-tab-pane label="转换盒app" name="conversion">
+        <keep-alive>
+          <app-version-manager :part-id="part_id" :device-type="11"></app-version-manager>
+        </keep-alive>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>

+ 2 - 1
src/views/hospital/ncs_device/deviceManager.vue

@@ -564,7 +564,8 @@ export default {
         this.deviceRules.eth_mac[1].pattern = null
         this.deviceRules.eth_mac[0].required = true
       } else {
-        this.deviceRules.eth_mac[1].pattern = /^([0-9A-Fa-f]{2}:?){6}/gi
+        // this.deviceRules.eth_mac[1].pattern = /^([0-9A-Fa-f]{2}:?){6}/gi
+        this.deviceRules.eth_mac[1].pattern = null
         this.deviceRules.eth_mac[0].required = true
       }
       this.hasRoleId = val === DEVICE_TYPE.NURSE_WATCH

+ 2 - 1
src/views/ncs-device/components/deviceManager.vue

@@ -625,7 +625,8 @@ export default {
         this.deviceRules.eth_mac[1].pattern = null
         this.deviceRules.eth_mac[0].required = true
       } else {
-        this.deviceRules.eth_mac[1].pattern = /^([0-9A-Fa-f]{2}:?){6}/gi
+        // this.deviceRules.eth_mac[1].pattern = /^([0-9A-Fa-f]{2}:?){6}/gi
+        this.deviceRules.eth_mac[1].pattern = null
         this.deviceRules.eth_mac[0].required = true
       }
       this.hasRoleId = val === DEVICE_TYPE.NURSE_WATCH

+ 5 - 0
src/views/ncs-orginazition/partInfoSetting.vue

@@ -54,6 +54,11 @@
           <app-version-manager :part-id="part_id" :device-type="7" />
         </keep-alive>
       </el-tab-pane>
+      <el-tab-pane label="转换盒app" name="conversion">
+        <keep-alive>
+          <app-version-manager :part-id="part_id" :device-type="11"></app-version-manager>
+        </keep-alive>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>