Commit 0af30dd8 authored by xiexingan's avatar xiexingan

tab修改

parent 36ea8879
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
background: 'rgba(0, 151, 255, 0.08)', background: 'rgba(0, 151, 255, 0.08)',
color: '#333333' color: '#333333'
}" }"
:max-height="maxHeight"
@current-change='handleCurrentChange' @current-change='handleCurrentChange'
> >
<el-table-column align="center" label="序号" width="100"> <el-table-column align="center" label="序号" width="100">
...@@ -63,6 +64,10 @@ ...@@ -63,6 +64,10 @@
export default { export default {
name: 'table-list', name: 'table-list',
props: { props: {
maxHeight: {
type: String,
default: ''
},
tableData: { tableData: {
type: Array type: Array
}, },
...@@ -88,7 +93,7 @@ export default { ...@@ -88,7 +93,7 @@ export default {
default: null default: null
}, },
// 行点击事件 // 行点击事件
currentChange:{ currentChange: {
type: Function type: Function
} }
}, },
...@@ -114,7 +119,7 @@ export default { ...@@ -114,7 +119,7 @@ export default {
} }
}, },
// 行点击事件 // 行点击事件
handleCurrentChange(data){ handleCurrentChange(data) {
this.currentChange(data) this.currentChange(data)
} }
} }
......
...@@ -707,7 +707,7 @@ export default { ...@@ -707,7 +707,7 @@ export default {
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.hall { .hall {
height: 100%; height: 100%;
// .el-input__inner { // .el-input__inner {
...@@ -759,7 +759,7 @@ export default { ...@@ -759,7 +759,7 @@ export default {
background: #4cb527 !important; background: #4cb527 !important;
border: 1px solid transparent; border: 1px solid transparent;
} }
.el-table__body-wrapper { /deep/.el-table__body-wrapper {
min-height: 400px; min-height: 400px;
} }
.el-dialog .el-form .el-input.el-date-editor { .el-dialog .el-form .el-input.el-date-editor {
......
...@@ -313,7 +313,7 @@ export default { ...@@ -313,7 +313,7 @@ export default {
type: this.activeTab, //类型 type: this.activeTab, //类型
region: 2, //办公区域 region: 2, //办公区域
page: page || this.pageIndex, page: page || this.pageIndex,
size: size || this.pageSize rows: size || this.pageSize
} }
}).then((data) => { }).then((data) => {
if (data && data.code === 0) { if (data && data.code === 0) {
......
...@@ -40,7 +40,7 @@ el-container(style="padding:0px;height:77.6vh;") ...@@ -40,7 +40,7 @@ el-container(style="padding:0px;height:77.6vh;")
span.num(v-if="activeName == 1") {{ hcdtSnqx.carbon_dioxide }} span.num(v-if="activeName == 1") {{ hcdtSnqx.carbon_dioxide }}
span.num(v-else) {{ currentRow.carbon_dioxide?currentRow.carbon_dioxide:'-- ' }} span.num(v-else) {{ currentRow.carbon_dioxide?currentRow.carbon_dioxide:'-- ' }}
span.unit PPM span.unit PPM
table-list(:tableColums='tableHeader' :tableData='dataList' :isShowOp="true" :opNum='4' :currentChange='handleCurrentChange') table-list(:tableColums='tableHeader' :tableData='dataList' maxHeight='300px' :isShowOp="true" :opNum='4' :currentChange='handleCurrentChange')
template(#operation="data") template(#operation="data")
el-button(type='text' size='small' @click="showParams(data.scope, 1)") 历史数据 el-button(type='text' size='small' @click="showParams(data.scope, 1)") 历史数据
el-button(type='text' size='small' @click="showParams(data.scope, 2)") 统计图表 el-button(type='text' size='small' @click="showParams(data.scope, 2)") 统计图表
...@@ -237,7 +237,7 @@ export default { ...@@ -237,7 +237,7 @@ export default {
type: '507ba9ae22174e4dbbf32dbf34dd7139', //室内气象站 type: '507ba9ae22174e4dbbf32dbf34dd7139', //室内气象站
region: Number(this.activeName), //区域类型 region: Number(this.activeName), //区域类型
page: page || this.pageIndex, page: page || this.pageIndex,
size: size || this.pageSize rows: size || this.pageSize
} }
}).then((data) => { }).then((data) => {
if (data && data.code === 0) { if (data && data.code === 0) {
......
...@@ -263,7 +263,7 @@ export default { ...@@ -263,7 +263,7 @@ export default {
type: this.activeTab === '1' ? '' : this.activeTab, //资源点类型 type: this.activeTab === '1' ? '' : this.activeTab, //资源点类型
list: list, list: list,
page: page || this.pageIndex, page: page || this.pageIndex,
size: size || this.pageSize rows: size || this.pageSize
} }
}).then((data) => { }).then((data) => {
if (data && data.code === 0) { if (data && data.code === 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment