Skip to content

Commit 260b0af

Browse files
author
pixel
committed
Merge branches 'develop' and 'plug' of https://github.com/piexlmax/QMPlus into plug
2 parents d8d3cbb + daad4c3 commit 260b0af

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

‎server/resource/template/fe/table.vue.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
4242
<el-button type="primary" size="mini" @click="delete{{.StructName}}(scope.row)">确定</el-button>
4343
</div>
44-
<el-button type="text" size="mini" slot="reference">删除</el-button>
44+
<el-button type="danger" icon="el-icon-delete" size="mini" slot="reference">删除</el-button>
4545
</el-popover>
4646
</template>
4747
</el-table-column>

‎web/src/view/example/customer/customer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
3232
<el-button type="primary" size="mini" @click="deleteCustomer(scope.row)">确定</el-button>
3333
</div>
34-
<el-button type="text" size="mini" slot="reference">删除</el-button>
34+
<el-button type="danger" icon="el-icon-delete" size="mini" slot="reference">删除</el-button>
3535
</el-popover>
3636
</template>
3737
</el-table-column>

‎web/src/view/superAdmin/api/api.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151

5252
<el-table-column fixed="right" label="操作" width="200">
5353
<template slot-scope="scope">
54-
<el-button @click="editApi(scope.row)" size="small" type="text">编辑</el-button>
55-
<el-button @click="deleteApi(scope.row)" size="small" type="text">删除</el-button>
54+
<el-button @click="editApi(scope.row)" size="small" type="primary" icon="el-icon-edit">编辑</el-button>
55+
<el-button @click="deleteApi(scope.row)" size="small" type="danger" icon="el-icon-delete">删除</el-button>
5656
</template>
5757
</el-table-column>
5858
</el-table>

‎web/src/view/superAdmin/authority/authority.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<el-table-column label="角色名称" min-width="180" prop="authorityName"></el-table-column>
1616
<el-table-column fixed="right" label="操作" width="460">
1717
<template slot-scope="scope">
18-
<el-button @click="opdendrawer(scope.row)" size="small" type="text">设置权限</el-button>
19-
<el-button @click="addAuthority(scope.row.authorityId)" size="small" type="text">新增子角色</el-button>
20-
<el-button @click="copyAuthority(scope.row)" size="small" type="text">拷贝角色</el-button>
21-
<el-button @click="editAuthority(scope.row)" size="small" type="text">编辑角色</el-button>
22-
<el-button @click="deleteAuth(scope.row)" size="small" type="text">删除角色</el-button>
18+
<el-button @click="opdendrawer(scope.row)" size="small" type="primary">设置权限</el-button>
19+
<el-button @click="addAuthority(scope.row.authorityId)" size="small" type="primary" icon="el-icon-plus">新增子角色</el-button>
20+
<el-button @click="copyAuthority(scope.row)" size="small" type="primary" icon="el-icon-copy-document" >拷贝</el-button>
21+
<el-button @click="editAuthority(scope.row)" size="small" type="primary" icon="el-icon-edit">编辑</el-button>
22+
<el-button @click="deleteAuth(scope.row)" size="small" type="danger" icon="el-icon-delete">删除</el-button>
2323

2424
</template>
2525
</el-table-column>

‎web/src/view/superAdmin/menu/menu.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
</el-table-column>
3131
<el-table-column fixed="right" label="操作" width="300">
3232
<template slot-scope="scope">
33-
<el-button @click="deleteMenu(scope.row.ID)" size="small" type="text">删除菜单</el-button>
34-
<el-button @click="editMenu(scope.row.ID)" size="small" type="text">编辑菜单</el-button>
35-
<el-button @click="addMenu(scope.row.ID)" size="small" type="text">添加子菜单</el-button>
33+
<el-button @click="addMenu(scope.row.ID)" size="small" type="primary" icon="el-icon-edit">添加子菜单</el-button>
34+
<el-button @click="editMenu(scope.row.ID)" size="small" type="primary" icon="el-icon-edit" >编辑</el-button>
35+
<el-button @click="deleteMenu(scope.row.ID)" size="small" type="danger" icon="el-icon-delete" >删除</el-button>
3636
</template>
3737
</el-table-column>
3838
</el-table>

‎web/src/view/superAdmin/user/user.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
3535
<el-button type="primary" size="mini" @click="deleteUser(scope.row)">确定</el-button>
3636
</div>
37-
<el-button type="text" size="small" slot="reference">删除</el-button>
37+
<el-button type="danger" icon="el-icon-delete" size="small" slot="reference">删除</el-button>
3838
</el-popover>
3939
</template>
4040
</el-table-column>

‎web/src/view/systemTools/autoCode/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</el-table-column>
4242
<el-table-column label="操作" width="250">
4343
<template slot-scope="scope">
44-
<el-button size="mini" type="text" @click="editAndAddField(scope.row)">编辑</el-button>
44+
<el-button size="mini" type="primary" icon="el-icon-edit" @click="editAndAddField(scope.row)">编辑</el-button>
4545
<el-button size="mini" type="text" :disabled="scope.$index == 0" @click="moveUpField(scope.$index)">上移</el-button>
4646
<el-button size="mini" type="text" :disabled="(scope.$index + 1) == form.fields.length" @click="moveDownField(scope.$index)">下移</el-button>
4747
<el-popover placement="top" v-model="scope.row.visible">
@@ -50,7 +50,7 @@
5050
<el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
5151
<el-button type="primary" size="mini" @click="deleteField(scope.$index)">确定</el-button>
5252
</div>
53-
<el-button size="mini" type="text" slot="reference">删除</el-button>
53+
<el-button size="mini" type="danger" icon="el-icon-delete" slot="reference">删除</el-button>
5454
</el-popover>
5555
</template>
5656
</el-table-column>

0 commit comments

Comments
 (0)