|
@@ -10,7 +10,17 @@
|
|
|
</a-col>
|
|
|
<a-col :span="6">
|
|
|
<a-form-item label="网点名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
|
- <a-input id="equipment-stationName" allowClear :maxLength="30" v-model="queryParam.stationName" placeholder="请输入网点名称" />
|
|
|
+ <a-select
|
|
|
+ id="cleanDetail-stationNo"
|
|
|
+ placeholder="请选择网点名称"
|
|
|
+ allowClear
|
|
|
+ v-model="queryParam.stationNo"
|
|
|
+ showSearch
|
|
|
+ option-filter-prop="children"
|
|
|
+ :filter-option="filterOption">
|
|
|
+ <a-select-option v-for="item in optionData" :key="item.stationNo" :value="item.stationNo">{{ item.name }}</a-select-option>
|
|
|
+ </a-select>
|
|
|
+ <!-- <a-input id="equipment-stationNo" allowClear :maxLength="30" v-model="queryParam.stationNo" placeholder="请输入网点名称" /> -->
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="6">
|
|
@@ -135,6 +145,7 @@
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import equipmentLogModal from './logModal.vue'
|
|
|
import { deviceList } from '@/api/device'
|
|
|
+import { stationList } from '@/api/releaseRecord.js'
|
|
|
import { deviceTypeListQuery, exportDevice } from '@/api/boxSetting'
|
|
|
import { lableSeleteList } from '@/api/labelSetting.js'
|
|
|
import QRCode from 'qrcode'
|
|
@@ -154,7 +165,7 @@ export default {
|
|
|
// 查询参数
|
|
|
queryParam: {
|
|
|
srcDeviceCode: '', // 设备编号
|
|
|
- stationName: '', // 网点名称
|
|
|
+ stationNo: undefined, // 网点名称
|
|
|
deviceTypeNo: undefined, // 箱体类型
|
|
|
boxNum: undefined, // 内置箱体数
|
|
|
onlineFlag: undefined, // 设备状态
|
|
@@ -162,14 +173,15 @@ export default {
|
|
|
labelNoList: [] // 网点标签
|
|
|
},
|
|
|
lableData: [],
|
|
|
+ optionData: [],
|
|
|
// 表头
|
|
|
columns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
|
- { title: '网点名称', dataIndex: 'stationName', width: 200, align: 'center',customRender: text => { return text || '--' } },
|
|
|
+ { title: '网点名称', dataIndex: 'stationName', width: 200, align: 'center', customRender: text => { return text || '--' } },
|
|
|
{ title: '网点标签', dataIndex: 'labelName', width: 200, align: 'center', customRender: text => { return text || '--' } },
|
|
|
- { title: '地址', dataIndex: 'stationAddress', width: 200, align: 'center',customRender: text => { return text || '--' } },
|
|
|
+ { title: '地址', dataIndex: 'stationAddress', width: 200, align: 'center', customRender: text => { return text || '--' } },
|
|
|
{ title: '设备编号', dataIndex: 'srcDeviceCode', width: 200, align: 'center' },
|
|
|
- { title: '箱体类型', dataIndex: 'deviceTypeName', width: 200, align: 'center',customRender: text => { return text || '--' } },
|
|
|
+ { title: '箱体类型', dataIndex: 'deviceTypeName', width: 200, align: 'center', customRender: text => { return text || '--' } },
|
|
|
{ title: '内置箱体数', dataIndex: 'boxNum', width: 200, align: 'center' },
|
|
|
{ title: '版本', dataIndex: 'boxVersion', width: 200, align: 'center' },
|
|
|
{ title: '设备状态', scopedSlots: { customRender: 'onlineFlag' }, width: 150, align: 'center' },
|
|
@@ -214,10 +226,19 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ // 获取合作商数据
|
|
|
+ getStationList () {
|
|
|
+ stationList().then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ this.optionData = res.data || []
|
|
|
+ console.log(res)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
// 重置
|
|
|
handleReset () {
|
|
|
this.queryParam.srcDeviceCode = ''
|
|
|
- this.queryParam.stationName = ''
|
|
|
+ this.queryParam.stationNo = undefined
|
|
|
this.queryParam.deviceTypeNo = undefined
|
|
|
this.queryParam.boxNum = undefined
|
|
|
this.queryParam.onlineFlag = undefined
|
|
@@ -266,7 +287,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
const url = 'id=' + item.srcDeviceCode + '&type=dustbin'
|
|
|
- _this.shName = (item.stationName?item.stationName:"")+item.srcDeviceCode.substring(item.srcDeviceCode.length-6)
|
|
|
+ _this.shName = (item.stationNo ? item.stationNo : '') + item.srcDeviceCode.substring(item.srcDeviceCode.length - 6)
|
|
|
if (url) {
|
|
|
QRCode.toDataURL(url, opts, function (err, url) {
|
|
|
_this.qrCode = url
|
|
@@ -299,6 +320,7 @@ export default {
|
|
|
mounted () {
|
|
|
this.getDeviceType()
|
|
|
this.getlableSeleteList()
|
|
|
+ this.getStationList()
|
|
|
}
|
|
|
}
|
|
|
</script>
|