|
@@ -190,7 +190,7 @@
|
|
|
class="playBack"
|
|
class="playBack"
|
|
|
@click="playBackDialogVisible = true"
|
|
@click="playBackDialogVisible = true"
|
|
|
></div>
|
|
></div>
|
|
|
- <div @click="addEquipDialogVisible = true" class="addequip"></div>
|
|
|
|
|
|
|
+ <!-- <div @click="addEquipDialogVisible = true" class="addequip"></div> -->
|
|
|
<div @click="fScreenFun()" class="fSBtn1"></div>
|
|
<div @click="fScreenFun()" class="fSBtn1"></div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -354,7 +354,8 @@ export default {
|
|
|
filters: {
|
|
filters: {
|
|
|
formatName: function (value) {
|
|
formatName: function (value) {
|
|
|
//设备名字
|
|
//设备名字
|
|
|
- if (value.device_name) {
|
|
|
|
|
|
|
+ var name = value.device_name.trim()
|
|
|
|
|
+ if (name) {
|
|
|
return `${value.device_name}-${value.jktype}`;
|
|
return `${value.device_name}-${value.jktype}`;
|
|
|
}else{
|
|
}else{
|
|
|
return `${value.device_id}`;
|
|
return `${value.device_id}`;
|