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

src/xt_pages/Dialysisanalysis/otherIndicators/index.vue

@@ -8,19 +8,19 @@
         <div class="page_patientControlAnalysis">
           <div class="photos">
             <div v-for="(item,index) in indicators" :key="index"  @click="echart_click(item)"
-              style="width: 280px;height: 360px;border:1px solid gainsboro;border-radius: 8px;margin: 0 0 30px 28px"
+              style="width: 280px;height: 300px;border:1px solid gainsboro;border-radius: 8px;margin: 0 0 30px 28px"
             >
 <!--              <div v-if="index+1==1" class="background date_type1" style="background-repeat: no-repeat;"></div>-->
               <div v-if="item.check_type == 1" class="background date_type2" style="background-repeat: no-repeat;"></div>
               <div v-if="item.check_type == 2" class="background date_type3" style="background-repeat: no-repeat;"></div>
               <p class="title">{{item.item_name}}</p>
-              <div class="tag">
+              <!-- <div class="tag">
                 <span class="tags">留治患者</span>
                 <span class="tags">转归</span>
                 <span class="tags">死亡</span>
-              </div>
+              </div> -->
 <!--              <span class="use">已使用14次</span>-->
-               <span class="shoucang" style="background-repeat: no-repeat;"></span>
+               <!-- <span class="shoucang" style="background-repeat: no-repeat;"></span> -->
               </div>
             </div>
         </div>

src/xt_pages/user/evaluationtool/pediatricFallAssessment.vue

@@ -201,7 +201,7 @@ export default {
       num:1,
       tumble_options:[],
       tumble:'',
-      date:new Date(),
+      date:this.getTime(new Date()),
       patient:'',
       touxihao:0,
     }
@@ -333,7 +333,7 @@ export default {
           pedia_Totalpoints:this.pedia_Totalpoints,
           tumble_options:this.tumble_options,
           tumble:this.tumble,
-          date:this.getTime(this.date),
+          date:this.date,
           patient_id:this.patient_id,
           patient:this.patient,
        }

src/xt_pages/user/history/Children_history.vue

@@ -391,7 +391,7 @@ export default{
       text:'',
       tumble_options:[],
       tumble:'',//评估人
-      date:new Date(),//评估日期
+      date:this.getTime(new Date()),//评估日期
       patient_id:0,
       patient:'',
       touxihao:0,//透析号
@@ -567,7 +567,7 @@ export default{
           pedia_Totalpoints:this.pedia_Totalpoints,
           tumble_options:this.tumble_options,
           tumble:this.tumble,
-          date:this.getTime(this.date),
+          date:this.date,
           patient_id:this.patient_id,
           patient:this.patient,