科室设置增加字段，修复科室设置错误的问题，修复设备详情的没有选择员工时报错的问题

languages/en.js

@@ -944,6 +944,10 @@ module.exports = {
     linuxBedGainSize: 'Digital extension volume gain',
     linuxDoorVolumeNative: 'Digital doorstep machine recording volume',
     linuxDoorGainSize: 'Digital doorstep machine volume gain',
+    androidBedVolumeNative: 'Android extension recording volume',
+    androidBedGainSize: 'Android extension volume gain',
+    androidDoorVolumeNative: 'Android doorstep machine recording volume',
+    androidDoorGainSize: 'Android doorstep machine volume gain',
     autoAccept: 'Extension automatic answering',
     openAutoAccept: 'Enable automatic answer',
     unmannedCall: 'Extension opens unmanned call',
@@ -1023,7 +1027,8 @@ module.exports = {
     boolAllDoorStatus: 'Enable all doorstep call displays',
     boolDooLightAlwaysOn: 'Is the door light always on',
     convenientServiceEnabled: 'Convenient service',
-    ledServiceEnabled: 'Server control LED'
+    ledServiceEnabled: 'Server control LED',
+    autoPositionEnabled: 'Enable automatic positioning'
   },
   role: {
     roleName: 'Role name',

languages/es.js

@@ -944,6 +944,10 @@ module.exports = {
     linuxBedGainSize: 'Incremento digital Ganancia de volumen',
     linuxDoorVolumeNative: 'Incremento digital de Volumen de grabación',
     linuxDoorGainSize: 'Incremento de Ganancia de volumen',
+    androidBedVolumeNative: 'Incremeto Android Volumen de grabación',
+    androidBedGainSize: 'Incremento Android Ganancia de volumen',
+    androidDoorVolumeNative: 'Incremento Android Ganancia de volumen',
+    androidDoorGainSize: 'Incremeto Android Volumen de grabación',
     autoAccept: 'Respuesta automática',
     openAutoAccept: 'Habilitar respuesta automática',
     unmannedCall: 'Respuesta automatica en llamada no controlada',
@@ -1023,7 +1027,8 @@ module.exports = {
     boolAllDoorStatus: 'Activar la visualización de llamadas en todas las puertas',
     boolDooLightAlwaysOn: '¿¿ las luces de la puerta siempre están encendidas?',
     convenientServiceEnabled: 'Servicios convenientes',
-    ledServiceEnabled: 'Control del servidor LED'
+    ledServiceEnabled: 'Control del servidor LED',
+    autoPositionEnabled: 'Activar posicionamiento automático'
   },
   role: {
     roleName: 'Nombre del rol',

languages/ru-RU.js

@@ -944,6 +944,10 @@ module.exports = {
     linuxBedGainSize: 'Цифровое увеличение громкости',
     linuxDoorVolumeNative: 'Звуковая запись на цифровом клапане',
     linuxDoorGainSize: 'Коэффициент усиления громкости цифрового клапана',
+    androidBedVolumeNative: 'Звук на андроид',
+    androidBedGainSize: 'Коэффициент усиления громкости',
+    androidDoorVolumeNative: 'Звуковая запись на Android',
+    androidDoorGainSize: 'Коэффициент усиления громкости у ворот Android',
     autoAccept: 'Автоматический ответ на добавочный номер',
     openAutoAccept: 'Включить автоматический ответ',
     unmannedCall: 'Включите добавочный. Беспилотный звонок.',
@@ -1023,7 +1027,8 @@ module.exports = {
     boolAllDoorStatus: 'Откройте все двери.',
     boolDooLightAlwaysOn: 'Светит ли дверь постоянно',
     convenientServiceEnabled: 'Удобное обслуживание',
-    ledServiceEnabled: 'Управление сервером LED'
+    ledServiceEnabled: 'Управление сервером LED',
+    autoPositionEnabled: 'Включить автоматическое позиционирование'
   },
   role: {
     roleName: 'Имя роли',

languages/zh-CN.js

@@ -944,6 +944,10 @@ module.exports = {
     linuxBedGainSize: '数字分机音量增益',
     linuxDoorVolumeNative: '数字门口机录音音量',
     linuxDoorGainSize: '数字门口机音量增益',
+    androidBedVolumeNative: '安卓分机录音音量',
+    androidBedGainSize: '安卓分机音量增益',
+    androidDoorVolumeNative: '安卓门口机录音音量',
+    androidDoorGainSize: '安卓门口机音量增益',
     autoAccept: '分机开启自动接听',
     openAutoAccept: '开启自动接听',
     unmannedCall: '分机开启无人呼叫',
@@ -1023,7 +1027,8 @@ module.exports = {
     boolAllDoorStatus: '开启所有门口机呼显示',
     boolDooLightAlwaysOn: '门灯是否常亮',
     convenientServiceEnabled: '便民服务',
-    ledServiceEnabled: '服务端控制点阵屏'
+    ledServiceEnabled: '服务端控制点阵屏',
+    autoPositionEnabled: '开启自动定位'
   },
   role: {
     roleName: '角色名称',

src/views/ncs-device-menu-detail/index.vue

@@ -170,10 +170,7 @@ export default {
         part_id: this.$route.params.part_id
       },
       formmodelPartClerk: [{
-        n_index: 1,
-        type: '',
-        name: '',
-        value: ''
+        clerk_id: '',
       }],
       loading: false,
       users: [],
@@ -352,7 +349,7 @@ export default {
     },
     strToId(str) {
       const partClerks = []
-      if (str) {
+      if (str !== null && str !== '') {
         let partClerk = JSON.parse(str)
         if (partClerk.length !== 0) {
           for (let i = 0; i < partClerk.length; i++) {
@@ -362,12 +359,13 @@ export default {
           }
         }
       }
-      else {
-        partClerks.push({
+      if (partClerks.length !== 0) {
+        return partClerks
+      } else {
+        return [{
           clerk_id: ''
-        })
+        }]
       }
-      return partClerks
     }
   }
 }

src/views/ncs-orginazition/components/partInfoEdit.vue

@@ -337,6 +337,36 @@
 
           <el-row>
             <el-col :span="8">
+              <el-form-item :label="this.$t('partInfo.androidBedVolumeNative')" prop="android_bed_volume_native">
+                <el-input-number v-model="formmodel.android_bed_volume_native" :min="1" :max="31" :label="this.$t('partInfo.androidBedVolumeNative')" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item :label="this.$t('partInfo.androidBedGainSize')" prop="android_bed_gain_size">
+                <el-input-number v-model="formmodel.android_bed_gain_size" :min="1" :max="255" :label="this.$t('partInfo.androidBedGainSize')" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="8">
+              <el-form-item :label="this.$t('partInfo.androidDoorVolumeNative')" prop="android_door_volume_native">
+                <el-input-number v-model="formmodel.android_door_volume_native" :min="1" :max="31" :label="this.$t('partInfo.androidDoorVolumeNative')" />
+              </el-form-item>
+            </el-col>
+
+
+            <el-col :span="8">
+              <el-form-item :label="this.$t('partInfo.androidDoorGainSize')" prop="android_door_gain_size">
+                <el-input-number v-model="formmodel.android_door_gain_size" :min="1" :max="255" :label="this.$t('partInfo.androidDoorGainSize')" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+          <el-row>
+            <el-col :span="8">
               <el-form-item :label="this.$t('partInfo.nursingColorRgb')">
                 <!--                <colorPicker v-model="formmodel.nursing_color_rgb" />-->
                 <el-input v-model="formmodel.nursing_color_rgb" />
@@ -416,12 +446,19 @@
 
             <el-col :span="8">
               <el-form-item :label="this.$t('partInfo.convenientServiceEnabled')">
-                <el-checkbox v-model="formmodel.convenient_service_enabled" :true-label="true" :false-label="false">{{ this.$t('action.enabled') }}</el-checkbox>
+                <el-checkbox v-model="formmodel.convenient_service_enabled" :true-label="1" :false-label="0">{{ this.$t('action.enabled') }}</el-checkbox>
               </el-form-item>
             </el-col>
+
             <el-col :span="8">
               <el-form-item :label="this.$t('partInfo.ledServiceEnabled')">
-                <el-checkbox v-model="formmodel.bool_led_service" :true-label="true" :false-label="false">{{ this.$t('action.enabled') }}</el-checkbox>
+                <el-checkbox v-model="formmodel.bool_led_service" :true-label="1" :false-label="0">{{ this.$t('action.enabled') }}</el-checkbox>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item :label="this.$t('partInfo.autoPositionEnabled')" prop="auto_position">
+                <el-checkbox v-model="formmodel.auto_position" :true-label="1" :false-label="0">{{ this.$t('action.enabled') }}</el-checkbox>
               </el-form-item>
             </el-col>
           </el-row>
@@ -732,6 +769,7 @@ export default {
       if (this.partId) {
         API_Part.getPartSetting(this.partId).then(res => {
           this.formmodel = { ...res }
+          console.log(this.formmodel)
           if (!this.formmodel.member_name || this.formmodel.member_name === '') {
             this.noMember = false
           } else {
@@ -872,6 +910,7 @@ export default {
           if (this.formmodel.qr_url) {
             this.imageUrl = this.formmodel.qr_url
           }
+          console.log(this.formmodel)
           API_Part.editPartSetting(this.formmodel, this.partId).then(res => {
             this.$message.success(this.$t('action.saveSuccess'))
             if (this.systemConfig.id != null) {