|
|
@@ -7,29 +7,10 @@
|
|
|
style="overflow: hidden;"
|
|
|
:style="filterForm.show ? null : { height: '0px' }"
|
|
|
size="mini"
|
|
|
- label-width="70px"
|
|
|
+ label-width="75px"
|
|
|
>
|
|
|
<el-row>
|
|
|
- <!-- <el-col :span="6">
|
|
|
- <el-form-item label="能介" label-width="40px">
|
|
|
- <el-select
|
|
|
- filterable clearable
|
|
|
- multiple
|
|
|
- collapse-tags
|
|
|
- v-model="filterForm.data.energyid"
|
|
|
- placeholder=""
|
|
|
- style="width: 100%;"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item of nameObj.energyid.arr"
|
|
|
- :key="item.id"
|
|
|
- :value="item.name"
|
|
|
- :label="item.name"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col> -->
|
|
|
- <el-col :span="4">
|
|
|
+ <el-col :span="6">
|
|
|
<el-form-item label="检测日期">
|
|
|
<!-- <el-date-picker
|
|
|
v-model="filterForm.data.clock"
|
|
|
@@ -49,7 +30,7 @@
|
|
|
></zj-timegran-date>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="4">
|
|
|
+ <el-col :span="3">
|
|
|
<el-form-item label="时间粒度">
|
|
|
<el-select
|
|
|
filterable clearable
|
|
|
@@ -66,7 +47,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="4">
|
|
|
+ <el-col :span="5">
|
|
|
<el-form-item label="能介名称">
|
|
|
<el-select
|
|
|
filterable clearable
|
|
|
@@ -77,7 +58,7 @@
|
|
|
style="width: 100%;"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="item of nameObj.energyid.arr"
|
|
|
+ v-for="item of nameObj.energy.arr"
|
|
|
:key="item.id"
|
|
|
:value="item.id"
|
|
|
:label="item.name"
|
|
|
@@ -168,9 +149,6 @@
|
|
|
align="center"
|
|
|
:show-overflow-tooltip="true"
|
|
|
>
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ nameObj.materialsource.obj[scope.row.materialsource] ? nameObj.materialsource.obj[scope.row.materialsource].name : scope.row.materialsource }}</span>
|
|
|
- </template>
|
|
|
</el-table-column>
|
|
|
<!-- <el-table-column
|
|
|
sortable
|
|
|
@@ -181,8 +159,7 @@
|
|
|
></el-table-column> -->
|
|
|
<el-table-column
|
|
|
sortable
|
|
|
- :sort-by="function(row, index) { return sortFoo(row, index, 'energyid') }"
|
|
|
- prop="energyname"
|
|
|
+ prop="energyid"
|
|
|
label="能介名称"
|
|
|
align="center"
|
|
|
width="120px"
|
|
|
@@ -450,13 +427,13 @@ export default {
|
|
|
},
|
|
|
timegranid: {
|
|
|
obj: {
|
|
|
- "DAY": {name: "天"},
|
|
|
+ "DAY": {name: "日"},
|
|
|
"MONTH": {name: "月"}
|
|
|
},
|
|
|
arr: [
|
|
|
{
|
|
|
id: "DAY",
|
|
|
- name: "天"
|
|
|
+ name: "日"
|
|
|
},
|
|
|
{
|
|
|
id: "MONTH",
|
|
|
@@ -464,51 +441,39 @@ export default {
|
|
|
}
|
|
|
]
|
|
|
},
|
|
|
- materialsource: {
|
|
|
+ energy: {
|
|
|
obj: {
|
|
|
- '1011GL1': {
|
|
|
- name: '一体系1780高炉'
|
|
|
- },
|
|
|
- '1011GL2': {
|
|
|
- name: '二体系1#1250高炉'
|
|
|
- },
|
|
|
- '1011GL3': {
|
|
|
- name: '二体系2#1250高炉'
|
|
|
- },
|
|
|
- '1011JH1': {
|
|
|
- name: '一焦化'
|
|
|
- },
|
|
|
- '1011JH2': {
|
|
|
- name: '二焦化'
|
|
|
- },
|
|
|
- '1011LG1': {
|
|
|
- name: '一炼钢'
|
|
|
- }
|
|
|
+ 'P005': '高炉煤气',
|
|
|
+ 'P006': '焦炉煤气',
|
|
|
+ 'P007': '转炉煤气',
|
|
|
+ 'X010': '焦炭',
|
|
|
+ 'X018': '焦粉',
|
|
|
+ 'X005': '精煤'
|
|
|
},
|
|
|
arr: [
|
|
|
{
|
|
|
- id: '1011GL1',
|
|
|
- name: '一体系1780高炉'
|
|
|
+ id: 'P005',
|
|
|
+ name: '高炉煤气'
|
|
|
},
|
|
|
{
|
|
|
- id: '1011GL2',
|
|
|
- name: '二体系1#1250高炉'
|
|
|
+ id: 'P006',
|
|
|
+ name: '焦炉煤气'
|
|
|
},
|
|
|
{
|
|
|
- id: '1011GL3',
|
|
|
- name: '二体系2#1250高炉'
|
|
|
+ id: 'P007',
|
|
|
+ name: '转炉煤气'
|
|
|
},
|
|
|
{
|
|
|
- id: '1011JH1',
|
|
|
- name: '一焦化'
|
|
|
+ id: 'X010',
|
|
|
+ name: '焦炭'
|
|
|
},
|
|
|
{
|
|
|
- id: '1011JH2',
|
|
|
- name: '二焦化'
|
|
|
+ id: 'X018',
|
|
|
+ name: '焦粉'
|
|
|
},
|
|
|
{
|
|
|
- id: '1011LG1',
|
|
|
- name: '一炼钢'
|
|
|
+ id: 'X005',
|
|
|
+ name: '精煤'
|
|
|
}
|
|
|
]
|
|
|
}
|
