Browse Source

Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

xiaoming_global 5 years ago
parent
commit
fee9abdb92
2 changed files with 5 additions and 17 deletions
  1. 4 16
      src/pages/main/DetailsPage.vue
  2. 1 1
      src/styles/style.scss

+ 4 - 16
src/pages/main/DetailsPage.vue View File

17
               :key="i"
17
               :key="i"
18
               :class="index == i ? 'active' : ''"
18
               :class="index == i ? 'active' : ''"
19
               @click="ClickTab(i)"
19
               @click="ClickTab(i)"
20
-            >
21
-              {{ item }}
22
-            </li>
20
+            >{{ item }}</li>
23
           </ul>
21
           </ul>
24
         </div>
22
         </div>
25
 
23
 
30
                   <span class="iconfont">2018-01-01&#xe74a;</span>
28
                   <span class="iconfont">2018-01-01&#xe74a;</span>
31
         </div>-->
29
         </div>-->
32
         <div class="print" style="float: right; display:none">
30
         <div class="print" style="float: right; display:none">
33
-          <el-button
34
-            size="mini"
35
-            type="primary"
36
-            @click="print"
37
-            icon="el-icon-printer"
38
-            >打印</el-button
39
-          >
31
+          <el-button size="mini" type="primary" @click="print" icon="el-icon-printer">打印</el-button>
40
         </div>
32
         </div>
41
       </div>
33
       </div>
42
 
34
 
43
       <div class="Tab">
35
       <div class="Tab">
44
         <CaseHistory v-show="index == 0" title="病历"></CaseHistory>
36
         <CaseHistory v-show="index == 0" title="病历"></CaseHistory>
45
         <!--<check-tab v-show="index==1" title="化验单"></check-tab>-->
37
         <!--<check-tab v-show="index==1" title="化验单"></check-tab>-->
46
-        <dialysis-tab
47
-          v-show="index == 1"
48
-          title="透析"
49
-          v-on:records="jump(val)"
50
-        ></dialysis-tab>
38
+        <dialysis-tab v-show="index == 1" title="透析" v-on:records="jump(val)"></dialysis-tab>
51
         <today-tab ref="today" v-show="index == 2" title="今日"></today-tab>
39
         <today-tab ref="today" v-show="index == 2" title="今日"></today-tab>
52
       </div>
40
       </div>
53
     </div>
41
     </div>
192
         margin-right: 3.6rem;
180
         margin-right: 3.6rem;
193
       }
181
       }
194
       @media only screen and (min-width: 415px) and (max-width: 767px) {
182
       @media only screen and (min-width: 415px) and (max-width: 767px) {
195
-        margin-right: 4rem;
183
+        margin-right: 3.6rem;
196
       }
184
       }
197
       @media only screen and (min-width: 768px) {
185
       @media only screen and (min-width: 768px) {
198
         margin-right: 4rem;
186
         margin-right: 4rem;

+ 1 - 1
src/styles/style.scss View File

99
           width: 4.2rem;
99
           width: 4.2rem;
100
         }
100
         }
101
         @media only screen and (min-width: 415px) and (max-width: 767px) {
101
         @media only screen and (min-width: 415px) and (max-width: 767px) {
102
-          width: 6rem;
102
+          width: 5.6rem;
103
           font-size: 0.4rem;
103
           font-size: 0.4rem;
104
         }
104
         }
105
         @media only screen and (min-width: 768px) {
105
         @media only screen and (min-width: 768px) {