Merge branch 'develop' into single-develop
This commit is contained in:
@ -24,20 +24,20 @@
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-button type="primary" @click="addDevice" native-type="button">新增设备</el-button>
|
||||
<!-- <el-dropdown @command="(val)=>downloadPointDetail(val,false)">-->
|
||||
<!-- <el-button-->
|
||||
<!-- style="margin-left:10px;"-->
|
||||
<!-- type="primary"-->
|
||||
<!-- plain>-->
|
||||
<!-- 下载点位清单-->
|
||||
<!-- </el-button>-->
|
||||
<!-- <el-dropdown-menu slot="dropdown">-->
|
||||
<!-- <el-dropdown-item v-for="(item,index) in deviceCategoryList" :key="index+'deviceCategoryList'"-->
|
||||
<!-- :command="item">-->
|
||||
<!-- {{ item.name }}-->
|
||||
<!-- </el-dropdown-item>-->
|
||||
<!-- </el-dropdown-menu>-->
|
||||
<!-- </el-dropdown>-->
|
||||
<el-dropdown @command="(val)=>downloadPointDetail(val,false)">
|
||||
<el-button
|
||||
style="margin-left:10px;"
|
||||
type="primary"
|
||||
plain>
|
||||
下载点位清单
|
||||
</el-button>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item v-for="(item,index) in deviceCategoryList" :key="index+'deviceCategoryList'"
|
||||
:command="item">
|
||||
{{ item.name }}
|
||||
</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
<!-- <el-dropdown @command="(val)=>uploadPointDetail(val,false)">-->
|
||||
<!-- <el-button-->
|
||||
<!-- style="margin-left:10px;"-->
|
||||
|
||||
Reference in New Issue
Block a user