Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/api/datastore.js

@@ -17,3 +17,12 @@ export function getDictionaryConfigList(params) {
     data: params
   })
 }
+
+export function getManageConfigList(params){
+  
+  return request({
+    url:"/api/dictionary/getmanageconfiglist",
+    method:"get",
+    data:params,
+  })
+}

src/api/patient.js

@@ -255,7 +255,7 @@ export function EditLapseto(patient_id, data,start_time,end_time,address) {
 }
 
 export function PostSearch(keyword) {
-  console.log('keyword2222222', keyword)
+  
   return request({
     url: '/api/patients/search?keyword=' + keyword,
     method: 'post'

src/api/role/admin.js

@@ -282,4 +282,22 @@ export function UploadPrintOrder(data){
     method:"Post",
     data:data,
   })
+}
+
+export function CreateQianshuUserName(data){
+  
+  return request({
+    url:"/api/device/createqianshuusername",
+    method:"Post",
+    data:data,
+  })
+}
+
+export function CreateSKDSendInformation(data){
+  
+  return request({
+    url:"/api/device/createskdsendinformation",
+    method:"Post",
+    data:data,
+  })
 }

src/router/modules/workforce.js

@@ -56,15 +56,15 @@ export default {
       noCache: true
     }
   },
-  // {//患者调班
-  //   path: '/workforce/Patientshift',
-  //   component: () => import('@/xt_pages/workforce/Patientshift'),
-  //   name: '患者调班',
-  //   meta: {
-  //     title: '患者调班',
-  //     noCache: true
-  //   }
-  // },
+  {//患者调班
+    path: '/workforce/Patientshift',
+    component: () => import('@/xt_pages/workforce/Patientshift'),
+    name: '患者调班',
+    meta: {
+      title: '患者调班',
+      noCache: true
+    }
+  },
   {
     path: '/workforce/schedule/printone',
     component: () => import('@/xt_pages/workforce/printOne'),

src/store/getters.js

@@ -20,6 +20,7 @@ const getters = {
   configlist: state => state.data.configlist,
 
   dictionary_configlist: state => state.data.dictionary_configlist,
+  manage_configlist:state => state.data.manage_configlist,
   pagedata:state => state.pagedata,
 
   xt_permission: state => state.xt_permission,

src/store/modules/data.js

@@ -1,19 +1,23 @@
-import { getConfigList,getDictionaryConfigList } from '@/api/datastore'
-import { getDataConfigList, setDataConfigList,getDataDictionaryConfigList,setDataDictionaryConfigList } from '@/utils/data_config' // getConfigList from sessionStorage
+import { getConfigList,getDictionaryConfigList,getManageConfigList } from '@/api/datastore'
+import { getDataConfigList, setDataConfigList,getDataDictionaryConfigList,setDataDictionaryConfigList,setDataManageConfigList } from '@/utils/data_config' // getConfigList from sessionStorage
 
 const data = {
   state: {
     configlist: '',
     dictionary_configlist:'',
+    manage_configlist:''
   },
 
   mutations: {
     SET_CONFIGLIST: (state, configlist) => {
       state.configlist = configlist
-    }, SET_DICTIONARY_CONFIGLIST: (state, configlist) => {
+    }, 
+    SET_DICTIONARY_CONFIGLIST: (state, configlist) => {
       state.dictionary_configlist = configlist
-    }
-
+    },
+    SET_Manage_CONFIGLIST: (state, configlist) => {
+      state.manage_configlist = configlist
+    },
   },
 
   actions: {
@@ -57,6 +61,26 @@ const data = {
           reject(error)
         })
 
+
+        getManageConfigList().then(response => {
+          if (!response.data) { // 由于mockjs 不支持自定义状态码只能这样hack
+            reject('error')
+          }
+          const list = response.data.data
+         
+          console.log('请求返回的数据：', list)
+          if (list) { // 验证返回的configlist是否是一个非空数组
+            // console.log('转换的configlist为：', list.configlist)
+            commit('SET_Manage_CONFIGLIST', list.configlist)
+            setDataManageConfigList(JSON.stringify(list.configlist))
+            resolve()
+          } else {
+            reject('getInfo: configlist must be a non-null array !')
+          }
+        }).catch(error => {
+          reject(error)
+        })
+
       })
     },
     updateConfigList({ commit }, configArr) {
@@ -162,6 +186,7 @@ const data = {
         }
         infoJSON[module].push(configArr)
         commit('SET_DICTIONARY_CONFIGLIST', infoJSON)
+
         setDataDictionaryConfigList(JSON.stringify(infoJSON))
         resolve()
       })

src/utils/data.js

@@ -73,3 +73,44 @@ export function getDictionaryDataConfig(module, field) {
     }
   }
 }
+
+
+export function getManageMentDataConfig(module, field) {
+  var storeConfigList = store.getters.manage_configlist
+  console.log("storeConfigListwwowowowowwo",storeConfigList)
+  var moduleConfig = storeConfigList[module]
+  if (moduleConfig == undefined) {
+    return false
+  }
+  if (module === 'summary') {
+    console.log("哈哈哈hhhwowowowoo")
+    var Aresult = []
+    for (var j = 0; j < moduleConfig.length; j++) {
+      var Atemp = []
+      var Aconfig = moduleConfig[j]
+      Atemp['id'] = Aconfig.value
+      Atemp['value'] = Aconfig.content
+      Atemp['text'] = Aconfig.title
+      Aresult.push(Atemp)
+    }
+    // console.log("Aresultwoowowowowow",Aresult)
+    return Aresult
+  } else {
+    for (var i = 0; i < moduleConfig.length; i++) {
+      var newConfig = moduleConfig[i]
+      if (newConfig.field_name === field) {
+        var result = []
+        if (newConfig.childs != null) {
+          for (var j = 0; j < newConfig.childs.length; j++) {
+            var tempconfig = newConfig.childs[j]
+            var temp = []
+            temp['id'] = tempconfig.value
+            temp['name'] = tempconfig.name
+            result.push(temp)
+          }
+        }
+        return result
+      }
+    }
+  }
+}

src/utils/data_config.js

@@ -5,6 +5,9 @@ const filedConfigKey = 'filed_config_list'
 const dataDictionaryConfigKey = 'data_dictionary_config_list'
 
 
+const manageDictionaryConfigKey ="manage_dictionary_config_list"
+
+
 
 
 export function getDataConfigList() {
@@ -15,6 +18,8 @@ export function setDataConfigList(infoJSONStr) {
   window.sessionStorage.setItem(dataConfigKey, infoJSONStr)
 }
 
+
+
 export function removeDataConfigList() {
   window.sessionStorage.removeItem(dataConfigKey)
 }
@@ -48,3 +53,15 @@ export function removeDataDictionaryConfigList() {
   window.sessionStorage.removeItem(dataDictionaryConfigKey)
 }
 
+
+export function getDataManageConfigList() {
+  return window.sessionStorage.getItem(manageDictionaryConfigKey)
+}
+
+export function setDataManageConfigList(infoJSONStr){
+  window.sessionStorage.setItem(manageDictionaryConfigKey, infoJSONStr)
+}
+
+export function removeManageConfigList() {
+  window.sessionStorage.removeItem(manageDictionaryConfigKey)
+}

src/xt_pages/device/airDisinfect.vue

@@ -298,6 +298,7 @@
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getManageMentDataConfig } from '@/utils/data'
   import { getAllDoctorList,saveAirDisinfect,getAirList,getAirDisinfectDetail,updateAirDisinfect,deleteAirDisinfect } from "@/api/device"
   import { uParseTime } from '@/utils/tools'
   const moment = require('moment')
@@ -356,6 +357,8 @@
       }
     },
     created(){
+      this.disinfection_fluid = getManageMentDataConfig('management', 'disinfection_fluid')
+      console.log("disinfection_fluid",this.disinfection_fluid)
       this.getlist()
       this.getAirList()
     },
@@ -387,7 +390,7 @@
                    check_out:parseInt(this.form.check_out),
                    modifications:parseInt(this.form.modifications),
                  }
-                //  console.log("params",params)
+              console.log("params",params)
                 
                saveAirDisinfect(params).then(response=>{
                   if(response.data.state == 1){

src/xt_pages/device/airDisinfectTwo.vue

@@ -843,6 +843,7 @@
     import { getAllDoctorList,saveNewAirDisinfect,getNewAirDisinfectList,getNewAirDisinfectByIdList,updateNewAirDisinfect,deleteNewAirDisInfect,getAirDisinfectLongTime} from "@/api/device"
     import { uParseTime } from '@/utils/tools'
     const moment = require('moment')
+    import { getManageMentDataConfig } from '@/utils/data'
     export default {
       name: 'airDisinfect',
       components: {
@@ -915,22 +916,24 @@
          total:0,
          tableData: [],
          hiddenShow:false,
-         disInfectionWaterList:[
-         { id: 1, name: "0.22%季铵盐" },
-         { id: 2, name: "500mg/l含氯消毒剂" },
-         { id: 3, name: "1000mg/l含氯消毒剂" },
-         { id: 4, name: "1500mg/l含氯消毒剂" },
-         { id: 5, name: "消毒湿巾" },
-         { id:6, name:"75%酒精"}
-         ],
-         DisinfectionMode: [
-            { id: 1, name: "紫外线" },
-            { id: 2, name: "等离子" },
-            { id: 3, name: "臭氧" },
-            {id:4,name:"含氯剂喷洒500mg/L"},
-            {id:5,name:"含氯剂喷洒1000mg/L"},
-            {id:6,name:"通风"}
-         ],
+        //  disInfectionWaterList:[
+        //  { id: 1, name: "0.22%季铵盐" },
+        //  { id: 2, name: "500mg/l含氯消毒剂" },
+        //  { id: 3, name: "1000mg/l含氯消毒剂" },
+        //  { id: 4, name: "1500mg/l含氯消毒剂" },
+        //  { id: 5, name: "消毒湿巾" },
+        //  { id:6, name:"75%酒精"}
+        //  ],
+        disInfectionWaterList:[],
+        //  DisinfectionMode: [
+        //     { id: 1, name: "紫外线" },
+        //     { id: 2, name: "等离子" },
+        //     { id: 3, name: "臭氧" },
+        //     {id:4,name:"含氯剂喷洒500mg/L"},
+        //     {id:5,name:"含氯剂喷洒1000mg/L"},
+        //     {id:6,name:"通风"}
+        //  ],
+         DisinfectionMode:[],
          operators: [],
          operatorMaps:{},
          firststart:'',
@@ -943,7 +946,17 @@
         }
       },
       created(){
-       
+        var  disinfection_fluid = getManageMentDataConfig('management', 'disinfection_fluid')
+        console.log("disinfection_fluid",disinfection_fluid)
+        for(let i=0;i<disinfection_fluid.length;i++){
+          this.disInfectionWaterList.push(disinfection_fluid[i])
+        }
+
+        var  disinfection_methods = getManageMentDataConfig('management', 'disinfection_methods')
+        console.log("disinfection_methods",disinfection_methods)
+        for(let i=0;i<disinfection_methods.length;i++){
+          this.DisinfectionMode.push(disinfection_methods[i])
+        }
         this.getAllDoctorList()
         this.getNewAirDisinfectList()
         var time=moment(this.form.first_start_time).format("HH:mm");

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -1069,6 +1069,7 @@
         updateObjectTableDisinfect, 
         deleteObjectTableDisinfect
     } from "@/api/device"
+    import { getManageMentDataConfig } from '@/utils/data'
     import { uParseTime } from '@/utils/tools'
     const moment = require('moment')
     export default {
@@ -1158,17 +1159,17 @@
          tableData: [],
          hiddenShow:false,
          disInfectionWaterList:[
-         { id: 1, name: "0.22%季铵盐" },
-         { id: 2, name: "500mg/l含氯消毒剂" },
-         { id: 3, name: "1000mg/l含氯消毒剂" },
-         { id: 4, name: "1500mg/l含氯消毒剂" },
-         { id: 5, name: "消毒湿巾" },
-         {  id:6, name:"75%酒精"}
+        //  { id: 1, name: "0.22%季铵盐" },
+        //  { id: 2, name: "500mg/l含氯消毒剂" },
+        //  { id: 3, name: "1000mg/l含氯消毒剂" },
+        //  { id: 4, name: "1500mg/l含氯消毒剂" },
+        //  { id: 5, name: "消毒湿巾" },
+        //  {  id:6, name:"75%酒精"}
          ],
          DisinfectionMode: [
-            { id: 1, name: "擦拭" },
-            { id: 2, name: "浸泡" },
-            { id: 3, name: "喷洒" }
+            // { id: 1, name: "擦拭" },
+            // { id: 2, name: "浸泡" },
+            // { id: 3, name: "喷洒" }
          ],
          operators: [],
          operatorMaps:{},
@@ -1176,6 +1177,17 @@
         }
       },
       created(){
+        var  disinfection_fluid = getManageMentDataConfig('management', 'disinfection_fluid')
+        console.log("disinfection_fluid",disinfection_fluid)
+        for(let i=0;i<disinfection_fluid.length;i++){
+          this.disInfectionWaterList.push(disinfection_fluid[i])
+        }
+
+        var  disinfection_methods = getManageMentDataConfig('management', 'disinfection_methods')
+        console.log("disinfection_methods",disinfection_methods)
+        for(let i=0;i<disinfection_methods.length;i++){
+          this.DisinfectionMode.push(disinfection_methods[i])
+        }
         this.getAllDoctorList()
         this.getObjectTableDisInfectList()
       },

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -87,7 +87,7 @@
                 {{ record.device_zone.name}}
               </div>
             </div>
-            <div class="inline_block" v-if="org_id!=10510">
+            <div class="inline_block" v-if="org_id!=10510 && org_id!=10460">
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
                 {{ record.device_number.number }}
@@ -99,7 +99,7 @@
                 {{ record.patient.dialysis_no }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 5px">
+            <div class="inline_block" style="margin-left: 5px" v-if="org_id!=10460">
               住院号/门诊号：
               <div
                 class="under_line"
@@ -129,7 +129,7 @@
                 {{ item.name }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 10px">
+            <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460">
               诊断：
               <div
                 class="under_line"
@@ -2137,7 +2137,7 @@
                   {{ "/" }}
                 </div>
               </div>
-              <div class="inline_block">
+              <div class="inline_block" v-if="org_id!=10460">
                 床号：
                 <div class="under_line" style="width: 50px; text-align: center">
                   {{ "/" }}
@@ -2149,7 +2149,7 @@
                   {{ record.patient.dialysis_no }}
                 </div>
               </div>
-              <div class="inline_block" style="margin-left: 5px">
+              <div class="inline_block" style="margin-left: 5px" v-if="org_id!=10460">
                 住院号/门诊号：
                 <div
                   class="under_line"
@@ -2181,7 +2181,7 @@
                   {{ item.name }}
                 </div>
               </div>
-              <div class="inline_block" style="margin-left: 10px">
+              <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460">
                 诊断：
                 <div
                   class="under_line"

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyseven.vue

@@ -560,8 +560,8 @@
                 <td>
                   <span style="width: 14%;">实际置换量：
                     {{
-                      record.assessment_after_dislysis.actual_ultrafiltration
-                        ? record.assessment_after_dislysis.actual_ultrafiltration
+                      record.assessment_after_dislysis.actual_displacement
+                        ? record.assessment_after_dislysis.actual_displacement
                         : ""
                      }}L
 

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -29,7 +29,7 @@
         <li v-if="isShow('置换速度') && this.$store.getters.xt_user.template_info.org_id == 10375">
           <label>置换速度 : </label>
           <span class="content">{{displace_speed }}</span>
-            <span class="unit">ml/L</span>
+            <span class="unit">L/h</span>
         </li>
 
 

src/xt_pages/dialysis/details/dialog/acceptsTreatmentDialog.vue

@@ -477,21 +477,18 @@ export default {
       }
       this.accepts = accepts;
      console.log("accepts", accepts);
-      // var arr = [];
-      // if (this.accepts.precaution) {
-      //   var precaution = this.accepts.precaution.split(",");
-      //   // console.log("precaution", precaution);
-      //   // console.log("hhh", this.precaution_arr);
-      //   for (let i = 0; i < precaution.length; i++) {
-      //     for (let j = 0; j < this.precaution_arr.length; j++) {
-      //       if (parseInt(precaution[i]) == this.precaution_arr[j].id) {
-      //         // console.log("aaaa");
-      //         this.arr.push(this.precaution_arr[j].name);
-      //       }
-      //     }
-      //   }
-      //   this.precautionTwo = this.arr;
-      // }
+      var arr = [];
+      if (this.accepts.precaution) {
+        var precaution = this.accepts.precaution.split(",");
+        for (let i = 0; i < precaution.length; i++) {
+          for (let j = 0; j < this.precaution_arr.length; j++) {
+            if (parseInt(precaution[i]) == this.precaution_arr[j].id) {
+              this.arr.push(this.precaution_arr[j].name);
+            }
+          }
+        }
+        this.precautionTwo = this.arr;
+      }
 
       this.getPermission();
       for (var index in this.receiveTreatmentAsses) {

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -2144,6 +2144,7 @@ export default {
       } else if (
         this.org_template_info.template_id == 2 ||
         this.org_template_info.template_id == 5 ||
+        this.org_template_info.template_id == 6 ||
         this.org_template_info.template_id == 22 ||
         this.org_template_info.template_id == 33
       ) {
@@ -2181,7 +2182,7 @@ export default {
           style: style,
           scanStyles: false,
         });
-      } else if (this.org_template_info.template_id == 53) {
+      } else if (this.org_template_info.template_id == 53 ) {
         console.log("进来233232323232")
         printJS({
           printable: "dialysis-print-box-1-2",
@@ -2897,7 +2898,7 @@ export default {
     },
   },
   created() {
-    console.log("hhahahhahahahah=======",this.org_template_info.template_id)
+    // console.log("hhahahhahahahah=======",this.org_template_info.template_id)
     console.log("this.$store.getters.xt_user.org.id",this.$store.getters.xt_user.org.id)
     var schedule_type_selected = this.$store.getters.schedule_type_selected;
     var zone_selected = this.$store.getters.zone_selected;

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -89,7 +89,7 @@
               <span v-else>{{ "/" }}</span>
             </div>
           </div>
-          <div class="inline_block">
+          <div class="inline_block" v-if="org_id!=10460">
             床号：
             <div class="under_line" style="width: 50px; text-align: center">
               <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460">{{
@@ -108,7 +108,7 @@
               {{ patientInfo.dialysis_no }}
             </div>
           </div>
-          <div class="inline_block" style="margin-left: 5px;" v-if="org_id!=9675 && org_id!=10447">
+          <div class="inline_block" style="margin-left: 5px;" v-if="org_id!=9675 && org_id!=10447&&org_id!=10460">
             住院号/门诊号：
             <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
               {{ receiverTreatmentAccess.admission_number }}
@@ -162,7 +162,7 @@
             <!--</div>-->
           </div>
 
-          <div class="inline_block" style="margin-left: 10px">
+          <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460">
             诊断：
             <div
               class="under_line"
@@ -1923,7 +1923,7 @@
               <span v-else>{{ "/" }}</span>
             </div>
             </div>
-            <div class="inline_block" v-if="org_id!=10510" >
+            <div class="inline_block" v-if="org_id!=10510 && org_id!=10460" >
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
               <span v-if="org_id == 10121 || org_id == 9675 || org_id == 10447 || org_id == 0 ||org_id == 10460">{{
@@ -1943,7 +1943,7 @@
               </div>
             </div>
             <div class="inline_block" style="margin-left: 5px"
-            v-if="org_id!=9675 && org_id!=10447">
+            v-if="org_id!=9675 && org_id!=10447 && org_id!=10460">
             住院号/门诊号：
             <div
               class="under_line"
@@ -2007,7 +2007,7 @@
               <!--平车-->
               <!--</div>-->
             </div>
-            <div class="inline_block" style="margin-left: 10px">
+            <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10460">
               诊断：
               <div
                 class="under_line"
@@ -2624,6 +2624,7 @@
                     </div>
                   </div>
                   <div
+                    v-if="org_id!=10460"
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
@@ -3104,6 +3105,190 @@
           <!-- <div  class="print-yema">1</div> -->
         </div>
       </div>
+    </div>
+
+
+
+    <div id="dialysis-print-box-1-2" class="dialysis-print-order print-template-two print_page_main_content" style="position: relative;">
+      <div class="order-yy-name">{{ orgname }}</div>
+      <div class="order_title">血液净化科医嘱及执行单</div>
+      <div class="row" style="margin-top: 15px">
+        <div class="inline_block">
+          科室：
+          <check-box text="门诊透析" :checked="patientInfo_source_1"></check-box>
+          &nbsp;
+          <check-box text="住院" :checked="patientInfo_source_2"></check-box>
+        </div>
+        <div class="inline_block" style="margin-left: 5px;">
+          住院号：
+          <div class="under_line" style="width: 70px;text-align: left" v-if="patientInfo.admission_number">
+            {{ patientInfo.admission_number }}
+          </div>
+          <div class="under_line" style="width: 70px;text-align: left" v-else>
+            {{ "/" }}
+          </div>
+        </div>
+        <div class="inline_block" style="margin-left:10px;">
+          姓名：
+          <div class="under_line" style="width: 50px;text-align: left">
+            {{ patientInfo.name }}
+          </div>
+        </div>
+        <div class="inline_block" style="margin-left: 10px;">
+          性别：
+          <check-box text="男" :checked="patientInfo_gender_1"></check-box>
+          &nbsp;
+          <check-box text="女" :checked="patientInfo_gender_2"></check-box>
+        </div>
+        <div class="inline_block" style="margin-left: 10px;">
+          年龄：
+          <div class="under_line" style="width: 30px;text-align: left">
+            {{ getAge(patientInfo) }}
+          </div>
+          岁
+        </div>
+        <div class="inline_block" style="margin-left: 10px;">
+          诊断：
+          <div class="under_line" style="width:180px;text-align: left">
+            {{ patientInfo.diagnose }}
+          </div>
+        </div>
+      </div>
+
+      <table class="print-table-no">
+                    <tbody>
+                      <tr style="line-height: 35px; padding: 8px 5px">
+                        <td
+                          colspan="7"
+                          style="
+                            letter-spacing: 5px;
+                            text-align: center;
+                            font-weight: 520;
+                            font-size: 16px;
+                            padding: 6px 8px;
+                            line-height: 30px;
+                          "
+                        >
+                          医嘱内容
+                        </td>
+                      </tr>
+                      <tr style="line-height: 35px; padding: 8px 5px">
+                        <td style="font-size: 16px" width="10%">时间</td>
+                        <td style="font-size: 16px" colspan="2" width="45%">
+                          医嘱内容
+                        </td>
+                        <td style="font-size: 16px" width="10%">医生签名</td>
+                        <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
+                        <td style="font-size: 16px" width="10%">执行人签名</td>
+                        <td style="font-size: 16px" width="10%">时间</td>
+                        <td
+                          style="font-size: 16px"
+                          width="10%"
+                          v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375"
+                        >
+                          核对护士
+                        </td>
+                      </tr>
+                     
+
+                      <tr
+                        v-for="(advice, advice_index) in doctor_advices"
+                        :key="advice_index"
+                      >
+                        <td height="32px">
+                          <span v-if="advice.start_time">
+                            {{ getTime(advice.start_time, "{h}:{i}") }}
+                          </span>
+                          
+                        </td>
+                        <td
+                          height="32px"
+                          colspan="2"
+                          class="advice-name"
+                          style="padding-left: 7px"
+                        >
+                          <span v-if="advice.parent_id > 0">---></span>
+                          <span>{{ advice.advice_name }}</span>
+                          <span v-if="advice && advice.advice_desc"
+                            >({{ advice.advice_desc
+                            }}{{ advice.drug_spec_unit }})</span
+                          >
+                          <span v-if="advice.prescribing_number"
+                            >&nbsp;&nbsp; {{ advice.prescribing_number
+                            }}{{ advice.prescribing_number_unit }}</span
+                          >
+                          <span v-if="advice.single_dose != 0"
+                            >{{ advice.single_dose
+                            }}{{ advice.single_dose_unit }}</span
+                          >
+                          <span v-if="advice.parent_id == 0">{{
+                            advice.delivery_way
+                          }}</span>
+                          <span v-if="advice.parent_id == 0">{{
+                            advice.execution_frequency
+                          }}</span>
+                          <span
+                            v-if="
+                              advice.parent_id == 0 && advice.remark.length > 0
+                            "
+                            >({{ advice.remark }})</span
+                          >
+                        </td>
+                    
+                        <td height="32px">
+                          <span
+                            v-if="setAdminUserES(advice.advice_doctor) == ''"
+                            >{{ getAdminUser(advice.advice_doctor) }}</span
+                          >
+                          <img
+                            style="height: 30px"
+                            :src="setAdminUserES(advice.advice_doctor)"
+                            alt=""
+                            srcset=""
+                            v-else
+                          />
+                        </td>
+                      
+                        <td height="32px">
+                          <span
+                            v-if="setAdminUserES(advice.execution_staff) == ''"
+                            >{{ getAdminUser(advice.execution_staff) }}</span
+                          >
+                          <img
+                            style="height: 30px"
+                            :src="setAdminUserES(advice.execution_staff)"
+                            alt=""
+                            srcset=""
+                            v-else
+                          />
+                        </td>
+                        <td height="32px">
+                          <span v-if="advice.execution_time">{{
+                            getTime(advice.execution_time, "{h}:{i}")
+                          }}</span>
+                        </td>
+                        <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375">
+                          <span v-if="setAdminUserES(advice.checker) == ''">{{
+                            getAdminUser(advice.checker)
+                          }}</span>
+                          <img
+                            style="height: 30px"
+                            :src="setAdminUserES(advice.checker)"
+                            alt=""
+                            srcset=""
+                            v-else
+                          />
+                        </td>
+                      </tr>
+                     
+                    </tbody>
+     </table>
+
+
+    
+     
+
+     
     </div>
   </div>
 </template>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -797,6 +797,11 @@ export default {
     }
   },
   methods: {
+    unique(arr) { // 根据唯一标识id来对数组进行过滤
+      const res = new Map();//定义常量 res,值为一个Map对象实例
+      //返回arr数组过滤后的结果，结果为一个数组   过滤条件是，如果res中没有某个键，就设置这个键的值为1
+      return arr.filter((arr) => !res.has(arr.advice_name) && res.set(arr.advice_name, 1))
+    },
     getDialysisRecord() {
       this.loading = true;
       this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
@@ -1020,22 +1025,44 @@ export default {
         console.log("this.projects", this.projects);
 
         // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
+      
         if(this.projects!=null && this.projects.length >0){
            for(let i=0;i<this.projects.length;i++){
              if(this.projects[i].type== 2){
-              this.projects[i].advice_name = this.projects[i].project.project_name
-              this.projects[i].start_time = this.projects[i].start_time
-              this.projects[i].single_dose = this.projects[i].single_dose
-              this.projects[i].single_dose_unit = this.projects[i].unit
-              this.projects[i].execution_time = this.projects[i].execution_time
-              this.projects[i].execution_staff= this.projects[i].execution_staff 
-              this.advices.push(this.projects[i])
+            
+              this.projects[i].project_team_name = ""
+              this.projects[i].project_team_id = 0
+              console.log("this.projects[i].project.team",this.projects[i].project.team)
+              if(this.projects[i].team!= "undefined" && this.projects[i].team.id >0){
+                this.projects[i].project_team = this.projects[i].team.project_team
+                this.projects[i].project_team_id = this.projects[i].team.id
+                this.projects[i].start_time = this.projects[i].start_time
+                this.projects[i].single_dose = this.projects[i].single_dose
+                this.projects[i].single_dose_unit = this.projects[i].unit
+                this.projects[i].execution_time = this.projects[i].execution_time
+                this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.projects[i].advice_name =  this.projects[i].team.project_team
+              
+               
+                this.advices.push(this.projects[i])
+              }else{
+                this.projects[i].project_team = this.projects[i].project.project_name
+                this.projects[i].advice_name = this.projects[i].project.project_name
+                this.projects[i].start_time = this.projects[i].start_time
+                this.projects[i].single_dose = this.projects[i].single_dose
+                this.projects[i].single_dose_unit = this.projects[i].unit
+                this.projects[i].execution_time = this.projects[i].execution_time
+                this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.advices.push(this.projects[i])
+              }
+             
              }
              
            }
         }
-        
-
+       
+       
+      
         var tableAdvice = this.advices;
 
 
@@ -1115,6 +1142,11 @@ export default {
           this.advices = tableAdvice;
         }
 
+        var arr = [] 
+        arr = this.unique(this.advices)
+        this.advices = []
+        this.advices= arr
+        console.log("wowoowowowo",arr)
         console.log("advices-----------------",this.advices)
 
  

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -211,7 +211,7 @@
           抗凝药物
           <div class="inline_block under_line" style="width:92%;text-align: left;">
             <label-box :isChecked="prescription.anticoagulant == '普通肝素' ? true : false" showValue="普通肝素"></label-box>&nbsp;
-            <label-box :isChecked="prescription.anticoagulant == '低分子肝素钙' ? true : prescription.anticoagulant == '低分子肝素钠' ? true : false" showValue="低分子肝素"></label-box>
+            <label-box :isChecked="prescription.anticoagulant == '低分子肝素钙' ? true : prescription.anticoagulant == '低分子肝素钠' ? true : prescription.anticoagulant == '低分子肝素' ? true : false" showValue="低分子肝素"></label-box>
             （<label-box :isChecked="prescription.anticoagulant == '低分子肝素钙' ? true : false" showValue="钙"></label-box>
               <label-box :isChecked="prescription.anticoagulant == '低分子肝素钠' ? true : false" showValue="钠"></label-box>）
             <div class="inline_block">

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -478,8 +478,8 @@
                   <span>实际置换量：
                    
                     {{
-                      afterdialysis.actual_ultrafiltration
-                        ? afterdialysis.actual_ultrafiltration
+                      afterdialysis.actual_displacement
+                        ? afterdialysis.actual_displacement
                         : ""
                      }}L
 

src/xt_pages/log/index.vue

@@ -77,7 +77,7 @@
               <el-pagination
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
-                :page-size="10"
+                :page-sizes="[10, 50, 100,500]"
                 background
                 style="margin-top:20px;float: right"
                 :total="total"
@@ -157,7 +157,7 @@
               <el-pagination
                 @size-change="handleSizeChangeOne"
                 @current-change="handleCurrentChangeOne"
-                :page-size="10"
+                :page-sizes="[10, 50, 100,500]"
                 background
                 style="margin-top:20px;float: right"
                 :total="total"
@@ -244,7 +244,7 @@
               <el-pagination
                 @size-change="handleSizeChangeTwo"
                 @current-change="handleCurrentChangeTwo"
-                :page-size="10"
+                :page-sizes="[10, 50, 100,500]"
                 background
                 style="margin-top:20px;float: right"
                 :total="total"
@@ -331,7 +331,7 @@
               <el-pagination
                 @size-change="handleSizeChangeThree"
                 @current-change="handleCurrentChangeThree"
-                :page-size="10"
+                :page-sizes="[10, 50, 100,500]"
                 background
                 style="margin-top:20px;float: right"
                 :total="total"
@@ -410,7 +410,7 @@
               <el-pagination
                 @size-change="handleSizeChangeFour"
                 @current-change="handleCurrentChangeFour"
-                :page-size="10"
+                :page-sizes="[10, 50, 100,500]"
                 background
                 style="margin-top:20px;float: right"
                 :total="total"

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

@@ -129,7 +129,7 @@
 
                   <div style="margin-left: 70px">
                     用法：
-                    <span v-if="(item.arr.length>0 && item.arr[0][0].groupno!=it.groupno)||arr.length<0">{{ it.single_dose }}{{ it.single_dose_unit }}</span>
+                    <span v-if="(item.arr.length>0 && item.arr[0][0].groupno!=it.groupno)||item.arr.length==0">{{ it.single_dose }}{{ it.single_dose_unit }}</span>
                     &nbsp;&nbsp;<span>
                       {{ it.execution_frequency }}&nbsp;{{
                         it.delivery_way

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -174,10 +174,10 @@
                     <p>HDF+HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                     <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
-                  <span v-if="item.mode_id == 'HFHD+HP'">
-                      <p>HFHD+HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                  <!-- <span v-if="item.mode_id == 'HFHD+HD'">
+                      <p>HFHD+HD:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
-                  </span>
+                  </span> -->
                    <span v-if="item.mode_id == '腹水回输'">
                       <p>腹水回输:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
@@ -1032,6 +1032,18 @@ export default {
             if(modedate[i].mode_id == 28){
               modedate[i].mode_id = "CVVHDF"
             }
+            if(modedate[i].mode_id == 29){
+              modedate[i].mode_id = "PE"
+            }
+            if(modedate[i].mode_id == 30){
+              modedate[i].mode_id = "血浆胆红素吸附+HP"
+            }
+            if(modedate[i].mode_id == 31){
+              modedate[i].mode_id = "HPD"
+            }
+            if(modedate[i].mode_id == 32){
+              modedate[i].mode_id = "HDP"
+            }
             this.modetype = modedate
 
             // this.modesData.xAxis.push(modedate[i].mode_id)

src/xt_pages/role/admin.vue

@@ -177,7 +177,7 @@
           style="float:left"
           @click="toEnd">结束签署</el-button> -->
            
-         
+       
           
      </div>
     
@@ -1013,7 +1013,8 @@ export default {
           this.$message.success("保存成功")
         }
       })
-    }
+    },
+   
   },
   watch: {
     should_update_admins(should_change) {

src/xt_pages/user/Sitemap.vue

@@ -3,7 +3,7 @@
     <div class='content_top' style="width: 100%;margin-bottom: 20px;border-bottom:1px solid #DCDFE6;padding-bottom:10px">
       <div style="font-size: 20px;">血管通路位点标记</div>
       <div>
-        <el-button type="primary">操作说明</el-button>
+        <!-- <el-button type="primary">操作说明</el-button> -->
       </div>
     </div>
 
@@ -18,11 +18,11 @@
         </div>
       </div>
       <div style="margin-top:6px;display:flex;flex-wrap: wrap;position:relative;min-height:480px;">
-        <div style="width:47%;border:1px solid #ddd;padding: 5px;" id="print_mark_img" ref="imageWrapper">
-          <div id="point_mark_img_wrap1" class="print_main_content" style="width: 100%;padding: 0;border: 0;" >
+        <div style="width:47%;border:1px solid #ddd;padding: 5px;" id="print_mark_img" >
+          <div id="point_mark_img_wrap1" class="print_main_content" style="width: 100%;padding: 0;border: 0;" ref="imageWrapper">
 
-            <img v-if="fileList.length==0" id="ossPointMarkImg" src="@/assets/evaluate/xgtl_default.png" alt="" srcset="">
-            <img v-if="fileList.length>0" id="ossPointMarkImg" :src="fileList[0].img_url" alt="" srcset="">
+            <img v-if="fileList[0].img_url==0" id="ossPointMarkImg" src="@/assets/evaluate/xgtl_default.png" alt="" srcset="">
+            <img v-if="fileList[0].img_url!=''" id="ossPointMarkImg" :src="fileList[0].img_url" alt="" srcset="">
 
             <!-- A端/V端 v-if="a_num==2" -->
             <!-- <div v-for="(item,index) in A_arr" :key="index">
@@ -57,16 +57,23 @@
             </div> -->
 
 
-            <!-- 穿刺文字 active  @mousedown="startDrag"   @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)" left:text_left+'px',top:text_top+'px',-->
-            <!-- <div  >@mousedown.self="A_mousedow($event)" @mouseup.self="A_moouseup($event)" -->
+            <!-- 穿刺文字 @mousedown="mousedown($event)"   active  @mousedown="startDrag"   @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)" left:text_left+'px',top:text_top+'px',-->
+            <!-- <div
+            >  width:(item.width + 10)+'px',-->
               <div v-for="(item,index) in text_arr" :key="index" class="add-mark-text-wrap active text" id="text" @mousedown="mousedown($event)"
-              :style="{width:(item.width + 10)+'px',left:item.left+'px',top:item.top+'px','font-size':14+'px', position: 'absolute'}"
+              :style="{width: 'fit-content',left:item.left+'px',top:item.top+'px','font-size':14+'px', position: 'absolute'}"
               >
-                <!-- <div  style="width:82px;left:62.17%;top:39.00%;display: inline-block;" @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)">position: 'absolute',top: 36+'%',left: 48+'%' -->
-                  <!-- {{ item }} @mousedown.self="A_mousedow($event)" @mouseup.self="A_moouseup($event)"-->
-                  <el-input v-text="item.text" size="mini" :style="{width:item.width+'px', border: 1+'px solid transparent', cursor: 'default'}"></el-input>
-                  <!-- <input id="inpu" type="text" :value="item" data-width="82" style="width: 82px; border: 1px solid transparent; cursor: default;" class="mark-text-ipt"> -->
-                <!-- </div> -->
+              <!-- <el-input v-model="item.text" class="inputStyle">
+                <template slot="prefix">
+                  {{ item.text }}
+                </template>
+              </el-input> -->
+
+                  <!-- <el-input v-model:value="item.text" size="mini" :style="{width:item.width+'px', border: 1+'px solid transparent', cursor: 'default'}"></el-input> -->
+                  <!-- <input id="inpu" type="text" :value="item.text" data-width="82" :style="{width:item.width+'px', border: 1+'px solid transparent', cursor: 'default',outline: 'none'}" class="mark-text-ipt"> -->
+                  <input id="inpu" type="text" @input="changewidth" v-model="item.text" data-width="82" :style="{width:'fit-content', border: 1+'px solid transparent', cursor: 'default',outline: 'none'}" class="mark-text-ipt">
+                  <!-- <input v-if="value!=''" id="inpu" type="text" v-model="value" data-width="82" :style="{width:item.width+'px', border: 1+'px solid transparent', cursor: 'default',outline: 'none'}" class="mark-text-ipt"> -->
+                  <!-- </div> -->
                 <span class="remove-mark-text" @click="input_deldte($event,item)">×</span>
                  <span class="mark-text-line" style="transform: rotate(45deg);" data-rotate="45"></span>
               </div>
@@ -169,7 +176,7 @@
       </div>
     </div>
 
-    <div style="width:50%; margin-top:20px">
+    <!-- <div style="width:50%; margin-top:20px">
       <div class='content_top' style="width: 100%;margin-bottom: 20px;border-bottom:1px solid #DCDFE6;padding-bottom:10px">
         <div style="font-size: 20px;">位点记录列表</div>
         <div>
@@ -187,7 +194,7 @@
           </thead>
         </table>
       </div>
-    </div>
+    </div> -->
     <!-- 保存按钮的隐藏 -->
     <el-dialog
       title="提示"
@@ -238,6 +245,40 @@
         <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
       </span> -->
     </el-dialog>
+    <!-- 打印 -->
+    <el-dialog
+      title="打印"
+      :visible.sync="dayinDialogVisible"
+      width="50%"
+      center>
+      <div>
+        <div @click="dayin">
+          <el-button type="primary" @click="dayin">打印</el-button>
+        </div>
+        <div id="print_img">
+          <div class="parint_content">
+            <!-- <div> -->
+              <div style="text-align: center;font-size:17;margin-bottom: 10px;">血液透析位点图</div>
+              <div style="display: flex;border-bottom: 1px solid black;padding: 5px;">
+                <div style="width: 200px;">患者姓名：{{ patients.name }}</div>
+                <div style="width: 200px;">透析号：{{ patients.dialysis_no }}</div>
+                <div style="width: 200px;">住院(门诊)号：{{ patients.admission_number }}</div>
+                <div style="width: 200px;">打印时间：{{date}}</div>
+              </div>
+
+              <div style="width: 530px;margin: 20px auto;">
+                <img :src="imgUrls" alt="" srcset="">
+
+              </div>
+            <!-- </div> -->
+          </div>
+        </div>
+      </div>
+      <!-- <span slot="footer" class="dialog-footer">
+        <el-button @click="dayinDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dayin">确 定</el-button>
+      </span> -->
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -245,18 +286,22 @@ import print from "print-js";
 import { getFileExtension} from '@/utils/tools'
 import { saveSitemap,getPatientSitemap,updateSiteMap } from "@/api/patient";
 import { getToken } from '@/api/qiniu'
+const moment = require('moment')
+import html2canvas from "html2canvas"
 export default{
   components:{
     // quillEditor
   },
   data(){
     return{
+      hidd:false,
       append:false,//控制是否编辑
       centerDialogVisible: false,
       imgDialogVisible:false,
       shiyituDialogVisible:false,
+      dayinDialogVisible:false,
       imgUrl:[],
-      
+
       fangxiangA:[{markNum:'',left:'',top:''}],//a端进针方向的数组
       fangxiangA_num:1,//控制a端进针方向是否显示
       fangxiangA_left:400,//A端进针方向X
@@ -267,7 +312,7 @@ export default{
       fangxiangV_left:100,//v端进针方向X
       fangxiangV_top:78,//v端进针方向Y
 
-      
+
       fuzhuA:[{a_markNum:0,a_left:0,a_top:0}],//助辅工具a的数组
       fuzhuA_num:1,//控制a端辅助工具是否显示
       xuanzhuan_a:0,//点击旋转角度a
@@ -287,12 +332,8 @@ export default{
       obj_a:{a_markNum:'',a_left:'',a_top:''},//助辅工具a的对象
       obj_v:{v_markNum:'',v_left:'',v_top:''},//助辅工具v的对象
 
-      A_left:390,//A端X
-      A_top:180,//A端Y
       a_num:1,//控制a端是否显示和高亮
 
-      V_left:184,//V端X
-      V_top:180,//V端Y
       v_num:1,//控制v端是否显示和高亮
 
       text_arr:[],//文本框
@@ -302,8 +343,8 @@ export default{
 
       av_bkx:0,
       av_bky:0,
-      
-      fileList:[],
+
+      fileList:[{img_url:"",desc:"",id:0}],
       uploadData: { token: '', key: '' },
       qiniuDomain: 'https://images.shengws.com/',
       puncture_text:[{text:'穿刺角度',width:70},{text:'卡夫距导管出口距离cm',width:158},{text:'动脉端向心穿刺',width:116},{text:'动脉端离心穿刺',width:116},
@@ -330,15 +371,23 @@ export default{
       patientID:0,
       id:0,
       texts:null,
+      imgUrls:'',
+      patients:{},
+      date:moment(new Date()).format("YYYY-MM-DD"),
+      widthtext:null,
     }
   },
   created(){
+
     const id = this.$route.params && this.$route.params.id;
     this.patientID = parseInt(id);
 
     // this.getPatientSitemap(this.patientID)
   },
   mounted(){
+    console.log('asdfdfgfd',this.value);
+    console.log('333333',this.date);
+    console.log('asfdazxsdfdfdsdfsadfs',this.fileList);
   },
   methods:{
     add(){
@@ -360,38 +409,11 @@ export default{
     open(){
       this.imgDialogVisible = true
     },
-    // a_item(e,val){
-    //   const A_div =document.getElementsByClassName('point-mark-a-item')
-    //   console.log('aaaa',val,this.A_left);
-    //   for (let i=1;i<=A_div.length;i++){
-    //     if(val== i){
-    //       if(e.target.className.indexOf('not-allow')==-1){
-    //         A_div[i-1].classList.add('not-allow')
-    //          this.classname='not-allow'
-    //         console.log('eqwrqqweadsf',this.classname);
-    //         this.a_num=2
-    //         var obj ={markNum:'',left:'',top:''}
-    //         obj.markNum = val
-    //         obj.left= this.A_left
-    //         obj.top=(this.A_top + (i-1)*30)
-    //         this.A_arr.push(obj)
-    //         console.log('asdf',this.A_arr);
-    //       }else{
-    //         A_div[i-1].classList.remove('not-allow')
-    //         for(let y=0;y<this.A_arr.length;y++){
-    //           if(val==this.A_arr[y].markNum){
-    //             this.A_arr.splice(y,1)
-    //           }
-    //         }
-    //       }
-
-    //     }
-    //   }
-    //   // console.log('333',this.A_arr)
-    // },
 
     a_item(e,val){
+      console.log('asdfasdf222',this.Aarr);
      for(let i=0;i<this.Aarr.length;i++){
+      console.log('asdfasdf222');
       // if(this.A_left[i].a_num=1){
       if(this.Aarr[i].markNum==val){
         if(this.A_right[i].a_num==1){
@@ -429,33 +451,7 @@ export default{
       // }
      }
     },
-    // v_item(e,val){
-    //   const V_div =document.getElementsByClassName('point-mark-v-item')
-    //   console.log('1111',val,e.target.className);
-    //   for (let i=1;i<=V_div.length;i++){
-    //     if(val== i){
-    //       if(e.target.className.indexOf('not-allow')==-1){
-    //         V_div[i-1].classList.add('not-allow')
-    //         this.v_num=2
-    //         var obj ={markNum:'',left:'',top:''}
-    //         obj.markNum = val
-    //         obj.left= this.V_left
-    //         obj.top=(this.V_top + (i-1)*30)
-    //         this.V_arr.push(obj)
-    //         console.log('GFSDGDSD',this.V_arr);
-    //       }else{
-    //         V_div[i-1].classList.remove('not-allow')
-    //         // this.V_ite=val
-    //         for(let y=0;y<this.V_arr.length;y++){
-    //           if(val==this.V_arr[y].markNum){
-    //             this.V_arr.splice(y,1)
-    //           }
-    //         }
-    //       }
-
-    //     }
-    //   }
-    // },
+
     A_mousedow(e){
       console.log('7777',e);
       // console.log('8888',val);
@@ -469,10 +465,9 @@ export default{
       var Alen=this.A_arr
       // var Vlen=this.V_arr
       // var textlen=this.text_arr
+
       var fx_alen=this.fangxiangA
       var fx_vlen=this.fangxiangV
-      // var FZ_alen=this.fuzhuA
-      // var FZ_vlen=this.fuzhuV
       var aleng=this.Aarr
       var vleng=this.Varr
       if(e.preventDefault){
@@ -555,22 +550,21 @@ export default{
           }
         }
       }
-      console.log('x',Alen,'12341234',this.A_top);
+      // console.log('x',Alen,'12341234',this.A_top);
     },
     A_moouseup(e){
-      // console.log('9999',e);
-      // console.log('0000',val);
       document.onmousemove =null
     },
     mousedown(e){
-      // this.texts = document.getElementsByClassName('text')[0]
       const tet=document.getElementsByClassName('text')
-      const evetext=e.target.innerText.split('\n')[0]
       var textlen=this.text_arr
-      console.log('ZXCBVCB',textlen);
+      console.log('ZXCBVCB',textlen,'33333',this.value);
+      const even= e.target.value
+      // console.log('zxcvbnvxcz',even);
       for(let i=0;i<tet.length;i++){
-        const textsle = tet[i].innerText.split('\n')[0]
-        if(evetext == textsle){
+        const textsle= tet[i].firstChild.value
+        // console.log('5234254',textsle);
+        if(even == textsle){
           const disX = e.clientX - tet[i].offsetLeft;
           const disY = e.clientY - tet[i].offsetTop;
           const isdow=true
@@ -584,7 +578,7 @@ export default{
             tet[i].style.top = moveY + "px";
             for(let i=0;i<textlen.length;i++){
               // const textsle=e.target.innerText.split('\n')[0]
-              if(textlen[i].text == textsle){
+              if(textlen[i].text == e.target.value){
                 console.log('3333');
                 textlen[i].left=moveX
                 textlen[i].top=moveY
@@ -650,10 +644,9 @@ export default{
       }
     },
     punctureclick(e,val){
-      console.log('event',e,'value',val);
+      console.log('event',e,'value',this.value);
       const text=e.target
       const textlen=this.text_arr.length
-
       if(text.innerText == val.text){
         this.text_num=2
        const obj={text:'',left:'',top:'',width:''}
@@ -662,6 +655,7 @@ export default{
        obj.left=this.text_left
        obj.top=this.text_top+(textlen*30)
        obj.width=e.target.offsetWidth
+      // obj.width= this.widthtext
         this.text_arr.push(obj)
       }
 
@@ -677,6 +671,11 @@ export default{
       }
     },
     fangxiang_A(e){
+      // if(this.fangxiangA[0].fangxiangA_num==1){
+      //   this.fangxiangA[0].fangxiangA_num=2
+      // }else{
+      //   this.fangxiangA[0].fangxiangA_num=1
+      // }
       if(this.fangxiangA_num == 1){
         console.log('1111',e);
         var obj ={markNum:'',left:'',top:''}
@@ -684,9 +683,11 @@ export default{
         obj.left= this.fangxiangA_left
         obj.top=this.fangxiangA_top
         this.fangxiangA.push(obj)
+        this.fangxiangA.shift()
         console.log('asdfdfgfd',this.fangxiangA);
         return this.fangxiangA_num = 2
       }else{
+        // this.fangxiangA.shift()
         console.log('2222');
         return this.fangxiangA_num = 1
       }
@@ -699,9 +700,11 @@ export default{
         obj.left= this.fangxiangV_left
         obj.top=this.fangxiangV_top
         this.fangxiangV.push(obj)
+        this.fangxiangV.shift()
         console.log('asdfdfgfd',this.fangxiangV);
         return this.fangxiangV_num = 2
       }else{
+        // this.fangxiangV.shift()
         console.log('2222');
         return this.fangxiangV_num = 1
       }
@@ -713,10 +716,11 @@ export default{
         this.obj_a.a_left= this.fuzhuA_left
         this.obj_a.a_top=this.fuzhuA_top
         this.fuzhuA.push(this.obj_a)
+        this.fuzhuA.shift()
         console.log('asdfdfgfd',this.fuzhuA);
         return this.fuzhuA_num = 2
       }else{
-        this.fuzhuA.shift()
+        // this.fuzhuA.shift()
         console.log('辅助工具a2222');
         return this.fuzhuA_num = 1
       }
@@ -728,10 +732,11 @@ export default{
         this.obj_v.v_left= this.fuzhuV_left
         this.obj_v.v_top=this.fuzhuV_top
         this.fuzhuV.push(this.obj_v)
+        this.fuzhuV.shift()
         console.log('辅助工具v1111',this.fuzhuV);
         return this.fuzhuV_num = 2
       }else{
-        this.fuzhuV.shift()
+        // this.fuzhuV.shift()
         console.log('辅助工具v2222');
         return this.fuzhuV_num = 1
       }
@@ -759,18 +764,27 @@ export default{
       }
     },
     printtup(){
-      const style='@media print{.print_main_content{#ossPointMarkImg {width: 100%;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} #point_mark_img_wrap1 {-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;position: relative;padding: 4px;width: 600px;background-color: #fff;border: 1px solid #ddd;border-radius: 4px;} .mark-target-a{background: #E73535;top: 40px; left: 40px;} .mark-line{background: #E73535;} .mark-target-v{background: rgb(53,162,231);.mark-line{background: #35A2E7;}}  .mark-target-a,.mark-target-v {position: absolute;z-index: 1001;width: 26px;border-radius: 13px;height: 26px;text-align: center;line-height: 26px;font-size: 18px;cursor: move;color: rgb(255,255,255);.mark-line {transform: rotate(160deg);transform-origin: left bottom;}.mark-line {display: inline-block;position: absolute;left: 50%;top: 50%;width: 86px;height: 1px;cursor: default;z-index: -1;} div.add-mark-text-wrap {position: absolute;top: 36%;left: 48%;border-radius: 4px;width: 60px;height: 24px;line-height: 24px;z-index: 1005;display: inline-block;} .remove-mark-text{overflow: hidden;} b.xtgl-ccz-arrow-a {border-left-color: #E73535;border-top-color: #E73535;} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;} b.xtgl-ccz-arrow {position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;}div.frame-image {position: absolute;overflow: hidden;top: 0px;left: 0px;width: 100%;height: 100%;background-image: url('+'../../assets/evaluate/tool-a.png'+');background-position: center center;background-size: 100%; background-repeat: no-repeat;}}}'
-      // const style='@media print{.print_main_content{#ossPointMarkImg {width: 100%;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} #point_mark_img_wrap1 {-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;position: relative;padding: 4px;width: 600px;background-color: #fff;border: 1px solid #ddd;border-radius: 4px;}  b.xtgl-ccz-arrow-a {border-left-color: #E73535;border-top-color: #E73535;}
-      // b.xtgl-ccz-arrow {position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;}
-      // .mark-target-a{background: #E73535;top: 40px;left: 40px;} .mark-line{background: #E73535;}}}'
-      // const style='@media print{.print_main_content{#ossPointMarkImg {width: 100%;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} #point_mark_img_wrap1 {-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;position: relative;padding: 4px;width: 600px;background-color: #fff;border: 1px solid #ddd;border-radius: 4px;} .mark-target-a{background: #E73535;top: 40px; left: 40px;} .mark-line{background: #E73535;} .mark-target-v{background: rgb(53,162,231);.mark-line{background: #35A2E7;}}  .mark-target-a,.mark-target-v {position: absolute;z-index: 1001;width: 26px;border-radius: 13px;height: 26px;text-align: center;line-height: 26px;font-size: 18px;cursor: move;color: rgb(255,255,255);.mark-line {transform: rotate(160deg);transform-origin: left bottom;}.mark-line {display: inline-block;position: absolute;left: 50%;top: 50%;width: 86px;height: 1px;cursor: default;z-index: -1;} div.add-mark-text-wrap {position: absolute;top: 36%;left: 48%;border-radius: 4px;width: 60px;height: 24px;line-height: 24px;z-index: 1005;display: inline-block;} input {width: 100px;width: 60px;max-width: 400px;border: 1px solid transparent;padding: 4px;color: #333;height: 24px;cursor: pointer;background-color: #fcfcfc;position: absolute;left: 0;top: 0;font-size: 13px;z-index: 1002;border-radius: 2px !important;outline: none;}.mark-text-ipt {cursor: default;}}}}'
+      console.log('先发给对方v不合格',this.fileList[0].img_url);
+      this.dayinDialogVisible = true
+      html2canvas(this.$refs.imageWrapper,{backgroundColor: null,allowTaint: true,useCORS: true,scrollY: 0,scrollX: 0,}).then(canvas => {
+        // 转成图片，生成图片地址
+        this.imgUrls = canvas.toDataURL("image/png");
+        console.log('123424534',this.imgUrls)
+      });
 
+
+    },
+    // 打印
+    dayin(){
+
+      const style='@media print{.parint_content{width:960px;} #ossPointMarkImg {width: 520px;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} .mark-target-a{background: #E73535;top: 40px; left: 40px;} .mark-line{background: #E73535;} .mark-target-v{background: rgb(53,162,231);.mark-line{background: #35A2E7;}}  .mark-target-a,.mark-target-v {position: absolute;z-index: 1001;width: 26px;border-radius: 13px;height: 26px;text-align: center;line-height: 26px;font-size: 18px;cursor: move;color: rgb(255,255,255);.mark-line {transform: rotate(160deg);transform-origin: left bottom;}.mark-line {display: inline-block;position: absolute;left: 50%;top: 50%;width: 86px;height: 1px;cursor: default;z-index: -1;}}'
       printJS({
-        printable: "print_mark_img",
+        printable: "print_img",
         type: "html",
         style: style,
         scanStyles: false
       });
+      this.dayinDialogVisible = false
     },
     imgv_click(){
       if(this.img_v==false){
@@ -874,11 +888,13 @@ export default{
       console.log('111',err);
       this.$message.error(err)
       this.loading.close()
+      this.imgDialogVisible=false
       return false
     },
     handleAvatarSuccess(res, file) {
       console.log("RESPOWOWOWOWO",res)
       console.log("wowowowow",file)
+      this.fileList.shift()
       this.fileList.push({
         img_url: this.qiniuDomain + res.url + '?imageView2/2/w/500/h/500/q/90',
         desc: '',
@@ -983,13 +999,37 @@ export default{
        if(this.V_right!=null && this.V_right.length>0){
 
          for(let i=0;i<this.V_right.length;i++){
-            this.V_right[i].markNum = parseInt(this.V_right[i].markNum)?parseInt(this.V_right[i].markNum):0
+            this.V_right[i].mark_num = parseInt(this.V_right[i].markNum)?parseInt(this.V_right[i].markNum):0
             this.V_right[i].v_num = parseInt(this.V_right[i].v_num)?parseInt(this.V_right[i].v_num):0
          }
        }
 
-   
 
+      if(this.Aarr!=null && this.Aarr.length>0){
+        console.log('asdfa',this.Aarr);
+        for(let i=0;i<this.Aarr.length;i++){
+            this.Aarr[i].mark_num = parseInt(this.Aarr[i].markNum)?parseInt(this.Aarr[i].markNum):0
+            this.Aarr[i].is_status = parseInt(this.Aarr[i].status)?parseInt(this.Aarr[i].status):0
+            this.Aarr[i].left = parseInt(this.Aarr[i].left)?parseInt(this.Aarr[i].left):0
+            this.Aarr[i].top = parseInt(this.Aarr[i].top)?parseInt(this.Aarr[i].top):0
+        }
+      }
+
+      if(this.Varr!=null && this.Varr.length>0){
+
+        for(let i=0;i<this.Varr.length;i++){
+            this.Varr[i].mark_num = parseInt(this.Varr[i].markNum)?parseInt(this.Varr[i].markNum):0
+            this.Varr[i].is_status = parseInt(this.Varr[i].status)?parseInt(this.Varr[i].status):0
+            this.Varr[i].left = parseInt(this.Varr[i].left)?parseInt(this.Varr[i].left):0
+            this.Varr[i].top = parseInt(this.Varr[i].top)?parseInt(this.Varr[i].top):0
+        }
+      }
+
+
+       var img_url = ""
+       if(this.fileList!=null && this.fileList.length>0){
+          img_url = this.fileList[0].img_url
+       }
        var params = {
          id:this.id,
          is_append:is_append,
@@ -998,17 +1038,17 @@ export default{
          v_num:this.v_num?this.v_num:0,
          text_num:this.text_num?this.text_num:0,
          fangxiang_a:this.fangxiangA,
-         fangxiang_a_num:this.fangxiangA_num,
-         fangxiang_v_num:this.fangxiangV_num,
+         fangxiang_a_num:this.fangxiangA_num?this.fangxiangA_num:0,
+         fangxiang_v_num:this.fangxiangV_num?this.fangxiangV_num:0,
          fangxiang_a_left:this.fangxiangA_left,
          fangxiang_a_top:this.fangxiangA_top,
          fangxiang_v:this.fangxiangV,
          fangxiang_v_left:this.fangxiangV_left,
          fangxiang_v_top:this.fangxiangV_top,
-         fuzhu_a_num:this.fuzhuA_num,
-         fuzhu_v_num:this.fuzhuV_num,
-         xuanzhuan_a:this.xuanzhuan_a,
-         xuanzhuan_v:this.xuanzhuan_v,
+         fuzhu_a_num:this.fuzhuA_num?this.fuzhuA_num:0,
+         fuzhu_v_num:this.fuzhuV_num?this.fuzhuV_num:0,
+         xuanzhuan_a:this.xuanzhuan_a?this.xuanzhuan_a:0,
+         xuanzhuan_v:this.xuanzhuan_v?this.xuanzhuan_v:0,
          fuzhu_a:this.fuzhuA,
          fuzhu_a_top:this.fuzhuA_top,
          fuzhu_a_left:this.fuzhuA_left,
@@ -1016,19 +1056,22 @@ export default{
          fuzhu_v_top:this.fuzhuV_top,
          fuzhu_v_left:this.fuzhuV_left,
          a_left:this.A_right,
-         a_top:this.A_top,
+         a_top:0,
          v_left:this.V_right,
-         v_top:this.V_top,
+         v_top:0,
          text_arr:this.text_arr,
          text_left:this.text_left,
          text_top:this.text_top,
-         av_bkx:this.av_bkx,
-         av_bky:this.av_bky,
-         scalev_num:this.scalev_num,
-         scalea_num:this.scalea_num,
+         av_bkx:this.av_bkx?this.av_bkx:0,
+         av_bky:this.av_bky?this.av_bky:0,
+         scalev_num:this.scalev_num?this.scalev_num:0,
+         scalea_num:this.scalea_num?this.scalea_num:0,
          patient_id:this.patientID,
-         left_a:this.A_left,
-         left_v:this.V_left,
+         left_a:0,
+         left_v:0,
+         aarr:this.Aarr,
+         varr:this.Varr,
+         img_url:img_url,
        }
        console.log("paramswowwo",params)
 
@@ -1036,7 +1079,7 @@ export default{
           if(response.data.state == 1){
             var deviceValsualMap =  response.data.data.deviceValsualMap
             this.$message.success("保存成功!")
-            
+
             this.append =false
             this.getPatientSitemap(this.patientID)
           }
@@ -1047,6 +1090,9 @@ export default{
          if(response.data.state == 1){
             var sitemap = response.data.data.sitemap
             console.log('idzhesdfasd',sitemap);
+            var patients = response.data.data.patients
+            this.patients=patients
+            console.log("患者信息",this.patients.name)
             if(sitemap.id>0){
               if(sitemap.is_append == 1){
               this.is_append =true
@@ -1067,20 +1113,18 @@ export default{
             }
 
             this.id = sitemap.id
-
-            this.A_top = sitemap.a_top
-            this.av_bkx = sitemap.av_bkx
-            this.av_bky = sitemap.av_bky
-            this.fangxiangA_top = sitemap.fangxiang_a_left
-            this.fangxiangA_num = sitemap.fangxiang_a_num
-            this.fangxiangA_num = sitemap.fangxiang_a_top
-            this.fangxiangV_left = sitemap.fangxiang_v_left
-            this.fangxiangV_num =sitemap.fangxiang_v_num
-            this.fangxiangV_top = sitemap.fangxiang_v_top
-            this.fuzhuA_left= sitemap.fuzhu_a_left
-            this.fuzhuA_num = sitemap.fuzhu_a_num
-            this.fuzhuA_top =sitemap.fuzhu_a_top
-            this.fuzhuV_left =sitemap.fuzhu_v_left
+            this.av_bkx = sitemap.av_bkx?sitemap.av_bkx:0
+            this.av_bky = sitemap.av_bky?sitemap.av_bky:0
+            this.fangxiangA_left = sitemap.fangxiang_a_left?sitemap.fangxiang_a_left:0
+            this.fangxiangA_num = sitemap.fangxiang_a_num?sitemap.fangxiang_a_num:0
+            this.fangxiangA_top = sitemap.fangxiang_a_top?sitemap.fangxiang_a_top:0
+            this.fangxiangV_left = sitemap.fangxiang_v_left?sitemap.fangxiang_v_left:0
+            this.fangxiangV_num =sitemap.fangxiang_v_num?sitemap.fangxiang_v_num:0
+            this.fangxiangV_top = sitemap.fangxiang_v_top?sitemap.fangxiang_v_top:0
+            this.fuzhuA_left= sitemap.fuzhu_a_left?sitemap.fuzhu_a_left:0
+            this.fuzhuA_num = sitemap.fuzhu_a_num?sitemap.fuzhu_a_num:0
+            this.fuzhuA_top =sitemap.fuzhu_a_top?sitemap.fuzhu_a_top:0
+            this.fuzhuV_left =sitemap.fuzhu_v_left?sitemap.fuzhu_v_left:0
             this.fuzhuV_num = sitemap.fuzhu_v_num
             this.fuzhuV_top =sitemap.fuzhu_v_top
             this.patientID = sitemap.patient_id
@@ -1090,65 +1134,108 @@ export default{
             this.text_num =sitemap.text_num
             this.text_top = sitemap.text_top
             this.v_num =sitemap.v_num
-            this.V_top = sitemap.v_top
+
             this.xuanzhuan_a = sitemap.xuanzhuan_a
             this.xuanzhuan_v = sitemap.xuanzhuan_v
-            this.A_left = sitemap.a_left
-            this.V_left = sitemap.v_left
+
+
+            console.log("wowowowowowowowowoowow",sitemap.img_url)
+            this.fileList[0].img_url =  sitemap.img_url
+
             this.A_right = []
-            
-            for(let i=0;i<sitemap.DeviceValsualALeft.length;i++){
-             
-              sitemap.DeviceValsualALeft[i].markNum =  sitemap.DeviceValsualALeft[i].mark_num
 
-              this.A_right.push(sitemap.DeviceValsualALeft[i])
-            }
+            if(sitemap.DeviceValsualALeft!=null && sitemap.DeviceValsualALeft.length>0){
+              for(let i=0;i<sitemap.DeviceValsualALeft.length;i++){
 
+                sitemap.DeviceValsualALeft[i].markNum =  sitemap.DeviceValsualALeft[i].mark_num
+
+                this.A_right.push(sitemap.DeviceValsualALeft[i])
+             }
+            }
+            console.log('阿斯顿发生v微软',this.A_right);
             this.V_right = []
-            
-            for(let i=0;i<sitemap.DeviceValsualALeft.length;i++){
-             
-              sitemap.XtDeviceValsualVLeft[i].markNum =  sitemap.XtDeviceValsualVLeft[i].mark_num
+            if(sitemap.DeviceValsualALeft!=null && sitemap.DeviceValsualALeft.length>0){
+              for(let i=0;i<sitemap.DeviceValsualALeft.length;i++){
 
-              this.V_right.push(sitemap.XtDeviceValsualVLeft[i])
+                sitemap.XtDeviceValsualVLeft[i].markNum =  sitemap.XtDeviceValsualVLeft[i].mark_num
+
+                this.V_right.push(sitemap.XtDeviceValsualVLeft[i])
+              }
             }
-           
+
             this.fuzhuA = []
-            for(let i=0;i<sitemap.DeviceValsualFuzhuA.length;i++){
+            if(sitemap.DeviceValsualFuzhuA!=null && sitemap.DeviceValsualFuzhuA.length>0){
+              for(let i=0;i<sitemap.DeviceValsualFuzhuA.length;i++){
                sitemap.DeviceValsualFuzhuA[i].a_markNum = sitemap.DeviceValsualFuzhuA[i].a_mark_num
               this.fuzhuA.push( sitemap.DeviceValsualFuzhuA[i])
             }
-           
+            }
+
             this.fuzhuV = []
-           for(let i=0;i<sitemap.DeviceValsualFuzhuV.length;i++){
-             sitemap.DeviceValsualFuzhuV[i].v_markNum = sitemap.DeviceValsualFuzhuV[i].a_mark_num
-             this.fuzhuV.push( sitemap.DeviceValsualFuzhuV[i])
-           }
-         
+            if(sitemap.DeviceValsualFuzhuV!=null && sitemap.DeviceValsualFuzhuV.length>0){
+              for(let i=0;i<sitemap.DeviceValsualFuzhuV.length;i++){
+              sitemap.DeviceValsualFuzhuV[i].v_markNum = sitemap.DeviceValsualFuzhuV[i].a_mark_num
+              this.fuzhuV.push( sitemap.DeviceValsualFuzhuV[i])
+             }
+            }
+
              this.fangxiangA = []
-             for(let i=0;i<sitemap.DeviceValsualMapFangxiangA.length;i++){
-               sitemap.DeviceValsualMapFangxiangA[i].markNum = sitemap.DeviceValsualMapFangxiangA[i].mark_n
-               this.fangxiangA.push(sitemap.DeviceValsualMapFangxiangA[i])
+             if(sitemap.DeviceValsualMapFangxiangA!=null && sitemap.DeviceValsualMapFangxiangA.length>0){
+               for(let i=0;i<sitemap.DeviceValsualMapFangxiangA.length;i++){
+                sitemap.DeviceValsualMapFangxiangA[i].markNum = sitemap.DeviceValsualMapFangxiangA[i].mark_num
+                this.fangxiangA.push(sitemap.DeviceValsualMapFangxiangA[i])
+               }
              }
-             
-             
+             console.log('11111111111',this.fangxiangA);
+
              this.fangxiangV = []
-             for(let i=0;i<sitemap.DeviceValsualMapFangxiangV.length;i++){
-               sitemap.DeviceValsualMapFangxiangV[i].markNum = sitemap.DeviceValsualMapFangxiangV[i].mark_num
-               this.fangxiangV.push(sitemap.DeviceValsualMapFangxiangV[i])
+             if(sitemap.DeviceValsualMapFangxiangV!=null && sitemap.DeviceValsualMapFangxiangV.length>0){
+                for(let i=0;i<sitemap.DeviceValsualMapFangxiangV.length;i++){
+                sitemap.DeviceValsualMapFangxiangV[i].markNum = sitemap.DeviceValsualMapFangxiangV[i].mark_num
+                this.fangxiangV.push(sitemap.DeviceValsualMapFangxiangV[i])
+              }
              }
-             
+             console.log('222222222222',this.fangxiangV);
+
              this.text_arr = []
-             for(let i=0;i<sitemap.DeviceValsualTextArr.length;i++){
+             if(sitemap.DeviceValsualTextArr!=null && sitemap.DeviceValsualTextArr.length>0){
+              for(let i=0;i<sitemap.DeviceValsualTextArr.length;i++){
                this.text_arr.push(sitemap.DeviceValsualTextArr[i])
+              }
              }
-             
+
+
+             this.Aarr = []
+             if(sitemap.DeviceValusalMapArr!=null && sitemap.DeviceValusalMapArr.length>0){
+              for(let i=0;i<sitemap.DeviceValusalMapArr.length;i++){
+                sitemap.DeviceValusalMapArr[i].markNum = sitemap.DeviceValusalMapArr[i].mark_num
+                sitemap.DeviceValusalMapArr[i].status = sitemap.DeviceValusalMapArr[i].is_status
+                this.Aarr.push(sitemap.DeviceValusalMapArr[i])
+              }
+             }
+
+
+             this.Varr = []
+             if(sitemap.DeviceValusalMapVrr!=null && sitemap.DeviceValusalMapVrr.length>0){
+              for(let i=0;i<sitemap.DeviceValusalMapVrr.length;i++){
+               sitemap.DeviceValusalMapVrr[i].markNum = sitemap.DeviceValusalMapVrr[i].mark_num
+               sitemap.DeviceValusalMapVrr[i].status = sitemap.DeviceValusalMapVrr[i].is_status
+               this.Varr.push(sitemap.DeviceValusalMapVrr[i])
+              }
+             }
+            //  this.fileList.push({
+            //     img_url: sitemap.img_url,
+            //     desc: '',
+            //     id: 0
+            //   })
+            //  this.fileList[0].img_url = sitemap.img_url
+             console.log('图片啊手动阀手动阀',this.fileList);
             }
 
          }
       })
     },
-    
+
     chakan(){
       console.log('22222',);
       this.shiyituDialogVisible=true
@@ -1163,10 +1250,15 @@ export default{
         u8arr[n] = bstr.charCodeAt(n);
       }
       return new Blob([u8arr], { type: mime });
+    },
+    changewidth(){
+      // let input = document.getElementById("inpu");
+      // const l = input.value.length;
+      // this.widthtext=(l+1) * 15 + "px"
+      // input.style.width = (l+1) * 15 + "px";
     }
   },
   created(){
-    // console.log('chu','chu',);
     const id = this.$route.params && this.$route.params.id;
     this.patientID = parseInt(id);
 
@@ -1404,34 +1496,34 @@ div.add-mark-text-wrap {
   line-height: 24px;
   z-index: 1005;
   display: inline-block;
-  .el-input {
-    /* position: relative; */
-    font-size: 14px;
-    display: inline-block;
-    width: 100%;
-  }
+  // .el-input {
+  //   /* position: relative; */
+  //   font-size: 14px;
+  //   display: inline-block;
+  //   width: 100%;
+  // }
+  .input{
+  width: 224px;
+  height: 40px;
+  line-height: 40px;
+  background: #F3F6FB;
+  border-radius: 4px;
+  padding:0  12px;
+  margin-right: 20px;
+}
+.input ::v-deep .el-input__inner {
+  width: 100%;
+  border: none;
+  outline: none;
+  font-size: 14px;
+  background: #F3F6FB;
+}
+
 }
 div.add-mark-text-wrap input.mark-text-ipt {
     cursor: default;
 }
-// div.add-mark-text-wrap input {
-//     width: 100px;
-//     width: 60px;
-//     max-width: 400px;
-//     border: 1px solid transparent;
-//     padding: 4px;
-//     color: #333;
-//     height: 24px;
-//     cursor: pointer;
-//     background-color: #fcfcfc;
-//     // position: absolute;
-//     // left: 0;
-//     // top: 0;
-//     font-size: 13px;
-//     z-index: 1002;
-//     border-radius: 2px !important;
-//     outline: none;
-// }
+
 input, button, textarea, select, optgroup, option {
     font-family: inherit;
     font-size: inherit;
@@ -1557,6 +1649,32 @@ span.chuanci:hover{
     opacity: 0;
     z-index: -1;
 }
+// .inputStyle {
+//   margin-top: 30px;
+//   text-align: start;    // 这里一样要设置，否则不是对齐的居中状态
+//   min-width: 160px;   //这里给一个最小宽度
+// }
+// .el-input {
+//    width: auto;  // 这里一定要设置为auto 否则由于input是默认width ：100%的
+// }
+// .inputStyle >>> .el-input__prefix {
+//   display: inline-block;
+//   position: relative;
+//   border: 1px solid #dcdfe6;
+//   box-sizing: border-box;
+//   color: #606266;
+//   font-size: inherit;
+//   height: 40px;
+//   line-height: 40px;
+//   padding: 0 30px;
+//   transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+//   padding-left: 30px;
+//   left: 0;
+//   visibility: hidden;
+// }
+// .inputStyle >>> .el-input__inner {
+//   position: absolute;
+// }
 </style>
 <style lang="scss">
 .ql-snow .ql-tooltip[data-mode="link"]::before {

src/xt_pages/user/patients.vue

@@ -528,9 +528,9 @@
           <el-form-item label="转归(死亡)时间 :" prop="lapseto_time" required v-if="lapsetoForm.lapseto_type == 2 || lapsetoForm.lapseto_type == 3"> 
             <el-date-picker
               v-model="lapsetoForm.lapseto_time"
-              type="datetime"
-              format="yyyy-MM-dd HH:mm:ss"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              type="date"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               placeholder="选择日期时间"
               default-time="12:00:00"
             >
@@ -1347,6 +1347,7 @@
         //   this.lapsetoForm.lapseto_type = 3
         //  }
         console.log("22222",this.lapsetoForm)
+       
         EditLapseto(this.lapsetoForm.patient_id, this.lapsetoForm,this.form.patient_start_time,this.form.patient_end_time,this.form.patient_address).then(
           response => {
             if (response.data.state === 1) {