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

src/api/schedule.js

@@ -122,3 +122,13 @@ export function getNextScheduleWeekDay(params){
     params:params
   })
 }
+
+
+export function getThreeWeekList(params){
+  console.log("params----",params)
+  return request({
+    url:"/api/schedule/getthreeweeklist",
+    method:"get",
+    params:params
+  })
+}

src/xt_pages/sign/signIn.vue

@@ -196,7 +196,7 @@ export default {
                 console.log('执行')
                 this.page++
                 let obj = {
-                    cmd: "queuelistbyq",
+                    cmd: "queue/queuelistbyq",
                     data: {page:this.page,size:10,sort:1}
                 };
                 this.websocketSend(obj)
@@ -204,7 +204,7 @@ export default {
                 console.log('执行2222')
                 this.page = 1
                 let newobj = {
-                    cmd: "queuelistbyq",
+                    cmd: "queue/queuelistbyq",
                     data: {page:this.page,size:10,sort:1}
                 };
                 this.websocketSend(newobj)
@@ -263,7 +263,7 @@ export default {
                         this.queueInfo = res.data.queueInfo
                         this.page = 1
                         let obj = {
-                            cmd: "queue/queuelist",
+                            cmd: "queue/queuelistbyq",
                             data: {page:1,size:10,sort:1}
                         };
                         this.websocketSend(obj)
@@ -279,6 +279,13 @@ export default {
                         this.signInList.map(item => {
                             item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
                         })
+                    }else if(res.channel == 'queue/queuelistbyq'){
+                        console.log(11111111111,res.data)
+                        this.signInList = res.data.patientQueueList.data
+                        this.count = res.data.patientQueueList.count
+                        this.signInList.map(item => {
+                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                        })
                     }
                 
                 // console.log("action", re.action);

src/xt_pages/stock/drugs/query.vue

@@ -418,7 +418,8 @@
        
         
          const data = this.formatJson(filterVal, this.tableData)
-      
+         console.log("data",data)
+        
          excel.export_json_to_excel({
            header: tHeader,
            data,

src/xt_pages/workforce/components/tableData.vue

@@ -1461,9 +1461,9 @@ export default {
             this.zone_device_map = zone_device_map;
 
             this.zone_names = Object.keys(this.zone_device_map);
-            console.log('8989898989898989',this.zone_names)
+            // console.log('8989898989898989',this.zone_names)
 
-            console.log(this.current_devices);
+            // console.log(this.current_devices);
 
             if (this.zone_names.length > 0) {
               this.zone_name = this.zone_names[0];

src/xt_pages/workforce/components/tableWeeks.vue

@@ -241,7 +241,7 @@ export default {
              scheduleData[i].sort = scheduleData[i].number.sort
            }
           var arr = scheduleData.sort(this.compare('sort'))
-          console.log("元旦快乐",arr)
+          
           this.scheduleData = arr
         } else {
           this.$message.error("网络错误");