|
@@ -13,6 +13,49 @@
|
|
<a-input id="equipment-stationName" allowClear :maxLength="30" v-model="queryParam.stationName" placeholder="请输入网点名称" />
|
|
<a-input id="equipment-stationName" allowClear :maxLength="30" v-model="queryParam.stationName" placeholder="请输入网点名称" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
+ <a-col :span="6">
|
|
|
|
+ <a-form-item label="箱体类型" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
|
|
+ <!-- <v-select
|
|
|
|
+ v-model="queryParam.deviceTypeNo"
|
|
|
|
+ ref="deviceTypeNo"
|
|
|
|
+ id="equipment-deviceTypeNo"
|
|
|
|
+ code="GOODS_STATE"
|
|
|
|
+ placeholder="请选择箱体类型"
|
|
|
|
+ allowClear></v-select> -->
|
|
|
|
+ <a-select id="equipment-deviceTypeNo" allowClear placeholder="请选择工作状态" v-model="queryParam.deviceTypeNo">
|
|
|
|
+ <a-select-option v-for="(item,index) in deviceTypeList" :key="index" :value="item.deviceTypeNo">{{ item.name }}</a-select-option>
|
|
|
|
+ </a-select>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :span="6">
|
|
|
|
+ <a-form-item label="内置箱体数" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
|
|
+ <v-select
|
|
|
|
+ v-model="queryParam.boxNum"
|
|
|
|
+ ref="boxNum"
|
|
|
|
+ id="equipment-boxNum"
|
|
|
|
+ code="BOX_NUM"
|
|
|
|
+ placeholder="请选择内置箱体数"
|
|
|
|
+ allowClear></v-select>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :span="6">
|
|
|
|
+ <a-form-item label="设备状态" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
|
|
+ <v-select
|
|
|
|
+ v-model="queryParam.state"
|
|
|
|
+ ref="state"
|
|
|
|
+ id="equipment-state"
|
|
|
|
+ code="ENABLE_FLAG"
|
|
|
|
+ placeholder="请选择设备状态"
|
|
|
|
+ allowClear></v-select>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
|
|
+ <a-col :span="6">
|
|
|
|
+ <a-form-item label="工作状态" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
|
|
+ <a-select id="equipment-onlineFlag" allowClear placeholder="请选择工作状态" v-model="queryParam.onlineFlag">
|
|
|
|
+ <a-select-option v-for="(item,index) in onlineFlagList" :key="index" :value="item.value">{{ item.name }}</a-select-option>
|
|
|
|
+ </a-select>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
<a-col :span="6">
|
|
<a-col :span="6">
|
|
<a-button class="handle-btn serach-btn" id="equipment-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
|
|
<a-button class="handle-btn serach-btn" id="equipment-btn-serach" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
|
|
<a-button class="handle-btn" type="" id="equipment-btn-reset" @click="handleReset">重置</a-button>
|
|
<a-button class="handle-btn" type="" id="equipment-btn-reset" @click="handleReset">重置</a-button>
|
|
@@ -60,6 +103,7 @@
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
import equipmentLogModal from './logModal.vue'
|
|
import equipmentLogModal from './logModal.vue'
|
|
import { deviceList } from '@/api/device'
|
|
import { deviceList } from '@/api/device'
|
|
|
|
+import { deviceTypeListQuery } from '@/api/boxSetting'
|
|
export default {
|
|
export default {
|
|
name: 'Equipment',
|
|
name: 'Equipment',
|
|
components: { STable, VSelect, equipmentLogModal },
|
|
components: { STable, VSelect, equipmentLogModal },
|
|
@@ -72,7 +116,11 @@ export default {
|
|
// 查询参数
|
|
// 查询参数
|
|
queryParam: {
|
|
queryParam: {
|
|
srcDeviceCode: '', // 设备编号
|
|
srcDeviceCode: '', // 设备编号
|
|
- stationName: '' // 网点名称
|
|
|
|
|
|
+ stationName: '', // 网点名称
|
|
|
|
+ deviceTypeNo: undefined, // 箱体类型
|
|
|
|
+ boxNum: undefined, // 内置箱体数
|
|
|
|
+ onlineFlag: undefined, // 设备状态
|
|
|
|
+ state: undefined // 工作状态
|
|
},
|
|
},
|
|
// 表头
|
|
// 表头
|
|
columns: [
|
|
columns: [
|
|
@@ -103,7 +151,12 @@ export default {
|
|
},
|
|
},
|
|
orderTotal: '', // 合计开单数量
|
|
orderTotal: '', // 合计开单数量
|
|
openLogModal: false, // 掉线日志 弹框
|
|
openLogModal: false, // 掉线日志 弹框
|
|
- srcDeviceCode: null // 设备编号
|
|
|
|
|
|
+ srcDeviceCode: null, // 设备编号
|
|
|
|
+ onlineFlagList: [ // 设备状态 下拉数据
|
|
|
|
+ { name: '在线', value: '1' },
|
|
|
|
+ { name: '离线', value: '0' }
|
|
|
|
+ ],
|
|
|
|
+ deviceTypeList: [] // 箱体类型 下拉数据
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
@@ -111,6 +164,10 @@ export default {
|
|
handleReset () {
|
|
handleReset () {
|
|
this.queryParam.srcDeviceCode = ''
|
|
this.queryParam.srcDeviceCode = ''
|
|
this.queryParam.stationName = ''
|
|
this.queryParam.stationName = ''
|
|
|
|
+ this.queryParam.deviceTypeNo = undefined
|
|
|
|
+ this.queryParam.boxNum = undefined
|
|
|
|
+ this.queryParam.onlineFlag = undefined
|
|
|
|
+ this.queryParam.state = undefined
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
},
|
|
},
|
|
// 查看掉线日志
|
|
// 查看掉线日志
|
|
@@ -121,7 +178,22 @@ export default {
|
|
closeModal () {
|
|
closeModal () {
|
|
this.srcDeviceCode = null
|
|
this.srcDeviceCode = null
|
|
this.openLogModal = false
|
|
this.openLogModal = false
|
|
|
|
+ },
|
|
|
|
+ // 获取箱体类型下拉数据
|
|
|
|
+ getDeviceType () {
|
|
|
|
+ deviceTypeListQuery({}).then(res => {
|
|
|
|
+ if (res.status == 200) {
|
|
|
|
+ this.deviceTypeList = res.data
|
|
|
|
+ } else {
|
|
|
|
+ this.deviceTypeList = []
|
|
|
|
+ }
|
|
|
|
+ })
|
|
}
|
|
}
|
|
|
|
+ },
|
|
|
|
+ beforeRouteEnter (to, from, next) {
|
|
|
|
+ next(vm => {
|
|
|
|
+ vm.getDeviceType()
|
|
|
|
+ })
|
|
}
|
|
}
|
|
}
|
|
}
|
|
</script>
|
|
</script>
|