浏览代码

表格居中 细节调整

柳香萍 6 年前
父节点
当前提交
d9f750ebeb

+ 1 - 1
config/dev.env.js 查看文件

@@ -6,7 +6,7 @@
6 6
 module.exports = {
7 7
   NODE_ENV: '"development"',
8 8
   ENV_CONFIG: '"dev"',
9
-  BASE_API: '"http://localhost:9529"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com
9
+  BASE_API: '"http://112.74.16.180:9527/"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com
10 10
   // PATIENT_SIT: '"http://test1.sgjyun.com"',
11 11
   // MIRCOMALL_SIT: '"http://mall.test.sgjyun.com"'
12 12
 }

+ 3 - 3
src/components/Hamburger/index.vue 查看文件

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <div>
3
-    <svg t="1492500959545" @click="toggleClick" class="hamburger" :class="{'is-active':isActive}" style="" viewBox="0 0 1024 1024"
3
+    <svg t="1492500959545" @click="toggleClick" class="hamburger" :class="{'is-active':isActive}" style="fill:#bfcbd9" viewBox="0 0 1024 1024"
4 4
       version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1691" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64">
5 5
       <path d="M966.8023 568.849776 57.196677 568.849776c-31.397081 0-56.850799-25.452695-56.850799-56.850799l0 0c0-31.397081 25.452695-56.849776 56.850799-56.849776l909.605623 0c31.397081 0 56.849776 25.452695 56.849776 56.849776l0 0C1023.653099 543.397081 998.200404 568.849776 966.8023 568.849776z"
6 6
         p-id="1692"></path>
@@ -32,8 +32,8 @@ export default {
32 32
 .hamburger {
33 33
   display: inline-block;
34 34
   cursor: pointer;
35
-  width: 20px;
36
-  height: 20px;
35
+  width: 16px;
36
+  height: 16px;
37 37
   transform: rotate(90deg);
38 38
   transition: .38s;
39 39
   transform-origin: 50% 50%;

+ 11 - 3
src/styles/index.scss 查看文件

@@ -139,7 +139,7 @@ code {
139 139
   padding: 20px;
140 140
   background: #fff;
141 141
   margin: 0 15px 15px 15px;
142
-  min-height: calc(100vh - 185px);
142
+  min-height: calc(100vh - 178px);
143 143
 }
144 144
 
145 145
 .components-container {
@@ -385,12 +385,12 @@ code {
385 385
           float: left;
386 386
           list-style: none;
387 387
           cursor: pointer;
388
-          padding: 6px 0;
388
+          padding: 6px 10px;
389 389
           color: #606266;
390 390
           border-radius: 4px;
391 391
           margin: 0 8px 0 0;
392 392
           font-size: 14px;
393
-          width: 70px;
393
+          // width: 70px;
394 394
           text-align: center;
395 395
           &:hover {
396 396
             background: #f5f7fa;
@@ -412,11 +412,19 @@ code {
412 412
     .cell {
413 413
       margin: 0;
414 414
       padding: 0 12px;
415
+      display: inline-block;
416
+    }
417
+  }
418
+  th{
419
+    .cell{
420
+      color: #999!important;
421
+      
415 422
     }
416 423
   }
417 424
   td {
418 425
     .cell {
419 426
       padding: 0 12px;
427
+      color: #606266;
420 428
     }
421 429
   }
422 430
 }

+ 10 - 2
src/xt_pages/user/components/PatientDetail.vue 查看文件

@@ -4,8 +4,16 @@
4 4
     <bread-crumb></bread-crumb>
5 5
   </div> -->
6 6
   <div class="app-container " >
7
-    <el-button size="mini" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="$router.push('/patients/patient/'+patientID+'/edit')" style="float:right;margin:0 0 6px 0;z-index:1;">修改</el-button>
8
-    <el-button size="mini" type="primary" @click="printThisInfo()" style="float:right;margin:0 6px 6px 0;z-index:1;">打印</el-button>
7
+
8
+
9
+
10
+    
11
+    <div style="float:right;">
12
+       <el-button size="mini" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="$router.push('/patients/patient/'+patientID+'/edit')" style="margin:0 0 6px 0;z-index:1;">修改</el-button>
13
+       <el-button size="mini" type="primary" @click="printThisInfo()" style="margin:0 6px 6px 0;z-index:1;">打印</el-button>
14
+    </div>
15
+    
16
+   
9 17
     <el-form ref="form" :rules="rules" :model="form" label-width="134px" class="clearfix" id="patient-info" >
10 18
       <div class="dataTitle">一般资料</div>
11 19
       <el-row >

+ 1 - 1
src/xt_pages/user/components/PatientSidebar.vue 查看文件

@@ -202,7 +202,7 @@
202 202
     float: left;
203 203
     bottom: 0;
204 204
     left: 0;
205
-    z-index: 1001;
205
+    z-index: 99;
206 206
     overflow: hidden;
207 207
   }
208 208
 

+ 5 - 64
src/xt_pages/user/doctorAdvice.vue 查看文件

@@ -3,10 +3,10 @@
3 3
         <patient-sidebar :id="patientID" defaultActive="1-4" v-on:tran-patient="onTranPatient"></patient-sidebar>
4 4
         <div class="patient-app-container advice-container app-container">
5 5
             <div class="filter-container">
6
-                <el-input   style="width: 400px;" v-model="listQuery.keywords" class="filter-item" />
7
-                <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="changeKey" >搜索</el-button>
8
-                <el-button  class="filter-item" style="float:right;" @click="printThisInfo()" :type="adviceType==1 || adviceType == 3?'primary':'warning'" icon="el-icon-printer" >打印医嘱</el-button>
9
-                <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" class="filter-item" style="float:right;" @click="openNew" type="primary" icon="el-icon-plus" >新增医嘱</el-button>
6
+                <el-input  size="small" style="width: 400px;" v-model="listQuery.keywords" class="filter-item" />
7
+                <el-button size="small"  class="filter-item" type="primary" icon="el-icon-search" @click="changeKey" >搜索</el-button>
8
+                <el-button size="small" class="filter-item" style="float:right;" @click="printThisInfo()" :type="adviceType==1 || adviceType == 3?'primary':'warning'" icon="el-icon-printer" >打印医嘱</el-button>
9
+                <el-button size="small" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" class="filter-item" style="float:right;" @click="openNew" type="primary" icon="el-icon-plus" >新增医嘱</el-button>
10 10
             </div>
11 11
             <div class="cell clearfix">
12 12
                 <label class="title"><span class="name">医嘱类型</span> : </label>
@@ -2839,66 +2839,7 @@ export default {
2839 2839
       cursor: pointer;
2840 2840
     }
2841 2841
   }
2842
-  .cell {
2843
-    margin: 0px 0 15px 0;
2844
-    -moz-box-sizing: border-box;
2845
-    -webkit-box-sizing: border-box;
2846
-    -o-box-sizing: border-box;
2847
-    -ms-box-sizing: border-box;
2848
-    box-sizing: border-box;
2849
-    display: -webkit-box;
2850
-    display: -ms-flexbox;
2851
-    // display: flex;
2852
-    -webkit-box-align: flex-start;
2853
-    -ms-flex-align: flex-start;
2854
-    align-items: flex-start;
2855
-    text-align: left;
2856
-    justify-content: flex-start;
2857
-    color: #333;
2858
-    .title {
2859
-      width: 80px;
2860
-      display: inline-block;
2861
-      font-weight: normal;
2862
-      color: #909399;
2863
-      padding: 6px 0;
2864
-      font-weight: 700;
2865
-      .name {
2866
-        width: 60px;
2867
-        text-align: justify;
2868
-        text-justify: distribute-all-lines;
2869
-        text-align-last: justify;
2870
-        -moz-text-align-last: justify;
2871
-        -webkit-text-align-last: justify;
2872
-        display: inline-block;
2873
-      }
2874
-    }
2875
-    .time {
2876
-      -webkit-box-flex: 1;
2877
-      -ms-flex: 1;
2878
-      flex: 1;
2879
-      ul {
2880
-        padding: 0;
2881
-        margin: 0;
2882
-        li {
2883
-          float: left;
2884
-          list-style: none;
2885
-          cursor: pointer;
2886
-          padding: 6px 10px;
2887
-          color: #606266;
2888
-          border-radius: 4px;
2889
-          margin: 0 4px 0 0;
2890
-          &:hover {
2891
-            background: #409eff;
2892
-            color: #fff;
2893
-          }
2894
-        }
2895
-        .active {
2896
-          background: #409eff;
2897
-          color: #fff;
2898
-        }
2899
-      }
2900
-    }
2901
-  }
2842
+
2902 2843
   .amount {
2903 2844
     font-weight: normal;
2904 2845
     padding: 10px 0 0 0;