Merge branch 'master' of http://git.shengws.com/csx/Pad_New

config/dev.env.js

@@ -5,8 +5,8 @@ const prodEnv = require("./prod.env");
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   //BASE_API: '"https://api.xt.kuyicloud.com"'
-  BASE_API: '"http://localhost:9531"'
-  // BASE_API: '"http://localhost:9529"'
+  // BASE_API: '"http://localhost:9531"'
+  BASE_API: '"http://localhost:9529"'
   //http://api.xt.test.sgjyun.com http://localhost:9529
   // BASE_API: '"http://api.xt.test.sgjyun.com"'
   // BASE_API: '"https://api.xt.kuyicloud.com"'

src/pages/advice/DialysisAdviceTable.vue

@@ -471,7 +471,15 @@ export default {
             item.doctor_advice.sort(this.compare("start_time"));
           });
           console.log("arrTwo", arrTwo);
-          schedules = arrTwo;
+
+          const res = new Map();
+          let a = arrTwo.filter(
+            a => !res.has(a.dialysis_no) && res.set(a.dialysis_no, 1)
+          );
+
+          console.log("a", a);
+
+          schedules = a;
           var zoneMap = {};
           var scheduleMap = {};
           for (let index = 0; index < schedules.length; index++) {