zhengchengwu пре 6 година
родитељ
комит
7684e6e84c

+ 1 - 1
config/dev.env.js Прегледај датотеку

4
 
4
 
5
 module.exports = merge(prodEnv, {
5
 module.exports = merge(prodEnv, {
6
   NODE_ENV: '"development"',
6
   NODE_ENV: '"development"',
7
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
7
+  BASE_API: '"http://api.xt.kuyicloud.com"',
8
    //http://api.xt.test.sgjyun.com http://localhost:9529
8
    //http://api.xt.test.sgjyun.com http://localhost:9529
9
   // BASE_API: '"http://localhost:9529"'
9
   // BASE_API: '"http://localhost:9529"'
10
 })
10
 })

+ 8 - 8
src/pages/advice/DialysisAdviceTable.vue Прегледај датотеку

83
 
83
 
84
         </tr>
84
         </tr>
85
         <template v-for="(schedule) in schedules">
85
         <template v-for="(schedule) in schedules">
86
-          <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice_index + '_' + index"  @click="clickfunction(schedule)">
86
+          <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice.id + '_' + advice_index + '_' + index"  @click="clickfunction(schedule)">
87
             <td>{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>
87
             <td>{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>
88
             <td>{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
88
             <td>{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
89
             <td>{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}</td>
89
             <td>{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}</td>
213
   },
213
   },
214
   methods: {
214
   methods: {
215
     clickfunction: function(val) {
215
     clickfunction: function(val) {
216
-      console.log(val);
216
+      // console.log(val);
217
       this.$router.push({
217
       this.$router.push({
218
         path: "/details",
218
         path: "/details",
219
         query: {
219
         query: {
264
       this.show_zone_selector = false;
264
       this.show_zone_selector = false;
265
     },
265
     },
266
     parseTime: function(time, layout) {
266
     parseTime: function(time, layout) {
267
-      console.log(time);
267
+      // console.log(time);
268
       if (time == 0) {
268
       if (time == 0) {
269
         return "";
269
         return "";
270
       }
270
       }
287
             if (schedule.doctor_advice.length == 0) {
287
             if (schedule.doctor_advice.length == 0) {
288
               continue;
288
               continue;
289
             }
289
             }
290
-            if (scheduleMap[schedule.device_zone.name] == null) {
291
-              scheduleMap[schedule.device_zone.name] = [];
290
+            if (scheduleMap[schedule.device_number.zone.name] == null) {
291
+              scheduleMap[schedule.device_number.zone.name] = [];
292
             }
292
             }
293
-            scheduleMap[schedule.device_zone.name].push(schedule);
294
-            if (zoneMap[schedule.device_zone.name] == null) {
295
-              zoneMap[schedule.device_zone.name] = schedule.device_zone;
293
+            scheduleMap[schedule.device_number.zone.name].push(schedule);
294
+            if (zoneMap[schedule.device_number.zone.name] == null) {
295
+              zoneMap[schedule.device_number.zone.name] = schedule.device_number.zone;
296
             }
296
             }
297
           }
297
           }
298
 
298
 

+ 6 - 6
src/pages/advice/NormalAdviceTable.vue Прегледај датотеку

82
 
82
 
83
           </tr>
83
           </tr>
84
           <template v-for="(schedule) in schedules">
84
           <template v-for="(schedule) in schedules">
85
-            <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice_index + '_' + index"  @click="clickfunction(schedule)">
85
+            <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice.id + '_' + advice_index + '_' + index"  @click="clickfunction(schedule)">
86
               <td>{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>
86
               <td>{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>
87
               <td>{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
87
               <td>{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
88
               <td>{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}</td>
88
               <td>{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}</td>
283
               if (schedule.doctor_advice.length == 0) {
283
               if (schedule.doctor_advice.length == 0) {
284
                 continue;
284
                 continue;
285
               }
285
               }
286
-              if (scheduleMap[schedule.device_zone.name] == null) {
287
-                scheduleMap[schedule.device_zone.name] = [];
286
+              if (scheduleMap[schedule.device_number.zone.name] == null) {
287
+                scheduleMap[schedule.device_number.zone.name] = [];
288
               }
288
               }
289
-              scheduleMap[schedule.device_zone.name].push(schedule);
290
-              if (zoneMap[schedule.device_zone.name] == null) {
291
-                zoneMap[schedule.device_zone.name] = schedule.device_zone;
289
+              scheduleMap[schedule.device_number.zone.name].push(schedule);
290
+              if (zoneMap[schedule.device_number.zone.name] == null) {
291
+                zoneMap[schedule.device_number.zone.name] = schedule.device_number.zone;
292
               }
292
               }
293
             }
293
             }
294
 
294
 

+ 6 - 6
src/pages/main/DialysisArea.vue Прегледај датотеку

140
           const schedule = originSchedules[s_i];
140
           const schedule = originSchedules[s_i];
141
           if (
141
           if (
142
             zone_name.length == 0 ||
142
             zone_name.length == 0 ||
143
-            (zone_name.length > 0 && zone_name == schedule.device_zone.name)
143
+            (zone_name.length > 0 && zone_name == schedule.device_number.zone.name)
144
           ) {
144
           ) {
145
             if (
145
             if (
146
               timetype_selected == 0 ||
146
               timetype_selected == 0 ||
209
               if (schedual.dialysis_order == null) {
209
               if (schedual.dialysis_order == null) {
210
                 continue;
210
                 continue;
211
               }
211
               }
212
-              if (schedualMap[schedual.device_zone.name] == null) {
213
-                schedualMap[schedual.device_zone.name] = [];
212
+              if (schedualMap[schedual.device_number.zone.name] == null) {
213
+                schedualMap[schedual.device_number.zone.name] = [];
214
               }
214
               }
215
-              schedualMap[schedual.device_zone.name].push(schedual);
216
-              if (zoneMap[schedual.device_zone.name] == null) {
217
-                zoneMap[schedual.device_zone.name] = schedual.device_zone;
215
+              schedualMap[schedual.device_number.zone.name].push(schedual);
216
+              if (zoneMap[schedual.device_number.zone.name] == null) {
217
+                zoneMap[schedual.device_number.zone.name] = schedual.device_number.zone;
218
               }
218
               }
219
             }
219
             }
220
 
220
 

+ 7 - 7
src/pages/main/WaitingArea.vue Прегледај датотеку

165
       var zoneMap = {};
165
       var zoneMap = {};
166
       for (let index = 0; index < scheduals.length; index++) {
166
       for (let index = 0; index < scheduals.length; index++) {
167
         const schedual = scheduals[index];
167
         const schedual = scheduals[index];
168
-        if (zoneMap[schedual.device_zone.id] == null) {
169
-          zoneMap[schedual.device_zone.id] = schedual.device_zone;
168
+        if (zoneMap[schedual.device_number.zone.id] == null) {
169
+          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
170
         }
170
         }
171
       }
171
       }
172
 
172
 
186
       var schedualMap = {};
186
       var schedualMap = {};
187
       for (let index = 0; index < scheduals.length; index++) {
187
       for (let index = 0; index < scheduals.length; index++) {
188
         const schedual = scheduals[index];
188
         const schedual = scheduals[index];
189
-        if (schedualMap[schedual.device_zone.id] == null) {
190
-          schedualMap[schedual.device_zone.id] = [];
189
+        if (schedualMap[schedual.device_number.zone.id] == null) {
190
+          schedualMap[schedual.device_number.zone.id] = [];
191
         }
191
         }
192
-        schedualMap[schedual.device_zone.id].push(schedual);
193
-        if (zoneMap[schedual.device_zone.id] == null) {
194
-          zoneMap[schedual.device_zone.id] = schedual.device_zone;
192
+        schedualMap[schedual.device_number.zone.id].push(schedual);
193
+        if (zoneMap[schedual.device_number.zone.id] == null) {
194
+          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
195
         }
195
         }
196
       }
196
       }
197
 
197