yvan/Study
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2.5.3beta版本提升 (#1116)

Browse Source 
* element-ui升级至2.2.2 部分标签存在重大变化，请重新安装依赖

* popover变更

* 增加真实的天气信息获取

* 天气功能抽离方便二开清理

* 侧边栏css优化

* 版本提升为2.5.3beta

Co-authored-by: task <121913992@qq.com>
This commit is contained in:
奇淼（piexlmax
2022-06-03 21:42:45 +08:00
committed by GitHub
co-authored by task
parent 99156155b3
commit a8d746e831
26 changed files with 135 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/view/superAdmin/api/api.vue
+4 -4
View File
@@ -30,10 +30,10 @@
<div class="gva-table-box">
<div class="gva-btn-list">
<el-button size="small" type="primary" icon="plus" @click="openDialog('addApi')">新增</el-button>
<el-popover v-model:visible="deleteVisible" placement="top" width="160">
<el-popover v-model="deleteVisible" placement="top" width="160">
<p>确定要删除吗？</p>
<div style="text-align: right; margin-top: 8px;">
<el-button size="small" type="text" @click="deleteVisible = false">取消</el-button>
<el-button size="small" type="primary" link @click="deleteVisible = false">取消</el-button>
<el-button size="small" type="primary" @click="onDelete">确定</el-button>
</div>
<template #reference>
@@ -63,13 +63,13 @@
<el-button
icon="edit"
size="small"
type="text"
type="primary" link
@click="editApiFunc(scope.row)"
>编辑</el-button>
<el-button
icon="delete"
size="small"
type="text"
type="primary" link
@click="deleteApiFunc(scope.row)"
>删除</el-button>
</template>
web/src/view/superAdmin/authority/authority.vue
+5 -5
View File
@@ -18,31 +18,31 @@
<el-button
icon="setting"
size="small"
type="text"
type="primary" link
@click="opdendrawer(scope.row)"
>设置权限</el-button>
<el-button
icon="plus"
size="small"
type="text"
type="primary" link
@click="addAuthority(scope.row.authorityId)"
>新增子角色</el-button>
<el-button
icon="copy-document"
size="small"
type="text"
type="primary" link
@click="copyAuthorityFunc(scope.row)"
>拷贝</el-button>
<el-button
icon="edit"
size="small"
type="text"
type="primary" link
@click="editAuthority(scope.row)"
>编辑</el-button>
<el-button
icon="delete"
size="small"
type="text"
type="primary" link
@click="deleteAuth(scope.row)"
>删除</el-button>
</template>
web/src/view/superAdmin/authority/components/menus.vue
+2 -2
View File
@@ -19,7 +19,7 @@
<span>{{ node.label }}</span>
<span>
<el-button
type="text"
type="primary" link
size="small"
:style="{color:row.defaultRouter === data.name?'#E6A23C':'#85ce61'}"
:disabled="!node.checked"
@@ -30,7 +30,7 @@
</span>
<span v-if="data.menuBtn.length">
<el-button
type="text"
type="primary" link
size="small"
@click="() => OpenBtn(data)"
>
web/src/view/superAdmin/dictionary/sysDictionary.vue
+5 -5
View File
@@ -85,17 +85,17 @@
<el-button
size="small"
icon="document"
type="text"
type="primary" link
@click="toDetile(scope.row)"
>详情</el-button>
<el-button
size="small"
icon="edit"
type="text"
type="primary" link
@click="updateSysDictionaryFunc(scope.row)"
>变更</el-button>
<el-popover
v-model:visible="scope.row.visible"
v-model="scope.row.visible"
placement="top"
width="160"
>
@@ -103,7 +103,7 @@
<div style="text-align: right; margin-top: 8px">
<el-button
size="small"
type="text"
type="primary" link
@click="scope.row.visible = false"
>取消</el-button>
<el-button
@@ -114,7 +114,7 @@
</div>
<template #reference>
<el-button
type="text"
type="primary" link
icon="delete"
size="small"
style="margin-left: 10px"
web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
+4 -4
View File
@@ -48,15 +48,15 @@
<el-table-column align="left" label="按钮组">
<template #default="scope">
<el-button size="small" type="text" icon="edit" @click="updateSysDictionaryDetailFunc(scope.row)">变更</el-button>
<el-popover v-model:visible="scope.row.visible" placement="top" width="160">
<el-button size="small" type="primary" link icon="edit" @click="updateSysDictionaryDetailFunc(scope.row)">变更</el-button>
<el-popover v-model="scope.row.visible" placement="top" width="160">
<p>确定要删除吗？</p>
<div style="text-align: right; margin-top: 8px;">
<el-button size="small" type="text" @click="scope.row.visible = false">取消</el-button>
<el-button size="small" type="primary" link @click="scope.row.visible = false">取消</el-button>
<el-button type="primary" size="small" @click="deleteSysDictionaryDetailFunc(scope.row)">确定</el-button>
</div>
<template #reference>
<el-button type="text" icon="delete" size="small" @click="scope.row.visible = true">删除</el-button>
<el-button type="primary" link icon="delete" size="small" @click="scope.row.visible = true">删除</el-button>
</template>
</el-popover>
</template>
web/src/view/superAdmin/menu/icon.vue
+8 -10
View File
@@ -2,20 +2,20 @@
<div>
<span class="gva-icon" style="position: absolute; z-index: 9999; padding: 3px 10px 0; ">
<el-icon>
<component :is="metaData.icon"/>
<component :is="metaData.icon" />
</el-icon>
</span>
<el-select v-model="metaData.icon" style="width:100%" clearable filterable class="gva-select" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.key"
class="select__option_item"
:label="item.key"
:value="item.key"
v-for="item in options"
:key="item.key"
class="select__option_item"
:label="item.key"
:value="item.key"
>
<span class="gva-icon" style=" padding: 3px 0 0; " :class="item.label">
<el-icon>
<component :is="item.label"/>
<component :is="item.label" />
</el-icon>
</span>
<span style="text-align: left">{{ item.key }}</span>
@@ -1173,10 +1173,8 @@ export default {
<style lang="scss">
.gva-icon {
//float: left;
color: rgb(132, 146, 166);
font-size: 13px;
//line-height: 32px;
font-size: 14px;
margin-right: 10px;
}
web/src/view/superAdmin/menu/menu.vue
+3 -4
View File
@@ -37,19 +37,19 @@
<template #default="scope">
<el-button
size="small"
type="text"
type="primary" link
icon="plus"
@click="addMenu(scope.row.ID)"
>添加子菜单</el-button>
<el-button
size="small"
type="text"
type="primary" link
icon="edit"
@click="editMenu(scope.row.ID)"
>编辑</el-button>
<el-button
size="small"
type="text"
type="primary" link
icon="delete"
@click="deleteMenu(scope.row.ID)"
>删除</el-button>
@@ -284,7 +284,6 @@ const deleteParameter = (parameters, index) => {
// 新增可控按钮
const addBtn = (form) => {
console.log(form)
if (!form.menuBtn) {
form.menuBtn = []
}
web/src/view/superAdmin/operation/sysOperationRecord.vue
+5 -5
View File
@@ -20,10 +20,10 @@
<div class="gva-table-box">
<div class="gva-btn-list">
<el-popover v-model:visible="deleteVisible" placement="top" width="160">
<el-popover v-model="deleteVisible" placement="top" width="160">
<p>确定要删除吗？</p>
<div style="text-align: right; margin-top: 8px;">
<el-button size="small" type="text" @click="deleteVisible = false">取消</el-button>
<el-button size="small" type="primary" link @click="deleteVisible = false">取消</el-button>
<el-button size="small" type="primary" @click="onDelete">确定</el-button>
</div>
<template #reference>
@@ -91,14 +91,14 @@
</el-table-column>
<el-table-column align="left" label="按钮组">
<template #default="scope">
<el-popover v-model:visible="scope.row.visible" placement="top" width="160">
<el-popover v-model="scope.row.visible" placement="top" width="160">
<p>确定要删除吗？</p>
<div style="text-align: right; margin-top: 8px;">
<el-button size="small" type="text" @click="scope.row.visible = false">取消</el-button>
<el-button size="small" type="primary" link @click="scope.row.visible = false">取消</el-button>
<el-button size="small" type="primary" @click="deleteSysOperationRecordFunc(scope.row)">确定</el-button>
</div>
<template #reference>
<el-button icon="delete" size="small" type="text" @click="scope.row.visible = true">删除</el-button>
<el-button icon="delete" size="small" type="primary" link @click="scope.row.visible = true">删除</el-button>
</template>
</el-popover>
</template>
web/src/view/superAdmin/user/user.vue
+5 -5
View File
@@ -36,18 +36,18 @@
<el-table-column label="操作" min-width="250" fixed="right">
<template #default="scope">
<el-popover v-model:visible="scope.row.visible" placement="top" width="160">
<el-popover v-model="scope.row.visible" placement="top" width="160">
<p>确定要删除此用户吗</p>
<div style="text-align: right; margin-top: 8px;">
<el-button size="small" type="text" @click="scope.row.visible = false">取消</el-button>
<el-button size="small" type="primary" link @click="scope.row.visible = false">取消</el-button>
<el-button type="primary" size="small" @click="deleteUserFunc(scope.row)">确定</el-button>
</div>
<template #reference>
<el-button type="text" icon="delete" size="small">删除</el-button>
<el-button type="primary" link icon="delete" size="small">删除</el-button>
</template>
</el-popover>
<el-button type="text" icon="edit" size="small" @click="openEdit(scope.row)">编辑</el-button>
<el-button type="text" icon="magic-stick" size="small" @click="resetPasswordFunc(scope.row)">重置密码</el-button>
<el-button type="primary" link icon="edit" size="small" @click="openEdit(scope.row)">编辑</el-button>
<el-button type="primary" link icon="magic-stick" size="small" @click="resetPasswordFunc(scope.row)">重置密码</el-button>
</template>
</el-table-column>