Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
This commit is contained in:
commit
b062b9f568
|
|
@ -42,65 +42,67 @@
|
||||||
></el-button>
|
></el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-container>
|
<el-main class="nopadding">
|
||||||
<el-main class="nopadding">
|
<el-container>
|
||||||
<scTable
|
<el-aside style="width: 50%; float: right;">
|
||||||
ref="table"
|
<!-- 折线图组件 -->
|
||||||
:apiObj="apiObj"
|
<scTable
|
||||||
row-key="id"
|
ref="table"
|
||||||
stripe
|
:apiObj="apiObj"
|
||||||
:params="params"
|
row-key="id"
|
||||||
:query="query"
|
stripe
|
||||||
highlightCurrentRow
|
:params="params"
|
||||||
@row-click="rowClick"
|
:query="query"
|
||||||
@dataChange="dataChange"
|
highlightCurrentRow
|
||||||
>
|
@row-click="rowClick"
|
||||||
<el-table-column type="index" width="50" />
|
@dataChange="dataChange"
|
||||||
<el-table-column label="测点" prop="mpoint_name">
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="所属集合" prop="mgroup_name">
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="类型" prop="type" width="80"> </el-table-column>
|
|
||||||
<el-table-column label="年" prop="year" width="80"> </el-table-column>
|
|
||||||
<el-table-column label="班年" prop="year_s" width="80"> </el-table-column>
|
|
||||||
<el-table-column label="月" prop="month" width="50"> </el-table-column>
|
|
||||||
<el-table-column label="班月" prop="month_s" width="50"> </el-table-column>
|
|
||||||
<el-table-column label="日" prop="day" width="50"> </el-table-column>
|
|
||||||
<el-table-column label="班日" prop="day_s" width="50"> </el-table-column>
|
|
||||||
<el-table-column label="时" prop="hour" width="50"> </el-table-column>
|
|
||||||
<el-table-column label="当前值" prop="val"></el-table-column>
|
|
||||||
<el-table-column
|
|
||||||
label="校正值"
|
|
||||||
prop="val_correct"
|
|
||||||
></el-table-column>
|
|
||||||
<el-table-column
|
|
||||||
label="原始计算值"
|
|
||||||
prop="val_origin"
|
|
||||||
></el-table-column>
|
|
||||||
<el-table-column
|
|
||||||
label="操作"
|
|
||||||
fixed="right"
|
|
||||||
align="center"
|
|
||||||
width="140"
|
|
||||||
>
|
>
|
||||||
<template #default="scope">
|
<el-table-column type="index" width="50" />
|
||||||
<el-button
|
<el-table-column label="测点" prop="mpoint_name">
|
||||||
link
|
</el-table-column>
|
||||||
size="small"
|
<el-table-column label="所属集合" prop="mgroup_name">
|
||||||
v-if="scope.row.type == 'year_s' || scope.row.type == 'month_s' || scope.row.type == 'day_s'"
|
</el-table-column>
|
||||||
@click="handle_edit(scope.row)"
|
<el-table-column label="类型" prop="type" width="80"> </el-table-column>
|
||||||
type="primary"
|
<el-table-column label="年" prop="year" width="80"> </el-table-column>
|
||||||
>校正</el-button
|
<el-table-column label="班年" prop="year_s" width="80"> </el-table-column>
|
||||||
>
|
<el-table-column label="月" prop="month" width="50"> </el-table-column>
|
||||||
</template>
|
<el-table-column label="班月" prop="month_s" width="50"> </el-table-column>
|
||||||
</el-table-column>
|
<el-table-column label="日" prop="day" width="50"> </el-table-column>
|
||||||
</scTable>
|
<el-table-column label="班日" prop="day_s" width="50"> </el-table-column>
|
||||||
|
<el-table-column label="时" prop="hour" width="50"> </el-table-column>
|
||||||
|
<el-table-column label="当前值" prop="val"></el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
label="校正值"
|
||||||
|
prop="val_correct"
|
||||||
|
></el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
label="原始计算值"
|
||||||
|
prop="val_origin"
|
||||||
|
></el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
label="操作"
|
||||||
|
fixed="right"
|
||||||
|
align="center"
|
||||||
|
width="140"
|
||||||
|
>
|
||||||
|
<template #default="scope">
|
||||||
|
<el-button
|
||||||
|
link
|
||||||
|
size="small"
|
||||||
|
v-if="scope.row.type == 'year_s' || scope.row.type == 'month_s' || scope.row.type == 'day_s'"
|
||||||
|
@click="handle_edit(scope.row)"
|
||||||
|
type="primary"
|
||||||
|
>校正</el-button
|
||||||
|
>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</scTable>
|
||||||
|
</el-aside>
|
||||||
|
<el-main>
|
||||||
|
<scEcharts :option="chartOption" height="400px" />
|
||||||
|
</el-main>
|
||||||
|
</el-container>
|
||||||
</el-main>
|
</el-main>
|
||||||
<el-aside style="width: 50%; float: right;">
|
|
||||||
<!-- 折线图组件 -->
|
|
||||||
<scEcharts :option="chartOption" height="400px" />
|
|
||||||
</el-aside>
|
|
||||||
</el-container>
|
|
||||||
</el-container>
|
</el-container>
|
||||||
<el-dialog title="校正" v-model="visible">
|
<el-dialog title="校正" v-model="visible">
|
||||||
<el-main style="padding: 0 20px 20px 20px">
|
<el-main style="padding: 0 20px 20px 20px">
|
||||||
|
|
@ -167,7 +169,7 @@ export default {
|
||||||
end_time: null
|
end_time: null
|
||||||
},
|
},
|
||||||
chartOption: {
|
chartOption: {
|
||||||
color: ["#80FFA5", "#00DDFF", "#37A2FF", "#FF0087", "#FFBF00"],
|
color: ["#191970"],
|
||||||
tooltip: {
|
tooltip: {
|
||||||
trigger: "axis",
|
trigger: "axis",
|
||||||
axisPointer: {
|
axisPointer: {
|
||||||
|
|
@ -232,14 +234,13 @@ export default {
|
||||||
|
|
||||||
option.series = [
|
option.series = [
|
||||||
{
|
{
|
||||||
name: '总生产',
|
name: tableData[0].mpoint_name,
|
||||||
type: 'line', // 折线图类型
|
type: 'line', // 折线图类型
|
||||||
data: tableData.map((item) => parseFloat(item.val)), // 将字符串转为数字
|
data: tableData.map((item) => parseFloat(item.val)), // 将字符串转为数字
|
||||||
smooth: true, // 平滑曲线
|
smooth: true, // 平滑曲线
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
option.legend.data = ['总生产'];
|
option.legend.data = [tableData[0].mpoint_name];
|
||||||
|
|
||||||
// 更新图表选项
|
// 更新图表选项
|
||||||
that.chartOption = option;
|
that.chartOption = option;
|
||||||
},
|
},
|
||||||
|
|
@ -254,7 +255,6 @@ export default {
|
||||||
},
|
},
|
||||||
handle_add() {},
|
handle_add() {},
|
||||||
handleQuery() {
|
handleQuery() {
|
||||||
console.log(this.query)
|
|
||||||
if (this.timeRange) {
|
if (this.timeRange) {
|
||||||
this.query.start_time = this.timeRange[0]
|
this.query.start_time = this.timeRange[0]
|
||||||
this.query.end_time = this.timeRange[1]
|
this.query.end_time = this.timeRange[1]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue