修复因为domain文件移位，导致device和system连接异常的问题，新增医嘱输入的功能，修复首页滚动有误的问题，修复首页用户备注更多跳转错误的问题，禁用空间结构中科室和医院的编辑删除功能

src/views/calling-board/index.vue

@@ -121,10 +121,11 @@ import { AG_GRID_LOCALE_CN } from '@/utils/AgGridVueLocaleCn'
 import ButtonCellRender from '../../components/AgGridCellRender/ButtonCellRender'
 import ListFilter from '@/components/AgGridCustomFilter/ListFilter'
 import RadioFilter from '@/components/AgGridCustomFilter/RadioFilter'
-import { DeviceUrl } from '@/utils/domain'
+// import { DeviceUrl } from '@/utils/domain'
 import * as API_Device from '@/api/ncs_device'
 import * as API_FrameGroup from '@/api/ncs_frameGroup'
 import * as API_Board from '@/api/ncs_board'
+const DeviceUrl = domain.DeviceUrl
 export default {
   name: 'Index',
   components: { ButtonCellRender, ListFilter, RadioFilter },

src/views/customer/components/customerManager.vue

@@ -477,10 +477,11 @@ import * as API_Customer from '@/api/ncs_customer'
 import { unix2Date, unixToDate } from '@/utils/Foundation'
 import * as API_Frame from '@/api/ncs_hospitalFrame'
 import * as RegExp from '@/utils/RegExp'
-import { serverUrl } from '@/utils/domain'
+// import { serverUrl } from '@/utils/domain'
 import * as API_Remark from '@/api/ncs_remark'
 import * as API_User from '@/api/user'
 import { FRAME_TYPE } from '@/utils/enum/FrameTypeEnum'
+const serverUrl = domain.serverUrl
 export default {
   name: 'CustomerManager',
   components: { ButtonCellRenderList, ButtonCellRender, ListFilter, RadioFilter },

src/views/customer/components/elderlyCareManager.vue

@@ -473,13 +473,13 @@
     import {unix2Date, unixToDate} from '@/utils/Foundation'
     import * as API_Frame from '@/api/ncs_hospitalFrame'
     import * as RegExp from '@/utils/RegExp'
-    import {serverUrl} from '@/utils/domain'
+    // import {serverUrl} from '@/utils/domain'
     import * as API_Remark from '@/api/ncs_remark'
     import * as API_User from '@/api/user'
     import * as API_Clerk from '@/api/ncs_clerk'
     import * as API_NurseConfig from '@/api/ncs_nurse_config'
     import vitalSignLog from '@/views/vital-sign/log'
-
+    const serverUrl = domain.serverUrl
     export default {
         name: 'ElderlyCareManager',
         components: {ButtonCellRender, ListFilter, RadioFilter, vitalSignLog},

src/views/customer/components/patientManager.vue

@@ -43,7 +43,7 @@
         <el-dialog :visible.sync="customerFormVisible" title="用户信息" class="customer-dialog">
             <el-tabs v-model="activeName" type="border-card" tab-position="bottom" width="50%" @tab-click="handleClick">
                 <el-tab-pane label="基本信息" name="customerBaseInfo">
-                    <div style="height: 590px">
+                    <div style="height: 720px">
                         <el-form ref="editForm" :model="formmodel" :rules="rules" label-width="120px">
                             <el-row>
                                 <el-col :span="12">
@@ -182,6 +182,19 @@
                                 </el-col>
                             </el-row>
 
+                          <el-row>
+                            <el-form-item label="医嘱">
+                              <el-input
+                                  v-model="formmodel.advice"
+                                  type="textarea"
+                                  :autosize="{ minRows: 2, maxRows: 4}"
+                                  :minlength="2"
+                                  :maxlength="50"
+                                  :placeholder="'请输入文本内容，长度2~50'"
+                              />
+                            </el-form-item>
+                          </el-row>
+
                             <el-row>
                                 <el-col :span="8">
                                     <el-form-item label="责任医生">
@@ -473,13 +486,13 @@
     import {unix2Date, unixToDate} from '@/utils/Foundation'
     import * as API_Frame from '@/api/ncs_hospitalFrame'
     import * as RegExp from '@/utils/RegExp'
-    import {serverUrl} from '@/utils/domain'
+    // import {serverUrl} from '@/utils/domain'
     import * as API_Remark from '@/api/ncs_remark'
     import * as API_User from '@/api/user'
     import * as API_Clerk from '@/api/ncs_clerk'
     import * as API_NurseConfig from '@/api/ncs_nurse_config'
     import vitalSignLog from '@/views/vital-sign/log'
-
+    const serverUrl = domain.serverUrl
     export default {
         name: 'PatientManager',
         components: {ButtonCellRender, ListFilter, RadioFilter, vitalSignLog},

src/views/customer/customerEdit.vue

@@ -231,9 +231,9 @@ import * as NurseConfig_API from '@/api/ncs_nurse_config'
 import * as remark_API from '@/api/ncs_remark'
 import * as RegExp from '@/utils/RegExp'
 import { unixToDate } from '@/utils/Foundation'
-import { serverUrl } from '@/utils/domain'
+// import { serverUrl } from '@/utils/domain'
 import customerRelative from '@/views/customer/customer_relative'
-
+const serverUrl = domain.serverUrl
 export default {
   name: 'PatientInfoEdit',
   components: { customerRelative },

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

@@ -38,8 +38,9 @@
 </template>
 
 <script>
-import { serverUrl } from '@/utils/domain'
+// import { serverUrl } from '@/utils/domain'
 import * as API_Device from '@/api/ncs_device'
+const serverUrl = domain.serverUrl
 export default {
   name: 'AppVersionManager',
   props: {

src/views/dashboard/calling/index.vue

@@ -134,6 +134,7 @@ import * as API_task from '@/api/ncs_task'
 import * as API_Remark from '@/api/ncs_remark'
 import { unixToDate } from '@/utils/Foundation'
 import * as API_CallingList from '@/api/ncs_interaction'
+const uiVersion = domain.uiVersion
 
 export default {
   name: 'Index',
@@ -191,19 +192,22 @@ export default {
       param.fixedCondition = ' part_id = ' + this.$store.getters.partId
       const _this = this
       _this.todayList = []
+      let data = []
       API_task.getList(param).then(response => {
         const today = (new Date().setHours(0, 0, 0, 0)) / 1000
         const todayend = (today * 1000 + 86400000) / 1000
         response.data.forEach((item, index) => {
           if (item.task_plan_time >= today && item.task_plan_time < todayend) {
-            _this.todayList.push(item)
+            data.push(item)
           }
         })
+        _this.todayList = data
       })
     },
     getNoteList() {
       const param = this.MixinClone(this.params)
       param.fixedCondition = ' type = 2 and part_id=' + this.$store.getters.partId
+      param.page_size = 20
       const _this = this
       API_Remark.getRemarks(param).then(response => {
         _this.noteList = response.data
@@ -212,6 +216,7 @@ export default {
     getRemarkList() {
       const param = this.MixinClone(this.params)
       param.fixedCondition = ' type = 1 and part_id=' + this.$store.getters.partId
+      param.page_size = 20
       const _this = this
       API_Remark.getRemarks(param).then(response => {
         _this.remarkList = response.data
@@ -235,6 +240,9 @@ export default {
       this.isShowArticle = true
     },
     goMove(path) {
+      if (path === 'customerList') {
+        uiVersion === 1 ? path = 'patientManagement' : uiVersion === 2 ? path = 'customerManager' : path = 'elderlyCareManager'
+      }
       this.$router.push({ name: path })
     },
     formatterFromName(row, column, cellValue) {

src/views/entrace-guard/index.vue

@@ -9,7 +9,8 @@
 </template>
 
 <script>
-import { DeviceUrl } from '@/utils/domain'
+// import { DeviceUrl } from '@/utils/domain'
+const DeviceUrl = domain.DeviceUrl
 export default {
   name: 'Index',
   data() {

src/views/hospital/clerkManager.vue

@@ -209,7 +209,7 @@
 </template>
 
 <script>
-import { serverUrl } from '@/utils/domain'
+// import { serverUrl } from '@/utils/domain'
 import * as clerk_API from '@/api/ncs_clerk'
 import * as shop_API from '@/api/ncs_shop'
 import * as RegExp from '@/utils/RegExp'
@@ -220,7 +220,7 @@ import ImageViewer from 'element-ui/packages/image/src/image-viewer'
 import RadioFilter from '@/components/AgGridCustomFilter/RadioFilter'
 import { ROLE_TYPE } from '@/utils/enum/RoleTypeEnum'
 let prevOverflow = ''
-
+const serverUrl = domain.serverUrl
 export default {
   name: 'CareDoctorManager',
   components: { ButtonCellRender, AgGridImg, ImageViewer, RadioFilter },

src/views/hospital/ncs_customer/customerManager.vue

@@ -429,12 +429,13 @@ import RadioFilter from '@/components/AgGridCustomFilter/RadioFilter'
 import * as API_Customer from '@/api/ncs_customer'
 import { unix2Date, unixToDate } from '@/utils/Foundation'
 import * as RegExp from '@/utils/RegExp'
-import { serverUrl } from '@/utils/domain'
+// import { serverUrl } from '@/utils/domain'
 import * as API_Remark from '@/api/ncs_remark'
 import * as API_User from '@/api/user'
 import * as API_hospitalFrame from '@/api/ncs_hospitalFrame'
 import { FRAME_TYPE } from '@/utils/enum/FrameTypeEnum'
 import * as API_Frame from '@/api/ncs_hospitalFrame'
+const serverUrl = domain.serverUrl
 export default {
   name: 'CustomerManager',
   components: { ButtonCellRender, ListFilter, RadioFilter },

src/views/hospital/ncs_frame/frameTreeView.vue

@@ -52,13 +52,14 @@
               />
               <el-button
                 type="text"
+                :disabled="data.type===1 || data.type===3"
                 size="mini"
                 icon="el-icon-edit"
                 @click.stop="() => edit(data)"
               />
               <el-button
                 type="text"
-                :disabled="data.id===1"
+                :disabled="data.type===1"
                 size="mini"
                 icon="el-icon-delete"
                 @click.stop="() => remove(data)"

src/views/hospitalFrame/frameTreeView-admin.vue

@@ -46,13 +46,14 @@
               />
               <el-button
                 type="text"
+                :disabled="data.type===1 || data.type===3"
                 size="mini"
                 icon="el-icon-edit"
                 @click.stop="() => edit(data)"
               />
               <el-button
                 type="text"
-                :disabled="data.id===1"
+                :disabled="data.type===1"
                 size="mini"
                 icon="el-icon-delete"
                 @click.stop="() => remove(data)"
@@ -195,8 +196,9 @@ import * as API_FrameGroup from '@/api/ncs_frameGroup'
 import CustomerManager from '../customer/components/customerManager'
 import DeviceManager from '../ncs-device/components/deviceManager'
 import PatientManager from '../customer/components/patientManager'
-import { uiVersion } from '@/utils/domain'
+// import { uiVersion } from '@/utils/domain'
 import { FRAME_TYPE } from '@/utils/enum/FrameTypeEnum'
+const uiVersion = domain.uiVersion
 export default {
   name: 'FrameTreeView',
   components: { PatientManager, DeviceManager, CustomerManager },

src/views/hospitalFrame/frameTreeView.vue

@@ -46,13 +46,14 @@
               />
               <el-button
                 type="text"
+                :disabled="data.type===1 || data.type===3"
                 size="mini"
                 icon="el-icon-edit"
                 @click.stop="() => edit(data)"
               />
               <el-button
                 type="text"
-                :disabled="data.id===1"
+                :disabled="data.type===1 || data.type===3"
                 size="mini"
                 icon="el-icon-delete"
                 @click.stop="() => remove(data)"

src/views/hospitalFrame/nurse_watch_frame.vue

@@ -71,7 +71,8 @@
      */
 import * as API_hospitalFrame from '@/api/ncs_hospitalFrame'
 import * as API_device from '@/api/ncs_device'
-import { uiVersion } from '@/utils/domain'
+// import { uiVersion } from '@/utils/domain'
+const uiVersion = domain.uiVersion
 import {getFrameByRoleGroupId} from "@/api/ncs_hospitalFrame";
 
 export default {

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

@@ -82,7 +82,8 @@ import ListFilter from '@/components/AgGridCustomFilter/ListFilter'
 import RadioFilter from '@/components/AgGridCustomFilter/RadioFilter'
 import { unix2Date } from '@/utils/Foundation'
 import * as API_BroadcastFiles from '@/api/calling-broadcastFiles'
-import { serverUrl } from '@/utils/domain'
+// import { serverUrl } from '@/utils/domain'
+const serverUrl = domain.serverUrl
 export default {
   name: 'BroadcastFileList',
   components: { ButtonCellRender, ListFilter, RadioFilter },

src/views/ncs-broadcast/index.vue

@@ -167,7 +167,9 @@ import * as API_FrameGroup from '@/api/ncs_frameGroup'
 import ListFilter from '@/components/AgGridCustomFilter/ListFilter'
 import RadioFilter from '@/components/AgGridCustomFilter/RadioFilter'
 import * as API_BroadcastFiles from '@/api/calling-broadcastFiles'
-import { serverUrl, DeviceUrl } from '@/utils/domain'
+// import { serverUrl, DeviceUrl } from '@/utils/domain'
+const serverUrl = domain.serverUrl
+const DeviceUrl = domain.DeviceUrl
 export default {
   name: 'Index',
   components: { ButtonCellRender, ListFilter, RadioFilter },

src/views/ncs-channel/index.vue

@@ -436,6 +436,7 @@ export default {
         subscribeIds = [...item.clerks.filter(p => p.checked).map(p => p.member_id), ...subscribeIds]
       })
       API_Channel.setChannelSubscribers({ channel_id: this.formmodel.id, member_ids: subscribeIds.length === 0 ? null : [...subscribeIds] }).then(() => {
+        this.formSubscribe = false
         this.$message.success('修改成功！')
       })
     },

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

@@ -202,7 +202,7 @@
 </template>
 
 <script>
-import { serverUrl } from '@/utils/domain'
+// import { serverUrl } from '@/utils/domain'
 import * as clerk_API from '@/api/ncs_clerk'
 import * as RegExp from '@/utils/RegExp'
 import { AG_GRID_LOCALE_CN } from '@/utils/AgGridVueLocaleCn'
@@ -212,7 +212,7 @@ import ImageViewer from 'element-ui/packages/image/src/image-viewer'
 import RadioFilter from '@/components/AgGridCustomFilter/RadioFilter'
 import * as API_User from "@/api/user";
 let prevOverflow = ''
-
+const serverUrl = domain.serverUrl
 export default {
   name: 'CareDoctorManager',
   components: { ButtonCellRender, AgGridImg, ImageViewer, RadioFilter },

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

@@ -247,9 +247,10 @@ import * as API_Device from '@/api/ncs_device'
 import * as API_Frame from '@/api/ncs_hospitalFrame'
 import * as API_SosDeviceSetting from '@/api/ncs_sos_device_settings'
 import * as clerk_API from '@/api/ncs_clerk'
-import { DeviceUrl } from '@/utils/domain'
+// import { DeviceUrl } from '@/utils/domain'
 import { FRAME_TYPE } from '@/utils/enum/FrameTypeEnum'
 import { DEVICE_TYPE } from '@/utils/enum/DeviceTypeEnum'
+const DeviceUrl = domain.DeviceUrl
 export default {
   name: 'DeviceManager',
   components: { ButtonCellRender, ListFilter, RadioFilter },
@@ -781,13 +782,7 @@ export default {
       } else if (val === DEVICE_TYPE.DIGIT_BED_DEVICE ||
           val === DEVICE_TYPE.SIMULATE_BED_DEVICE ||
           val === DEVICE_TYPE.REMOTE_CONTROL ||
-          val === DEVICE_TYPE.CELL_PHONE ||
-          val === DEVICE_TYPE.ALARM_BODY_INDUCTIVE ||
-          val === DEVICE_TYPE.ALARM_WATER_OVERFLOW ||
-          val === DEVICE_TYPE.ALARM_HOUSEHOLD_GAS ||
-          val === DEVICE_TYPE.ALARM_HOUSEHOLD_SMOKE ||
-          val === DEVICE_TYPE.ALARM_BUTTON_SOS ||
-          val === DEVICE_TYPE.DOOR_LOCK
+          val === DEVICE_TYPE.CELL_PHONE
       ) {
         this.getFramesByType(FRAME_TYPE.BED)
       } else {

src/views/ncs-device/nurse_watch.vue

@@ -70,13 +70,13 @@
 import * as API_Device from '@/api/ncs_device'
 import { unixToDate } from '@/utils/Foundation'
 import { AG_GRID_LOCALE_CN } from '@/utils/AgGridVueLocaleCn'
-import { DeviceUrl } from '@/utils/domain'
+// import { DeviceUrl } from '@/utils/domain'
 import * as clerk_API from '@/api/ncs_clerk'
 import ButtonCellRender from '@/components/AgGridCellRender/ButtonCellRender'
 import RadioFilter from '@/components/AgGridCustomFilter/RadioFilter'
 import nurseWatchFrame from '@/views/hospitalFrame/nurse_watch_frame'
 import watchLocation from '@/views/ncs-device/watch_location'
-
+const DeviceUrl = domain.DeviceUrl
 export default {
   name: 'Index',
   components: { ButtonCellRender, RadioFilter, nurseWatchFrame, watchLocation },
@@ -295,7 +295,7 @@ export default {
       this.websock.onclose = this.websocketclose
     },
     websocketonopen: function() {
-      console.log('WebSocket连接成功')
+      console.log('WebSocket连接成功1111111')
       this.$message.success('连接成功')
     },
     websocketonerror: function(e) {

src/views/ncs-device/watch_location.vue

@@ -53,7 +53,8 @@
 import * as API_DeviceLocation from '@/api/ncs_device_location'
 import { unixToDate } from '@/utils/Foundation'
 import { getListByDeviceId } from '@/api/ncs_hospitalFrame'
-import {DeviceUrl} from "@/utils/domain";
+// import {DeviceUrl} from "@/utils/domain"
+const DeviceUrl = domain.DeviceUrl
 export default {
   name: 'Index',
   props: {

src/views/ncs-event/index.vue

@@ -99,7 +99,7 @@
 <script>
 import * as API_event from '@/api/ncs_event'
 import { unix2Date, unixToDate } from '@/utils/Foundation'
-import { serverUrl } from '@/utils/domain'
+// import { serverUrl } from '@/utils/domain'
 import { AG_GRID_LOCALE_CN } from '@/utils/AgGridVueLocaleCn'
 import { param } from '@/utils'
 import ButtonCellRender from '@/components/AgGridCellRender/ButtonCellRender'
@@ -107,7 +107,7 @@ import AgGridImg from '@/components/AgGridImg/AgGridImg'
 import ImageViewer from 'element-ui/packages/image/src/image-viewer'
 import * as clerk_API from '@/api/ncs_clerk'
 let prevOverflow = ''
-
+const serverUrl = domain.serverUrl
 export default {
   name: 'Index',
   components: { ButtonCellRender, AgGridImg, ImageViewer },

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

@@ -39,8 +39,9 @@
 </template>
 
 <script>
-import { serverUrl } from '@/utils/domain'
+// import { serverUrl } from '@/utils/domain'
 import * as API_Device from '@/api/ncs_device'
+const serverUrl = domain.serverUrl
 export default {
   name: 'AppVersionManager',
   props: {

src/views/ncs-remark/index.vue

@@ -82,9 +82,9 @@
 <script>
     import * as API_Remark from '@/api/ncs_remark'
     import {unixToDate} from '@/utils/Foundation'
-    import {serverUrl} from "@/utils/domain"
+    // import {serverUrl} from "@/utils/domain"
     import * as RegExp from "@/utils/RegExp"
-
+    const serverUrl = domain.serverUrl
     export default {
         name: 'Index',
         data() {

src/views/ncs-task/index.vue

@@ -107,8 +107,9 @@ import { unix2Date, unixToDate } from '@/utils/Foundation'
 import { AG_GRID_LOCALE_CN } from '@/utils/AgGridVueLocaleCn'
 import Tooltip from '../../components/Tooltip/Tooltip'
 import ButtonCellRenderList from '@/components/AgGridCellRender/ButtonCellRenderList'
-import { serverUrl } from '@/utils/domain'
+// import { serverUrl } from '@/utils/domain'
 import { param } from '@/utils'
+const serverUrl = domain.serverUrl
 export default {
   name: 'Index',
   components: { Tooltip, ButtonCellRenderList },
@@ -348,7 +349,8 @@ export default {
         if (valid) {
           /** 新增通知 */
           if (this.editflag === 0) {
-            this.formmodel.task_plan_time = Date.parse(new Date()) / 1000
+            // this.formmodel.task_plan_time = Date.parse(new Date()) / 1000
+            this.formmodel.task_plan_time = this.formmodel.task_plan_time / 1000
             this.formmodel.file_name = this.fileName
             this.formmodel.file_path = this.filePath
             this.formmodel.create_id = this.$store.getters.userInfo.uid
@@ -372,7 +374,8 @@ export default {
                 this.getList()
               })
             } else {
-              this.formmodel.task_plan_time = Date.parse(new Date()) / 1000
+              // this.formmodel.task_plan_time = Date.parse(new Date()) / 1000
+              this.formmodel.task_plan_time = this.formmodel.task_plan_time / 1000
               this.formmodel.file_name = this.fileName
               this.formmodel.file_path = this.filePath
               this.formmodel.create_id = this.$store.getters.userInfo.uid