Sfoglia il codice sorgente

提升甘特图前端展示性能

oyq28 2 anni fa
parent
commit
c894825ffd

+ 24 - 9
imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/runningOrder/components/PprogResource.vue

@@ -248,9 +248,9 @@ export default {
                   [expectStartTime, expectEndTime]
                 );
           // cell【包含-startEnd】在时间段中 
-          if(flag=="2" || flag=="3"){
-            console.log("时间点:",[filedTime, filedTime + 30], [expectStartTime, expectEndTime], flag, item.planTime, item.procedureNo);
-          }          
+          //if(flag=="2" || flag=="3"){
+          //  console.log("时间点:",[filedTime, filedTime + 30], [expectStartTime, expectEndTime], flag, item.planTime, item.procedureNo);
+          //}          
           if (flag == "1") {
             // 文字偏移量
             let leftNums = 0;           
@@ -358,11 +358,26 @@ export default {
       return seconds;
     },
 
-	getHourSecend2(date){
+	  getHourSecend2(date){
        let d = new Date(date);       
        return d.getTime();
-	},
-
+	  },
+    getHourTitle(titleList){
+      let titles = [];
+      titleList.map(item=> {        
+        for(let i=0; i<=47; i++){
+           let j = parseInt(i/2);
+           let t = j<10? "0"+j: j;
+           if(i%2==0){
+                t=t+":00";
+            }else{
+                t=t+":30";
+            }            
+            titles.push({field:t, id:item+" "+t, text:item+" "+t})            
+        }
+      });
+      return titles;
+    },
     setTenant(val) {
       if (val) {
         this.tenant = { ...val };
@@ -397,14 +412,14 @@ export default {
         this.queryParams.planIds = this.orderData.planIds;
       }
 
-      planMgrApi
-        .scheduleTaskByResource(this.queryParams)
+      planMgrApi.scheduleTaskByResource(this.queryParams)
         .then((response) => {
           const res = response.data;
           if (res.isSuccess) {            
             this.tableData = res.data;      
             //this.titleData = res.data.titleList    
-			      this.titleData = res.data.titleList.filter(item => {
+            this.titleData = this.getHourTitle(res.data.titleList)            
+			      this.titleData = this.titleData.filter(item => {
 				      return this.getHourSecend2(item.text) > this.getHourSecend2(this.tenant.createTime);
 			     })			
           }

+ 20 - 4
imcs-ui/src/views/zuihou/runManageCenter/productionScheduling/components/SchedResource.vue

@@ -247,7 +247,22 @@ export default {
         });
       }
     },
-
+    getHourTitle(titleList){
+      let titles = [];
+      titleList.map(item=> {        
+        for(let i=0; i<=47; i++){
+           let j = parseInt(i/2);
+           let t = j<10? "0"+j: j;
+           if(i%2==0){
+                t=t+":00";
+            }else{
+                t=t+":30";
+            }            
+            titles.push({field:t, id:item+" "+t, text:item+" "+t})            
+        }
+      });
+      return titles;
+    },
     setTenant(val) {
       if (val) {
         this.tenant = { ...val };
@@ -301,9 +316,9 @@ export default {
               [expectStartTime, expectEndTime]
             );       
           }        
-          if(flag!='0'){
-            console.log("时间点:",[filedTime, filedTime + 30], [expectStartTime, expectEndTime], flag, item.planTime, item.procedureNo, item.resourceCode);
-          }
+          //if(flag!='0'){
+          //  console.log("时间点:",[filedTime, filedTime + 30], [expectStartTime, expectEndTime], flag, item.planTime, item.procedureNo, item.resourceCode);
+          //}
           //arr[0].flag = flag  
           // cell【包含-startEnd】在时间段中
           if (flag == "1") {
@@ -436,6 +451,7 @@ export default {
           const res = response.data;
           if (res.isSuccess) {
             this.tableData = res.data;
+            this.tableData.titleList = this.getHourTitle(res.data.titleList)            
           }
           // eslint-disable-next-line no-return-assign
         })