Merge remote-tracking branch 'origin/dev' into dev

src/views/manage/components/indicatorMonitoring.vue

@@ -1,8 +1,13 @@
 <template>
   <div class="header">
     <div class="leftheader">
-            <div class="item" v-for="(item, index) in categorylist" :key="item.id" @click="clickcategory(item, index)"
+      <div
-                :class="index == categoryindex ? 'selectitem' : ''">
+        class="item"
+        v-for="(item, index) in categorylist"
+        :key="item.id"
+        @click="clickcategory(item, index)"
+        :class="index == categoryindex ? 'selectitem' : ''"
+      >
         <div class="name">
           {{ item.title }}
         </div>
@@ -10,11 +15,19 @@
     </div>
     <div class="rightheader">
       <div class="time">
-                <el-date-picker v-model="measureTime" type="daterange" range-separator="至" start-placeholder="开始日期"
+        <el-date-picker
-                    :clearable="false" value-format="yyyy-MM-dd" :picker-options="pickerOptions" end-placeholder="结束日期">
+          v-model="measureTime"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          :clearable="false"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
+          end-placeholder="结束日期"
+        >
         </el-date-picker>
       </div>
-            <div id="main"></div>
+      <div id="main" style="height:50%"></div>
     </div>
   </div>
 </template>
@@ -28,6 +41,7 @@ export default {
   name: "indicatorMonitoring",
   data() {
     return {
+        MAX:null,
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now(); //禁止选择今天以后的时间
@@ -86,14 +100,19 @@ export default {
       })
     },
     info(row) {
+      if(Object.keys(row.ylist).length==0){
+        this.MAX=100
+      }
       // 基于准备好的dom，初始化echarts实例
       var chartDom = document.getElementById('main');
       var myChart = echarts.init(chartDom);
       var option;
       if (this.query.title == '运动检测') {
         option = {
+
           title: {
-                        text: this.query.title
+            text: this.query.title,
+            subtext: '单位：次/分钟'
           },
           tooltip: {
             trigger: 'axis'
@@ -103,7 +122,7 @@ export default {
           grid: {
             left: '3%',
             right: '4%',
-                        bottom: '0%',
+            bottom: '2%',
             containLabel: true
           },
           xAxis: {
@@ -112,7 +131,9 @@ export default {
             data: row.xlist
           },
           yAxis: {
-                        type: 'value'
+            type: 'value',
+            min: 0,
+            max: this.MAX,
           },
           series: [
             {
@@ -130,7 +151,9 @@ export default {
       } else if (this.query.title == '血压测量') {
         option = {
           title: {
-                        text: this.query.title
+            text: this.query.title,
+            subtext: '单位：mmHg'
+
           },
           tooltip: {
             trigger: 'axis'
@@ -140,7 +163,7 @@ export default {
           grid: {
             left: '3%',
             right: '4%',
-                        bottom: '0%',
+            bottom: '2%',
             containLabel: true
           },
           xAxis: {
@@ -149,7 +172,9 @@ export default {
             data: row.xlist
           },
           yAxis: {
-                        type: 'value'
+            type: 'value',
+            min: 0,
+            max: this.MAX,
           },
           series: [
             {
@@ -167,7 +192,9 @@ export default {
       } else if (this.query.title == '血糖测量') {
         option = {
           title: {
-                        text: this.query.title
+            text: this.query.title,
+            subtext: '单位：mmol/L'
+
           },
           tooltip: {
             trigger: 'axis'
@@ -177,7 +204,7 @@ export default {
           grid: {
             left: '3%',
             right: '4%',
-                        bottom: '0%',
+            bottom: '2%',
             containLabel: true
           },
           xAxis: {
@@ -186,7 +213,9 @@ export default {
             data: row.xlist
           },
           yAxis: {
-                        type: 'value'
+            type: 'value',
+            min: 0,
+            max: this.MAX,
           },
           series: [
             {
@@ -210,11 +239,10 @@ export default {
   display: flex;
   height: calc(100vh - 84px);
 
-
   .rightheader {
     width: 75%;
     padding-top: 20px;
-        border-left: 3px solid #DFE4ED;
+    border-left: 3px solid #dfe4ed;
     position: relative;
 
     .time {
@@ -241,7 +269,7 @@ export default {
     overflow-x: hidden !important;
 
     .selectitem {
-            background-color: #D2E9FC;
+      background-color: #d2e9fc;
       border-left: 2px solid #1890ff !important;
       border-bottom: 1px solid #fff !important;
     }
@@ -250,7 +278,7 @@ export default {
       padding: 25px 10px;
       position: relative;
       border-left: 2px solid #fff;
-            border-bottom: 1px solid #E7E7E7;
+      border-bottom: 1px solid #e7e7e7;
 
       .name {
         font-size: 18px;

src/views/manage/details/patientdetails.vue

@@ -7,14 +7,17 @@
           src="../../../assets/manage/touxiang.png"
           alt=""
           v-if="$route.query.sex == 'MALE'"
+          @click="shiftCollapsiable"
         />
         <img
           class="headsculpture"
           src="../../../assets/manage/nvtouxiang.png"
           alt=""
           v-if="$route.query.sex == 'FEMALE'"
+          @click="shiftCollapsiable"
+
         />
-        <div class="name">
+        <div class="name" @click="shiftCollapsiable">
           {{ $route.query.patientName }}
         </div>
         <div class="gender">