每个版本加上足迹功能

src/views/customer/components/customerManager.vue

@@ -409,6 +409,9 @@
             </div>
           </div>
         </el-tab-pane>
+        <el-tab-pane v-if="formmodel.id && boolDevice" :label="this.$t('customerManage.footprint')" name="footprint">
+          <my-map-html :map-url="mapUrl" style="width: 100%; height: 670px;"></my-map-html>
+        </el-tab-pane>
       </el-tabs>
     </el-dialog>
     <!-- 用户信息 -->
@@ -545,10 +548,12 @@ import * as API_SystemConfig from '@/api/ncs_systemconfig'
 import {RELATIVE_NAME_TYPE} from "@/utils/enum/RelativeNameTypeEnum";
 import {CHILDBIRTH_TYPE} from "@/utils/enum/ChildbirthTypeEnum";
 import * as shop_API from "@/api/ncs_shop";
+import {getDevicesByUuid} from "@/api/initialize"
+import myMapHtml from '@/views/customer/myMapHtml'
 const serverUrl = domain.serverUrl
 export default {
   name: 'CustomerManager',
-  components: { ButtonCellRenderList, ButtonCellRender, ListFilter, RadioFilter, vitalSignLog, vueQr },
+  components: { ButtonCellRenderList, ButtonCellRender, ListFilter, RadioFilter, vitalSignLog, vueQr, myMapHtml },
   filters: {
     unixDateFilter(val) {
       return unixToDate(val)
@@ -718,7 +723,9 @@ export default {
       relativeNameTypeEnum: RELATIVE_NAME_TYPE.getValueList(),
       childbirthTypeEnum: CHILDBIRTH_TYPE.getValueList(),
       isChild: false,
-      shop: {}
+      shop: {},
+      boolDevice: false,
+      mapUrl: null
     }
   },
   computed: {
@@ -1104,7 +1111,9 @@ export default {
       return date
     },
     handleClick() {
-
+      if (this.activeName === 'footprint') {
+        this.$router.push({path:'/myMapHtml', query: {mapUrl: this.mapUrl}})
+      }
     },
     /** 生日选择变化，修改年龄字段 */
     birthdayChange(val) {
@@ -1258,6 +1267,7 @@ export default {
     },
 
     handleEdit(row) {
+      this.boolDevice = false
       this.relativeRules.mobile[0].required = this.isCloud
       this.formmodel = {
         ...row
@@ -1283,6 +1293,15 @@ export default {
       this.getQrCode()
       this.getRemarks()
       this.getRelatives()
+      if (this.isCloud) {
+        const _this = this
+        getDevicesByUuid(row.uuid).then(res => {
+          if (res) {
+            _this.boolDevice = true
+            _this.mapUrl = res
+          }
+        })
+      }
     },
     /** 出院 退床 **/
     handleOut(row) {

src/views/customer/components/elderlyCareManager.vue

@@ -396,7 +396,7 @@
                 </el-tab-pane>
 
               <el-tab-pane v-if="formmodel.id && boolDevice" :label="this.$t('customerManage.footprint')" name="footprint">
-<!--                <my-map-html :map-url="mapUrl" style="width: 100%; height: 670px;"></my-map-html>-->
+                <my-map-html :map-url="mapUrl" style="width: 100%; height: 670px;"></my-map-html>
               </el-tab-pane>
 
             </el-tabs>
@@ -494,14 +494,14 @@
     import * as API_Clerk from '@/api/ncs_clerk'
     import * as API_NurseConfig from '@/api/ncs_nurse_config'
     import vitalSignLog from '@/views/vital-sign/log'
-    // import myMapHtml from '@/views/customer/myMapHtml'
+    import myMapHtml from '@/views/customer/myMapHtml'
     import myMap from '@/views/customer/myMap'
     import * as API_SystemConfig from '@/api/ncs_systemconfig'
     import { getDevicesByUuid } from '@/api/initialize'
     const serverUrl = domain.serverUrl
     export default {
         name: 'ElderlyCareManager',
-        components: {ButtonCellRenderList, ButtonCellRender, ListFilter, RadioFilter, vitalSignLog, myMap},
+        components: {ButtonCellRenderList, ButtonCellRender, ListFilter, RadioFilter, vitalSignLog, myMap, myMapHtml},
         filters: {
             unixDateFilter(val) {
                 return unixToDate(val)

src/views/customer/components/patientManager.vue

@@ -307,7 +307,7 @@
                             <el-row>
                                 <el-col :span="12">
                                     <el-form-item :label="this.$t('customerManage.customerRelativeTrueName')" prop="true_name">
-                                        <el-input v-model="relativeFormModel.true_name" clearable :placeholder="请输入姓名"
+                                        <el-input v-model="relativeFormModel.true_name" clearable :placeholder="this.$t('customerManage.inputNamed')"
                                                   :maxlength="20"/>
                                     </el-form-item>
                                 </el-col>
@@ -415,6 +415,10 @@
                     </div>
                 </el-tab-pane>
 
+              <el-tab-pane v-if="formmodel.id && boolDevice" :label="this.$t('customerManage.footprint')" name="footprint">
+                <my-map-html :map-url="mapUrl" style="width: 100%; height: 670px;"></my-map-html>
+              </el-tab-pane>
+
             </el-tabs>
         </el-dialog>
         <!-- 用户信息 -->
@@ -510,10 +514,12 @@
     import {FRAME_TYPE} from "@/utils/enum/FrameTypeEnum";
     import * as API_SystemConfig from "@/api/ncs_systemconfig";
     import * as shop_API from "@/api/ncs_shop";
+    import myMapHtml from '@/views/customer/myMapHtml'
+    import {getDevicesByUuid} from "@/api/initialize";
     const serverUrl = domain.serverUrl
     export default {
         name: 'PatientManager',
-        components: { ButtonCellRenderList, ButtonCellRender, ListFilter, RadioFilter, vitalSignLog, vueQr },
+        components: { ButtonCellRenderList, ButtonCellRender, ListFilter, RadioFilter, vitalSignLog, vueQr, myMapHtml },
         filters: {
             unixDateFilter(val) {
                 return unixToDate(val)
@@ -666,6 +672,8 @@
                 colour: this.$t('action.colour'),
                 deleted: this.$t('action.delete'),
                 qrCode: null,
+                boolDevice: false,
+                mapUrl: null
             }
         },
         computed: {
@@ -1104,7 +1112,9 @@
             }
           },
             handleClick() {
-
+              if (this.activeName === 'footprint') {
+                this.$router.push({path:'/myMapHtml', query: {mapUrl: this.mapUrl}})
+              }
             },
             /** 生日选择变化，修改年龄字段 */
             birthdayChange(val) {
@@ -1266,6 +1276,7 @@
             },
 
             handleEdit(row) {
+                this.boolDevice = false
                 this.relativeRules.mobile[0].required = this.isCloud
                 this.formmodel = {
                     ...row
@@ -1298,6 +1309,15 @@
                 this.getQrCode()
                 this.getRemarks()
                 this.getRelatives()
+              if (this.isCloud) {
+                const _this = this
+                getDevicesByUuid(row.uuid).then(res => {
+                  if (res) {
+                    _this.boolDevice = true
+                    _this.mapUrl = res
+                  }
+                })
+              }
             },
             /** 出院 退床 **/
             handleOut(row) {

src/views/dashboard/calling/index.vue

@@ -250,9 +250,7 @@ export default {
       this.$router.push({ name: path })
     },
     formatterFromName(row, column, cellValue) {
-      console.log(!row.outerior_action, row.relative_name, !row.outerior_action && row.relative_name === null)
       if (!row.outerior_action && row.relative_name === null) {
-        console.log('row===', row.id)
         let named = ''
         if (row.from_frame_full_name && row.from_member_name) {
           named = row.from_frame_full_name + row.from_member_name