浏览代码

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

28169 1年前
父节点
当前提交
43eda5fe8c

+ 7 - 1
src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue 查看文件

340
               let project = []
340
               let project = []
341
               let item = []
341
               let item = []
342
               this.all_inspection_reference = resp.data.references
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
               for (let i = 0; i < this.all_inspection_reference.length; i++) {
350
               for (let i = 0; i < this.all_inspection_reference.length; i++) {
345
                 project.push(this.all_inspection_reference[i])
351
                 project.push(this.all_inspection_reference[i])
346
               }
352
               }

+ 14 - 9
src/xt_pages/qcd/indicatorControlAnalysis/components/personal.vue 查看文件

345
                       { offset: 1, color: colorList[index][1] }
345
                       { offset: 1, color: colorList[index][1] }
346
                     ])
346
                     ])
347
                   },
347
                   },
348
-                  lineStyle:{ 
348
+                  lineStyle:{
349
                     color:'#409eff' //改变折线颜色
349
                     color:'#409eff' //改变折线颜色
350
-                  }, 
350
+                  },
351
                   barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
351
                   barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
352
                 },
352
                 },
353
 
353
 
461
           }
461
           }
462
         }
462
         }
463
         this.item_columns = item_inspection_reference
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
         this.query.project_id = projectInfo.project_id
465
         this.query.project_id = projectInfo.project_id
466
-        this.query.item_id = projectInfo.id
466
+        this.query.item_id = projectInfo.item_id
467
         this.item_name = projectInfo.item_name
467
         this.item_name = projectInfo.item_name
468
         this.query.range_type = projectInfo.range_type
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
       }, changeItem(val) {
471
       }, changeItem(val) {
472
         this.query.page = 1
472
         this.query.page = 1
473
         this.query.item_id = val
473
         this.query.item_id = val
474
         var projectInfo = this.getPojectInfo(this.query.project_id, val)
474
         var projectInfo = this.getPojectInfo(this.query.project_id, val)
475
         this.item_name = projectInfo.item_name
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
       }, changeRangeValue(val) {
478
       }, changeRangeValue(val) {
479
         this.query.range_value = val
479
         this.query.range_value = val
490
               let project = []
490
               let project = []
491
               let item = []
491
               let item = []
492
               this.all_inspection_reference = resp.data.references
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
               for (let i = 0; i < this.all_inspection_reference.length; i++) {
499
               for (let i = 0; i < this.all_inspection_reference.length; i++) {
495
                 project.push(this.all_inspection_reference[i])
500
                 project.push(this.all_inspection_reference[i])
511
               this.item_columns = item
516
               this.item_columns = item
512
               this.item_name = item[0].item_name
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
               this.query.project_id = projectInfo.project_id
520
               this.query.project_id = projectInfo.project_id
516
-              this.query.item_id = projectInfo.id
521
+              this.query.item_id = projectInfo.item_id
517
               this.query.range_type = projectInfo.range_type
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
             } else {
524
             } else {
520
               this.$message.error(resp.msg)
525
               this.$message.error(resp.msg)
521
 
526