|
|
|
@ -3,7 +3,7 @@
|
|
|
|
|
<div class="JNPF-common-layout-center">
|
|
|
|
|
<el-row class="JNPF-common-search-box" :gutter="16">
|
|
|
|
|
<el-form @submit.native.prevent>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<!-- <el-col :span="6">
|
|
|
|
|
<el-form-item label="设备编码">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="query.deviceCode"
|
|
|
|
@ -12,7 +12,19 @@
|
|
|
|
|
>
|
|
|
|
|
</el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-col> -->
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="设备编码">
|
|
|
|
|
<JnpfSelect
|
|
|
|
|
v-model="query.deviceCode"
|
|
|
|
|
placeholder="请选择"
|
|
|
|
|
clearable
|
|
|
|
|
:options="deviceCodeOptions"
|
|
|
|
|
:props="deviceCodeProps"
|
|
|
|
|
>
|
|
|
|
|
</JnpfSelect>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="6">
|
|
|
|
|
<el-form-item label="桶编号">
|
|
|
|
|
<el-input
|
|
|
|
@ -291,6 +303,8 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
deviceCodeOptions: [],
|
|
|
|
|
deviceCodeProps: { label: "device_name", value: "device_code" },
|
|
|
|
|
keyword: "",
|
|
|
|
|
expandsTree: true,
|
|
|
|
|
refreshTree: true,
|
|
|
|
@ -406,6 +420,7 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
created() {
|
|
|
|
|
this.getdeviceCodeOptions();
|
|
|
|
|
this.query.deviceCode = this.$route.query.deviceCode;
|
|
|
|
|
this.getColumnList(), this.initSearchDataAndListData();
|
|
|
|
|
this.queryData = JSON.parse(JSON.stringify(this.query));
|
|
|
|
@ -559,6 +574,12 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
this.exportList = exportList;
|
|
|
|
|
},
|
|
|
|
|
getdeviceCodeOptions() {
|
|
|
|
|
getDataInterfaceRes("564713894723988869").then(res => {
|
|
|
|
|
let data = res.data;
|
|
|
|
|
this.deviceCodeOptions = data;
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
goDetail(id) {
|
|
|
|
|
this.detailVisible = true;
|
|
|
|
|
this.$nextTick(() => {
|
|
|
|
@ -592,8 +613,6 @@ export default {
|
|
|
|
|
method: "post",
|
|
|
|
|
data: _query
|
|
|
|
|
}).then(res => {
|
|
|
|
|
console.log("hi1");
|
|
|
|
|
console.log(res);
|
|
|
|
|
if (res.data) {
|
|
|
|
|
var _list = res.data.list;
|
|
|
|
|
this.list = _list.map(o => ({
|
|
|
|
|