fix(dashboard): 控制台剖析图表支持仓房与品种智能双向联动及空状态优雅提示
这个提交包含在:
@@ -124,10 +124,19 @@ class Dashboard extends Backend
|
||||
public function getInitData(TestingModel $testingModel)
|
||||
{
|
||||
$granaryList = Db::name('granary')
|
||||
->field(['id', 'name'])
|
||||
->field(['id', 'name', 'varieties'])
|
||||
->select();
|
||||
$defaultType = 'rapeseed';
|
||||
if (!empty($granaryList)) {
|
||||
foreach ($granaryList as &$g) {
|
||||
$vInfo = getVarietiesInfo($g['varieties'] ?? '');
|
||||
$g['type'] = $vInfo['type'] ?? 'rapeseed';
|
||||
}
|
||||
unset($g);
|
||||
$defaultType = $granaryList[0]['type'] ?? 'rapeseed';
|
||||
}
|
||||
$typeList = $testingModel->getTypeList();
|
||||
$lineCharts = $this->paramsQuarterLineChartsData(!empty($granaryList) ? $granaryList[0]['id'] : 0, date('Y'), 'rapeseed');
|
||||
$lineCharts = $this->paramsQuarterLineChartsData(!empty($granaryList) ? $granaryList[0]['id'] : 0, date('Y'), $defaultType);
|
||||
|
||||
return json([
|
||||
'code' => 200,
|
||||
@@ -135,6 +144,7 @@ class Dashboard extends Backend
|
||||
'data' => [
|
||||
'granaryList' => $granaryList,
|
||||
'typeList' => $typeList,
|
||||
'defaultType' => $defaultType,
|
||||
'lineCharts' => $lineCharts,
|
||||
'year' => date('Y')
|
||||
]
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
</el-date-picker>
|
||||
</div>
|
||||
<div class="granary" style="margin-left: 10px;">
|
||||
<el-select filterable size="small" style="width: 270px;" v-model="search.gid" placeholder="所属仓库">
|
||||
<el-select filterable size="small" style="width: 270px;" v-model="search.gid" placeholder="所属仓库" @change="granaryChange">
|
||||
<el-option
|
||||
v-for="item in granaryList"
|
||||
:key="item.id"
|
||||
@@ -108,7 +108,7 @@
|
||||
</div>
|
||||
<div class="type-list" style="margin-left: 10px;position: relative;top: -6px;">
|
||||
<div class="screen-container-right display-flex" style="position: relative; top: 2px;">
|
||||
<el-radio-group size="small" v-model="search.type">
|
||||
<el-radio-group size="small" v-model="search.type" @change="typeChange">
|
||||
<el-radio-button v-for="(item, index) of typeList" :label="index">{{item.name}}
|
||||
</el-radio-button>
|
||||
</el-radio-group>
|
||||
|
||||
在新工单中引用
屏蔽一个用户