设备日历

pages/resourceManagement/EquipmentCalendar/components/newEquipment.vue

@@ -106,33 +106,32 @@ export default {
         },
             laodaction(){
           let parmse ={
-              pageIndex:0,
-              cont:0,
+              pageIndex:1,
               conditions: [],
-              pageSize: 0
+              pageSize: 10
           }
-            let url = `${systemUrl}/calendarwork/list`,
+            let url = `${systemUrl}/mesdailyworksched/list`,//paged
                 that = this;
             service.post(`${url}`, parmse).then(res => {
                 let selectdata = res.result;
-                 //console.log(selectdata)
+                //  console.log(selectdata)
                 selectdata.forEach(item => {
                     that.cityList.push({
-                        value: item.title,
-                        label: item.title,
+                        value: item.calName,
+                        label: item.calName,
                         id: item.id,
                     })
                     // console.log(that.cityList)
                 });
             });
-            let url1 = `${systemUrl}/calendarovertime/list`;
+            let url1 = `${systemUrl}/mesholidaycal/list`;
             service.post(`${url1}`,parmse).then(res => {
                 let selectdata1 = res.result;
-                 console.log(selectdata1)
+                //  console.log(selectdata1)
                 selectdata1.forEach(item => {
                     this.cityList1.push({
-                        value: item.title,
-                        label: item.title,
+                        value: item.holidayCalName,
+                        label: item.holidayCalName,
                         id: item.id,
                     })
                     // console.log(that.cityList)