陈少旭 1 год назад
Родитель
Сommit
e00a8c645a

+ 7 - 1
src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue Просмотреть файл

@@ -340,7 +340,13 @@
340 340
               let project = []
341 341
               let item = []
342 342
               this.all_inspection_reference = resp.data.references
343
-               console.log("====hhh",this.all_inspection_reference)
343
+
344
+              for(let i = 0; i <  this.all_inspection_reference.length; i++){
345
+                if(this.all_inspection_reference[i].org_id == 0){
346
+                  this.all_inspection_reference[i].item_id = this.all_inspection_reference[i].id
347
+                }
348
+              }
349
+
344 350
               for (let i = 0; i < this.all_inspection_reference.length; i++) {
345 351
                 project.push(this.all_inspection_reference[i])
346 352
               }

+ 14 - 9
src/xt_pages/qcd/indicatorControlAnalysis/components/personal.vue Просмотреть файл

@@ -345,9 +345,9 @@
345 345
                       { offset: 1, color: colorList[index][1] }
346 346
                     ])
347 347
                   },
348
-                  lineStyle:{ 
348
+                  lineStyle:{
349 349
                     color:'#409eff' //改变折线颜色
350
-                  }, 
350
+                  },
351 351
                   barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
352 352
                 },
353 353
 
@@ -461,19 +461,19 @@
461 461
           }
462 462
         }
463 463
         this.item_columns = item_inspection_reference
464
-        var projectInfo = this.getPojectInfo(this.item_columns[0].project_id, this.item_columns[0].id)
464
+        var projectInfo = this.getPojectInfo(this.item_columns[0].project_id, this.item_columns[0].item_id)
465 465
         this.query.project_id = projectInfo.project_id
466
-        this.query.item_id = projectInfo.id
466
+        this.query.item_id = projectInfo.item_id
467 467
         this.item_name = projectInfo.item_name
468 468
         this.query.range_type = projectInfo.range_type
469
-        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
469
+        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.item_id)
470 470
 
471 471
       }, changeItem(val) {
472 472
         this.query.page = 1
473 473
         this.query.item_id = val
474 474
         var projectInfo = this.getPojectInfo(this.query.project_id, val)
475 475
         this.item_name = projectInfo.item_name
476
-        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
476
+        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.item_id)
477 477
 
478 478
       }, changeRangeValue(val) {
479 479
         this.query.range_value = val
@@ -490,6 +490,11 @@
490 490
               let project = []
491 491
               let item = []
492 492
               this.all_inspection_reference = resp.data.references
493
+              for(let i = 0; i <  this.all_inspection_reference.length; i++){
494
+                if(this.all_inspection_reference[i].org_id == 0){
495
+                  this.all_inspection_reference[i].item_id = this.all_inspection_reference[i].id
496
+                }
497
+              }
493 498
 
494 499
               for (let i = 0; i < this.all_inspection_reference.length; i++) {
495 500
                 project.push(this.all_inspection_reference[i])
@@ -511,11 +516,11 @@
511 516
               this.item_columns = item
512 517
               this.item_name = item[0].item_name
513 518
 
514
-              var projectInfo = this.getPojectInfo(this.project_columns[0].project_id, this.item_columns[0].id)
519
+              var projectInfo = this.getPojectInfo(this.project_columns[0].project_id, this.item_columns[0].item_id)
515 520
               this.query.project_id = projectInfo.project_id
516
-              this.query.item_id = projectInfo.id
521
+              this.query.item_id = projectInfo.item_id
517 522
               this.query.range_type = projectInfo.range_type
518
-              this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
523
+              this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.item_id)
519 524
             } else {
520 525
               this.$message.error(resp.msg)
521 526