Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/details/index.vue

@@ -1208,10 +1208,10 @@
             <span>已排详情</span>
           </div>
           <div>
-            <!-- <el-calendar v-model="time_value">  
+            <el-calendar v-model="time_value" >  
               <template
                 slot="dateCell"
-                slot-scope="{date, data}">
+                slot-scope="{date, data}" @click="viewDayWork(data)">
                 <P v-if="data.day.split('-').slice(1).join('-')=='03-06'"
                   style="background: red;color: white;text-align: center;">
                   HD
@@ -1222,22 +1222,10 @@
                 </p>
 
               </template>
-            </el-calendar> -->
-            <Calendar class="Calendar"
-              v-on:choseDay="clickDay"
-              v-on:changeMonth="changeDate"
-              v-on:isToday="clickToday"
-              v-model="time_value"
-            >
-            </Calendar>
+            </el-calendar>
           </div>
-          
         </div>
       </div>
-      <!-- <span slot="footer" class="dialog-footer" slot-scope="{date, data}" @click="diajian(data)"> 
-        <el-button @click="historyclick = false">取 消</el-button>
-        <el-button type="primary" @click="historyclick = false">确 定</el-button>
-      </span> -->
     </el-dialog>
   </div>
 </template>
@@ -1420,13 +1408,14 @@ export default {
       norefresh:true,
       historyclick:false,
       time_value:new Date(),
+      
       startTime:'',
       endTime:'',
       
     }
   },
   created() {
-    console.log('bbbbb',this.time_value);
+    
    this.blood_access_part_opera = getDataConfig('hemodialysis', 'vascular_access_desc')
    this.org_id = this.$store.getters.xt_user.org.id,
    this.printDate = moment().format("YYYY-MM-DD HH:mm:ss")
@@ -1475,47 +1464,6 @@ export default {
 
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
   },
-  beforeMount() {
-    if (this.websocket) {
-      if (this.websocket.readyState == 1) {
-        console.log('执行1')
-        this.websocketMess();
-      } else {
-        setTimeout(() => {
-          console.log('执行2')
-          this.websocketMess();
-        }, 1000);
-      }
-    } else {
-      setTimeout(() => {
-        if (this.websocket) {
-          console.log('执行3')
-          this.websocketMess();
-        } else {
-          setTimeout(() => {
-            console.log('执行4')
-            this.websocketMess();
-          }, 1000);
-        }
-      }, 1000);
-    }
-  },
-  mounted() {
-    const timer = setInterval(() => {
-      // this.getInitData();
-      this.requestDialysisSchedules()
-    }, 1000 * 30)
-    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
-    this.$once('hook:beforeDestroy', () => {
-      clearInterval(timer)
-    })
-
-    let obj = {
-      cmd: "queue/join",
-      data: {type:3,page:0,size:0},
-    };
-    this.websocketSend(obj)
-  },
   computed: {
     websocket() {
       return this.$store.state.user.websocket;
@@ -1629,6 +1577,50 @@ export default {
       // return schedules
     }
   },
+  beforeMount() {
+    if (this.websocket) {
+      if (this.websocket.readyState == 1) {
+        console.log('执行1')
+        this.websocketMess();
+      } else {
+        setTimeout(() => {
+          console.log('执行2')
+          this.websocketMess();
+        }, 1000);
+      }
+    } else {
+      setTimeout(() => {
+        if (this.websocket) {
+          console.log('执行3')
+          this.websocketMess();
+        } else {
+          setTimeout(() => {
+            console.log('执行4')
+            this.websocketMess();
+          }, 1000);
+        }
+      }, 1000);
+    }
+  },
+  mounted() {
+    const timer = setInterval(() => {
+      // this.getInitData();
+      this.requestDialysisSchedules()
+    }, 1000 * 30)
+    // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
+    this.$once('hook:beforeDestroy', () => {
+      clearInterval(timer)
+    })
+
+    let obj = {
+      cmd: "queue/join",
+      data: {type:3,page:0,size:0},
+    };
+    this.websocketSend(obj)
+    // this.getmonth(this.time_value)
+    // this.handlePick(this.time_value)
+  },
+ 
   beforeDestroy(){
 
     let unObj = {
@@ -1638,9 +1630,6 @@ export default {
     this.websocketSend(unObj)
   },
   methods: {
-    diajian(value){
-      console.log('zzzzz',value);
-    },
     // 透析次数
     chishuclick(row){
       this.cishu_dialogVisible=true
@@ -2934,23 +2923,8 @@ export default {
     // 透析历史
     history_click(){
       this.historyclick =true
-      this.getmonth(this.time_value)
-      // console.log('time_value',);
-    },
-    // //选中某天
-    clickDay(data) {
-      this.time_value = data
-      console.log('33333',this.time_value); 
-      // this.getmonth(data)
-    },
-    // //左右点击切换月份
-    changeDate(data) {
-      this.getmonth(data)
-      console.log('999999',data); 
-    },
-    // 跳到了本月
-    clickToday(data) {
-      console.log('444444',data); 
+      // this.getmonth(this.time_value2)
+      // console.log('time_value',moment(this.time_value2).format('YYYY-MM-DD'));
     },
     // 获取每个月的第一天和最后一天
     getmonth(val){
@@ -2962,32 +2936,16 @@ export default {
       this.startTime = startTime
       this.endTime = endTime
       console.log('time_value333333',this.startTime,this.endTime);
-      // var date =new Date(val) 
-      // console.log('66666',date);
-      // var new_year = date.getFullYear() // 取当前的年份
-      // var month = date.getMonth()
-      
-      // var new_month = month + 1 
-      // // console.log('22222',month,new_month,new_year);// 取当前的月份
-      // if (month > 12) {
-      //   console.log('111');
-      //   new_month -= 12 // 月份减
-      //   new_year++ // 年份增
-      // }
-      // console.log('new_month',new_month);
-      // var firstDay = new Date(new_year, new_month, 1) // 取当年当月中的第一天
-      // console.log('qqqqq',moment(firstDay).format("YYYY-MM-DD HH:mm:ss"));
-      // var lastDay = new Date(firstDay.getTime() - 1000 * 60 * 60 * 24).getDate() // 获取当月最后一天日期
-      // if (firstDay.getMonth() < 10) {
-        
-      //   var mon = "0" + firstDay.getMonth()
-      //   console.log('wwww',moment(firstDay).format("YYYY-MM-DD HH:mm:ss"));
-      // } else {
-      //   var mon = firstDay.getMonth()
-      // }
-      // var startDate = firstDay.getFullYear() + '-' + mon + '-' + "0" + firstDay.getDate();
-      // var endDate = firstDay.getFullYear() + '-' + mon + '-' + lastDay;
-
+    }
+  },
+  watch:{
+    time_value:{
+      handler(newValue,oldValue){
+        // this.initData()
+        this.time_value = newValue
+        this.getmonth(this.time_value)
+        console.log('yyyyyyyyyyy',moment(this.time_value).format('YYYY-MM-DD'),moment(oldValue).format('YYYY-MM-DD'))
+      }
     }
   }
 }