Merge branch 'zentaobiz38_bi_wangyuting' into 'master'

* Fix waterpolo chart bug.

See merge request easycorp/zentaopms!7413

module/screen/model.php

@@ -728,29 +728,16 @@ class screenModel extends model
         {
             if($chart->sql)
             {
-                $settings = json_decode($chart->settings);
+                $settings   = json_decode($chart->settings);
+                $sourceData = 0;
                 if($settings and isset($settings->metric))
                 {
-                    $sourceData = array();
-
-                    $sql     = $this->setFilterSQL($chart);
-                    $results = $this->dao->query($sql)->fetchAll();
-                    $group = $settings->group[0]->field;
-
-                    $groupCount = array();
-                    foreach($results as $result)
-                    {
-                        if($settings->metric[0]->agg == 'count')
-                        {
-                            if(!isset($groupCount[$result->$group])) $groupCount[$result->$group] = 0;
-                            $groupCount[$result->$group]++;
-                        }
-                    }
-
-                    foreach($groupCount as $groupValue => $groupCount) $sourceData[$groupValue] = $groupCount;
+                    $sql        = $this->setFilterSQL($chart);
+                    $result     = $this->dao->query($sql)->fetch();
+                    $group      = $settings->group[0]->field;
+                    $sourceData = zget($result, $group, 0);
                 }
-                $doneData = round((array_sum($sourceData) != 0 and !empty($sourceData['done'])) ? $sourceData['done'] / array_sum($sourceData) : 0, 4);
-                $component->option->dataset = $doneData;
+                $component->option->dataset = $sourceData;
             }
 
             return $this->setComponentDefaults($component);

www/static/js/403-78ec52c3.js

@@ -0,0 +1 @@
+import{_ as a}from"./403-24e394e4.js";import{j as c,d as r,r as n,o as u,m as d,e as p,w as i,D as m,E as l,z as t,p as E,H as v,P as x}from"./index.js";const o=e=>(m("data-v-3497d613"),e=e(),l(),e),B={class:"go-error"},h=o(()=>t("div",{class:"text-center"},[t("img",{src:a,alt:""})],-1)),f=o(()=>t("div",{class:"text-center"},[t("h1",{class:"text-base text-gray-500"},"\u62B1\u6B49\uFF0C\u4F60\u65E0\u6743\u8BBF\u95EE\u8BE5\u9875\u9762")],-1)),g=E("\u56DE\u5230\u9996\u9875"),y=r({__name:"403",setup(e){function s(){v(x.BASE_HOME_NAME)}return(C,N)=>{const _=n("n-button");return u(),d("div",B,[h,f,p(_,{type:"primary",onClick:s},{default:i(()=>[g]),_:1})])}}});var I=c(y,[["__scopeId","data-v-3497d613"]]);export{I as default};

www/static/js/403-ea9c410f.js

@@ -1 +0,0 @@
-import{_}from"./403-24e394e4.js";import{j as c,d as r,r as n,m as u,e as p,w as d,E as i,P as m,o as l,p as E,G as v,H as x,z as t}from"./index.js";const o=e=>(v("data-v-6eb339c3"),e=e(),x(),e),B={class:"go-error"},f=o(()=>t("div",{class:"text-center"},[t("img",{src:_,alt:""})],-1)),h=o(()=>t("div",{class:"text-center"},[t("h1",{class:"text-base text-gray-500"},"\u62B1\u6B49\uFF0C\u4F60\u65E0\u6743\u8BBF\u95EE\u8BE5\u9875\u9762")],-1)),g=r({__name:"403",setup(e){function s(){i(m.BASE_HOME_NAME)}return(b,y)=>{const a=n("n-button");return l(),u("div",B,[f,h,p(a,{type:"primary",onClick:s},{default:d(()=>[E("\u56DE\u5230\u9996\u9875")]),_:1})])}}});var F=c(g,[["__scopeId","data-v-6eb339c3"]]);export{F as default};