See999 4 years ago
parent
commit
d48a8ca6c9
2 changed files with 7 additions and 12 deletions
  1. 0 5
      config/prod.env.js
  2. 7 7
      src/pages/advice/DialysisAdviceTable.vue

+ 0 - 5
config/prod.env.js View File

@@ -1,13 +1,8 @@
1 1
 "use strict";
2 2
 module.exports = {
3 3
   NODE_ENV: '"production"',
4
-<<<<<<< .mine
5
-  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"'
6
-  // BASE_API: '"https://api.xt.kuyicloud.com"'
7
-=======
8 4
   BASE_API: '"http://new_mobile.xt.api.sgjyun.com"'
9 5
   //BASE_API: '"https://api.xt.kuyicloud.com"'
10
->>>>>>> .theirs
11 6
   // BASE_API:'"http://localhost:9529"',
12 7
   // BASE_API: '"http://api.xt.test.sgjyun.com"'
13 8
   // http://api.xt.test.sgjyun.com

+ 7 - 7
src/pages/advice/DialysisAdviceTable.vue View File

@@ -85,12 +85,12 @@
85 85
           <!-- <th width="50px">类型</th> -->
86 86
           <th width="50px">开始时间</th>
87 87
           <th width="60px">医嘱内容</th>
88
-          <th width="100px">执行时间</th>
88
+          <th width="50px">执行时间</th>
89 89
           <th width="80px">执行护士</th>
90 90
           <th width="80px">校对护士</th>
91
-          <th width="110px">校对时间</th>
91
+          <th width="50px">校对时间</th>
92 92
           <th width="60px">开嘱医生</th>
93
-          <th width="110px">开嘱时间</th>
93
+          <th width="50px">开嘱时间</th>
94 94
         </tr>
95 95
         <template v-for="(schedules, zone_name, index) in filtedScheduals">
96 96
           <tr :key="index">
@@ -153,12 +153,12 @@
153 153
                     v-if="advice.parent_id == 0 && advice.remark.length > 0"
154 154
                   >({{ advice.remark }})</span>
155 155
                 </td>
156
-                <td>{{ parseTime(advice.execution_time, "{m}-{d} {h}:{i}") }}</td>
156
+                <td>{{ parseTime(advice.execution_time, "{h}:{i}") }}</td>
157 157
                 <td>{{ getName(advice.execution_staff) }}</td>
158 158
                 <td>{{ getName(advice.checker) }}</td>
159
-                <td>{{ parseTime(advice.check_time, "{m}-{d} {h}:{i}") }}</td>
159
+                <td>{{ parseTime(advice.check_time, "{h}:{i}") }}</td>
160 160
                 <td>{{ getName(advice.advice_doctor) }}</td>
161
-                <td>{{ parseTime(advice.created_time, "{m}-{d} {h}:{i}") }}</td>
161
+                <td>{{ parseTime(advice.created_time, "{h}:{i}") }}</td>
162 162
               </tr>
163 163
             </template>
164 164
           </template>
@@ -626,7 +626,7 @@ export default {
626 626
 }
627 627
 .dialysisTable {
628 628
   @media only screen and (max-width: 450px) {
629
-    width: 1000px;
629
+    width: 800px;
630 630
     //
631 631
   }
632 632
 }