Merge branch 'develop' into feature/update-20230720

# Conflicts:
#	public/domain.js
#	src/views/dashboard/calling/index.vue
#	src/views/ncs-clerk/components/clerkList.vue

Dockerfile

@@ -4,11 +4,12 @@ MAINTAINER wuyunfeng
 RUN mkdir -p /app/
 COPY ./dist /app/
 COPY ./nginx.conf /etc/nginx/nginx.conf
-
+COPY ./set-envs.sh /app/set-envs.sh
 EXPOSE 443 80
 
-ENV serverUrl=http://172.28.100.100:8005 DeviceUrl=http://172.28.100.100:8006 mediaUrl=http://172.28.100.100:8004 apiMode=dev uiVersion=1
+ENV OnlineSystemUrl=http://api.base.wdklian.com serverUrl=http://172.28.100.100:8005 DeviceUrl=http://172.28.100.100:8006 mediaUrl=http://172.28.100.100:8004 apiMode=dev uiVersion=1 enableBroadcast=false enableMobile=false enableEntraceguard=false enableNBiot=false enableCustomerDevice=false enableSosDevice=false enable485=false enableLinux=false
 RUN echo 'USERNAME=' $serverUrl ',DeviceUrl=' $DeviceUrl ',mediaUrl=' $mediaUrl',apiMode=' $apiMode ',uiVersion=' $uiVersion
 #CMD sh -c "sed -i 's/^.*8006.*$/serverUrl=$serverUrl' domain.js"
-CMD sh -c  "sed -i -e \"s~^.*serverUrl.*$~serverUrl:'$serverUrl',~;s~^.*DeviceUrl.*$~DeviceUrl:'$DeviceUrl',~;s~^.*mediaUrl.*$~mediaUrl:'$mediaUrl',~;s~^.*apiMode.*$~apiMode:'$apiMode',~;s~^.*uiVersion.*$~uiVersion:$uiVersion~\" /app/domain.js; exec nginx -g \"daemon off;\""
+RUN ["chmod", "+x", "/app/set-envs.sh"]
+CMD sh -c  "/app/set-envs.sh && exec nginx -g \"daemon off;\""
 #CMD sh -c "exec nginx -g 'daemon off;'"

public/domain.js

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

set-envs.sh

@@ -0,0 +1,16 @@
+echo "const domain = {
+  serverUrl: '${serverUrl}',
+  DeviceUrl: '${DeviceUrl}',
+  mediaUrl: '${mediaUrl}',
+  OnlineSystemUrl: '${API_MODEL}',
+  apiMode: '${apiMode}',
+  uiVersion: ${uiVersion}, // 1 医院版，2 月子中心版,3养老院版
+  enableBroadcast: ${enableBroadcast}, //广播使能
+  enableMobile: ${enableMobile},  //手机使能
+  enableEntraceguard: ${enableEntraceguard},  //门禁使能
+  enableNBiot: ${enableNBiot},  //NB设备
+  enableCustomerDevice: ${enableCustomerDevice},  //用户设备
+  enableSosDevice: ${enableSosDevice}, //报警设备
+  enable485:${enable485},
+  enableLinux:${enableLinux}
+}"  > /app/domain.js

src/router/index.js

@@ -15,6 +15,8 @@ const enableEntraceguard = domain.enableEntraceguard
 const enableNBiot = domain.enableNBiot
 const enableCustomerDevice = domain.enableCustomerDevice
 const enableSosDevice = domain.enableSosDevice
+const enable485 = domain.enable485
+const enableLinux = domain.enableLinux
 
 /**
  * constantRoutes
@@ -572,7 +574,8 @@ export const adminRoutes = [
         path: 'linux_version',
         component: () => import('@/views/ncs-linux-version/linuxVersionSetting'),
         name: 'admin-linux-version',
-        meta: { title: i18n.t('tab.linuxVersion'), icon: 'nested', noCache: true }
+        meta: { title: i18n.t('tab.linuxVersion'), icon: 'nested', noCache: true },
+        hidden: !enableLinux
       },
       {
         path: 'led_device',
@@ -654,22 +657,7 @@ export const adminRoutes = [
         meta: { title: i18n.t('tab.systemConfig'), icon: 'nested', noCache: true }
       }
     ]
-  },
-  {
-    path: '/part_settings',
-    component: Layout,
-    redirect: '/part_settings/index/:id?',
-    children: [
-      {
-        path: 'index/:id?',
-        component: () => import('@/views/ncs-orginazition/partInfoSetting'),
-        name: 'admin-part-settings',
-        meta: { title: i18n.t('tab.shopSetting'), icon: 'nested', noCache: true },
-        hidden: true
-      }
-    ]
-  },
-  {
+  },{
     path: '/menu',
     component: Layout,
     redirect: '/menu/index',
@@ -692,6 +680,12 @@ export const adminRoutes = [
         component: () => import('@/views/ncs-orginazition/index'),
         name: 'admin-organization',
         meta: { title: i18n.t('tab.organization'), icon: 'tree', noCache: true }
+      },{
+        path: 'index/:id?',
+        component: () => import('@/views/ncs-orginazition/partInfoSetting'),
+        name: 'admin-part-settings',
+        meta: { title: i18n.t('tab.shopSetting'), icon: 'nested', noCache: true },
+        hidden: true
       }
     ]
   },
@@ -719,7 +713,8 @@ export const adminRoutes = [
         name: 'admin-485-commissioning',
         meta: { title: i18n.t('tab.debugging485'), icon: 'authen', noCache: true }
       }
-    ]
+    ],
+    hidden: !enable485
   },
   {
     path: '/interaction_push',

src/views/custom-infoboard/templates/common/text-display2.vue

@@ -29,12 +29,18 @@
                         return customItem.area_content
                     }
                 }
-               return '文字'
+               return ''
             },
             titleText(){
+                //重写自定看板项标题
+                if(this.data.moduleConfig.dataConfig&&this.data.moduleConfig.dataConfig.titleText!=='') {
+                   return  this.data.moduleConfig.dataConfig.titleText
+                }
+
                 if(this.data.moduleConfig.dataConfig&&this.data.moduleConfig.dataConfig.displayCustomerItem!==null){ //看板项内容
 
                     let customItem = this.boardCustomerItems.filter(p=>p.his_keyval===this.data.moduleConfig.dataConfig.displayCustomerItem)[0]
+
                     if(customItem){
                         return customItem.area_label
                     }
@@ -90,12 +96,14 @@
                     marginRight:'0px',
                 },
                 dataConfig:{
-                   displayCustomerItem:''
+                   displayCustomerItem:'',
+                    titleText:''
+
                 },
                 showTitle:true, //显示标题,
             },
             children:([])
-        },
+        }
 
     }
 </script>

src/views/custom-infoboard/templates/moduleConfig.vue

@@ -342,7 +342,7 @@
 
 
                             <el-option v-for="(item, index) in boardItems" :key="index"
-                                       :label="item.area_label" :value="item.his_keyval"/>
+                                       :label="item.label_group_name+'-'+item.area_label" :value="item.his_keyval"/>
 
 
                         <!--                        <el-option v-for="field in dataFields" :label="field.display" :value="field.value"/>-->

src/views/customer/components/customerManager.vue

@@ -1139,7 +1139,7 @@ export default {
     },
     handleClick() {
       if (this.activeName === 'footprint') {
-        this.$router.push({path:'/device/myMapHtml', query: {mapUrl: this.mapUrl}})
+        this.$router.push({path:'/device/map', query: {mapUrl: this.mapUrl}})
       }
     },
     /** 生日选择变化，修改年龄字段 */

src/views/customer/components/elderlyCareManager.vue

@@ -1086,7 +1086,7 @@
             },
             handleClick() {
               if (this.activeName === 'footprint') {
-                this.$router.push({path:'/device/myMapHtml', query: {mapUrl: this.mapUrl}})
+                this.$router.push({path:'/device/map', query: {mapUrl: this.mapUrl}})
               }
             },
             /** 生日选择变化，修改年龄字段 */
@@ -1601,7 +1601,7 @@
             this.locationShow = false
           },
           goPage() {
-            this.$router.push({path:'/allMap'})
+            this.$router.push({path:'/customer/map'})
           },
           getCloud() {
             API_SystemConfig.cloud().then(r => {

src/views/customer/components/patientManager.vue

@@ -1162,7 +1162,7 @@
           },
             handleClick() {
               if (this.activeName === 'footprint') {
-                this.$router.push({path:'/device/myMapHtml', query: {mapUrl: this.mapUrl}})
+                this.$router.push({path:'/device/map', query: {mapUrl: this.mapUrl}})
               }
             },
             /** 生日选择变化，修改年龄字段 */

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

@@ -233,7 +233,7 @@ export default {
     },
     /** 编辑按钮 */
     handlerEdit: function(index, row) {
-      this.$router.push({ name: 'partInfoSetting', params: { id: row.id, callback: this.getList() }})
+      this.$router.push({ name: 'admin-part-settings', params: { id: row.id, callback: this.getList() }})
     },
     /** 表格行选择变化记录选中行数据*/
     selectFun: function(val) {

src/views/hospitalFrame/frameGroup.vue

@@ -356,7 +356,7 @@ export default {
       this.getList()
     },
     handEdit(row) {
-      this.$router.push({ name: 'frameGroupEdit', params: { id: row.id, callback: this.getList() }})
+      this.$router.push({ name: 'frame-group-edit', params: { id: row.id, callback: this.getList() }})
     },
     /**
              * 提交新增表单

src/views/ncs-broadcast/index.vue

@@ -760,7 +760,7 @@ export default {
       this.getList()
     },
     handEdit(row) {
-      this.$router.push({ name: 'broadcastEdit', params: { id: row.id, callback: this.getList() }})
+      this.$router.push({ name: 'broadcast-edit', params: { id: row.id, callback: this.getList() }})
     },
     /**
      * 提交新增表单

src/views/ncs-channel/index.vue

@@ -514,7 +514,7 @@ export default {
       this.formSubscribe = true
     },
     channelImHistory(row) {
-      this.$router.push({ name: 'channelImHistory', params: { id: row.id, callback: this.getList() }})
+      this.$router.push({ name: 'channel-im-history', params: { id: row.id, callback: this.getList() }})
     },
     getEmployees() {
       const _this = this

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

@@ -412,13 +412,13 @@ export default {
         }
       },
       { headerName: this.$t('member.mobile'), field: 'mobile', sortable: true, filter: true, width: 150 },
-      { headerName: this.$t('clerkManage.role'), field: 'role_name', sortable: true, filter: false, width: 150, valueFormatter: this.formatterRole,   filterFramework: 'ListFilter', 
+      { headerName: this.$t('clerkManage.role'), field: 'role_name', sortable: true, filter: false, width: 150, valueFormatter: this.formatterRole,   filterFramework: 'ListFilter',
         filterParams: {
           listData: this.roleTransfer
         } },
       { headerName: this.$t('member.leaderName'), field: 'leader_name', sortable: true, filter: true, width: 180 },
 
-      { headerName: this.$t('member.passNo'), field: 'pass_no', sortable: true, filter: true, width: 180 },
+      { headerName: this.$t('member.passNo'), field: 'pass_no', sortable: true, filter: true, flex:1 },
       { headerName: this.$t('action.handle'), field: 'id',
         cellRendererFramework: 'ButtonCellRender',
         cellRendererParams: param => {
@@ -578,6 +578,7 @@ export default {
       // 获取角色
       API_Clerk.getRoles(param).then(res => {
         this.rolesOptions = res.data
+        // this.rolesOptions.push({role_id:0,role_name:'超级管理员'})
         this.roleTransfer =[...res.data.map(p=>{return {'key':p.role_name,'value':p.role_name}})]
         this.columnDefs[6].filterParams.listData=this.roleTransfer
         // console.log(this.columnDefs)
@@ -653,7 +654,7 @@ export default {
           } else {
             params.role_name = this.rolesOptions.filter(p => p.role_id === params.role_id)[0].role_name
           }
-
+          // 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 })
@@ -696,6 +697,7 @@ export default {
     },
     /** 编辑用户 */
     handlerEdit(row) {
+
       this.autoCompleteDisabled=true
       this.addMemberForm = Object.assign({}, row)
 
@@ -860,7 +862,7 @@ export default {
     querySearch(queryString, cb) {
       API_Member.getList({...this.paramsmember,query:queryString}).then(res=>{
         cb(res.data)
-        console.log(res)
+
       })
     },
     handleSelect(item) {
@@ -872,7 +874,7 @@ export default {
       if(member_id){
         this.addMemberRules.password[0].required = false
       }
-      console.log(item);
+
     }
 
   }

src/views/ncs-device/nurse_watch.vue

@@ -567,7 +567,7 @@ export default {
     },
     handEdit(row) {
       if (row.role_id) {
-        this.$router.push({ name: 'nurseWatchFrame', params: { id: row.id, role_id: row.role_id, callback: this.getList() }})
+        this.$router.push({ name: 'nurse-watch-frame', params: { id: row.id, role_id: row.role_id, callback: this.getList() }})
       } else {
         this.$message.error(this.$t('deviceManage.choiceRoleName'))
       }

src/views/ncs-his/his-part/hisPartManager.vue

@@ -193,13 +193,13 @@ export default {
       })
     },
     getHisPatient(row) {
-      this.$router.push({ name: 'hisPatientManage', params: { id: row.keyval, callback: this.getList() }})
+      this.$router.push({ name: 'admin-his-patient', params: { id: row.keyval, callback: this.getList() }})
     },
     getHisClerk(row) {
-      this.$router.push({ name: 'hisClerkManage', params: { id: row.keyval, callback: this.getList() }})
+      this.$router.push({ name: 'admin-his-clerk', params: { id: row.keyval, callback: this.getList() }})
     },
     getHisNurseConfig(row) {
-      this.$router.push({ name: 'hisNurseConfigManage', params: { id: row.keyval, callback: this.getList() }})
+      this.$router.push({ name: 'admin-his-nurse-config', params: { id: row.keyval, callback: this.getList() }})
     },
     /** 处理搜索 */
     handlerSearch(value) {

src/views/ncs-interaction-push-config/index.vue

@@ -441,7 +441,7 @@
             },
 
             goConfig(row) {
-                this.$router.push({ name: 'interaction-push-config', params: { id:row.id }})
+                this.$router.push({ name: 'admin-interaction-push', params: { id:row.id }})
             },
             /** 设备状态格式化 **/
             deviceStatusFormatter(params) {

src/views/ncs-orginazition/index.vue

@@ -468,7 +468,7 @@ export default {
       }
     },
     handEdit(row) {
-      this.$router.push({ name: 'partInfoSetting', params: { id: row.shop_id, callback: this.getList() }})
+      this.$router.push({ name: 'admin-part-settings', params: { id: row.shop_id, callback: this.getList() }})
     },
     /** 获取上级机构数组 特指医院 **/
     getPartents() {
@@ -508,7 +508,7 @@ export default {
     },
     deviceBind(row) {
       console.log('--------------------', row.shop_id, row.parent_id)
-      this.$router.push({ name: 'device-frame', params: { id: row.shop_id, parent_id: row.parent_id }})
+      this.$router.push({ name: 'admin-device-frame', params: { id: row.shop_id, parent_id: row.parent_id }})
     },
     synchroDevice(row) { // 同步线上设备
       synchroDevice(row.union_id, row.shop_id).then(res => {