* Finish anual summary screen chart.
This commit is contained in:
songchenxuan
@@ -19,6 +19,15 @@ UPDATE `zt_chart` SET `type` = 'cluBarY', `settings` = '[{\"type\":\"cluBarY\",\
|
||||
UPDATE `zt_chart` SET `type` = 'pie', `settings` = '[{\"type\":\"pie\",\"group\":[{\"field\":\"status\",\"name\":\"\\u72b6\\u6001\",\"group\":\"\"}],\"metric\":[{\"field\":\"id\",\"name\":\"id\",\"valOrAgg\":\"count\"}]}]', `fields` = '{\"id\":{\"name\":\"id\",\"object\":\"zt_project\",\"field\":\"id\",\"type\":\"number\"},\"name\":{\"name\":\"name\",\"object\":\"zt_project\",\"field\":\"name\",\"type\":\"string\"},\"status\":{\"name\":\"\\u72b6\\u6001\",\"object\":\"project\",\"field\":\"status\",\"type\":\"option\"},\"prograss\":{\"name\":\"prograss\",\"object\":\"task\",\"field\":\"prograss\",\"type\":\"number\"},\"planPrograss\":{\"name\":\"planPrograss\",\"object\":\"task\",\"field\":\"planPrograss\",\"type\":\"number\"},\"endYear\":{\"name\":\"endYear\",\"object\":\"task\",\"field\":\"endYear\",\"type\":\"string\"}}', `langs` = '{\"id\":{\"zh-cn\":\"\\u9879\\u76eeID\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"name\":{\"zh-cn\":\"\\u9879\\u76ee\\u540d\\u79f0\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"status\":{\"zh-cn\":\"\\u72b6\\u6001\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"prograss\":{\"zh-cn\":\"\\u9879\\u76ee\\u8fdb\\u5ea6\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"planPrograss\":{\"zh-cn\":\"\\u8ba1\\u5212\\u8fdb\\u5ea6\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"endYear\":{\"zh-cn\":\"\\u7ed3\\u675f\\u5e74\\u4efd\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT t1.id, t1.name, \nIF(\n DATEDIFF(t1.`end`, NOW()) < 0, \n \"延期\", \n (IF(\n (IFNULL(prograss, 0) >= (DATEDIFF(NOW(), t1.`begin`) / DATEDIFF(t1.`end`, t1.`begin`) * 100) AND LEFT(t1.`end`, 4) != \'2059\') \n OR LEFT(t1.`end`, 4) = \'2059\' ,\n \"顺利\",\n \"滞后\"\n ))) AS \'status\',\nIFNULL(prograss, 0) AS prograss, ROUND(DATEDIFF(NOW(), t1.`begin`) / DATEDIFF(t1.`end`, t1.`begin`) * 100, 2) AS planPrograss,LEFT(t1.`end`, 4) AS endYear\nFROM zt_project AS t1\nLEFT JOIN (\n SELECT t22.project,\n ROUND(IF(SUM(t22.consumed) + SUM(IF(t22.status != \'closed\' && t22.status != \'cancel\', t22.`left`, 0)) > 0, SUM(t22.consumed) / (SUM(t22.consumed) + SUM(IF(t22.status != \'closed\' && t22.status != \'cancel\', t22.`left`, 0))), 0) * 100, 2) AS prograss\n FROM zt_project AS t21\n LEFT JOIN zt_task AS t22 ON t21.id = t22.execution\n WHERE t21.deleted = \'0\' AND t21.type IN (\'sprint\', \'kanban\')\n AND t22.deleted = \'0\' AND t22.parent < 1\n GROUP BY t22.project\n UNION\n SELECT t.project, ROUND(SUM(t.prograss * (t.percent / 100)), 2) as prograss\n FROM (\n SELECT t21.id,t21.percent, t22.project,\n IF(SUM(t22.consumed) + SUM(IF(t22.status != \'closed\' && t22.status != \'cancel\', t22.`left`, 0)) > 0, ROUND(SUM(t22.consumed) / (SUM(t22.consumed) + SUM(IF(t22.status != \'closed\' && t22.status != \'cancel\', t22.`left`, 0))) * 1000 / 1000 * 100, 2), 0) AS prograss\n FROM zt_project AS t21\n LEFT JOIN zt_task AS t22 ON t21.id = t22.execution\n WHERE t21.deleted = \'0\' AND t21.type = \'stage\'\n AND t22.deleted = \'0\' AND t22.parent < 1\n AND t22.id IS NOT NULL\n GROUP BY t21.id, t21.percent, t22.project\n ) t\n GROUP BY t.project\n) AS t2 ON t1.id = t2.project \nWHERE t1.deleted = \'0\'\nAND t1.status = \'doing\' \nAND t1.type = \'project\'', `stage` = 'published', `builtin` = 0 WHERE `id` = 10114;
|
||||
UPDATE `zt_chart` SET `type` = 'pie', `settings` = '[{\"type\":\"pie\",\"group\":[{\"field\":\"status\",\"name\":\"\\u72b6\\u6001\",\"group\":\"\"}],\"metric\":[{\"field\":\"id\",\"name\":\"\\u9879\\u76eeID\",\"valOrAgg\":\"count\"}]}]', `fields` = '{\"id\":{\"name\":\"\\u9879\\u76eeID\",\"object\":\"project\",\"field\":\"id\",\"type\":\"number\"},\"name\":{\"name\":\"\\u9879\\u76ee\\u540d\\u79f0\",\"object\":\"project\",\"field\":\"name\",\"type\":\"string\"},\"status\":{\"name\":\"\\u72b6\\u6001\",\"object\":\"project\",\"field\":\"status\",\"type\":\"option\"},\"prograss\":{\"name\":\"prograss\",\"object\":\"task\",\"field\":\"prograss\",\"type\":\"number\"},\"planPrograss\":{\"name\":\"planPrograss\",\"object\":\"task\",\"field\":\"planPrograss\",\"type\":\"number\"},\"end\":{\"name\":\"\\u8ba1\\u5212\\u5b8c\\u6210\",\"object\":\"project\",\"field\":\"end\",\"type\":\"date\"}}', `langs` = '{\"id\":{\"zh-cn\":\"\\u9879\\u76eeID\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"name\":{\"zh-cn\":\"\\u9879\\u76ee\\u540d\\u79f0\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"status\":{\"zh-cn\":\"\\u72b6\\u6001\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"prograss\":{\"zh-cn\":\"\\u9879\\u76ee\\u8fdb\\u5ea6\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"planPrograss\":{\"zh-cn\":\"\\u8ba1\\u5212\\u8fdb\\u5ea6\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"},\"end\":{\"zh-cn\":\"\\u8ba1\\u5212\\u5b8c\\u6210\",\"zh-tw\":\"\",\"en\":\"\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT id, name,IF(\n DATEDIFF(`end`, NOW()) < 0,\n \"延期\",\n (IF(\n prograss >= planPrograss,\n \"顺利\",\n \"滞后\"\n ))\n) AS status,\nprograss, planPrograss, `end`\nFROM (\nSELECT t1.id,t1.name,ROUND(DATEDIFF(NOW(), t1.`begin`) / DATEDIFF(t1.`end`, t1.`begin`) * 100, 2) AS planPrograss,t1.`end`,\nROUND(IF(SUM(t2.consumed) + SUM(IF(t2.status != \'closed\' && t2.status != \'cancel\', t2.`left`, 0)) > 0, SUM(t2.consumed) / (SUM(t2.consumed) + SUM(IF(t2.status != \'closed\' && t2.status != \'cancel\', t2.`left`, 0))), 0) * 100, 2) AS prograss\nFROM zt_project AS t1\nLEFT JOIN zt_task AS t2 ON t1.id = t2.execution\nWHERE t1.deleted = \'0\' AND t1.type IN (\'sprint\', \'stage\', \'kanban\') AND t1.status = \'doing\' AND t1.multiple = \'1\'\nAND ((t2.deleted = \'0\' AND t2.parent < 1) OR t2.id IS NULL)\nGROUP BY t1.id\n) AS t', `stage` = 'published', `builtin` = 0 WHERE `id` = 10115;
|
||||
|
||||
-- 年度汇总数据大屏
|
||||
UPDATE `zt_chart` SET `type` = 'line', `settings` = '[{\"type\":\"line\",\"xaxis\":[{\"field\":\"month\",\"name\":\"month\",\"group\":\"\"}],\"yaxis\":[{\"field\":\"newStory\",\"name\":\"\\u7ee7\\u7eed\\u6dfb\\u52a0\\u7814\\u53d1\\u9700\\u6c42\",\"valOrAgg\":\"sum\"},{\"field\":\"closedStory\",\"name\":\"\\u9700\\u6c42\\uff1a%s \\u5df2\\u5173\\u95ed\\uff0c\\u5c06\\u4e0d\\u4f1a\\u88ab\\u5173\\u95ed\\u3002\",\"valOrAgg\":\"sum\"}]}]', `fields` = '{\"year\":{\"name\":\"year\",\"object\":\"story\",\"field\":\"year\",\"type\":\"number\"},\"month\":{\"name\":\"month\",\"object\":\"story\",\"field\":\"month\",\"type\":\"string\"},\"newStory\":{\"name\":\"\\u7ee7\\u7eed\\u6dfb\\u52a0\\u7814\\u53d1\\u9700\\u6c42\",\"object\":\"story\",\"field\":\"newStory\",\"type\":\"string\"},\"closedStory\":{\"name\":\"\\u9700\\u6c42\\uff1a%s \\u5df2\\u5173\\u95ed\\uff0c\\u5c06\\u4e0d\\u4f1a\\u88ab\\u5173\\u95ed\\u3002\",\"object\":\"story\",\"field\":\"closedStory\",\"type\":\"string\"}}', `langs` = '{\"year\":{\"zh-cn\":\"\\u5e74\\u5ea6\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"},\"month\":{\"zh-cn\":\"\\u6708\\u5ea6\",\"zh-tw\":\"\",\"en\":\"month\",\"de\":\"\",\"fr\":\"\"},\"newStory\":{\"zh-cn\":\"\\u65b0\\u589e\\u9700\\u6c42\\u6570\",\"zh-tw\":\"\",\"en\":\"newStory\",\"de\":\"\",\"fr\":\"\"},\"closedStory\":{\"zh-cn\":\"\\u5b8c\\u6210\\u9700\\u6c42\\u6570\",\"zh-tw\":\"\",\"en\":\"closedStory\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT t1.year, CONCAT(t1.month, \"月\") AS `month`, IFNULL(t2.story, 0) AS newStory, IFNULL(t3.story, 0) AS closedStory\nFROM (SELECT DISTINCT Year(date) AS `year`, MONTH(date) AS `month` FROM zt_action) AS t1\nLEFT JOIN (SELECT YEAR(openedDate) AS `year`, MONTH(openedDate) AS `month`, COUNT(1) AS story FROM zt_story WHERE deleted = \'0\' GROUP BY `year`, `month`) AS t2 ON t1.year = t2.year AND t1.month = t2.month\nLEFT JOIN (SELECT YEAR(closedDate) AS `year`, MONTH(closedDate) AS `month`, COUNT(1) AS story FROM zt_story WHERE deleted = \'0\' AND closedReason = \'done\' GROUP BY `year`, `month`) AS t3 ON t1.year = t3.year AND t1.month = t3.month\nORDER BY `year`, t1.month', `filters` = '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u5ea6\"}]', `stage` = 'published', `builtin` = 0 WHERE `id` = 1077;
|
||||
UPDATE `zt_chart` SET `type` = 'line', `settings` = '[{\"type\":\"line\",\"xaxis\":[{\"field\":\"month\",\"name\":\"month\",\"group\":\"\"}],\"yaxis\":[{\"field\":\"newBug\",\"name\":\"newBug\",\"valOrAgg\":\"sum\"},{\"field\":\"fixedBug\",\"name\":\"fixedBug\",\"valOrAgg\":\"sum\"}]}]', `fields` = '{\"year\":{\"name\":\"year\",\"object\":\"bug\",\"field\":\"year\",\"type\":\"number\"},\"month\":{\"name\":\"month\",\"object\":\"bug\",\"field\":\"month\",\"type\":\"string\"},\"newBug\":{\"name\":\"newBug\",\"object\":\"bug\",\"field\":\"newBug\",\"type\":\"string\"},\"fixedBug\":{\"name\":\"fixedBug\",\"object\":\"bug\",\"field\":\"fixedBug\",\"type\":\"string\"}}', `langs` = '{\"year\":{\"zh-cn\":\"\\u5e74\\u5ea6\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"},\"month\":{\"zh-cn\":\"\\u6708\\u4efd\",\"zh-tw\":\"\",\"en\":\"month\",\"de\":\"\",\"fr\":\"\"},\"newBug\":{\"zh-cn\":\"\\u65b0\\u589eBug\\u6570\",\"zh-tw\":\"\",\"en\":\"newBug\",\"de\":\"\",\"fr\":\"\"},\"fixedBug\":{\"zh-cn\":\"\\u89e3\\u51b3Bug\\u6570\",\"zh-tw\":\"\",\"en\":\"fixedBug\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT t1.year, CONCAT(t1.month, \"月\") AS `month`, IFNULL(t2.bug, 0) AS newBug, IFNULL(t3.bug, 0) AS fixedBug\nFROM (SELECT DISTINCT Year(date) AS `year`, MONTH(date) AS `month` FROM zt_action) AS t1\nLEFT JOIN (SELECT YEAR(openedDate) AS `year`, MONTH(openedDate) AS `month`, COUNT(1) AS bug FROM zt_bug WHERE deleted = \'0\' GROUP BY `year`, `month`) AS t2 ON t1.year = t2.year AND t1.month = t2.month\nLEFT JOIN (SELECT YEAR(closedDate) AS `year`, MONTH(closedDate) AS `month`, COUNT(1) AS bug FROM zt_bug WHERE deleted = \'0\' AND resolution = \'fixed\' AND status = \'closed\' GROUP BY `year`, `month`) AS t3 ON t1.year = t3.year AND t1.month = t3.month\nORDER BY `year`, t1.month', `filters` = '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u5ea6\"}]', `stage` = 'published', `builtin` = 0 WHERE `id` = 1078;
|
||||
UPDATE `zt_chart` SET `type` = 'line', `settings` = '[{\"type\":\"line\",\"xaxis\":[{\"field\":\"month\",\"name\":\"month\",\"group\":\"\"}],\"yaxis\":[{\"field\":\"newTask\",\"name\":\"newTask\",\"valOrAgg\":\"sum\"},{\"field\":\"closedTask\",\"name\":\"closedTask\",\"valOrAgg\":\"sum\"}]}]', `fields` = '{\"year\":{\"name\":\"year\",\"object\":\"task\",\"field\":\"year\",\"type\":\"number\"},\"month\":{\"name\":\"month\",\"object\":\"task\",\"field\":\"month\",\"type\":\"string\"},\"newTask\":{\"name\":\"newTask\",\"object\":\"task\",\"field\":\"newTask\",\"type\":\"string\"},\"closedTask\":{\"name\":\"closedTask\",\"object\":\"task\",\"field\":\"closedTask\",\"type\":\"string\"}}', `langs` = '{\"year\":{\"zh-cn\":\"\\u5e74\\u4efd\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"},\"month\":{\"zh-cn\":\"\\u6708\\u4efd\",\"zh-tw\":\"\",\"en\":\"month\",\"de\":\"\",\"fr\":\"\"},\"newTask\":{\"zh-cn\":\"\\u65b0\\u589e\\u4efb\\u52a1\\u6570\",\"zh-tw\":\"\",\"en\":\"newTask\",\"de\":\"\",\"fr\":\"\"},\"closedTask\":{\"zh-cn\":\"\\u5b8c\\u6210\\u4efb\\u52a1\\u6570\",\"zh-tw\":\"\",\"en\":\"closedTask\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT t1.year, CONCAT(t1.month, \"月\") AS `month`, IFNULL(t2.task, 0) AS newTask, IFNULL(t3.task, 0) AS closedTask\nFROM (SELECT DISTINCT Year(date) AS `year`, MONTH(date) AS `month` FROM zt_action) AS t1\nLEFT JOIN (SELECT YEAR(openedDate) AS `year`, MONTH(openedDate) AS `month`, COUNT(1) AS task FROM zt_task WHERE deleted = \'0\' GROUP BY `year`, `month`) AS t2 ON t1.year = t2.year AND t1.month = t2.month\nLEFT JOIN (SELECT YEAR(closedDate) AS `year`, MONTH(closedDate) AS `month`, COUNT(1) AS task FROM zt_task WHERE deleted = \'0\' AND status = \'closed\' GROUP BY `year`, `month`) AS t3 ON t1.year = t3.year AND t1.month = t3.month\nORDER BY `year`, t1.month', `filters` = '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u4efd\"}]', `stage` = 'published', `builtin` = 0 WHERE `id` = 1079;
|
||||
UPDATE `zt_chart` SET `type` = 'line', `settings` = '[{\"type\":\"line\",\"xaxis\":[{\"field\":\"month\",\"name\":\"month\",\"group\":\"\"}],\"yaxis\":[{\"field\":\"newProject\",\"name\":\"newProject\",\"valOrAgg\":\"sum\"},{\"field\":\"closedProject\",\"name\":\"\\u5df2\\u5173\\u95ed\\u7684\\u9879\\u76ee\",\"valOrAgg\":\"sum\"}]}]', `fields` = '{\"year\":{\"name\":\"year\",\"object\":\"project\",\"field\":\"year\",\"type\":\"number\"},\"month\":{\"name\":\"month\",\"object\":\"project\",\"field\":\"month\",\"type\":\"string\"},\"newProject\":{\"name\":\"newProject\",\"object\":\"project\",\"field\":\"newProject\",\"type\":\"string\"},\"closedProject\":{\"name\":\"\\u5df2\\u5173\\u95ed\\u7684\\u9879\\u76ee\",\"object\":\"project\",\"field\":\"closedProject\",\"type\":\"string\"}}', `langs` = '{\"year\":{\"zh-cn\":\"\\u5e74\\u4efd\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"},\"month\":{\"zh-cn\":\"\\u6708\\u4efd\",\"zh-tw\":\"\",\"en\":\"month\",\"de\":\"\",\"fr\":\"\"},\"newProject\":{\"zh-cn\":\"\\u65b0\\u589e\\u9879\\u76ee\\u6570\",\"zh-tw\":\"\",\"en\":\"newProject\",\"de\":\"\",\"fr\":\"\"},\"closedProject\":{\"zh-cn\":\"\\u5b8c\\u6210\\u9879\\u76ee\\u6570\",\"zh-tw\":\"\",\"en\":\"closedProject\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT t1.year, CONCAT(t1.month, \"月\") AS `month`, IFNULL(t2.project, 0) AS newProject, IFNULL(t3.project, 0) AS closedProject\nFROM (SELECT DISTINCT Year(date) AS `year`, MONTH(date) AS `month` FROM zt_action) AS t1\nLEFT JOIN (SELECT YEAR(openedDate) AS `year`, MONTH(openedDate) AS `month`, COUNT(1) AS project FROM zt_project WHERE deleted = \'0\' AND type = \'project\' GROUP BY `year`, `month`) AS t2 ON t1.year = t2.year AND t1.month = t2.month\nLEFT JOIN (SELECT YEAR(closedDate) AS `year`, MONTH(closedDate) AS `month`, COUNT(1) AS project FROM zt_project WHERE deleted = \'0\' AND type = \'project\' AND status = \'closed\' GROUP BY `year`, `month`) AS t3 ON t1.year = t3.year AND t1.month = t3.month\nORDER BY `year`, t1.month', `filters` = '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u4efd\"}]', `stage` = 'published', `builtin` = 0 WHERE `id` = 1080;
|
||||
UPDATE `zt_chart` SET `type` = 'line', `settings` = '[{\"type\":\"line\",\"xaxis\":[{\"field\":\"month\",\"name\":\"month\",\"group\":\"\"}],\"yaxis\":[{\"field\":\"newExecution\",\"name\":\"newExecution\",\"valOrAgg\":\"sum\"},{\"field\":\"closedExecution\",\"name\":\"closedExecution\",\"valOrAgg\":\"sum\"}]}]', `fields` = '{\"year\":{\"name\":\"year\",\"object\":\"project\",\"field\":\"year\",\"type\":\"number\"},\"month\":{\"name\":\"month\",\"object\":\"project\",\"field\":\"month\",\"type\":\"string\"},\"newExecution\":{\"name\":\"newExecution\",\"object\":\"project\",\"field\":\"newExecution\",\"type\":\"string\"},\"closedExecution\":{\"name\":\"closedExecution\",\"object\":\"project\",\"field\":\"closedExecution\",\"type\":\"string\"}}', `langs` = '{\"year\":{\"zh-cn\":\"\\u5e74\\u4efd\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"},\"month\":{\"zh-cn\":\"\\u6708\\u4efd\",\"zh-tw\":\"\",\"en\":\"month\",\"de\":\"\",\"fr\":\"\"},\"newExecution\":{\"zh-cn\":\"\\u65b0\\u589e\\u6267\\u884c\\u6570\",\"zh-tw\":\"\",\"en\":\"newExecution\",\"de\":\"\",\"fr\":\"\"},\"closedExecution\":{\"zh-cn\":\"\\u5b8c\\u6210\\u6267\\u884c\\u6570\",\"zh-tw\":\"\",\"en\":\"closedExecution\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT t1.year, CONCAT(t1.month, \"月\") AS `month`, IFNULL(t2.execution, 0) AS newExecution, IFNULL(t3.execution, 0) AS closedExecution\nFROM (SELECT DISTINCT YEAR(date) AS `year`, MONTH(date) AS `month` FROM zt_action) AS t1\nLEFT JOIN (SELECT YEAR(openedDate) AS `year`, MONTH(openedDate) AS `month`, COUNT(1) AS execution FROM zt_project WHERE deleted = \'0\' AND type IN (\'sprint\', \'stage\', \'kanban\') AND multiple = \'1\' GROUP BY `year`, `month`) AS t2 ON t1.year = t2.year AND t1.month = t2.month\nLEFT JOIN (SELECT YEAR(closedDate) AS `year`, MONTH(closedDate) AS `month`, COUNT(1) AS execution FROM zt_project WHERE deleted = \'0\' AND type IN (\'sprint\', \'stage\', \'kanban\') AND status = \'closed\' AND multiple = \'1\' GROUP BY `year`, `month`) AS t3 ON t1.year = t3.year AND t1.month = t3.month\nORDER BY `year`, t1.month', `filters` = '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u4efd\"}]', `stage` = 'published', `builtin` = 0 WHERE `id` = 1081;
|
||||
UPDATE `zt_chart` SET `type` = 'line', `settings` = '[{\"type\":\"line\",\"xaxis\":[{\"field\":\"month\",\"name\":\"month\",\"group\":\"\"}],\"yaxis\":[{\"field\":\"release\",\"name\":\"release\",\"valOrAgg\":\"sum\"}]}]', `fields` = '{\"year\":{\"name\":\"year\",\"object\":\"release\",\"field\":\"year\",\"type\":\"number\"},\"month\":{\"name\":\"month\",\"object\":\"release\",\"field\":\"month\",\"type\":\"string\"},\"release\":{\"name\":\"release\",\"object\":\"release\",\"field\":\"release\",\"type\":\"string\"}}', `langs` = '{\"year\":{\"zh-cn\":\"\\u5e74\\u4efd\",\"zh-tw\":\"\",\"en\":\"year\",\"de\":\"\",\"fr\":\"\"},\"month\":{\"zh-cn\":\"\\u6708\\u4efd\",\"zh-tw\":\"\",\"en\":\"month\",\"de\":\"\",\"fr\":\"\"},\"release\":{\"zh-cn\":\"\\u53d1\\u5e03\\u6b21\\u6570\",\"zh-tw\":\"\",\"en\":\"release\",\"de\":\"\",\"fr\":\"\"}}', `sql` = 'SELECT t1.year, CONCAT(t1.month, \"月\") AS `month`, IFNULL(t2.release, 0) AS `release`\nFROM (SELECT DISTINCT Year(date) AS `year`, MONTH(date) AS `month` FROM zt_action) AS t1\nLEFT JOIN (SELECT YEAR(createdDate) AS `year`, MONTH(createdDate) AS `month`, COUNT(1) AS `release` FROM zt_release WHERE deleted = \'0\' GROUP BY `year`, `month`) AS t2 ON t1.year = t2.year AND t1.month = t2.month\nORDER BY `year`, t1.month', `filters` = '[{\"field\":\"year\",\"type\":\"select\",\"name\":\"\\u5e74\\u4efd\"}]', `stage` = 'published', `builtin` = 0 WHERE `id` = 1082;
|
||||
|
||||
-- 质量数据盘点大屏
|
||||
UPDATE `zt_chart` SET `type` = 'pie', `settings` = '[{\"type\":\"pie\",\"group\":[{\"field\":\"resolution\",\"name\":\"\\u89e3\\u51b3\\u65b9\\u6848\",\"group\":\"\"}],\"metric\":[{\"field\":\"id\",\"name\":\"Bug\\u7f16\\u53f7\",\"valOrAgg\":\"count\"}]}]', `filters` = '[{\"field\":\"resolvedDate\",\"type\":\"date\",\"name\":\"\\u89e3\\u51b3\\u65e5\\u671f\",\"default\":{\"begin\":\"\",\"end\":\"\"}}]', `fields` = '{\"id\":{\"name\":\"Bug\\u7f16\\u53f7\",\"object\":\"bug\",\"field\":\"id\",\"type\":\"number\"},\"resolution\":{\"name\":\"\\u89e3\\u51b3\\u65b9\\u6848\",\"object\":\"bug\",\"field\":\"resolution\",\"type\":\"option\"},\"resolvedDate\":{\"name\":\"\\u89e3\\u51b3\\u65e5\\u671f\",\"object\":\"bug\",\"field\":\"resolvedDate\",\"type\":\"date\"}}', `langs` = '{"id":{"zh-cn":"Bug\u7f16\u53f7","zh-tw":"","en":"Bug ID","de":"","fr":""},"resolution":{"zh-cn":"\u89e3\u51b3\u65b9\u6848","zh-tw":"","en":"Resolution","de":"","fr":""},"resolvedDate":{"zh-cn":"\u89e3\u51b3\u65e5\u671f","zh-tw":"","en":"Resolved Date","de":"","fr":""}}', `sql` = 'select id,resolution,resolvedDate from zt_bug\nwhere deleted=\'0\' and resolution!=\' \'', `builtin` = 0 WHERE `id` = 10220;
|
||||
UPDATE `zt_chart` SET `type` = 'pie', `settings` = '[{\"type\":\"pie\",\"group\":[{\"field\":\"severity\",\"name\":\"\\u4e25\\u91cd\\u7a0b\\u5ea6\",\"group\":\"\"}],\"metric\":[{\"field\":\"id\",\"name\":\"Bug\\u7f16\\u53f7\",\"valOrAgg\":\"count\"}]}]', `filters` = '[{\"field\":\"openedDate\",\"type\":\"date\",\"name\":\"\\u521b\\u5efa\\u65e5\\u671f\",\"default\":{\"begin\":\"\",\"end\":\"\"}}]', `fields` = '{\"id\":{\"name\":\"Bug\\u7f16\\u53f7\",\"object\":\"bug\",\"field\":\"id\",\"type\":\"number\"},\"severity\":{\"name\":\"\\u4e25\\u91cd\\u7a0b\\u5ea6\",\"object\":\"bug\",\"field\":\"severity\",\"type\":\"option\"},\"openedDate\":{\"name\":\"\\u521b\\u5efa\\u65e5\\u671f\",\"object\":\"bug\",\"field\":\"openedDate\",\"type\":\"date\"}}', `langs` = '{"id":{"zh-cn":"Bug\u7f16\u53f7","zh-tw":"","en":"Bug ID","de":"","fr":""},"severity":{"zh-cn":"\u4e25\u91cd\u7a0b\u5ea6","zh-tw":"","en":"Severity","de":"","fr":""},"openedDate":{"zh-cn":"\u521b\u5efa\u65e5\u671f","zh-tw":"","en":"Opened Date","de":"","fr":""}}', `sql` = 'select\nid,severity,openedDate\nfrom\nzt_bug\nwhere deleted=\'0\'', `builtin` = 0 WHERE `id` = 10219;
|
||||
UPDATE `zt_chart` SET `type` = 'pie', `settings` = '[{\"type\":\"pie\",\"group\":[{\"field\":\"type\",\"name\":\"Bug\\u7c7b\\u578b\",\"group\":\"\"}],\"metric\":[{\"field\":\"id\",\"name\":\"Bug\\u7f16\\u53f7\",\"valOrAgg\":\"count\"}]}]', `filters` = '[{\"field\":\"openedDate\",\"type\":\"date\",\"name\":\"\\u521b\\u5efa\\u65e5\\u671f\",\"default\":{\"begin\":\"\",\"end\":\"\"}}]', `fields` = '{\"id\":{\"name\":\"Bug\\u7f16\\u53f7\",\"object\":\"bug\",\"field\":\"id\",\"type\":\"number\"},\"type\":{\"name\":\"Bug\\u7c7b\\u578b\",\"object\":\"bug\",\"field\":\"type\",\"type\":\"option\"},\"openedDate\":{\"name\":\"\\u521b\\u5efa\\u65e5\\u671f\",\"object\":\"bug\",\"field\":\"openedDate\",\"type\":\"date\"}}', `langs` = '{"id":{"zh-cn":"Bug\u7f16\u53f7","zh-tw":"","en":"Bug ID","de":"","fr":""},"type":{"zh-cn":"Bug\u7c7b\u578b","zh-tw":"","en":"Type","de":"","fr":""},"openedDate":{"zh-cn":"\u521b\u5efa\u65e5\u671f","zh-tw":"","en":"Opened Date","de":"","fr":""}}', `sql` = 'select\nid,type,openedDate\nfrom\nzt_bug\nwhere deleted=\'0\'', `builtin` = 0 WHERE `id` = 10218;
|
||||
|
||||
@@ -978,6 +978,11 @@ class screenModel extends model
|
||||
return $this->buildCardChart($component, $chart);
|
||||
break;
|
||||
case 'line':
|
||||
if($chart->builtin == '0')
|
||||
{
|
||||
$chart->sql = $this->setFilterSQL($chart);
|
||||
return $this->getLineChartOption($component, $chart, $filters);
|
||||
}
|
||||
return $this->buildLineChart($component, $chart);
|
||||
break;
|
||||
case 'bar':
|
||||
|
||||
Reference in New Issue
Block a user