merge upstream
This commit is contained in:
@ -118,7 +118,7 @@
|
|||||||
'battery-yellow': Number(scope.row.battery) >= 20 && Number(scope.row.battery) < 80,
|
'battery-yellow': Number(scope.row.battery) >= 20 && Number(scope.row.battery) < 80,
|
||||||
'battery-green': Number(scope.row.battery) >= 80 && Number(scope.row.battery) <= 100
|
'battery-green': Number(scope.row.battery) >= 80 && Number(scope.row.battery) <= 100
|
||||||
}">
|
}">
|
||||||
{{ scope.row.battery }}%
|
{{ scope.row.battery || '0'}}%
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@ -306,7 +306,6 @@ const handleControl = (row: any) => {
|
|||||||
const detailPageUrl = row.detailPageUrl;
|
const detailPageUrl = row.detailPageUrl;
|
||||||
const basePath = detailPageUrl.replace(/\/index$/, '');
|
const basePath = detailPageUrl.replace(/\/index$/, '');
|
||||||
const dynamicPath = `/${basePath}/${deviceId}`;
|
const dynamicPath = `/${basePath}/${deviceId}`;
|
||||||
debugger;
|
|
||||||
router.push(dynamicPath); // 跳转路由
|
router.push(dynamicPath); // 跳转路由
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user