diff --git a/module/bi/config.php b/module/bi/config.php index c6cfd1716e..eecec6a389 100644 --- a/module/bi/config.php +++ b/module/bi/config.php @@ -12,77 +12,77 @@ $config->bi->default->request = json_decode('{"requestDataType":0,"requestHttpTy $config->bi->default->events = json_decode('{"baseEvent":{"click":null,"dblclick":null,"mouseenter":null,"mouseleave":null},"advancedEvents":{"vnodeMounted":null,"vnodeBeforeMount":null}}'); $charts = array(); -$charts['32'] = array("root" => 1, "name" => "产品"); -$charts['33'] = array("root" => 1, "name" => "项目"); -$charts['34'] = array("root" => 1, "name" => "测试"); -$charts['35'] = array("root" => 1, "name" => "组织"); -$charts['36'] = array("root" => 1, "name" => "需求"); -$charts['37'] = array("root" => 1, "name" => "发布"); -$charts['38'] = array("root" => 1, "name" => "项目"); -$charts['39'] = array("root" => 1, "name" => "任务"); -$charts['40'] = array("root" => 1, "name" => "迭代"); -$charts['41'] = array("root" => 1, "name" => "成本"); -$charts['42'] = array("root" => 1, "name" => "工期"); -$charts['43'] = array("root" => 1, "name" => "需求"); -$charts['44'] = array("root" => 1, "name" => "Bug"); -$charts['45'] = array("root" => 1, "name" => "项目集"); -$charts['46'] = array("root" => 1, "name" => "项目"); -$charts['47'] = array("root" => 1, "name" => "产品"); -$charts['48'] = array("root" => 1, "name" => "计划"); -$charts['49'] = array("root" => 1, "name" => "迭代"); -$charts['50'] = array("root" => 1, "name" => "发布"); -$charts['51'] = array("root" => 1, "name" => "需求"); -$charts['52'] = array("root" => 1, "name" => "任务"); -$charts['53'] = array("root" => 1, "name" => "Bug"); -$charts['54'] = array("root" => 1, "name" => "文档"); -$charts['55'] = array("root" => 1, "name" => "成本"); -$charts['56'] = array("root" => 1, "name" => "人员"); -$charts['57'] = array("root" => 1, "name" => "工时"); -$charts['64'] = array("root" => 1, "name" => "行为"); -$charts['65'] = array("root" => 2, "name" => "产品"); -$charts['66'] = array("root" => 2, "name" => "项目"); -$charts['67'] = array("root" => 2, "name" => "测试"); -$charts['68'] = array("root" => 2, "name" => "组织"); -$charts['69'] = array("root" => 2, "name" => "进度"); -$charts['70'] = array("root" => 2, "name" => "成本"); -$charts['71'] = array("root" => 2, "name" => "工期"); -$charts['72'] = array("root" => 2, "name" => "项目"); -$charts['73'] = array("root" => 2, "name" => "迭代"); -$charts['74'] = array("root" => 2, "name" => "发布"); -$charts['75'] = array("root" => 2, "name" => "需求"); -$charts['76'] = array("root" => 2, "name" => "任务"); -$charts['77'] = array("root" => 2, "name" => "Bug"); -$charts['86'] = array("root" => 2, "name" => "成本"); -$charts['87'] = array("root" => 3, "name" => "产品"); -$charts['88'] = array("root" => 3, "name" => "项目"); -$charts['89'] = array("root" => 3, "name" => "测试"); -$charts['90'] = array("root" => 3, "name" => "组织"); -$charts['91'] = array("root" => 3, "name" => "Bug"); -$charts['92'] = array("root" => 3, "name" => "用例"); -$charts['93'] = array("root" => 3, "name" => "需求"); -$charts['94'] = array("root" => 3, "name" => "Bug"); -$charts['95'] = array("root" => 3, "name" => "用例"); +$charts['32'] = array("root" => 1, "name" => "产品", "grade" => 1); +$charts['33'] = array("root" => 1, "name" => "项目", "grade" => 1); +$charts['34'] = array("root" => 1, "name" => "测试", "grade" => 1); +$charts['35'] = array("root" => 1, "name" => "组织", "grade" => 1); +$charts['36'] = array("root" => 1, "name" => "需求", "grade" => 2); +$charts['37'] = array("root" => 1, "name" => "发布", "grade" => 2); +$charts['38'] = array("root" => 1, "name" => "项目", "grade" => 2); +$charts['39'] = array("root" => 1, "name" => "任务", "grade" => 2); +$charts['40'] = array("root" => 1, "name" => "迭代", "grade" => 2); +$charts['41'] = array("root" => 1, "name" => "成本", "grade" => 2); +$charts['42'] = array("root" => 1, "name" => "工期", "grade" => 2); +$charts['43'] = array("root" => 1, "name" => "需求", "grade" => 2); +$charts['44'] = array("root" => 1, "name" => "Bug", "grade" => 2); +$charts['45'] = array("root" => 1, "name" => "项目集", "grade" => 2); +$charts['46'] = array("root" => 1, "name" => "项目", "grade" => 2); +$charts['47'] = array("root" => 1, "name" => "产品", "grade" => 2); +$charts['48'] = array("root" => 1, "name" => "计划", "grade" => 2); +$charts['49'] = array("root" => 1, "name" => "迭代", "grade" => 2); +$charts['50'] = array("root" => 1, "name" => "发布", "grade" => 2); +$charts['51'] = array("root" => 1, "name" => "需求", "grade" => 2); +$charts['52'] = array("root" => 1, "name" => "任务", "grade" => 2); +$charts['53'] = array("root" => 1, "name" => "Bug", "grade" => 2); +$charts['54'] = array("root" => 1, "name" => "文档", "grade" => 2); +$charts['55'] = array("root" => 1, "name" => "成本", "grade" => 2); +$charts['56'] = array("root" => 1, "name" => "人员", "grade" => 2); +$charts['57'] = array("root" => 1, "name" => "工时", "grade" => 2); +$charts['64'] = array("root" => 1, "name" => "行为", "grade" => 2); +$charts['65'] = array("root" => 2, "name" => "产品", "grade" => 1); +$charts['66'] = array("root" => 2, "name" => "项目", "grade" => 1); +$charts['67'] = array("root" => 2, "name" => "测试", "grade" => 1); +$charts['68'] = array("root" => 2, "name" => "组织", "grade" => 1); +$charts['69'] = array("root" => 2, "name" => "进度", "grade" => 2); +$charts['70'] = array("root" => 2, "name" => "成本", "grade" => 2); +$charts['71'] = array("root" => 2, "name" => "工期", "grade" => 2); +$charts['72'] = array("root" => 2, "name" => "项目", "grade" => 2); +$charts['73'] = array("root" => 2, "name" => "迭代", "grade" => 2); +$charts['74'] = array("root" => 2, "name" => "发布", "grade" => 2); +$charts['75'] = array("root" => 2, "name" => "需求", "grade" => 2); +$charts['76'] = array("root" => 2, "name" => "任务", "grade" => 2); +$charts['77'] = array("root" => 2, "name" => "Bug", "grade" => 2); +$charts['86'] = array("root" => 2, "name" => "成本", "grade" => 2); +$charts['87'] = array("root" => 3, "name" => "产品", "grade" => 1); +$charts['88'] = array("root" => 3, "name" => "项目", "grade" => 1); +$charts['89'] = array("root" => 3, "name" => "测试", "grade" => 1); +$charts['90'] = array("root" => 3, "name" => "组织", "grade" => 1); +$charts['91'] = array("root" => 3, "name" => "Bug", "grade" => 2); +$charts['92'] = array("root" => 3, "name" => "用例", "grade" => 2); +$charts['93'] = array("root" => 3, "name" => "需求", "grade" => 2); +$charts['94'] = array("root" => 3, "name" => "Bug", "grade" => 2); +$charts['95'] = array("root" => 3, "name" => "用例", "grade" => 2); $pivots = array(); -$pivots['59'] = array("root" => 1, "name" => "产品"); -$pivots['60'] = array("root" => 1, "name" => "项目"); -$pivots['61'] = array("root" => 1, "name" => "测试"); -$pivots['62'] = array("root" => 1, "name" => "组织"); -$pivots['63'] = array("root" => 1, "name" => "产品"); -$pivots['64'] = array("root" => 1, "name" => "项目集"); -$pivots['79'] = array("root" => 2, "name" => "产品"); -$pivots['80'] = array("root" => 2, "name" => "项目"); -$pivots['81'] = array("root" => 2, "name" => "测试"); -$pivots['82'] = array("root" => 2, "name" => "组织"); -$pivots['83'] = array("root" => 2, "name" => "项目"); -$pivots['84'] = array("root" => 2, "name" => "进度"); -$pivots['85'] = array("root" => 2, "name" => "成本"); -$pivots['86'] = array("root" => 2, "name" => "工期"); -$pivots['96'] = array("root" => 3, "name" => "产品"); -$pivots['97'] = array("root" => 3, "name" => "项目"); -$pivots['98'] = array("root" => 3, "name" => "测试"); -$pivots['99'] = array("root" => 3, "name" => "组织"); -$pivots['100'] = array("root" => 3, "name" => "Bug"); +$pivots['59'] = array("root" => 1, "name" => "产品", "grade" => 1); +$pivots['60'] = array("root" => 1, "name" => "项目", "grade" => 1); +$pivots['61'] = array("root" => 1, "name" => "测试", "grade" => 1); +$pivots['62'] = array("root" => 1, "name" => "组织", "grade" => 1); +$pivots['63'] = array("root" => 1, "name" => "产品", "grade" => 2); +$pivots['64'] = array("root" => 1, "name" => "项目集", "grade" => 2); +$pivots['79'] = array("root" => 2, "name" => "产品", "grade" => 1); +$pivots['80'] = array("root" => 2, "name" => "项目", "grade" => 1); +$pivots['81'] = array("root" => 2, "name" => "测试", "grade" => 1); +$pivots['82'] = array("root" => 2, "name" => "组织", "grade" => 1); +$pivots['83'] = array("root" => 2, "name" => "项目", "grade" => 2); +$pivots['84'] = array("root" => 2, "name" => "进度", "grade" => 2); +$pivots['85'] = array("root" => 2, "name" => "成本", "grade" => 2); +$pivots['86'] = array("root" => 2, "name" => "工期", "grade" => 2); +$pivots['96'] = array("root" => 3, "name" => "产品", "grade" => 1); +$pivots['97'] = array("root" => 3, "name" => "项目", "grade" => 1); +$pivots['98'] = array("root" => 3, "name" => "测试", "grade" => 1); +$pivots['99'] = array("root" => 3, "name" => "组织", "grade" => 1); +$pivots['100'] = array("root" => 3, "name" => "Bug", "grade" => 2); $config->bi->builtin->modules->charts = $charts; $config->bi->builtin->modules->pivots = $pivots; diff --git a/module/bi/model.php b/module/bi/model.php index 16567fdae6..d5a10db647 100644 --- a/module/bi/model.php +++ b/module/bi/model.php @@ -613,6 +613,7 @@ class biModel extends model ->where('root')->eq($root) ->andWhere('name')->eq($name) ->andWhere('type')->eq($type) + ->andWhere('grade')->eq($grade) ->fetch('id'); return empty($moduleID) ? '' : $moduleID;