Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
This commit is contained in:
@@ -11,7 +11,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div flex search>
|
<div flex search>
|
||||||
<el-select v-model="search.bind" size="mini" placeholder="全部" clearable>
|
<el-select v-model="search.bind" size="mini" placeholder="全部" clearable>
|
||||||
<el-option v-for="(op,i) in dict.getDict('zyDeviceBindStatus')" :key="i" :value="op.dictValue"
|
<el-option v-for="(op,i) in dict.getDict('deviceStatus')" :key="i" :value="op.dictValue"
|
||||||
:label="op.dictName"/>
|
:label="op.dictName"/>
|
||||||
</el-select>
|
</el-select>
|
||||||
<el-input v-model="search.name" size="mini" placeholder="设备名称" prefix-icon="el-icon-search"
|
<el-input v-model="search.name" size="mini" placeholder="设备名称" prefix-icon="el-icon-search"
|
||||||
@@ -108,7 +108,7 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.dict.load("zyDeviceBindStatus")
|
this.dict.load("deviceStatus")
|
||||||
this.getDevices()
|
this.getDevices()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user