xzzn/emsfront
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into single-develop

Browse Source
This commit is contained in:
白菜
2025-12-16 11:14:50 +08:00
parent 4a4d26f018 0966813c25
commit c90f4f5766
1 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/views/ems/site/sblb/index.vue
View File

@ -24,34 +24,34 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-button type="primary" @click="addDevice" native-type="button">新增设备</el-button> <el-button type="primary" @click="addDevice" native-type="button">新增设备</el-button>
<el-dropdown @command="(val)=>downloadPointDetail(val,false)"> <!-- <el-dropdown @command="(val)=>downloadPointDetail(val,false)">-->
<el-button <!-- <el-button-->
style="margin-left:10px;" <!-- style="margin-left:10px;"-->
type="primary" <!-- type="primary"-->
plain> <!-- plain>-->
下载点位清单 <!-- 下载点位清单-->
</el-button> <!-- </el-button>-->
<el-dropdown-menu slot="dropdown"> <!-- <el-dropdown-menu slot="dropdown">-->
<el-dropdown-item v-for="(item,index) in deviceCategoryList" :key="index+'deviceCategoryList'" <!-- <el-dropdown-item v-for="(item,index) in deviceCategoryList" :key="index+'deviceCategoryList'"-->
:command="item"> <!-- :command="item">-->
{{ item.name }} <!-- {{ item.name }}-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
</el-dropdown-menu> <!-- </el-dropdown-menu>-->
</el-dropdown> <!-- </el-dropdown>-->
<el-dropdown @command="(val)=>uploadPointDetail(val,false)"> <!-- <el-dropdown @command="(val)=>uploadPointDetail(val,false)">-->
<el-button <!-- <el-button-->
style="margin-left:10px;" <!-- style="margin-left:10px;"-->
type="success" <!-- type="success"-->
plain> <!-- plain>-->
上传点位清单 <!-- 上传点位清单-->
</el-button> <!-- </el-button>-->
<el-dropdown-menu slot="dropdown"> <!-- <el-dropdown-menu slot="dropdown">-->
<el-dropdown-item v-for="(item,index) in deviceCategoryList" :key="index+'deviceCategoryList'" <!-- <el-dropdown-item v-for="(item,index) in deviceCategoryList" :key="index+'deviceCategoryList'"-->
:command="item"> <!-- :command="item">-->
{{ item.name }} <!-- {{ item.name }}-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
</el-dropdown-menu> <!-- </el-dropdown-menu>-->
</el-dropdown> <!-- </el-dropdown>-->
<el-table <el-table
class="common-table" class="common-table"
:data="tableData" :data="tableData"
@ -84,7 +84,8 @@
label="在线状态"> label="在线状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ $store.state.ems.deviceStatusOptions[scope.row.deviceStatus] }}</span> <span>{{ $store.state.ems.deviceStatusOptions[scope.row.deviceStatus] }}</span>
<pcs-switch v-if="scope.row.deviceCategory === 'PCS'" style="margin-left:5px;" <pcs-switch v-if="scope.row.deviceCategory === 'PCS' && ![null,'',undefined].includes(scope.row.deviceStatus)"
style="margin-left:5px;"
:data="{siteId:scope.row.siteId,deviceStatus:scope.row.deviceStatus,deviceId:scope.row.deviceId,deviceName:scope.row.deviceName}" :data="{siteId:scope.row.siteId,deviceStatus:scope.row.deviceStatus,deviceId:scope.row.deviceId,deviceName:scope.row.deviceName}"
@updateSuccess="getData"/> @updateSuccess="getData"/>
</template> </template>