修改frame相关接口的位置

public/domain.js

@@ -1,15 +1,15 @@
 const domain = {
-  serverUrl: 'http://192.168.1.186:8005',
-  DeviceUrl: 'http://8.129.220.143:8006',
-  mediaUrl: 'http://8.129.220.143:8004',
+  serverUrl: 'http://192.168.1.57:8005',
+  DeviceUrl: 'http://192.168.1.57:8006',
+  mediaUrl: 'http://192.168.1.57:8004',
   OnlineSystemUrl: 'http://api.base.wdklian.com',
   apiMode: 'dev',
   uiVersion: 1, // 1 医院版，2 月子中心版,3养老院版
-  enableBroadcast: false, //广播使能
-  enableMobile: false,  //手机使能
-  enableEntraceguard: false,  //门禁使能
-  enableNBiot: false,  //NB设备 
-  enableCustomerDevice: false,  //用户设备 
-  enableSosDevice: false  //报警设备 
+  enableBroadcast: true, //广播使能
+  enableMobile: true,  //手机使能
+  enableEntraceguard: true,  //门禁使能
+  enableNBiot: true,  //NB设备
+  enableCustomerDevice: true,  //用户设备
+  enableSosDevice: true  //报警设备
 }
 

src/api/ncs_frameGroup.js

@@ -63,54 +63,3 @@ export function getAll(partId) {
   })
 }
 
-/** 查询某科室下的房间结构 */
-export function getframestruct(part_id, frame_type) {
-  return request({
-    url: `/ncs/frame/getframestruct/${part_id}/${frame_type}`,
-    method: 'get',
-    loading: false
-  })
-}
-
-/** 查询某科室下的房间结构 */
-export function getAllFrameTreeByType(frame_type) {
-  return request({
-    url: `/ncs/frame/getAllFrameTreeByType/${frame_type}`,
-    method: 'get',
-    loading: false
-  })
-}
-
-
-/** 查询空间结构的管理人员信息 */
-export function getFrameManagedClerk(frameId) {
-  return request({
-    url: `/ncs/frame/getframemanagedclerk/${frameId}`,
-    method: 'get',
-    loading: false
-  })
-}
-
-
-/** 保存空间结构的管理人员信息 */
-export function saveFrameManagedClerk(params) {
-  return request({
-    url: `/ncs/frame/saveframemanagedclerk`,
-    method: 'POST',
-    loading: true,
-    headers: { 'Content-Type': 'application/json' },
-    data:params
-  })
-}
-
-/** 查询某科室下多人共管的房间结构 */
-export function getframemultimanagedstruct(part_id, frame_type) {
-  return request({
-    url: `/ncs/frame/getframemultimanagedstruct/${part_id}/${frame_type}`,
-    method: 'get',
-    loading: false
-  })
-}
-
-
-

src/api/ncs_hospitalFrame.js

@@ -174,4 +174,51 @@ export function getFrameAndDevice(id) {
     method: 'GET',
     loading: false
   })
-}
+}
+
+/** 查询某科室下的房间结构 */
+export function getframestruct(part_id, frame_type) {
+  return request({
+    url: `/ncs/frame/getframestruct/${part_id}/${frame_type}`,
+    method: 'get',
+    loading: false
+  })
+}
+
+/** 查询某科室下的房间结构 */
+export function getAllFrameTreeByType(frame_type) {
+  return request({
+    url: `/ncs/frame/getAllFrameTreeByType/${frame_type}`,
+    method: 'get',
+    loading: false
+  })
+}
+
+/** 查询空间结构的管理人员信息 */
+export function getFrameManagedClerk(frameId) {
+  return request({
+    url: `/ncs/frame/getframemanagedclerk/${frameId}`,
+    method: 'get',
+    loading: false
+  })
+}
+
+/** 保存空间结构的管理人员信息 */
+export function saveFrameManagedClerk(params) {
+  return request({
+    url: `/ncs/frame/saveframemanagedclerk`,
+    method: 'POST',
+    loading: true,
+    headers: { 'Content-Type': 'application/json' },
+    data: params
+  })
+}
+
+/** 查询某科室下多人共管的房间结构 */
+export function getframemultimanagedstruct(part_id, frame_type) {
+  return request({
+    url: `/ncs/frame/getframemultimanagedstruct/${part_id}/${frame_type}`,
+    method: 'get',
+    loading: false
+  })
+}

src/views/calling-board/index.vue

@@ -129,7 +129,7 @@ import ListFilter from '@/components/AgGridCustomFilter/ListFilter'
 import RadioFilter from '@/components/AgGridCustomFilter/RadioFilter'
 // import { DeviceUrl } from '@/utils/domain'
 import * as API_Device from '@/api/ncs_device'
-import * as API_FrameGroup from '@/api/ncs_frameGroup'
+import * as API_Frame from '@/api/ncs_hospitalFrame'
 import * as API_Board from '@/api/ncs_board'
 const DeviceUrl = domain.DeviceUrl
 export default {
@@ -417,7 +417,7 @@ export default {
      * */
     getFrameTree() {
       return new Promise((resolve, reject) => {
-        API_FrameGroup.getframestruct(this.$store.getters.partId, 3).then(res => {
+        API_Frame.getframestruct(this.$store.getters.partId, 3).then(res => {
           this.treeData = res.frameTree
           resolve()
         }).catch(err => {

src/views/hospital/ncs_frame/frameTreeView.vue

@@ -294,7 +294,7 @@
 
 <script>
 import * as HospitalFrame_API from '@/api/ncs_hospitalFrame'
-import * as API_FrameGroup from '@/api/ncs_frameGroup'
+import * as API_Frame from '@/api/ncs_hospitalFrame'
 import CustomerManager from '@/views/hospital/ncs_customer/customerManager'
 import DeviceManager from '@/views/hospital/ncs_device/deviceManager'
 // import ClerkList from '@/views/ncs-clerk/clerkList
@@ -397,7 +397,7 @@ export default {
      * */
     getFrameTree() {
       return new Promise((resolve, reject) => {
-        API_FrameGroup.getframestruct(this.$store.getters.partId, FRAME_TYPE.HOSPITAL).then(res => {
+        API_Frame.getframestruct(this.$store.getters.partId, FRAME_TYPE.HOSPITAL).then(res => {
           console.log(res)
           this.bfCount = res.bfCount
           this.zcCount = res.zcCount

src/views/hospitalFrame/frameGroupEdit.vue

@@ -45,6 +45,7 @@
      * 编辑病区信息
      */
 import * as API_FrameGroup from '@/api/ncs_frameGroup'
+import * as API_Frame from '@/api/ncs_hospitalFrame'
 export default {
   name: 'FrameGroupEdit',
   data() {
@@ -75,7 +76,7 @@ export default {
     },
 
     getRoomStructs() {
-      API_FrameGroup.getframestruct(this.$store.getters.partId, 4).then(res => {
+      API_Frame.getframestruct(this.$store.getters.partId, 4).then(res => {
         this.rooms = this.filterGroupFrames(res.frameTree, this.groupId)
         console.log('rooms', this.rooms)
       }).catch(err => {

src/views/hospitalFrame/frameTreeView-admin.vue

@@ -205,7 +205,7 @@
 
 <script>
 import * as HospitalFrame_API from '@/api/ncs_hospitalFrame'
-import * as API_FrameGroup from '@/api/ncs_frameGroup'
+import * as API_Frame from '@/api/ncs_hospitalFrame'
 import CustomerManager from '../customer/components/customerManager'
 import DeviceManager from '../ncs-device/components/deviceManager'
 import PatientManager from '../customer/components/patientManager'
@@ -289,7 +289,7 @@ export default {
      * */
     getFrameTree() {
       return new Promise((resolve, reject) => {
-        API_FrameGroup.getAllFrameTreeByType(FRAME_TYPE.HOSPITAL).then(res => {
+        API_Frame.getAllFrameTreeByType(FRAME_TYPE.HOSPITAL).then(res => {
           this.treeData = res.frameTree
           resolve()
         }).catch(err => {

src/views/hospitalFrame/frameTreeView.vue

@@ -247,7 +247,7 @@
 
 <script>
 import * as HospitalFrame_API from '@/api/ncs_hospitalFrame'
-import * as API_FrameGroup from '@/api/ncs_frameGroup'
+import * as API_Frame from '@/api/ncs_hospitalFrame'
 import CustomerManager from '../customer/components/customerManager'
 import DeviceManager from '../ncs-device/components/deviceManager'
 import PatientManager from '../customer/components/patientManager'
@@ -335,7 +335,7 @@ export default {
      * */
     getFrameTree() {
       return new Promise((resolve, reject) => {
-        API_FrameGroup.getframestruct(this.$store.getters.partId, FRAME_TYPE.PART).then(res => {
+        API_Frame.getframestruct(this.$store.getters.partId, FRAME_TYPE.PART).then(res => {
           this.treeData = res.frameTree
           resolve()
         }).catch(err => {

src/views/ncs-broadcast/components/broadcastInfo.vue

@@ -128,6 +128,7 @@
 
 <script>
 import * as API_FrameGroup from '@/api/ncs_frameGroup'
+import * as API_Frame from '@/api/ncs_hospitalFrame'
 import * as API_Broadcast from '@/api/calling-broadcast'
 
 export default {
@@ -261,7 +262,7 @@ export default {
     },
     /** 获取科室房间结构 **/
     getRoomStructs() {
-      API_FrameGroup.getframestruct(this.$store.getters.partId, 4).then(res => {
+      API_Frame.getframestruct(this.$store.getters.partId, 4).then(res => {
         this.rooms = this.filterGroupFrames(res.frameTree, this.formmodel.frame_ids)
       })
     },

src/views/ncs-clerk-frame-manage/components/frameView.vue

@@ -318,7 +318,7 @@
 </template>
 
 <script>
-    import * as API_FrameGroup from '@/api/ncs_frameGroup'
+    import * as API_Frame from '@/api/ncs_hospitalFrame'
     import {FRAME_TYPE} from '@/utils/enum/FrameTypeEnum'
     import i18n from "../../../utils/i18n"
 
@@ -366,7 +366,7 @@
              * */
             getFrameTree() {
                 return new Promise((resolve, reject) => {
-                    API_FrameGroup.getframestruct(this.$store.getters.partId, FRAME_TYPE.PART).then(res => {
+                    API_Frame.getframestruct(this.$store.getters.partId, FRAME_TYPE.PART).then(res => {
                         this.treeData = res.frameTree
                         resolve()
                     }).catch(err => {
@@ -418,7 +418,7 @@
                 })
             },
             getFrameManagedClerk(frameId) {
-                API_FrameGroup.getFrameManagedClerk(frameId).then(res => {
+                API_Frame.getFrameManagedClerk(frameId).then(res => {
                     this.frameManagedClerk = {...res}
                 }).catch(err => {
 
@@ -438,7 +438,7 @@
             },
 
             saveFrameManagedClerk() {
-                API_FrameGroup.saveFrameManagedClerk(this.frameManagedClerk).then(res => {
+                API_Frame.saveFrameManagedClerk(this.frameManagedClerk).then(res => {
 
                     this.getFrameManagedClerk(res.id)
                     this.$message.success(this.$t('action.saveSuccess'))

src/views/ncs-clerk-frame-manage/components/multiClerkManageFrame.vue

@@ -291,7 +291,7 @@
 </template>
 
 <script>
-    import * as API_FrameGroup from '@/api/ncs_frameGroup'
+    import * as API_Frame from '@/api/ncs_hospitalFrame'
     import {FRAME_TYPE} from '@/utils/enum/FrameTypeEnum'
     import i18n from "../../../utils/i18n"
     export default {
@@ -344,7 +344,7 @@
              * */
             getFrameTree() {
                 return new Promise((resolve, reject) => {
-                    API_FrameGroup.getframemultimanagedstruct(this.$store.getters.partId, FRAME_TYPE.PART).then(res => {
+                    API_Frame.getframemultimanagedstruct(this.$store.getters.partId, FRAME_TYPE.PART).then(res => {
                         this.treeData = [...res]
                         resolve()
                     }).catch(err => {
@@ -354,7 +354,7 @@
             },
 
             getFrameManagedClerk(frameId) {
-                API_FrameGroup.getFrameManagedClerk(frameId).then(res => {
+                API_Frame.getFrameManagedClerk(frameId).then(res => {
                     this.frameManagedClerk={...res}
                 }).catch(err => {
 
@@ -414,7 +414,7 @@
             },
 
             saveFrameManagedClerk(){
-                API_FrameGroup.saveFrameManagedClerk(this.frameManagedClerk).then(res=>{
+                API_Frame.saveFrameManagedClerk(this.frameManagedClerk).then(res=>{
                     this.getFrameTree().then(() => {
                         if(this.treeData[0]!=null){
                             let node = this.findNodeById(this.treeData,this.selectedNodeId)

src/views/ncs-clerk/components/clerkList.vue

@@ -72,7 +72,7 @@
                       v-model="addMemberForm.mobile"
                       :fetch-suggestions="querySearch"
                       value-key="mobile"
-                      placeholder="请输入内容"
+                      :placeholder="this.$t('action.inputMsg')"
                       @select="handleSelect"
                       :disabled="autoCompleteDisabled"
               >
@@ -94,7 +94,7 @@
                       v-model="addMemberForm.uname"
                       :fetch-suggestions="querySearch"
                       value-key="mobile"
-                      placeholder="请输入内容"
+                      :placeholder="this.$t('action.inputMsg')"
                       @select="handleSelect"
                       :disabled="autoCompleteDisabled"
               >
@@ -693,7 +693,13 @@ export default {
           if (this.imageUrl) {
             params.face = this.imageUrl
           }
-          params.role_name = this.rolesOptions.filter( p => p.role_id === params.role_id)[0].role_name
+
+          if (params.role_id === 0) {
+            params.role_name = this.rolesOptions.filter(p => p.role_id === 1)[0].role_name
+          } else {
+            params.role_name = this.rolesOptions.filter(p => p.role_id === params.role_id)[0].role_name
+          }
+
           if (params.clerk_id) {
             // if (this.roleZzId === params.role_id) {
             //   const addIds = this.newCheckList.filter(function(val) { return _this.oldCheckList.indexOf(val) === -1 })

src/views/nfc-interaction/nfcPosition.vue

@@ -129,7 +129,7 @@ import {parseTime} from "@/utils";
 import {FUNCTION_TYPE} from "@/utils/enum/FunctionEnum";
 import * as API_Clerk from "@/api/ncs_clerk";
 import {unixToDate} from "@/utils/Foundation";
-import * as API_FrameGroup from "@/api/ncs_frameGroup";
+import * as API_Frame from "@/api/ncs_hospitalFrame";
 import {FRAME_TYPE} from "@/utils/enum/FrameTypeEnum";
 
 export default {
@@ -310,7 +310,7 @@ export default {
       }
     },
     getAllFrame(){
-      API_FrameGroup.getframestruct(this.$store.getters.partId, FRAME_TYPE.PART).then(res => {
+      API_Frame.getframestruct(this.$store.getters.partId, FRAME_TYPE.PART).then(res => {
         this.partTree = res.frameTree[0]
       })
     },