guoyuepeng
/
qa-regulatory-gwj-vue
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	src/views/keyprojects/platformelectronic/index.vue
main
guoyuepeng 2023-11-29 15:48:55 +08:00
parent d08d823145 82de06b2d3
commit 981ba47e84
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/keyprojects/platformelectronic/index.vue
View File

@ -52,7 +52,7 @@
<el-table-column label="操作" align="left" width="400"> <el-table-column label="操作" align="left" width="400">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="success" icon="el-icon-caret-right" size="mini" @click="showVideo(row)">播放</el-button> <el-button type="success" icon="el-icon-caret-right" size="mini" @click="showVideo(row)">播放</el-button>
<!-- <el-button type="info" icon="el-icon-location-information" size="mini" @click="goEdit(row)">定位</el-button>--> <!-- <el-button type="info" icon="el-icon-location-information" size="mini" @click="goEdit(row)">定位</el-button>-->
<el-button type="primary" icon="el-icon-edit" size="mini" @click="goEdit(row)">编辑</el-button> <el-button type="primary" icon="el-icon-edit" size="mini" @click="goEdit(row)">编辑</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -60,7 +60,7 @@
<div class="page-btn-group"> <div class="page-btn-group">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button> <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
<!-- <el-button type="success" icon="el-icon-caret-right" @click="showAll">播放全部</el-button>--> <!-- <el-button type="success" icon="el-icon-caret-right" @click="showAll">播放全部</el-button>-->
</div> </div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getAllList" /> <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getAllList" />
</div> </div>
@ -509,8 +509,8 @@ export default {
} }
</script> </script>
<style> <style>
#map{ #map{
width: 1000px; width: 1000px;
height: 500px; height: 500px;
} }
</style> </style>