Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/biz17'

Browse Source
This commit is contained in:
wangyidong
2023-03-31 08:58:40 +08:00
parent 2bcbd46898 d75d5e9b5a
commit f2a164ffb8
1349 changed files with 279389 additions and 309659 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/screen/model.php
+8 -8
View File
@@ -40,10 +40,7 @@ class screenModel extends model
*/
public function getList($dimensionID)
{
return $this->dao->select('*')->from(TABLE_SCREEN)
->where('dimension')->eq($dimensionID)
->andWhere('deleted')->eq(0)
->fetchAll();
return $this->dao->select('*')->from(TABLE_SCREEN)->where('dimension')->eq($dimensionID)->andWhere('deleted')->eq('0')->fetchAll();
}
/**
@@ -56,7 +53,7 @@ class screenModel extends model
* @access public
* @return object
*/
public function getByID($screenID, $year, $dept, $account)
public function getByID($screenID, $year = '', $dept = '', $account = '')
{
$this->filter = new stdclass();
$this->filter->screen = $screenID;
@@ -66,6 +63,7 @@ class screenModel extends model
$this->filter->charts = array();
$screen = $this->dao->select('*')->from(TABLE_SCREEN)->where('id')->eq($screenID)->fetch();
if(!isset($screen->scheme) or empty($screen->scheme)) $screen->scheme = file_get_contents(__DIR__ . '/json/screen.json');
$screen->chartData = $this->genChartData($screen, $year, $dept, $account);
return $screen;
@@ -83,6 +81,8 @@ class screenModel extends model
*/
public function genChartData($screen)
{
if(!$screen->builtin) return json_decode($screen->scheme);
$config = new stdclass();
$config->width = 1300;
$config->height = 1080;
@@ -119,7 +119,7 @@ class screenModel extends model
$chartData = new stdclass();
$chartData->editCanvasConfig = $config;
$chartData->componentList = $this->buildComponentList($componentList);
$chartData->requestGlobalConfig = json_decode('{ "requestDataPond": [], "requestOriginUrl": "", "requestInterval": 30, "requestIntervalUnit": "second", "requestParams": { "Body": { "form-data": {}, "x-www-form-urlencoded": {}, "json": "", "xml": "" }, "Header": {}, "Params": {} } return $chartData; }');
$chartData->requestGlobalConfig = json_decode('{ "requestDataPond": [], "requestOriginUrl": "", "requestInterval": 30, "requestIntervalUnit": "second", "requestParams": { "Body": { "form-data": {}, "x-www-form-urlencoded": {}, "json": "", "xml": "" }, "Header": {}, "Params": {} } }');
return $chartData;
}
@@ -136,7 +136,7 @@ class screenModel extends model
$components = array();
foreach($componentList as $component)
{
$components[] = $this->buildComponent($component);
if($component) $components[] = $this->buildComponent($component);
}
return $components;
@@ -155,7 +155,7 @@ class screenModel extends model
if(isset($component->sourceID) and $component->sourceID) return $this->buildChart($component);
if(isset($component->key) and $component->key === 'Select') return $this->buildSelect($component);
if(!$component->isGroup) return $this->setComponentDefaults($component);
if(empty($component->isGroup)) return $this->setComponentDefaults($component);
$component->groupList = $this->buildComponentList($component->groupList);
return $this->buildGroup($component);