|
@@ -60,13 +60,13 @@
|
|
|
</div>
|
|
|
<el-table @row-click='innerTable' :data='tableData' :border='true' style='width: 100%;amrgin-bottom:30px'>
|
|
|
<el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
|
|
|
- <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable width='230'>
|
|
|
+ <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable min-width='150'>
|
|
|
<template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop='assetnum' label='设备内码' show-overflow-tooltip resizable width='80'>
|
|
|
<template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop='sl' label='数量' width='80'>
|
|
|
+ <el-table-column prop='sl' label='数量' width='60'>
|
|
|
<template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop='sbglgs' label='管理归属' show-overflow-tooltip resizable>
|
|
@@ -81,7 +81,7 @@
|
|
|
<el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='80'>
|
|
|
<template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop='floor' sortable label='楼层' width='80' show-overflow-tooltip resizable>
|
|
|
+ <el-table-column prop='floor' sortable label='楼层' width='70' show-overflow-tooltip resizable>
|
|
|
<template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable min-width='150'>
|
|
@@ -90,10 +90,10 @@
|
|
|
<el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='150'>
|
|
|
<template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable width='200'>
|
|
|
+ <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable min-width='150'>
|
|
|
<template slot-scope='{row}'>{{row.fws || '--'}}</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop label='相关资料' show-overflow-tooltip resizable width='100'>
|
|
|
+ <el-table-column prop label='相关资料' show-overflow-tooltip resizable min-width='150'>
|
|
|
<template slot-scope='{row}'>{{'--'}}</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -102,6 +102,7 @@
|
|
|
background
|
|
|
layout='prev, pager, next'
|
|
|
:total='total'
|
|
|
+ :current-page.sync="sonpage"
|
|
|
:page-size='size'
|
|
|
@prev-click='pageChanged'
|
|
|
@next-click='pageChanged'
|
|
@@ -124,9 +125,9 @@ export default {
|
|
|
{ id: 'test1', name: '选择项' },
|
|
|
{ id: 'test2', name: '单平米' },
|
|
|
{ id: 'test3', name: '下级分项' },
|
|
|
- { id: 'test4', name: '滑动平均滑动平均' }
|
|
|
+ { id: 'test4', name: '滑动平均滑动平均' },
|
|
|
],
|
|
|
- page: 1,
|
|
|
+ // page: 1,
|
|
|
size: 10,
|
|
|
total: 1,
|
|
|
sbjc: '',
|
|
@@ -139,17 +140,17 @@ export default {
|
|
|
sbglgs: '1',
|
|
|
sbglgsOption: [],
|
|
|
statusOption: [],
|
|
|
- floorAllSelect: []
|
|
|
+ floorAllSelect: [],
|
|
|
}
|
|
|
},
|
|
|
components: {
|
|
|
Select,
|
|
|
- inputDialog
|
|
|
+ inputDialog,
|
|
|
},
|
|
|
computed: {
|
|
|
- ...mapGetters(['floorSelect'])
|
|
|
+ ...mapGetters(['floorSelect']),
|
|
|
},
|
|
|
- props: ['row', 'major'],
|
|
|
+ props: ['row', 'major', 'sonpage'],
|
|
|
mounted() {
|
|
|
this.queryTableList()
|
|
|
this.tabFind()
|
|
@@ -164,7 +165,9 @@ export default {
|
|
|
},
|
|
|
//序号的方法
|
|
|
indexMethod(index) {
|
|
|
- return (this.page - 1) * this.size + index + 1
|
|
|
+ if (this.sonpage) {
|
|
|
+ return (this.sonpage - 1) * this.size + index + 1
|
|
|
+ }
|
|
|
},
|
|
|
//多余输入框监听
|
|
|
confirm(fws, manufacturer) {
|
|
@@ -179,10 +182,10 @@ export default {
|
|
|
{
|
|
|
columnName: { sbglgs: 'sbglgs', sb_status: 'sb_status' },
|
|
|
params: {
|
|
|
- type_code: this.row.type_code
|
|
|
+ type_code: this.row.type_code,
|
|
|
},
|
|
|
- tableName: 'sms_asset' //视图名称
|
|
|
- }
|
|
|
+ tableName: 'sms_asset', //视图名称
|
|
|
+ },
|
|
|
]
|
|
|
let major
|
|
|
if (this.major.slice(0, 2) == 'GD') {
|
|
@@ -200,38 +203,38 @@ export default {
|
|
|
}
|
|
|
let data = {
|
|
|
major: major,
|
|
|
- plazaId: this.$store.state.plazaId
|
|
|
+ plazaId: this.$store.state.plazaId,
|
|
|
}
|
|
|
- querySelect({ data, postParams }).then(res => {
|
|
|
+ querySelect({ data, postParams }).then((res) => {
|
|
|
//console.log(res)
|
|
|
let sb_status = res.data.data.sms_asset.sb_status
|
|
|
let sbglgs = res.data.data.sms_asset.sbglgs
|
|
|
this.sbglgsOption = []
|
|
|
this.sbglgsOption.push({
|
|
|
name: '全部',
|
|
|
- id: '1'
|
|
|
+ id: '1',
|
|
|
})
|
|
|
this.statusOption = []
|
|
|
this.statusOption.push({
|
|
|
name: '全部',
|
|
|
- id: '1'
|
|
|
+ id: '1',
|
|
|
})
|
|
|
- sb_status.forEach(el => {
|
|
|
+ sb_status.forEach((el) => {
|
|
|
this.statusOption.push({
|
|
|
name: el.value,
|
|
|
- id: el.key
|
|
|
+ id: el.key,
|
|
|
})
|
|
|
})
|
|
|
- sbglgs.forEach(el => {
|
|
|
+ sbglgs.forEach((el) => {
|
|
|
this.sbglgsOption.push({
|
|
|
name: el.value,
|
|
|
- id: el.key
|
|
|
+ id: el.key,
|
|
|
})
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
pageChanged(page) {
|
|
|
- this.page = page
|
|
|
+ this.sonpage = page
|
|
|
this.queryTableList()
|
|
|
},
|
|
|
queryTableList() {
|
|
@@ -252,8 +255,8 @@ export default {
|
|
|
let data = {
|
|
|
major: major,
|
|
|
plazaId: this.$store.state.plazaId,
|
|
|
- page: this.page,
|
|
|
- size: this.size
|
|
|
+ page: this.sonpage,
|
|
|
+ size: this.size,
|
|
|
}
|
|
|
//输入框搜索
|
|
|
data.keyword = ''
|
|
@@ -280,7 +283,7 @@ export default {
|
|
|
type_code: this.row.type_code,
|
|
|
manufacturer: this.row.manufacturer || '--',
|
|
|
sbxh: this.row.sbxh || '--',
|
|
|
- brand: this.row.brand || '--'
|
|
|
+ brand: this.row.brand || '--',
|
|
|
}
|
|
|
//下拉筛选
|
|
|
if (this.floor && this.floor != 1) {
|
|
@@ -292,7 +295,7 @@ export default {
|
|
|
if (this.status && this.status != 1) {
|
|
|
postParams.status = this.status
|
|
|
}
|
|
|
- queryAsset({ data, postParams }).then(res => {
|
|
|
+ queryAsset({ data, postParams }).then((res) => {
|
|
|
//console.log(res)
|
|
|
this.tableData = res.data.data
|
|
|
this.total = res.data.count
|
|
@@ -302,13 +305,13 @@ export default {
|
|
|
this.floorAllSelect = []
|
|
|
this.floorAllSelect.push({
|
|
|
id: '1',
|
|
|
- name: '全部'
|
|
|
+ name: '全部',
|
|
|
})
|
|
|
- this.floorSelect.forEach(el => {
|
|
|
+ this.floorSelect.forEach((el) => {
|
|
|
this.floorAllSelect.push(el)
|
|
|
})
|
|
|
console.log(this.floorAllSelect)
|
|
|
- }
|
|
|
+ },
|
|
|
},
|
|
|
watch: {
|
|
|
row: {
|
|
@@ -317,7 +320,7 @@ export default {
|
|
|
this.getFloorAllSelect()
|
|
|
this.tabFind()
|
|
|
},
|
|
|
- deep: true
|
|
|
+ deep: true,
|
|
|
},
|
|
|
sbglgs() {
|
|
|
this.queryTableList()
|
|
@@ -327,8 +330,8 @@ export default {
|
|
|
},
|
|
|
floor() {
|
|
|
this.queryTableList()
|
|
|
- }
|
|
|
- }
|
|
|
+ },
|
|
|
+ },
|
|
|
}
|
|
|
</script>
|
|
|
<style lang="less" scoped>
|
|
@@ -359,7 +362,7 @@ export default {
|
|
|
</style>
|
|
|
<style lang="less">
|
|
|
.gdqd-dialog {
|
|
|
- /deep/.el-table tr {
|
|
|
+ /deep/.el-table td {
|
|
|
cursor: pointer;
|
|
|
}
|
|
|
}
|