Browse Source

bug修改

XMLWAN 5 years ago
parent
commit
923f5c5d82

+ 2 - 2
src/xt_pages/qcd/officesControlAnalysis/project.vue View File

95
       options1: [
95
       options1: [
96
         {
96
         {
97
           value: 1,
97
           value: 1,
98
-          label: "按季度对比统计"
98
+          label: "按季度统计对比"
99
         },
99
         },
100
         {
100
         {
101
           value: 2,
101
           value: 2,
102
-          label: "按月份对比统计"
102
+          label: "按月份统计对比"
103
         },
103
         },
104
       ],
104
       ],
105
       value: "请选项",
105
       value: "请选项",

+ 1 - 1
src/xt_pages/qcd/officesControlAnalysis/time.vue View File

168
           label: "自定义"
168
           label: "自定义"
169
         }
169
         }
170
       ],
170
       ],
171
-      type: "按季度对比统计",
171
+      type: "按季度统计对比",
172
       quarter: [
172
       quarter: [
173
         { value: 0, label: "第一季度", state: 0 },
173
         { value: 0, label: "第一季度", state: 0 },
174
         { value: 1, label: "第二季度", state: 1 },
174
         { value: 1, label: "第二季度", state: 1 },

+ 4 - 13
src/xt_pages/qcd/treatmentControlAnalysis/components/CheckPersonal.vue View File

246
                }
246
                }
247
             }
247
             }
248
           
248
           
249
-             var arrtwo =  this.arrayDate(counts,this.normData)
249
+           var arrtwo =  this.arrayDate(counts,this.normData)
250
             
250
             
251
             var hash = {};
251
             var hash = {};
252
             var i = 0;
252
             var i = 0;
279
               this.modesData.series.push(parseInt(item.Count));
279
               this.modesData.series.push(parseInt(item.Count));
280
             })
280
             })
281
 
281
 
282
-
283
             for (const key in this.tableData) {
282
             for (const key in this.tableData) {
284
               this.modesData.xAxis.push(this.tableData[key].project_name);
283
               this.modesData.xAxis.push(this.tableData[key].project_name);
285
-              // if (key in res) {
286
-                
287
-              //   this.modesData.series.push(parseInt(res[key].Count));
288
-              //   // batotal += parseInt(res[key].Count);
289
-              // } else {
290
-              //   this.modesData.series.push(0);
291
-              // }
292
             }
284
             }
293
-
294
-
295
-            
285
+ 
296
             this.chart.series[0].data = this.modesData.series
286
             this.chart.series[0].data = this.modesData.series
297
             this.chart.xAxis.data = this.modesData.xAxis
287
             this.chart.xAxis.data = this.modesData.xAxis
298
           }
288
           }
318
             
308
             
319
            let time = new Date(this.listQuery.end_time) - new Date(this.listQuery.start_time)
309
            let time = new Date(this.listQuery.end_time) - new Date(this.listQuery.start_time)
320
            let day = parseInt(time / (1000 * 60 * 60 * 24))
310
            let day = parseInt(time / (1000 * 60 * 60 * 24))
321
-       
311
+           console.log("arr",arr)
312
+           console.log("tabledata",this.tableData)
322
             for (const key in this.tableData) {
313
             for (const key in this.tableData) {
323
               this.modesData.xAxis.push(this.tableData[key].project_name);
314
               this.modesData.xAxis.push(this.tableData[key].project_name);
324
               if (key in arr) {
315
               if (key in arr) {