修改病床为床位，增加中英文语言包，增加485地址输入

languages/en.js

@@ -1,10 +1,20 @@
 module.exports = {
   action: {
     home: 'home',
+    add: 'add',
     edit: 'edit',
     more: 'more',
     delete: 'delete',
     logout: 'logout',
+    waring: 'waring',
+    yes: 'yes',
+    cancel: 'cancel',
+    deleted: 'deleted!',
+    editSuccess: 'edit success!',
+    addSuccess: 'add success!',
+    createSuccess: 'create success!',
+    saveSuccess: 'save success!',
+    notDevelopedYet: 'not developed yet',
     keywords: 'Please enter a search keyword',
     chooseLang: 'languages',
     perpetualLicence: 'perpetual license',
@@ -20,11 +30,40 @@ module.exports = {
   },
   frameManage: {
     frameManage: 'frame manage',
+    numberOfRooms: 'rooms',
+    numberOfBeds: 'beds',
+    occupiedBeds: 'occupied',
+    emptyBeds: 'empty',
     keywordsFilter: 'Enter keywords to filter',
-    quickCreate: 'quick create',
     memberList: 'member list',
     deviceList: 'device list',
-    clerkList: 'clerk list'
+    clerkList: 'clerk list',
+    quickCreate: 'quick create',
+    quickCreateFrame: 'quick create frame',
+    startRoom: 'start room number',
+    endRoom: 'end room number',
+    bedQuantity: 'number of beds per room',
+    showRoomDigit: 'room number display digits',
+    showBedDigit: 'bed number display digit',
+    example: 'example',
+    inputFrameName: 'please enter frame name!',
+    inputFrameFullName: 'please enter full name!',
+    inputLong: 'the length is between 2 and 10 characters',
+    addBed: 'add bed',
+    addRoom: 'add room',
+    editFrame: 'edit frame',
+    sureDelete: 'are you sure you want to delete',
+    allBad: 'and all the beds?',
+    sureDeleteBed: 'are you sure to delete the bed',
+    room: 'room',
+    bed: 'bed',
+    nowOrganization: 'now organization',
+    partName: 'the part name',
+    inputPartName: 'please enter the part name',
+    adminMember: 'administrator account',
+    inputAdminMember: 'please enter the administrator account',
+    adminPassword: 'administrator password',
+    inputAdminPassword: 'please enter the administrator password'
   },
   deviceManage: {
     deviceManage: 'device manage',
@@ -57,5 +96,8 @@ module.exports = {
     clerkManage: 'clerk manage',
     memberManage: 'member manage',
     mobileDeviceManage: 'mobile device manage'
+  },
+  error: {
+    fromError: '表单填写有误，请检查！'
   }
 }

languages/zh-CN.js

@@ -1,16 +1,30 @@
 module.exports = {
   action: {
     home: '首页',
+    add: '添加',
     edit: '编辑',
     more: '更多',
     delete: '删除',
     logout: '退出登录',
+    waring: '警告',
+    yes: '确定',
+    cancel: '取消',
+    deleted: '已删除！',
+    editSuccess: '修改成功！',
+    addSuccess: '添加成功！',
+    createSuccess: '创建成功！',
+    saveSuccess: '保存成功！',
+    notDevelopedYet: '暂未开发',
     keywords: '请输入搜索关键字',
     chooseLang: '选择语言',
     perpetualLicence: '永久授权',
     licenseValidity: '授权有效期至: ',
     licenseRemainsValid: '授权剩余有效期：',
-    getLicense: '天,请联系售后获得授权'
+    getLicense: '天,请联系售后获得授权',
+    name: '名称',
+    fullName: '全称',
+    type: '类型',
+    alias: '别名'
   },
   home: {
     todayTask: '今日任务',
@@ -20,11 +34,40 @@ module.exports = {
   },
   frameManage: {
     frameManage: '空间位置',
+    numberOfRooms: '客房数',
+    numberOfBeds: '床位数',
+    occupiedBeds: '在床数',
+    emptyBeds: '空床数',
     keywordsFilter: '输入关键字进行过滤',
-    quickCreate: '快速创建',
     memberList: '用户列表',
     deviceList: '设备列表',
-    clerkList: '机构成员'
+    clerkList: '机构成员',
+    quickCreate: '快速创建',
+    quickCreateFrame: '快速构建结构',
+    startRoom: '开始房间号',
+    endRoom: '结束房间号',
+    bedQuantity: '每房床位数',
+    showRoomDigit: '房号显示位数',
+    showBedDigit: '床号显示位数',
+    example: '示例',
+    inputFrameName: '请输入结构名称！',
+    inputFrameFullName: '请输入全称!',
+    inputLong: '长度在 2 到 10 个字符',
+    addBed: '添加床位',
+    addRoom: '添加房间',
+    editFrame: '编辑节点',
+    sureDelete: '确定要删除',
+    allBad: '及其中的所有床位吗?',
+    sureDeleteBed: '确定删除床位',
+    room: '房',
+    bed: '床',
+    nowOrganization: '新建组织',
+    partName: '科室名称',
+    inputPartName: '请输入科室名称',
+    adminMember: '管理员账号',
+    inputAdminMember: '请输入管理员账号',
+    adminPassword: '管理员密码',
+    inputAdminPassword: '请输入管理员密码'
   },
   deviceManage: {
     deviceManage: '设备管理',
@@ -57,5 +100,8 @@ module.exports = {
     clerkManage: '员工管理',
     memberManage: '用户管理',
     mobileDeviceManage: '移动设备'
+  },
+  error: {
+    fromError: '表单填写有误，请检查！'
   }
 }

src/router/index.js

@@ -426,7 +426,49 @@ export const hospitalRoutes = [
 ]
 export const adminRoutes = [
   {
-    path: '/ncs-device',
+    path: '/admin/ncs_frame',
+    component: Layout,
+    redirect: '/ncs_frame/frame-admin',
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/hospital/ncs_frame/frameTreeView'),
+        name: 'CallingFrameTreeViewAdmin',
+        meta: { title: '空间管理', icon: 'tree', noCache: true }
+      }
+    ]
+  },
+  {
+    path: '/admin/ncs_clerk',
+    component: Layout,
+    redirect: '/ncs_clerk/clerk-admin',
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/ncs-clerk/clerkList'),
+        name: 'CallingClerkAdmin',
+        meta: { title: '所有员工', icon: 'peoples', noCache: true }
+      }
+    ]
+  },
+  {
+    path: '/admin/ncs_customer',
+    component: Layout,
+    redirect: '/ncs_customer/customer-admin',
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/hospital/customerManagement'),
+        name: 'CallingCustomerAdmin',
+        meta: { title: '所有用户', icon: 'el-icon-s-custom', noCache: true }
+        // component: () => uiVersion === 1 ? import('@/views/customer/patientManagement') : import('@/views/customer/customerManagement'),
+        // name: uiVersion === 1 ? 'hospital_patientList' : 'hospital_customerList',
+        // meta: { title: uiVersion === 1 ? '病人管理' : '用户管理', icon: 'el-icon-s-custom', noCache: true }
+      }
+    ]
+  },
+  {
+    path: '/admin/ncs-device',
     component: Layout,
     redirect: '/ncs-device/device-admin',
     children: [

src/utils/device_type.js

@@ -7,7 +7,7 @@ export function returnDeviceType(value) {
     case 3:
       return '门口机'
     case 4:
-      return '病床分机'
+      return '床位分机'
     case 5:
       return 'LCD走廊屏'
     case 6:

src/utils/enum/DeviceTypeEnum.js

@@ -5,7 +5,7 @@ export const DEVICE_TYPE = createEnum(
     NURSE_HOST: [1, '护士主机'],
     DOCTOR_HOST: [2, '医生主机'],
     DOOR_DEVICE: [3, '门口机'],
-    DIGIT_BED_DEVICE: [4, '病床分机'],
+    DIGIT_BED_DEVICE: [4, '床位分机'],
     LED_SCREEN: [5, 'LCD走廊屏'],
     LCD_SCREEN: [6, 'LED点阵屏'],
     NURSE_WATCH: [7, '护士移动'],

src/views/calling-ncError/index.vue

@@ -110,7 +110,7 @@ export default {
         { key: '护士主机', value: 1 },
         { key: '医生主机', value: 2 },
         { key: '门口机', value: 3 },
-        { key: '病床分机', value: 4 },
+        { key: '床位分机', value: 4 },
         { key: 'LCD走廊屏', value: 5 },
         { key: 'LED点阵屏', value: 6 },
         { key: '移动设备', value: 7 },

src/views/calling-setting/components/SystemSetting.vue

@@ -56,7 +56,7 @@
                 <el-input-number v-model="formmodel.part_day_doorsipvol" :min="0" :max="100" label="门口机通话音量" />
               </el-form-item>
               <el-form-item label="转换盒通话音量" prop="part_day_tboxsipvol">
-                <el-input-number v-model="formmodel.part_day_tboxsipvol" :min="0" :max="100" label="病床分机通话音量" />
+                <el-input-number v-model="formmodel.part_day_tboxsipvol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -66,8 +66,8 @@
               <el-form-item label="主机叫号次数" prop="part_day_ringtimes">
                 <el-input-number v-model="formmodel.part_day_ringtimes" :min="0" :max="10" label="主机叫号次数" />
               </el-form-item>
-              <el-form-item label="病床分机通话音量" prop="part_day_bedsipvol">
-                <el-input-number v-model="formmodel.part_day_bedsipvol" :min="0" :max="100" label="病床分机通话音量" />
+              <el-form-item label="分机通话音量" prop="part_day_bedsipvol">
+                <el-input-number v-model="formmodel.part_day_bedsipvol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -78,7 +78,7 @@
                 <el-input-number v-model="formmodel.part_day_nursingled" :min="0" :max="100" label="分机护理灯亮度" />
               </el-form-item>
               <el-form-item label="转换盒系统音量" prop="part_day_tboxsysvol">
-                <el-input-number v-model="formmodel.part_day_tboxsysvol" :min="0" :max="100" label="病床分机通话音量" />
+                <el-input-number v-model="formmodel.part_day_tboxsysvol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -102,7 +102,7 @@
                 <el-input-number v-model="formmodel.part_night_doorsipvol" :min="0" :max="100" label="门口机通话音量" />
               </el-form-item>
               <el-form-item label="转换盒通话音量" prop="part_night_tboxsipvol">
-                <el-input-number v-model="formmodel.part_night_tboxsipvol" :min="0" :max="100" label="病床分机通话音量" />
+                <el-input-number v-model="formmodel.part_night_tboxsipvol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -112,8 +112,8 @@
               <el-form-item label="主机叫号次数" prop="part_night_ringtimes">
                 <el-input-number v-model="formmodel.part_night_ringtimes" :min="0" :max="10" label="主机叫号次数" />
               </el-form-item>
-              <el-form-item label="病床分机通话音量" prop="part_night_bedsipvol">
-                <el-input-number v-model="formmodel.part_night_bedsipvol" :min="0" :max="100" label="病床分机通话音量" />
+              <el-form-item label="分机通话音量" prop="part_night_bedsipvol">
+                <el-input-number v-model="formmodel.part_night_bedsipvol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -124,7 +124,7 @@
                 <el-input-number v-model="formmodel.part_night_nursingled" :min="0" :max="100" label="分机护理灯亮度" />
               </el-form-item>
               <el-form-item label="转换盒系统音量" prop="part_night_tboxsysvol">
-                <el-input-number v-model="formmodel.part_night_tboxsysvol" :min="0" :max="100" label="病床分机通话音量" />
+                <el-input-number v-model="formmodel.part_night_tboxsysvol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
           </el-row>

src/views/customer/list.vue

@@ -4,7 +4,7 @@
     <div class="toolbar" style="padding-left: 20px">
       <el-form :inline="true" label-width="120px">
         <el-form-item>
-          <el-input v-model="searchStr" placeholder="请输入用户姓名、编号、病床" clearable @clear="clickSearch" @keyup.native.enter="clickSearch">
+          <el-input v-model="searchStr" placeholder="请输入用户姓名、编号、床位" clearable @clear="clickSearch" @keyup.native.enter="clickSearch">
             <el-button slot="append" icon="el-icon-search" @click="clickSearch"></el-button>
           </el-input>
         </el-form-item>
@@ -51,8 +51,8 @@
 
     <el-dialog title="换床" :visible.sync="formshow" :append-to-body="true" width="80%">
       <el-form ref="editForm" label-width="140px">
-        <el-form-item label="当前病床："><svg-icon icon-class="bed" style="color: #9aaabf;margin-top: 5px" />{{ full_name }}</el-form-item>
-        <el-form-item label="可换病床：">
+        <el-form-item label="当前床位："><svg-icon icon-class="bed" style="color: #9aaabf;margin-top: 5px" />{{ full_name }}</el-form-item>
+        <el-form-item label="可换床位：">
           <el-radio-group v-model="changeFrameId">
             <el-radio v-for="(item, index) in frameList" :label="item.id" :key="index">
               <svg-icon icon-class="bed" style="color: #9aaabf;margin-top: 5px" />{{ item.full_name }}
@@ -168,7 +168,7 @@
             listData: this.statusTransfer
           }
         },
-        { headerName: '病床', field: 'full_name', sortable: true, filter: true, minWidth: 120 },
+        { headerName: '床位', field: 'full_name', sortable: true, filter: true, minWidth: 120 },
         { headerName: '操作任务', field: 'id',
           cellRendererFramework: 'ButtonCellRender',
           cellRendererParams: param => {
@@ -382,7 +382,7 @@
         if (!this.changeFrameId) {
           this.$message({
             type: 'info',
-            message: '请选择病床'
+            message: '请选择床位'
           })
           return
         }

src/views/dashboard/calling-admin/components/partInfoEdit.vue

@@ -56,7 +56,7 @@
                 <el-input-number v-model="formmodel.part_day_doorsipvol" :min="0" :max="100" label="门口机通话音量" />
               </el-form-item>
               <el-form-item label="转换盒通话音量" prop="part_day_tboxsipvol">
-                <el-input-number v-model="formmodel.part_day_tboxsipvol" :min="0" :max="100" label="病床分机通话音量" />
+                <el-input-number v-model="formmodel.part_day_tboxsipvol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -66,8 +66,8 @@
               <el-form-item label="主机叫号次数" prop="part_day_ringtimes">
                 <el-input-number v-model="formmodel.part_day_ringtimes" :min="0" :max="10" label="主机叫号次数" />
               </el-form-item>
-              <el-form-item label="病床分机通话音量" prop="part_day_bedsipvol">
-                <el-input-number v-model="formmodel.part_day_bedsipvol" :min="0" :max="100" label="病床分机通话音量" />
+              <el-form-item label="分机通话音量" prop="part_day_bedsipvol">
+                <el-input-number v-model="formmodel.part_day_bedsipvol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -78,7 +78,7 @@
                 <el-input-number v-model="formmodel.part_day_nursingled" :min="0" :max="100" label="分机护理灯亮度" />
               </el-form-item>
               <el-form-item label="转换盒系统音量" prop="part_day_tboxsysvol">
-                <el-input-number v-model="formmodel.part_day_tboxsysvol" :min="0" :max="100" label="病床分机通话音量" />
+                <el-input-number v-model="formmodel.part_day_tboxsysvol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -102,7 +102,7 @@
                 <el-input-number v-model="formmodel.part_night_doorsipvol" :min="0" :max="100" label="门口机通话音量" />
               </el-form-item>
               <el-form-item label="转换盒通话音量" prop="part_night_tboxsipvol">
-                <el-input-number v-model="formmodel.part_night_tboxsipvol" :min="0" :max="100" label="病床分机通话音量" />
+                <el-input-number v-model="formmodel.part_night_tboxsipvol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -112,8 +112,8 @@
               <el-form-item label="主机叫号次数" prop="part_night_ringtimes">
                 <el-input-number v-model="formmodel.part_night_ringtimes" :min="0" :max="10" label="主机叫号次数" />
               </el-form-item>
-              <el-form-item label="病床分机通话音量" prop="part_night_bedsipvol">
-                <el-input-number v-model="formmodel.part_night_bedsipvol" :min="0" :max="100" label="病床分机通话音量" />
+              <el-form-item label="分机通话音量" prop="part_night_bedsipvol">
+                <el-input-number v-model="formmodel.part_night_bedsipvol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -124,7 +124,7 @@
                 <el-input-number v-model="formmodel.part_night_nursingled" :min="0" :max="100" label="分机护理灯亮度" />
               </el-form-item>
               <el-form-item label="转换盒系统音量" prop="part_night_tboxsysvol">
-                <el-input-number v-model="formmodel.part_night_tboxsysvol" :min="0" :max="100" label="病床分机通话音量" />
+                <el-input-number v-model="formmodel.part_night_tboxsysvol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
           </el-row>

src/views/dashboard/calling-admin/partInfoSetting.vue

@@ -33,18 +33,18 @@
         </keep-alive>
       </el-tab-pane>
 
-      <el-tab-pane label="5寸病床分机APP" name="sickbed">
+      <el-tab-pane label="5寸床位分机APP" name="sickbed">
         <keep-alive>
           <app-version-manager :part-id="part_id" :device-type="4"></app-version-manager>
         </keep-alive>
       </el-tab-pane>
 
-      <el-tab-pane label="7寸病床分机APP" name="sevensickbed">
+      <el-tab-pane label="7寸床位分机APP" name="sevensickbed">
         <keep-alive>
           <app-version-manager :part-id="part_id" :device-type="204"></app-version-manager>
         </keep-alive>
       </el-tab-pane>
-      <el-tab-pane label="病床分机可视版" name="vsickbed">
+      <el-tab-pane label="床位分机可视版" name="vsickbed">
         <keep-alive>
           <app-version-manager :part-id="part_id" :device-type="104"></app-version-manager>
         </keep-alive>

src/views/dashboard/calling/components/PanelGroup.vue

@@ -20,7 +20,7 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            空置病床
+            空置床位
           </div>
           <count-to :start-val="0" :end-val="bedBoard.empty_beds" :duration="2000" class="card-panel-num" />
         </div>

src/views/hospital/ncs_device/deviceManager.vue

@@ -172,6 +172,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row v-if="hasAudioId">
+          <el-col :span="12">
+            <el-form-item label="485地址" prop="sip_id">
+              <el-input v-model="deviceModel.sip_id" clearable placeholder="请输入485地址" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="handlerFormSubmit('deviceEditForm')">确 定</el-button>
@@ -256,7 +263,13 @@ export default {
         ],
         trans_audio_id: [
           { required: true, message: '请选择总线转换盒', trigger: 'blur' }
-        ]
+        ],
+        // trans_rs485_id: [
+        //   { required: true, message: '请选择485转换盒', trigger: 'blur' }
+        // ],
+        // sip_id: [
+        //   { required: true, message: '请输入485地址', trigger: 'blur' }
+        // ]
       },
       partFrames: [],
       typeFrames: [],
@@ -265,7 +278,7 @@ export default {
         { key: '护士主机', value: 1 },
         { key: '医生主机', value: 2 },
         { key: '门口机', value: 3 },
-        { key: '病床分机', value: 4 },
+        { key: '床位分机', value: 4 },
         { key: 'LCD走廊屏', value: 5 },
         { key: 'LED点阵屏', value: 6 },
         { key: '移动设备', value: 7 },

src/views/hospital/ncs_frame/frameTreeView.vue

@@ -76,7 +76,7 @@
               </div>
               <div class="card-panel-description">
                 <div class="card-panel-text">
-                  病房数
+                  {{ this.$t('frameManage.numberOfRooms') }}
                 </div>
                 <count-to :start-val="0" :end-val="bfCount" :duration="2600" class="card-panel-num" />
               </div>
@@ -89,7 +89,7 @@
               </div>
               <div class="card-panel-description">
                 <div class="card-panel-text">
-                  病床数
+                  {{ this.$t('frameManage.numberOfBeds') }}
                 </div>
                 <count-to :start-val="0" :end-val="bcCount" :duration="2000" class="card-panel-num" />
               </div>
@@ -102,7 +102,7 @@
               </div>
               <div class="card-panel-description">
                 <div class="card-panel-text">
-                  在床数
+                  {{ this.$t('frameManage.occupiedBeds') }}
                 </div>
                 <count-to :start-val="0" :end-val="zcCount" :duration="1900" class="card-panel-num" />
               </div>
@@ -115,7 +115,7 @@
               </div>
               <div class="card-panel-description primary-care">
                 <div class="card-panel-text primary-care">
-                  空床数
+                  {{ this.$t('frameManage.emptyBeds') }}
                 </div>
                 <count-to :start-val="0" :end-val="kcCount" :duration="1500" class="card-panel-num" />
               </div>
@@ -123,17 +123,17 @@
           </el-col>
         </el-row>
         <el-tabs v-model="activeName" style="margin:0;" type="border-card">
-          <el-tab-pane label="用户列表" name="frameInfo">
+          <el-tab-pane :label="this.$t('frameManage.memberList')" name="frameInfo">
             <keep-alive>
               <customer-manager :frame="selectedNode" @saved="handleCustomerChange" />
             </keep-alive>
           </el-tab-pane>
-          <el-tab-pane label="设备列表" name="deviceList">
+          <el-tab-pane :label="this.$t('frameManage.deviceList')" name="deviceList">
             <keep-alive>
               <device-manager :frame="selectedNode" />
             </keep-alive>
           </el-tab-pane>
-          <el-tab-pane label="机构成员" name="clerkManager">
+          <el-tab-pane :label="this.$t('frameManage.clerkList')" name="clerkManager">
             <keep-alive>
               <clerk-manager :part-id="selectedNode.part_id" />
             </keep-alive>
@@ -144,13 +144,13 @@
 
     <!---添加空间结构弹窗 -->
     <el-dialog :title="frameEditTitle" :visible.sync="frameDialogVisible" width="500px">
-      <el-form ref="editForm" :model="frameInfo" :rules="rules" label-width="110px">
+      <el-form ref="editForm" :model="frameInfo" :rules="rules" label-width="130px">
         <el-row>
           <el-col :span="24">
             <!--医院结构名称-->
-            <el-form-item label="名称" prop="name">
+            <el-form-item :label="this.$t('action.name')" prop="name">
               <el-input v-model="frameInfo.name" :maxlength="20" @change="frameChange">
-                <template slot="append">{{ frameInfo.type === 4?"房":"床" }}</template>
+                <template slot="append">{{ frameInfo.type === 4? this.$t('frameManage.room') : this.$t('frameManage.bed') }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -158,7 +158,7 @@
         <el-row>
           <el-col :span="24">
             <!--医院结构别名-->
-            <el-form-item label="全称" prop="full_name">
+            <el-form-item :label="this.$t('action.fullName')" prop="full_name">
               <el-input v-model="frameInfo.full_name" :maxlength="20" />
             </el-form-item>
           </el-col>
@@ -166,34 +166,34 @@
         <el-row>
           <el-col :span="24">
             <!--医院结构别名-->
-            <el-form-item label="别名" prop="alias">
+            <el-form-item :label="this.$t('action.alias')" prop="alias">
               <el-input v-model="frameInfo.alias" :maxlength="20" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row hidden>
           <el-col :span="12">
-            <el-form-item label="类型">
-              <el-radio v-model="frameInfo.type" :label="1">病房</el-radio>
-              <el-radio v-model="frameInfo.type" :label="2">床位</el-radio>
+            <el-form-item :label="this.$t('action.type')">
+              <el-radio v-model="frameInfo.type" :label="1">{{ this.$t('frameManage.room') }}</el-radio>
+              <el-radio v-model="frameInfo.type" :label="2">{{ this.$t('frameManage.bed') }}</el-radio>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-form-item>
-          <el-button type="primary" class="save" @click="handleFrameSubmit('editForm')">确定</el-button>
+          <el-button type="primary" class="save" @click="handleFrameSubmit('editForm')">{{ this.$t('action.yes') }}</el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
     <!---添加空间结构弹窗 -->
 
     <!---快速创建结构弹窗 -->
-    <el-dialog title="快速构建结构" :visible.sync="frameQuickCreateVisible" width="500px">
-      <el-form ref="createFrameForm" :model="createFrameModel" :rules="createFrameRules" label-width="110px">
+    <el-dialog :title="this.$t('frameManage.quickCreateFrame')" :visible.sync="frameQuickCreateVisible" width="600px">
+      <el-form ref="createFrameForm" :model="createFrameModel" :rules="createFrameRules" label-width="200px">
         <el-row>
           <el-col :span="24">
             <!--开始房间号-->
-            <el-form-item label="开始房间号" prop="start_no">
+            <el-form-item :label="this.$t('frameManage.startRoom')" prop="start_no">
               <el-input-number
                 v-model="createFrameModel.room_start_no"
                 :min="1"
@@ -205,7 +205,7 @@
         <el-row>
           <el-col :span="24">
             <!--结束房间号-->
-            <el-form-item label="结束房间号" prop="end_no">
+            <el-form-item :label="this.$t('frameManage.endRoom')" prop="end_no">
               <el-input-number
                 v-model="createFrameModel.room_end_no"
                 :min="createFrameModel.room_start_no"
@@ -216,7 +216,7 @@
         <el-row>
           <el-col :span="24">
             <!--每房床位数-->
-            <el-form-item label="每房床位数" prop="beds_per_room">
+            <el-form-item :label="this.$t('frameManage.bedQuantity')" prop="beds_per_room">
               <el-input-number v-model="createFrameModel.beds_per_room" :min="1" :max="20" />
             </el-form-item>
           </el-col>
@@ -225,7 +225,7 @@
         <el-row>
           <el-col :span="18">
             <!--每房床位数-->
-            <el-form-item label="房号显示位数" prop="room_num_bits">
+            <el-form-item :label="this.$t('frameManage.showRoomDigit')" prop="room_num_bits">
               <el-input-number
                 v-model="createFrameModel.room_num_bits"
                 :min="1"
@@ -236,7 +236,7 @@
           </el-col>
           <el-col :span="6">
             <div class="el-form-item__label">
-              示例：{{ room_num_demo }}
+              {{ this.$t('frameManage.example') }}：{{ room_num_demo }}
             </div>
           </el-col>
         </el-row>
@@ -244,7 +244,7 @@
         <el-row>
           <el-col :span="18">
             <!--每房床位数-->
-            <el-form-item label="床号显示位数" prop="bed_num_bits">
+            <el-form-item :label="this.$t('frameManage.showBedDigit')" prop="bed_num_bits">
               <el-input-number
                 v-model="createFrameModel.bed_num_bits"
                 :min="1"
@@ -255,13 +255,13 @@
           </el-col>
           <el-col :span="6">
             <div class="el-form-item__label">
-              示例：{{ bed_num_demo }}
+              {{ this.$t('frameManage.example') }}：{{ bed_num_demo }}
             </div>
           </el-col>
         </el-row>
 
         <el-form-item>
-          <el-button type="primary" class="save" @click="quickCreateSubmit()">确定</el-button>
+          <el-button type="primary" class="save" @click="quickCreateSubmit()">{{ this.$t('action.yes') }}</el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -270,21 +270,21 @@
     <!-- 新建科室弹窗 -->
     <el-dialog :title.sync="formtitle" :visible.sync="formshow" width="50%">
       <div>
-        <el-form ref="editform" :rules="rules" label-width="120px" :model="formmodel">
-          <el-form-item label="科室名称" prop="shop_name">
-            <el-input v-model="formmodel.shop_name" clearable :maxlength="100" placeholder="请输入科室名称" />
+        <el-form ref="editform" :rules="rules" label-width="200px" :model="formmodel">
+          <el-form-item :label="this.$t('frameManage.partName')" prop="shop_name">
+            <el-input v-model="formmodel.shop_name" clearable :maxlength="100" :placeholder="this.$t('frameManage.inputPartName')" />
           </el-form-item>
-          <el-form-item label="管理员账号" prop="member_name">
-            <el-input v-model="formmodel.member_name" clearable :maxlength="100" placeholder="请输入管理员账号" />
+          <el-form-item :label="this.$t('frameManage.adminMember')" prop="member_name">
+            <el-input v-model="formmodel.member_name" clearable :maxlength="100" :placeholder="this.$t('frameManage.inputAdminMember')" />
           </el-form-item>
-          <el-form-item label="管理员密码" prop="member_password">
-            <el-input v-model="formmodel.member_password" type="password" clearable :maxlength="100" placeholder="请输入管理员密码" />
+          <el-form-item :label="this.$t('frameManage.adminPassword')" prop="member_password">
+            <el-input v-model="formmodel.member_password" type="password" clearable :maxlength="100" :placeholder="this.$t('frameManage.inputAdminPassword')" />
           </el-form-item>
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="formshow = false">取 消</el-button>
-        <el-button type="primary" @click="handlerFormSubmit('editform')">确 定</el-button>
+        <el-button @click="formshow = false">{{ this.$t('action.cancel') }}</el-button>
+        <el-button type="primary" @click="handlerFormSubmit('editform')">{{ this.$t('action.yes') }}</el-button>
       </div>
     </el-dialog>
     <!-- 新建科室弹窗结束 -->
@@ -317,20 +317,20 @@ export default {
       /** 上级机构数组 **/
       parents: [],
       /** frame 编辑弹窗 **/
-      frameEditTitle: '添加',
+      frameEditTitle: this.$t('action.add'),
       frameDialogVisible: false,
       frameInfo: {},
       rules: {
         name: [
-          this.MixinRequired('请输入结构名称！'),
-          { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'blur' }
+          this.MixinRequired(this.$t('frameManage.inputFrameName')),
+          { min: 2, max: 10, message: this.$t('frameManage.inputLong'), trigger: 'blur' }
         ],
         alias: [
-          { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'blur' }
+          { min: 2, max: 10, message: this.$t('frameManage.inputLong'), trigger: 'blur' }
         ],
         full_name: [
-          this.MixinRequired('请输入全称！'),
-          { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'blur' }
+          this.MixinRequired(this.$t('frameManage.inputFrameFullName')),
+          { min: 2, max: 10, message: this.$t('frameManage.inputLong'), trigger: 'blur' }
         ],
         shop_name: [
           { required: true, message: '组织名称必须选择', trigger: 'blur' }
@@ -359,7 +359,7 @@ export default {
       kcCount: 82,
       bcCount: 56,
       /** 新建组织弹出参数 **/
-      formtitle: '新建组织',
+      formtitle: this.$t('frameManage.nowOrganization'),
       formshow: false,
       formmodel: {},
       isShop: true
@@ -420,9 +420,9 @@ export default {
         this.formshow = true
       } else {
         if (data.type === FRAME_TYPE.ROOM) {
-          this.frameEditTitle = '【' + data.full_name + '】添加床位'
+          this.frameEditTitle = '【' + data.full_name + '】' + this.$t('frameManage.addBed')
         } else {
-          this.frameEditTitle = '【' + data.full_name + '】添加房间'
+          this.frameEditTitle = '【' + data.full_name + '】' + this.$t('frameManage.addRoom')
         }
         this.frameInfo = {
           part_id: data.part_id,
@@ -439,7 +439,7 @@ export default {
     },
     edit(data, e) {
       if (data.type === FRAME_TYPE.PART || data.type === FRAME_TYPE.HOSPITAL) {
-        console.log('暂未开发')
+        this.$message.info(this.$t('action.notDevelopedYet') + '')
         return
       }
       const parentNode = this.findNodeById(this.treeData, data.parent_id)
@@ -447,25 +447,25 @@ export default {
         ...data,
         parent_name: parentNode === null ? '' : parentNode.name
       }
-      this.frameEditTitle = '编辑节点'
+      this.frameEditTitle = this.$t('frameManage.editFrame')
       this.frameDialogVisible = true
     },
     remove(data) {
       let warning = ''
       if (data.type === FRAME_TYPE.ROOM) {
-        warning = '确定要删除【' + data.full_name + '】及其中的所有床位吗?'
+        warning = this.$t('frameManage.sureDelete') + '【' + data.full_name + '】' + this.$t('frameManage.allBad')
       } else {
-        warning = '确定删除床位【' + data.full_name + '】吗？'
+        warning = this.$t('frameManage.sureDeleteBed') + '【' + data.full_name + '】?'
       }
-      this.$confirm(warning, '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(warning, this.$t('action.waring' + ''), {
+        confirmButtonText: this.$t('action.yes'),
+        cancelButtonText: this.$t('action.cancel'),
         type: 'warning'
       }).then(() => {
         HospitalFrame_API.deleteHospitalFrame(data.id).then(response => {
           this.$message({
             type: 'success',
-            message: '已删除!'
+            message: this.$t('action.deleted')
           })
           this.getFrameTree().then(() => {
             // 判断选中节点是否被删除，如果被删除需要重新选择根节点
@@ -497,7 +497,7 @@ export default {
             //   params.full_name = params.parent_name + '-' + params.name + '床'
             // }
             HospitalFrame_API.updateHospitalFrame(params.id, params).then(response => {
-              this.$message.success('修改成功！')
+              this.$message.success(this.$t('action.editSuccess') + '')
               this.frameDialogVisible = false
               this.getFrameTree().then(() => {
                 this.selectedNodeId = response.id
@@ -515,13 +515,13 @@ export default {
             // }
 
             HospitalFrame_API.addHospitalFrame(params).then(response => {
-              this.$message.success('添加成功！')
+              this.$message.success(this.$t('action.addSuccess') + '')
               this.frameDialogVisible = false
               this.getFrameTree()
             })
           }
         } else {
-          this.$message.error('表单填写有误，请检查！')
+          this.$message.error(this.$t('action.editSuccess') + '')
           return false
         }
       })
@@ -599,7 +599,7 @@ export default {
       const params = this.createFrameModel
       params.part_frame_id = this.treeData[0].id
       HospitalFrame_API.quickCreate(params).then(res => {
-        this.$message.success('创建成功！')
+        this.$message.success(this.$t('action.createSuccess') + '')
         this.frameQuickCreateVisible = false
         this.getFrameTree().then(() => {
           this.$refs.frameTree.setCurrentKey(this.selectedNodeId)
@@ -633,9 +633,9 @@ export default {
       console.log('s', this.frameInfo)
       if (!this.frameInfo.full_name) {
         if (this.frameInfo.type === FRAME_TYPE.ROOM) {
-          this.$set(this.frameInfo, 'full_name', val + '房')
+          this.$set(this.frameInfo, 'full_name', val + this.$t('frameManage.room'))
         } else {
-          this.$set(this.frameInfo, 'full_name', this.frameInfo.parent_name + '-' + val + '床')
+          this.$set(this.frameInfo, 'full_name', this.frameInfo.parent_name + '-' + val + this.$t('frameManage.bed'))
         }
       }
     },
@@ -653,12 +653,12 @@ export default {
           const _this = this
           API_PartInfo.add(this.formmodel).then(() => {
             _this.formshow = false
-            _this.$message.success('保存成功！')
+            _this.$message.success(this.$t('action.saveSuccess') + '')
             _this.getFrameTree()
           }).catch(err => {
             _this.formshow = false
             _this.formmodel.member_password = ''
-            _this.$message.error(err)
+            _this.$message.error(err.message)
           })
         }
       })

src/views/hospitalFrame/frameTreeView.vue

@@ -63,13 +63,13 @@
       </el-aside>
       <el-main>
         <el-tabs v-model="activeName" style="margin:0px;" type="border-card">
-          <el-tab-pane label="用户列表" name="frameInfo">
+          <el-tab-pane :label="this.$t('frameManage.memberList')" name="frameInfo">
             <keep-alive>
               <customer-manager v-if="uiVersion===2" :frame="selectedNode" @saved="handleCustomerChange" />
               <patient-manager v-if="uiVersion===1" :frame="selectedNode" @saved="handleCustomerChange" />
             </keep-alive>
           </el-tab-pane>
-          <el-tab-pane label="设备列表" name="deviceList">
+          <el-tab-pane :label="this.$t('frameManage.deviceList')" name="deviceList">
             <keep-alive>
               <device-manager :frame="selectedNode" />
             </keep-alive>
@@ -80,13 +80,13 @@
 
     <!---添加空间结构弹窗 -->
     <el-dialog :title="frameEditTitle" :visible.sync="frameDialogVisible" width="500px">
-      <el-form ref="editForm" :model="frameInfo" :rules="rules" label-width="110px">
+      <el-form ref="editForm" :model="frameInfo" :rules="rules" label-width="130px">
         <el-row>
           <el-col :span="24">
             <!--医院结构名称-->
-            <el-form-item label="名称" prop="name">
+            <el-form-item :label="this.$t('action.name')" prop="name">
               <el-input v-model="frameInfo.name" :maxlength="20" @change="frameChange">
-                <template slot="append">{{ frameInfo.type === 4?"房":"床" }}</template>
+                <template slot="append">{{ frameInfo.type === 4? this.$t('frameManage.room') : this.$t('frameManage.bed') }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -94,7 +94,7 @@
         <el-row>
           <el-col :span="24">
             <!--医院结构别名-->
-            <el-form-item label="别名" prop="alias">
+            <el-form-item :label="this.$t('action.alias')" prop="alias">
               <el-input v-model="frameInfo.alias" :maxlength="20" />
             </el-form-item>
           </el-col>
@@ -102,34 +102,34 @@
         <el-row>
           <el-col :span="24">
             <!--医院结构别名-->
-            <el-form-item label="全称" prop="full_name">
+            <el-form-item :label="this.$t('action.fullName')" prop="full_name">
               <el-input v-model="frameInfo.full_name" :maxlength="20" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row hidden>
           <el-col :span="12">
-            <el-form-item label="类型">
-              <el-radio v-model="frameInfo.type" :label="1">病房</el-radio>
-              <el-radio v-model="frameInfo.type" :label="2">床位</el-radio>
+            <el-form-item :label="this.$t('action.type')">
+              <el-radio v-model="frameInfo.type" :label="1">{{ this.$t('frameManage.room') }}</el-radio>
+              <el-radio v-model="frameInfo.type" :label="2">{{ this.$t('frameManage.bed') }}</el-radio>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-form-item>
-          <el-button type="primary" class="save" @click="handleFrameSubmit('editForm')">确定</el-button>
+          <el-button type="primary" class="save" @click="handleFrameSubmit('editForm')">{{ this.$t('action.yes') }}</el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
     <!---添加空间结构弹窗 -->
 
     <!---快速创建结构弹窗 -->
-    <el-dialog title="快速构建结构" :visible.sync="frameQuickCreateVisible" width="500px">
-      <el-form ref="createFrameForm" :model="createFrameModel" :rules="createFrameRules" label-width="110px">
+    <el-dialog :title="this.$t('frameManage.quickCreateFrame')" :visible.sync="frameQuickCreateVisible" width="600px">
+      <el-form ref="createFrameForm" :model="createFrameModel" :rules="createFrameRules" label-width="200px">
         <el-row>
           <el-col :span="24">
             <!--开始房间号-->
-            <el-form-item label="开始房间号" prop="start_no">
+            <el-form-item :label="this.$t('frameManage.startRoom')" prop="start_no">
               <el-input-number v-model="createFrameModel.room_start_no" :min="1" @change="roomStartChange" />
             </el-form-item>
           </el-col>
@@ -137,7 +137,7 @@
         <el-row>
           <el-col :span="24">
             <!--结束房间号-->
-            <el-form-item label="结束房间号" prop="end_no">
+            <el-form-item :label="this.$t('frameManage.endRoom')" prop="end_no">
               <el-input-number v-model="createFrameModel.room_end_no" :min="createFrameModel.room_start_no" />
             </el-form-item>
           </el-col>
@@ -145,7 +145,7 @@
         <el-row>
           <el-col :span="24">
             <!--每房床位数-->
-            <el-form-item label="每房床位数" prop="beds_per_room">
+            <el-form-item :label="this.$t('frameManage.bedQuantity')" prop="beds_per_room">
               <el-input-number v-model="createFrameModel.beds_per_room" :min="1" :max="20" />
             </el-form-item>
           </el-col>
@@ -154,13 +154,13 @@
         <el-row>
           <el-col :span="18">
             <!--每房床位数-->
-            <el-form-item label="房号显示位数" prop="room_num_bits">
+            <el-form-item :label="this.$t('frameManage.showRoomDigit')" prop="room_num_bits">
               <el-input-number v-model="createFrameModel.room_num_bits" :min="1" :max="4" @change="(val)=>{bitNumChange(val,'room')}" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <div class="el-form-item__label">
-              示例：{{ room_num_demo }}
+              {{ this.$t('frameManage.example') }}：{{ room_num_demo }}
             </div>
           </el-col>
         </el-row>
@@ -168,19 +168,19 @@
         <el-row>
           <el-col :span="18">
             <!--每房床位数-->
-            <el-form-item label="床号显示位数" prop="bed_num_bits">
+            <el-form-item :label="this.$t('frameManage.showBedDigit')" prop="bed_num_bits">
               <el-input-number v-model="createFrameModel.bed_num_bits" :min="1" :max="4" @change="(val)=>{bitNumChange(val,'bed')}" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <div class="el-form-item__label">
-              示例：{{ bed_num_demo }}
+              {{ this.$t('frameManage.example') }}：{{ bed_num_demo }}
             </div>
           </el-col>
         </el-row>
 
         <el-form-item>
-          <el-button type="primary" class="save" @click="quickCreateSubmit()">确定</el-button>
+          <el-button type="primary" class="save" @click="quickCreateSubmit()">{{ this.$t('action.yes') }}</el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -212,20 +212,20 @@ export default {
       /** 上级机构数组 **/
       parents: [],
       /** frame 编辑弹窗 **/
-      frameEditTitle: '添加',
+      frameEditTitle: this.$t('action.add'),
       frameDialogVisible: false,
       frameInfo: {},
       rules: {
         name: [
-          this.MixinRequired('请输入结构名称！'),
-          { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'blur' }
+          this.MixinRequired(this.$t('frameManage.inputFrameName')),
+          { min: 2, max: 10, message: this.$t('frameManage.inputLong'), trigger: 'blur' }
         ],
         alias: [
-          { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'blur' }
+          { min: 2, max: 10, message: this.$t('frameManage.inputLong'), trigger: 'blur' }
         ],
         full_name: [
-          this.MixinRequired('请输入全称！'),
-          { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'blur' }
+          this.MixinRequired(this.$t('frameManage.inputFrameFullName')),
+          { min: 2, max: 10, message: this.$t('frameManage.inputLong'), trigger: 'blur' }
         ]
       },
       /** 快速创建空间结构弹窗 **/
@@ -284,9 +284,9 @@ export default {
 
     append(data) {
       if (data.type === FRAME_TYPE.ROOM) {
-        this.frameEditTitle = '【' + data.full_name + '】添加床位'
+        this.frameEditTitle = '【' + data.full_name + '】' + this.$t('frameManage.addBed')
       } else {
-        this.frameEditTitle = '【' + data.full_name + '】添加房间'
+        this.frameEditTitle = '【' + data.full_name + '】' + this.$t('frameManage.addRoom')
       }
       this.frameInfo = {
         hospital_id: data.hospital_id,
@@ -305,25 +305,25 @@ export default {
         ...data,
         parent_name: parentNode === null ? '' : parentNode.name
       }
-      this.frameEditTitle = '编辑节点'
+      this.frameEditTitle = this.$t('frameManage.editFrame')
       this.frameDialogVisible = true
     },
     remove(data) {
       let warning = ''
       if (data.type === FRAME_TYPE.ROOM) {
-        warning = '确定要删除【' + data.full_name + '】及其中的所有床位吗?'
+        warning = this.$t('frameManage.sureDelete') + '【' + data.full_name + '】' + this.$t('frameManage.allBad')
       } else {
-        warning = '确定删除床位【' + data.full_name + '】吗？'
+        warning = this.$t('frameManage.sureDeleteBed') + '【' + data.full_name + '】?'
       }
-      this.$confirm(warning, '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(warning, this.$t('action.waring' + ''), {
+        confirmButtonText: this.$t('action.yes'),
+        cancelButtonText: this.$t('action.cancel'),
         type: 'warning'
       }).then(() => {
         HospitalFrame_API.deleteHospitalFrame(data.id).then(response => {
           this.$message({
             type: 'success',
-            message: '已删除!'
+            message: this.$t('action.deleted')
           })
           this.getFrameTree().then(() => {
             // 判断选中节点是否被删除，如果被删除需要重新选择根节点
@@ -350,7 +350,7 @@ export default {
           const params = this.MixinClone(this.frameInfo)
           if (params.id) {
             HospitalFrame_API.updateHospitalFrame(params.id, params).then(response => {
-              this.$message.success('修改成功！')
+              this.$message.success(this.$t('action.editSuccess') + '')
               this.frameDialogVisible = false
               this.getFrameTree().then(() => {
                 this.selectedNodeId = response.id
@@ -363,13 +363,13 @@ export default {
             }
 
             HospitalFrame_API.addHospitalFrame(params).then(response => {
-              this.$message.success('添加成功！')
+              this.$message.success(this.$t('action.addSuccess') + '')
               this.frameDialogVisible = false
               this.getFrameTree()
             })
           }
         } else {
-          this.$message.error('表单填写有误，请检查！')
+          this.$message.error(this.$t('error.fromError') + '')
           return false
         }
       })
@@ -446,7 +446,7 @@ export default {
       const params = this.createFrameModel
       params.part_frame_id = this.treeData[0].id
       HospitalFrame_API.quickCreate(params).then(res => {
-        this.$message.success('创建成功！')
+        this.$message.success(this.$t('action.createSuccess') + '')
         this.frameQuickCreateVisible = false
         this.getFrameTree().then(() => {
           this.$refs.frameTree.setCurrentKey(this.selectedNodeId)
@@ -480,10 +480,10 @@ export default {
       console.log('s', this.frameInfo)
       if (!this.frameInfo.full_name) {
         if (this.frameInfo.type === FRAME_TYPE.ROOM) {
-          this.$set(this.frameInfo, 'full_name', val + '房')
+          this.$set(this.frameInfo, 'full_name', val + this.$t('frameManage.room'))
           // this.frameInfo.full_name = val
         } else {
-          this.$set(this.frameInfo, 'full_name', this.frameInfo.parent_name + '-' + val + '床')
+          this.$set(this.frameInfo, 'full_name', this.frameInfo.parent_name + '-' + val + this.$t('frameManage.bed'))
           // this.frameInfo.full_name =
         }
       }

src/views/hospitalFrame/hospitalFrame.vue

@@ -96,7 +96,7 @@
         <el-row hidden>
           <el-col :span="12">
             <el-form-item label="类型">
-              <el-radio v-model="frameInfo.type" :label="1">病房</el-radio>
+              <el-radio v-model="frameInfo.type" :label="1">客房</el-radio>
               <el-radio v-model="frameInfo.type" :label="2">床位</el-radio>
             </el-form-item>
           </el-col>

src/views/hospitalFrame/nurse_watch_frame.vue

@@ -230,7 +230,7 @@ export default {
         })
       })
       if (data.length === 0) {
-        this.$message.info('请选择病床！')
+        this.$message.info('请选择床位！')
         return
       }
       API_hospitalFrame.updateDeviceFrameManage({ deviceId: this.deviceId, frameIds: data.join(','), delList: otherData }).then(res => {

src/views/ncs-device/components/deviceManager.vue

@@ -168,6 +168,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row v-if="hasAudioId">
+          <el-col :span="12">
+            <el-form-item label="485地址" prop="sip_id">
+              <el-input v-model="deviceModel.sip_id" clearable placeholder="请输入485地址" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="handlerFormSubmit('deviceEditForm')">确 定</el-button>
@@ -255,9 +262,12 @@ export default {
         ],
         trans_audio_id: [
           { required: true, message: '请选择总线转换盒', trigger: 'blur' }
-        ]
+        ],
         // trans_rs485_id: [
         //   { required: true, message: '请选择485转换盒', trigger: 'blur' }
+        // ],
+        // sip_id: [
+        //   { required: true, message: '请输入485地址', trigger: 'blur' }
         // ]
       },
       partFrames: [],
@@ -267,7 +277,7 @@ export default {
         { key: '护士主机', value: 1 },
         { key: '医生主机', value: 2 },
         { key: '门口机', value: 3 },
-        { key: '病床分机', value: 4 },
+        { key: '床位分机', value: 4 },
         { key: 'LCD走廊屏', value: 5 },
         { key: 'LED点阵屏', value: 6 },
         { key: '移动设备', value: 7 },

src/views/ncs-device/device-edit.vue

@@ -10,7 +10,7 @@
                 <el-option label="护士主机" :value="1" />
                 <el-option label="医生主机" :value="2" />
                 <el-option label="门口机" :value="3" />
-                <el-option label="病床分机" :value="4" />
+                <el-option label="床位分机" :value="4" />
                 <el-option label="LCD走廊屏" :value="5" />
                 <el-option label="LED点阵屏" :value="6" />
                 <el-option label="移动设备" :value="7" />

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

@@ -69,7 +69,7 @@
                 <el-input-number v-model="formmodel.day_door_vol" :min="0" :max="100" label="门口机通话音量" />
               </el-form-item>
               <el-form-item label="转换盒通话音量" prop="day_transfer_box_vol">
-                <el-input-number v-model="formmodel.day_transfer_box_vol" :min="0" :max="100" label="病床分机通话音量" />
+                <el-input-number v-model="formmodel.day_transfer_box_vol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -80,7 +80,7 @@
                 <el-input-number v-model="formmodel.day_ring_times" :min="0" :max="10" label="主机叫号次数" />
               </el-form-item>
               <el-form-item label="分机通话音量" prop="day_bed_vol">
-                <el-input-number v-model="formmodel.day_bed_vol" :min="0" :max="100" label="病床分机通话音量" />
+                <el-input-number v-model="formmodel.day_bed_vol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -91,7 +91,7 @@
                 <el-input-number v-model="formmodel.day_nurse_led" :min="0" :max="100" label="分机护理灯亮度" />
               </el-form-item>
               <el-form-item label="转换盒系统音量" prop="day_transfer_box_system_vol">
-                <el-input-number v-model="formmodel.day_transfer_box_system_vol" :min="0" :max="100" label="病床分机通话音量" />
+                <el-input-number v-model="formmodel.day_transfer_box_system_vol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -116,7 +116,7 @@
                 <el-input-number v-model="formmodel.night_door_vol" :min="0" :max="100" label="门口机通话音量" />
               </el-form-item>
               <el-form-item label="转换盒通话音量" prop="night_transfer_box_vol">
-                <el-input-number v-model="formmodel.night_transfer_box_vol" :min="0" :max="100" label="病床分机通话音量" />
+                <el-input-number v-model="formmodel.night_transfer_box_vol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -127,7 +127,7 @@
                 <el-input-number v-model="formmodel.night_ring_times" :min="0" :max="10" label="主机叫号次数" />
               </el-form-item>
               <el-form-item label="分机通话音量" prop="night_bed_vol">
-                <el-input-number v-model="formmodel.night_bed_vol" :min="0" :max="100" label="病床分机通话音量" />
+                <el-input-number v-model="formmodel.night_bed_vol" :min="0" :max="100" label="分机通话音量" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -142,7 +142,7 @@
                   v-model="formmodel.night_transfer_box_system_vol"
                   :min="0"
                   :max="100"
-                  label="病床分机通话音量"
+                  label="分机通话音量"
                 />
               </el-form-item>
             </el-col>

src/views/ncs-orginazition/partInfoSetting.vue

@@ -33,18 +33,18 @@
         </keep-alive>
       </el-tab-pane>
 
-      <el-tab-pane label="5寸病床分机APP" name="sickbed">
+      <el-tab-pane label="5寸床位分机APP" name="sickbed">
         <keep-alive>
           <app-version-manager :part-id="part_id" :device-type="4" />
         </keep-alive>
       </el-tab-pane>
 
-      <el-tab-pane label="7寸病床分机APP" name="sevensickbed">
+      <el-tab-pane label="7寸床位分机APP" name="sevensickbed">
         <keep-alive>
           <app-version-manager :part-id="part_id" :device-type="204" />
         </keep-alive>
       </el-tab-pane>
-      <el-tab-pane label="病床分机可视版" name="vsickbed">
+      <el-tab-pane label="床位分机可视版" name="vsickbed">
         <keep-alive>
           <app-version-manager :part-id="part_id" :device-type="104" />
         </keep-alive>