Browse Source

修改华侨问题

csx 5 years ago
parent
commit
9fa46bed00

+ 4 - 3
build/utils.js View File

@@ -47,13 +47,14 @@ exports.cssLoaders = function (options) {
47 47
     if (options.extract) {
48 48
       return ExtractTextPlugin.extract({
49 49
         use: loaders,
50
-        fallback: 'vue-style-loader'
50
+        fallback: 'vue-style-loader',
51
+        publicPath:'../../',
51 52
       })
52 53
     } else {
53 54
       return ['vue-style-loader'].concat(loaders)
54 55
     }
55 56
   }
56
- 
57
+
57 58
   // 全局文件引入 当然只想编译一个文件的话可以省去这个函数
58 59
 function resolveResource(name) {
59 60
   return path.resolve(__dirname, '../src/styles/' + name);
@@ -66,7 +67,7 @@ function generateSassResourceLoader() {
66 67
       loader: 'sass-resources-loader',
67 68
       options: {
68 69
         // 多个文件时用数组的形式传入,单个文件时可以直接使用 path.resolve(__dirname, '../static/style/common.scss'
69
-        resources: [resolveResource('variables.scss')]  
70
+        resources: [resolveResource('variables.scss')]
70 71
       }
71 72
     }
72 73
     ];

+ 1 - 1
config/index.js View File

@@ -9,7 +9,7 @@ module.exports = {
9 9
 
10 10
     // Paths
11 11
     assetsSubDirectory: 'static',
12
-    assetsPublicPath: '/',
12
+    assetsPublicPath: './',
13 13
     proxyTable: {},
14 14
 
15 15
     // Various Dev Server settings

+ 15 - 1
src/pages/advice/DialysisAdviceTable.vue View File

@@ -93,7 +93,7 @@
93 93
                  :rowspan="group.advices.length">{{ getAdaviceType(advice.advice_type,advice.parent_id)}}</td>
94 94
             <td  v-if="advice_index == 0"
95 95
                  :rowspan="group.advices.length">{{ advice.parent_id == 0 ? parseTime(advice.start_time, "{m}-{d} {h}:{i}") : "" }}</td>
96
-            <td>
96
+            <td :class="advice.parent_id == 0 ? 'advice_content' : 'subadvice_content'">
97 97
               <span >{{advice.advice_name }}</span>
98 98
               <span >{{advice.advice_desc}}</span>
99 99
               <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
@@ -497,4 +497,18 @@ export default {
497 497
   background: #fff;
498 498
   min-height: calc(100vh - 2px);
499 499
 }
500
+
501
+
502
+  .advice_content {
503
+  text-align: left;
504
+  padding-left: 5px;
505
+  padding-right: 5px;
506
+  // background: #eff6fc;
507
+  }
508
+  .subadvice_content {
509
+  text-align: left;
510
+  padding-left: 25px;
511
+  padding-right: 5px;
512
+  // background: #fafcfe;
513
+  }
500 514
 </style>

+ 5 - 3
src/pages/advice/NormalAdviceTable.vue View File

@@ -46,7 +46,7 @@
46 46
     </div>
47 47
 
48 48
     <div style="width:100%;overflow:hildden;overflow-x:auto;" class="NormalAdvice">
49
-      <div class="blueBorder"></div>      
49
+      <div class="blueBorder"></div>
50 50
       <table class="table">
51 51
         <tr>
52 52
           <th width="50px">机号</th>
@@ -110,7 +110,7 @@
110 110
         </template>
111 111
       </table>
112 112
       <div class="NoData" v-show="zones.length  <= 1"><img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt=""></div>
113
-      
113
+
114 114
     </div>
115 115
     <!--<div class="NoData" v-show="zones.length <= 1"><img src="@/assets/login/data.jpg" alt=""></div>-->
116 116
 
@@ -401,8 +401,10 @@
401 401
 .table {
402 402
 }
403 403
 .NormalAdvice{
404
-  padding-top:115px; 
404
+  padding-top:115px;
405 405
   background: #fff;
406 406
   min-height: calc(100vh - 2px);
407 407
 }
408
+
409
+
408 410
 </style>

+ 0 - 1
src/pages/main/today/statOrder.vue View File

@@ -170,7 +170,6 @@ export default {
170 170
       font-weight: normal;
171 171
     }
172 172
 
173
-
174 173
     .advice_content {
175 174
       text-align: left;
176 175
       padding-left: 5px;