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

Merge branch 'gva-vue3-fedev' into last

Browse Source
This commit is contained in:
奇淼（piexlmax
2021-09-21 16:34:53 +08:00
committed by GitHub
parent d69243d720 c3480b3c49
commit cd576a1e02
42 changed files with 700 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/view/dashboard/dashbordTable/dashbordTable.vue
-5
View File
@@ -10,11 +10,6 @@
<div class="flex-3 flex form">{{ item.from }}</div>
</div>
</div>
<!-- <el-table v-loading="loading" :data="dataTimeline" style="width: 100%">
<el-table-column prop="from" show-overflow-tooltip label="日期" width="180" />
<el-table-column prop="title" show-overflow-tooltip label="推送者" width="120" />
<el-table-column prop="message" show-overflow-tooltip label="commit 信息" />
</el-table> -->
</div>
</template>
web/src/view/dashboard/index.vue
+45 -43
View File
@@ -1,12 +1,12 @@
<template>
<div class="page">
<div class="gva-card-box">
<div class="gva-card dashbord1">
<div class="dashbord1-left">
<div class="dashbord1-left-title">早安，管理员，请开始一天的工作吧</div>
<div class="dashbord1-left-dot">今日晴，0℃ - 10℃，天气寒冷，注意添加衣物。</div>
<div class="dashbord1-left-rows">
<el-row :gutter="20">
<div class="gva-card gva-top-card">
<div class="gva-top-card-left">
<div class="gva-top-card-left-title">早安，管理员，请开始一天的工作吧</div>
<div class="gva-top-card-left-dot">今日晴，0℃ - 10℃，天气寒冷，注意添加衣物。</div>
<div class="gva-top-card-left-rows">
<el-row>
<el-col :span="8" :xs="24" :sm="8">
<div class="flex-center">
<i class="el-icon-sort icon" />今日流量 (1231231)
@@ -24,30 +24,26 @@
</el-col>
</el-row>
</div>
</div>
<img src="@/assets/dashbord.png" class="dashbord1-right" alt>
</div>
</div>
<div class="gva-card-box">
<div class="gva-card dashbord2">
<div>
<div class="dashbord2-item">
使用教学：
<a
style="color:#409EFF"
target="view_window"
href="https://www.bilibili.com/video/BV1Rg411u7xH/"
>https://www.bilibili.com/video/BV1Rg411u7xH</a>
</div>
<div class="dashbord2-item">
插件仓库：
<a
style="color:#409EFF"
target="view_window"
href="https://github.com/flipped-aurora/gva-plugins"
>https://github.com/flipped-aurora/gva-plugins</a>
<div>
<div class="gva-top-card-left-item">
使用教学：
<a
style="color:#409EFF"
target="view_window"
href="https://www.bilibili.com/video/BV1Rg411u7xH/"
>https://www.bilibili.com/video/BV1Rg411u7xH</a>
</div>
<div class="gva-top-card-left-item">
插件仓库：
<a
style="color:#409EFF"
target="view_window"
href="https://github.com/flipped-aurora/gva-plugins"
>https://github.com/flipped-aurora/gva-plugins</a>
</div>
</div>
</div>
<img src="@/assets/dashbord.png" class="gva-top-card-right" alt>
</div>
</div>
<div class="gva-card-box">
@@ -183,8 +179,8 @@ export default {
overflow: hidden;
box-shadow: 0 0 7px 1px rgba(0, 0, 0, 0.03);
}
.dashbord1 {
height: 196px;
.gva-top-card {
height: 260px;
@include flex-center;
justify-content: space-between;
color: #777;
@@ -192,7 +188,6 @@ export default {
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
&-title {
font-size: 22px;
color: #343844;
@@ -200,13 +195,21 @@ export default {
&-dot {
font-size: 14px;
color: #6B7687;
margin-top: 24px;
}
&-rows {
// margin-top: 15px;
margin-top: 18px;
color: #6B7687;
width: 600px;
align-items: center;
}
&-item{
+.gva-top-card-left-item{
margin-top: 24px;
}
margin-top: 14px;
}
}
&-right {
height: 600px;
@@ -222,16 +225,6 @@ export default {
padding-bottom: 20px;
border-bottom: 1px solid #e8e8e8;
}
.dashbord2 {
@include flex-center;
justify-content: flex-start;
&-item {
&+.dashbord2-item{
margin-top:24px;
}
line-height: 25px;
}
}
.quick-entrance-title {
height: 30px;
font-size: 22px;
@@ -245,6 +238,15 @@ export default {
text-align: center;
color: #333;
.quick-entrance-item {
padding: 16px 28px;
margin-top: -16px;
margin-bottom: -16px;
border-radius: 4px;
transition: all 0.2s;
&:hover{
box-shadow: 0px 0px 7px 0px rgba(217, 217, 217, 0.55);
}
cursor: pointer;
height: auto;
text-align: center;
// align-items: center;
@@ -284,7 +286,7 @@ export default {
@media (max-width: 750px) {
.gva-card {
padding: 20px 10px !important;
.dashbord1 {
.gva-top-card {
height: auto;
&-left {
&-title {
@@ -299,7 +301,7 @@ export default {
display: none;
}
}
.dashbord2 {
.gva-middle-card {
&-item {
line-height: 20px;
}
web/src/view/example/customer/customer.vue
+5 -5
View File
@@ -11,15 +11,15 @@
tooltip-effect="dark"
>
<el-table-column type="selection" width="55" />
<el-table-column label="接入日期" width="180">
<el-table-column align="center" label="接入日期" width="180">
<template #default="scope">
<span>{{ formatDate(scope.row.CreatedAt) }}</span>
</template>
</el-table-column>
<el-table-column label="姓名" prop="customerName" width="120" />
<el-table-column label="电话" prop="customerPhoneData" width="120" />
<el-table-column label="接入人ID" prop="sysUserId" width="120" />
<el-table-column label="按钮组" min-width="160">
<el-table-column align="center" label="姓名" prop="customerName" width="120" />
<el-table-column align="center" label="电话" prop="customerPhoneData" width="120" />
<el-table-column align="center" label="接入人ID" prop="sysUserId" width="120" />
<el-table-column align="center" label="按钮组" min-width="160">
<template #default="scope">
<el-button size="small" type="text" icon="el-icon-edit" @click="updateCustomer(scope.row)">变更</el-button>
<el-popover v-model:visible="scope.row.visible" placement="top" width="160">
web/src/view/example/excel/excel.vue
+7 -7
View File
@@ -16,18 +16,18 @@
<el-button class="excel-btn" size="mini" type="success" icon="el-icon-download" @click="downloadExcelTemplate()">下载模板</el-button>
</div>
<el-table :data="tableData" row-key="ID">
<el-table-column label="ID" min-width="100" prop="ID" />
<el-table-column show-overflow-tooltip label="路由Name" min-width="160" prop="name" />
<el-table-column show-overflow-tooltip label="路由Path" min-width="160" prop="path" />
<el-table-column label="是否隐藏" min-width="100" prop="hidden">
<el-table-column align="center" label="ID" min-width="100" prop="ID" />
<el-table-column align="center" show-overflow-tooltip label="路由Name" min-width="160" prop="name" />
<el-table-column align="center" show-overflow-tooltip label="路由Path" min-width="160" prop="path" />
<el-table-column align="center" label="是否隐藏" min-width="100" prop="hidden">
<template #default="scope">
<span>{{ scope.row.hidden?"隐藏":"显示" }}</span>
</template>
</el-table-column>
<el-table-column label="父节点" min-width="90" prop="parentId" />
<el-table-column label="排序" min-width="70" prop="sort" />
<el-table-column label="文件路径" min-width="360" prop="component" />
<el-table-column align="center" label="父节点" min-width="90" prop="parentId" />
<el-table-column align="center" label="排序" min-width="70" prop="sort" />
<el-table-column align="center" label="文件路径" min-width="360" prop="component" />
</el-table>
</div>
</div>
web/src/view/example/upload/upload.vue
+6 -6
View File
@@ -23,19 +23,19 @@
</div>
<el-table :data="tableData">
<el-table-column label="预览" width="100">
<el-table-column align="center" label="预览" width="100">
<template #default="scope">
<CustomPic pic-type="file" :pic-src="scope.row.url" />
</template>
</el-table-column>
<el-table-column label="日期" prop="UpdatedAt" width="180">
<el-table-column align="center" label="日期" prop="UpdatedAt" width="180">
<template #default="scope">
<div>{{ formatDate(scope.row.UpdatedAt) }}</div>
</template>
</el-table-column>
<el-table-column label="文件名" prop="name" width="180" />
<el-table-column label="链接" prop="url" min-width="300" />
<el-table-column label="标签" prop="tag" width="100">
<el-table-column align="center" label="文件名" prop="name" width="180" />
<el-table-column align="center" label="链接" prop="url" min-width="300" />
<el-table-column align="center" label="标签" prop="tag" width="100">
<template #default="scope">
<el-tag
:type="scope.row.tag === 'jpg' ? 'primary' : 'success'"
@@ -43,7 +43,7 @@
>{{ scope.row.tag }}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="160">
<el-table-column align="center" label="操作" width="160">
<template #default="scope">
<el-button size="small" icon="el-icon-download" type="text" @click="downloadFile(scope.row)">下载</el-button>
<el-button size="small" icon="el-icon-delete" type="text" @click="deleteFile(scope.row)">删除</el-button>
web/src/view/layout/index.vue
+4 -4
View File
@@ -24,14 +24,14 @@
<el-col>
<el-header class="header-cont">
<el-row class="pd-0">
<el-col :xs="2" :lg="1" :md="1" :sm="1" :xl="1">
<el-col :xs="2" :lg="1" :md="1" :sm="1" :xl="1" style="z-index:100">
<div class="menu-total" @click="totalCollapse">
<i v-if="isCollapse" class="el-icon-s-unfold" />
<i v-else class="el-icon-s-fold" />
</div>
</el-col>
<el-col :xs="10" :lg="14" :md="14" :sm="9" :xl="14">
<el-breadcrumb class="breadcrumb" separator-class="el-icon-arrow-right">
<el-col :xs="10" :lg="14" :md="14" :sm="9" :xl="14" :pull="1">
<el-breadcrumb class="breadcrumb">
<el-breadcrumb-item
v-for="item in matched.slice(1, matched.length)"
:key="item.path"
@@ -39,7 +39,7 @@
</el-breadcrumb>
</el-col>
<el-col :xs="12" :lg="9" :md="9" :sm="14" :xl="9">
<div class="fl-right right-box">
<div class="right-box">
<Search />
<Screenfull class="screenfull" :style="{ cursor: 'pointer' }" />
<el-dropdown>
web/src/view/layout/screenfull/index.vue
+5 -34
View File
@@ -1,38 +1,11 @@
<template>
<div @click="click">
<!-- <svg
t="1508738709248"
class="screenfull-svg"
viewBox="0 0 1024 1024"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
p-id="2069"
xmlns:xlink="http://www.w3.org/1999/xlink"
width="32"
height="32"
v-if="isShow"
>
<path
d="M333.493443 428.647617 428.322206 333.832158 262.572184 168.045297 366.707916 64.444754 64.09683 64.444754 63.853283 366.570793 167.283957 262.460644Z"
p-id="2070"/>
<path
d="M854.845439 760.133334 688.61037 593.95864 593.805144 688.764889 759.554142 854.56096 655.44604 958.161503 958.055079 958.161503 958.274066 656.035464Z"
p-id="2071"/>
<path
d="M688.535669 428.550403 854.31025 262.801405 957.935352 366.921787 957.935352 64.34754 655.809313 64.081481 759.919463 167.535691 593.70793 333.731874Z"
p-id="2072"/>
<path
d="M333.590658 594.033341 167.8171 759.804852 64.218604 655.67219 64.218604 958.270996 366.342596 958.502263 262.234493 855.071589 428.421466 688.86108Z"
p-id="2073"/>
</svg> -->
<svg
v-if="isShow"
t="1590133227479"
class="screenfull-svg"
viewBox="0 0 1024 1024"
version="1.1"
width="20"
height="20"
xmlns="http://www.w3.org/2000/svg"
>
<path id="svg_1" d="m928.512,959.744a32,32 0 0 1 -32,-32l0,-256a32,32 0 0 1 64,0l0,256a32,32 0 0 1 -32,32z" />
@@ -63,8 +36,6 @@
xmlns="http://www.w3.org/2000/svg"
p-id="1862"
xmlns:xlink="http://www.w3.org/1999/xlink"
width="20"
height="20"
>
<path d="M928.512 959.744a32 32 0 0 1-32-32v-256a32 32 0 0 1 64 0v256a32 32 0 0 1-32 32z" fill="" p-id="1863" />
<path
@@ -135,13 +106,13 @@ export default {
}
</script>
<style scoped>
<style scoped lang="scss">
.screenfull-svg {
width: 17px;
height: 17px;
width: 16px;
height: 16px;
cursor: pointer;
fill: #606266;
vertical-align: middle;
margin-right: 15px;
margin-right: 32px;
fill: rgba(0, 0, 0, 0.45);
}
</style>
web/src/view/layout/search/search.vue
+13 -8
View File
@@ -20,13 +20,16 @@
</div>
</transition>
<div
:style="{display:'inline-block',float:'right',width:'31px',textAlign:'left',fontSize:'16px',paddingTop:'2px'}"
v-if="btnShow"
class="user-box"
>
<i :style="{cursor:'pointer',paddingLeft:'1px'}" class="el-icon-refresh reload" :class="[reload ? 'reloading' : '']" @click="handleReload" />
<i class="el-icon-refresh reload" :class="[reload ? 'reloading' : '']" @click="handleReload" />
</div>
<div :style="{display:'inline-block',float:'right'}" class="user-box">
<i :style="{cursor:'pointer'}" class="el-icon-search search-icon" @click="showSearch()" />
<div
v-if="btnShow"
class="user-box"
>
<i class="el-icon-search search-icon" @click="showSearch()" />
</div>
</div>
</template>
@@ -41,6 +44,7 @@ export default {
return {
value: '',
show: false,
btnShow: true,
reload: false
}
},
@@ -55,8 +59,12 @@ export default {
},
hiddenSearch() {
this.show = false
setTimeout(() => {
this.btnShow = true
}, 500)
},
showSearch() {
this.btnShow = false
this.show = true
this.$nextTick(() => {
this.$refs['search-input'].focus()
@@ -74,10 +82,7 @@ export default {
</script>
<style scoped lang="scss">
.reload{
font-size: 17px;
&:hover{
transform: scale(1.02)
}
font-size: 18px;
}
.reloading{
web/src/view/superAdmin/api/api.vue
+11 -12
View File
@@ -46,23 +46,22 @@
</template>
</el-popover>
</div>
<el-table
:data="tableData"
@sort-change="sortChange"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" />
<el-table-column label="id" min-width="60" prop="ID" sortable="custom" />
<el-table-column label="API路径" min-width="150" prop="path" sortable="custom" />
<el-table-column label="API分组" min-width="150" prop="apiGroup" sortable="custom" />
<el-table-column label="API简介" min-width="150" prop="description" sortable="custom" />
<el-table-column label="请求" min-width="150" prop="method" sortable="custom">
<el-table :data="tableData" @sort-change="sortChange" @selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="55"
/>
<el-table-column align="center" label="id" min-width="60" prop="ID" sortable="custom" />
<el-table-column align="center" label="API路径" min-width="150" prop="path" sortable="custom" />
<el-table-column align="center" label="API分组" min-width="150" prop="apiGroup" sortable="custom" />
<el-table-column align="center" label="API简介" min-width="150" prop="description" sortable="custom" />
<el-table-column align="center" label="请求" min-width="150" prop="method" sortable="custom">
<template #default="scope">
<div>{{ scope.row.method }} / {{ methodFiletr(scope.row.method) }}</div>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="200">
<el-table-column align="center" fixed="right" label="操作" width="200">
<template #default="scope">
<el-button icon="el-icon-edit" size="small" type="text" @click="editApi(scope.row)">编辑</el-button>
<el-popconfirm
web/src/view/superAdmin/authority/authority.vue
+2 -2
View File
@@ -11,8 +11,8 @@
style="width: 100%"
>
<el-table-column label="角色ID" min-width="180" prop="authorityId" />
<el-table-column label="角色名称" min-width="180" prop="authorityName" />
<el-table-column label="操作" width="460">
<el-table-column align="center" label="角色名称" min-width="180" prop="authorityName" />
<el-table-column align="center" label="操作" width="460">
<template #default="scope">
<el-button
icon="el-icon-setting"
web/src/view/superAdmin/authority/components/datas.vue
+4 -3
View File
@@ -9,16 +9,17 @@
<el-checkbox-group v-model="dataAuthorityId" @change="selectAuthority">
<el-checkbox v-for="(item,key) in authoritys" :key="key" :label="item">{{ item.authorityName }}</el-checkbox>
</el-checkbox-group>
<span>
此功能仅用于创建角色和角色的many2many关系表，具体使用还须自己结合表实现业务，详情参考示例代码（客户示例）
</span>
<warning-bar title="此功能仅用于创建角色和角色的many2many关系表，具体使用还须自己结合表实现业务，详情参考示例代码（客户示例）" />
</div>
</template>
<script>
import { setDataAuthority } from '@/api/authority'
import warningBar from '@/components/warningBar/warningBar.vue'
export default {
name: 'Datas',
components: { warningBar },
props: {
row: {
default: function() {
web/src/view/superAdmin/dictionary/sysDictionary.vue
+14 -10
View File
@@ -33,21 +33,21 @@
tooltip-effect="dark"
>
<el-table-column type="selection" width="55" />
<el-table-column label="日期" width="180">
<el-table-column align="center" label="日期" width="180">
<template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
</el-table-column>
<el-table-column label="字典名（中）" prop="name" width="240" />
<el-table-column align="center" label="字典名（中）" prop="name" width="160" />
<el-table-column label="字典名（英）" prop="type" width="180" />
<el-table-column align="center" label="字典名（英）" prop="type" width="120" />
<el-table-column label="状态" prop="status" width="120">
<el-table-column align="center" label="状态" prop="status" width="120">
<template #default="scope">{{ formatBoolean(scope.row.status) }}</template>
</el-table-column>
<el-table-column label="描述" prop="desc" width="280" />
<el-table-column align="center" label="描述" prop="desc" width="280" />
<el-table-column label="按钮组">
<el-table-column align="center" label="按钮组">
<template #default="scope">
<el-button size="mini" icon="el-icon-document" type="text" @click="toDetile(scope.row)">详情</el-button>
<el-button size="mini" icon="el-icon-edit" type="text" @click="updateSysDictionary(scope.row)">变更</el-button>
@@ -64,7 +64,10 @@
</template>
</el-table-column>
</el-table>
<warning-bar
title="获取字典且缓存方法已在前端utils/dictionary 已经封装完成 不必自己书写 使用方法查看文件内注释"
style="margin-top:12px"
/>
<div class="gva-pagination">
<el-pagination
:current-page="page"
@@ -108,10 +111,7 @@
<el-button size="small" type="primary" @click="enterDialog">确 定</el-button>
</div>
</template>
</el-dialog>
<div style="margin-top:40px;color:red">获取字典且缓存方法已在前端utils/dictionary 已经封装完成 不必自己书写 使用方法查看文件内注释</div>
</div>
</template>
@@ -124,8 +124,12 @@ import {
getSysDictionaryList
} from '@/api/sysDictionary' // 此处请自行替换地址
import infoList from '@/mixins/infoList'
import warningBar from '@/components/warningBar/warningBar.vue'
export default {
name: 'SysDictionary',
components: {
warningBar
},
mixins: [infoList],
data() {
return {
web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
+6 -6
View File
@@ -31,21 +31,21 @@
tooltip-effect="dark"
>
<el-table-column type="selection" width="55" />
<el-table-column label="日期" width="180">
<el-table-column align="center" label="日期" width="180">
<template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
</el-table-column>
<el-table-column label="展示值" prop="label" width="120" />
<el-table-column align="center" label="展示值" prop="label" width="120" />
<el-table-column label="字典值" prop="value" width="120" />
<el-table-column align="center" label="字典值" prop="value" width="120" />
<el-table-column label="启用状态" prop="status" width="120">
<el-table-column align="center" label="启用状态" prop="status" width="120">
<template #default="scope">{{ formatBoolean(scope.row.status) }}</template>
</el-table-column>
<el-table-column label="排序标记" prop="sort" width="120" />
<el-table-column align="center" label="排序标记" prop="sort" width="120" />
<el-table-column label="按钮组">
<el-table-column align="center" label="按钮组">
<template #default="scope">
<el-button size="small" type="text" icon="el-icon-edit" @click="updateSysDictionaryDetail(scope.row)">变更</el-button>
<el-popover v-model:visible="scope.row.visible" placement="top" width="160">
web/src/view/superAdmin/menu/icon.vue
+1 -1
View File
@@ -5,7 +5,7 @@
:class="'el-icon-'+ metaData.icon"
style="position: absolute; z-index: 9999; padding: 5px 10px; "
/>
<el-select v-model="metaData.icon" clearable filterable class="gva-select" placeholder="请选择">
<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" :label="item.key" :value="item.key">
<span class="icon" :class="item.label" />
<span style="float: left">{{ item.key }}</span>
web/src/view/superAdmin/menu/menu.vue
+18 -17
View File
@@ -7,29 +7,29 @@
<!-- 由于此处菜单跟左侧列表一一对应所以不需要分页 pageSize默认999 -->
<el-table :data="tableData" row-key="ID">
<el-table-column label="ID" min-width="100" prop="ID" />
<el-table-column label="路由Name" show-overflow-tooltip min-width="160" prop="name" />
<el-table-column label="路由Path" show-overflow-tooltip min-width="160" prop="path" />
<el-table-column label="是否隐藏" min-width="100" prop="hidden">
<el-table-column align="center" label="ID" min-width="100" prop="ID" />
<el-table-column align="center" label="路由Name" show-overflow-tooltip min-width="160" prop="name" />
<el-table-column align="center" label="路由Path" show-overflow-tooltip min-width="160" prop="path" />
<el-table-column align="center" label="是否隐藏" min-width="100" prop="hidden">
<template #default="scope">
<span>{{ scope.row.hidden?"隐藏":"显示" }}</span>
</template>
</el-table-column>
<el-table-column label="父节点" min-width="90" prop="parentId" />
<el-table-column label="排序" min-width="70" prop="sort" />
<el-table-column label="文件路径" min-width="360" prop="component" />
<el-table-column label="展示名称" min-width="120" prop="authorityName">
<el-table-column align="center" label="父节点" min-width="90" prop="parentId" />
<el-table-column align="center" label="排序" min-width="70" prop="sort" />
<el-table-column align="center" label="文件路径" min-width="360" prop="component" />
<el-table-column align="center" label="展示名称" min-width="120" prop="authorityName">
<template #default="scope">
<span>{{ scope.row.meta.title }}</span>
</template>
</el-table-column>
<el-table-column label="图标" min-width="140" prop="authorityName">
<el-table-column align="center" label="图标" min-width="140" prop="authorityName">
<template #default="scope">
<i :class="`el-icon-${scope.row.meta.icon}`" />
<span>{{ scope.row.meta.icon }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="300">
<el-table-column align="center" fixed="right" label="操作" width="300">
<template #default="scope">
<el-button
size="mini"
@@ -96,6 +96,7 @@
<el-form-item label="父节点ID" style="width:30%">
<el-cascader
v-model="form.parentId"
style="width:100%"
:disabled="!isEdit"
:options="menuOption"
:props="{ checkStrictly: true,label:'title',value:'ID',disabled:'disabled',emitPath:false}"
@@ -111,19 +112,19 @@
<el-input v-model="form.meta.title" autocomplete="off" />
</el-form-item>
<el-form-item label="图标" prop="meta.icon" style="width:30%">
<icon :meta="form.meta" />
<icon :meta="form.meta" style="width:100%" />
</el-form-item>
<el-form-item label="排序标记" prop="sort" style="width:30%">
<el-input v-model.number="form.sort" autocomplete="off" />
</el-form-item>
<el-form-item label="KeepAlive" prop="meta.keepAlive" style="width:30%">
<el-select v-model="form.meta.keepAlive" placeholder="是否keepAlive缓存页面">
<el-select v-model="form.meta.keepAlive" style="width:100%" placeholder="是否keepAlive缓存页面">
<el-option :value="false" label="否" />
<el-option :value="true" label="是" />
</el-select>
</el-form-item>
<el-form-item label="CloseTab" prop="meta.closeTab" style="width:30%">
<el-select v-model="form.meta.closeTab" placeholder="是否自动关闭tab">
<el-select v-model="form.meta.closeTab" style="width:100%" placeholder="是否自动关闭tab">
<el-option :value="false" label="否" />
<el-option :value="true" label="是" />
</el-select>
@@ -137,7 +138,7 @@
@click="addParameter(form)"
>新增菜单参数</el-button>
<el-table :data="form.parameters" style="width: 100%">
<el-table-column prop="type" label="参数类型" width="180">
<el-table-column align="center" prop="type" label="参数类型" width="180">
<template #default="scope">
<el-select v-model="scope.row.type" placeholder="请选择">
<el-option key="query" value="query" label="query" />
@@ -145,21 +146,21 @@
</el-select>
</template>
</el-table-column>
<el-table-column prop="key" label="参数key" width="180">
<el-table-column align="center" prop="key" label="参数key" width="180">
<template #default="scope">
<div>
<el-input v-model="scope.row.key" />
</div>
</template>
</el-table-column>
<el-table-column prop="value" label="参数值">
<el-table-column align="center" prop="value" label="参数值">
<template #default="scope">
<div>
<el-input v-model="scope.row.value" />
</div>
</template>
</el-table-column>
<el-table-column>
<el-table-column align="center">
<template #default="scope">
<div>
<el-button
web/src/view/superAdmin/operation/sysOperationRecord.vue
+10 -10
View File
@@ -38,26 +38,26 @@
tooltip-effect="dark"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" />
<el-table-column label="操作人" width="140">
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="操作人" width="140">
<template #default="scope">
<div>{{ scope.row.user.userName }}({{ scope.row.user.nickName }})</div>
</template>
</el-table-column>
<el-table-column label="日期" width="180">
<el-table-column align="center" label="日期" width="180">
<template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
</el-table-column>
<el-table-column label="状态码" prop="status" width="120">
<el-table-column align="center" label="状态码" prop="status" width="120">
<template #default="scope">
<div>
<el-tag type="success">{{ scope.row.status }}</el-tag>
</div>
</template>
</el-table-column>
<el-table-column label="请求IP" prop="ip" width="120" />
<el-table-column label="请求方法" prop="method" width="120" />
<el-table-column label="请求路径" prop="path" width="240" />
<el-table-column label="请求" prop="path" width="80">
<el-table-column align="center" label="请求IP" prop="ip" width="120" />
<el-table-column align="center" label="请求方法" prop="method" width="120" />
<el-table-column align="center" label="请求路径" prop="path" width="240" />
<el-table-column align="center" label="请求" prop="path" width="80">
<template #default="scope">
<div>
<el-popover v-if="scope.row.body" placement="top-start" trigger="hover">
@@ -73,7 +73,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="响应" prop="path" width="80">
<el-table-column align="center" label="响应" prop="path" width="80">
<template #default="scope">
<div>
<el-popover v-if="scope.row.resp" placement="top-start" trigger="hover">
@@ -88,7 +88,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="按钮组">
<el-table-column align="center" label="按钮组">
<template #default="scope">
<el-popover v-model:visible="scope.row.visible" placement="top" width="160">
<p>确定要删除吗？</p>
web/src/view/superAdmin/user/user.vue
+6 -6
View File
@@ -5,17 +5,17 @@
<el-button size="mini" type="primary" icon="el-icon-plus" @click="addUser">新增用户</el-button>
</div>
<el-table :data="tableData">
<el-table-column label="头像" min-width="50">
<el-table-column align="center" label="头像" min-width="50">
<template #default="scope">
<div :style="{'textAlign':'center'}">
<CustomPic :pic-src="scope.row.headerImg" />
</div>
</template>
</el-table-column>
<el-table-column label="UUID" min-width="250" prop="uuid" />
<el-table-column label="用户名" min-width="150" prop="userName" />
<el-table-column label="昵称" min-width="150" prop="nickName" />
<el-table-column label="用户角色" min-width="150">
<el-table-column align="center" label="UUID" min-width="250" prop="uuid" />
<el-table-column align="center" label="用户名" min-width="150" prop="userName" />
<el-table-column align="center" label="昵称" min-width="150" prop="nickName" />
<el-table-column align="center" label="用户角色" min-width="150">
<template #default="scope">
<el-cascader
v-model="scope.row.authorityIds"
@@ -29,7 +29,7 @@
/>
</template>
</el-table-column>
<el-table-column label="操作" min-width="150">
<el-table-column align="center" label="操作" min-width="150">
<template #default="scope">
<el-popover v-model:visible="scope.row.visible" placement="top" width="160">
<p>确定要删除此用户吗</p>
web/src/view/systemTools/autoCode/component/previewCodeDialg.vue
-11
View File
@@ -1,10 +1,5 @@
<template>
<div class="previewCode">
<div class="previewCodeTool">
<p>操作栏：</p>
<el-button @click="selectText">全选</el-button>
<el-button @click="copy">复制</el-button>
</div>
<el-tabs v-model="activeName">
<el-tab-pane v-for="(item, key) in previewCode" :key="key" :label="key" :name="key">
<div :id="key" class="tab-info" />
@@ -82,12 +77,6 @@ export default {
<style lang="scss">
.previewCode {
.previewCodeTool {
display: flex;
align-items: center;
padding: 5px 0;
margin-top: -40px;
}
.tab-info {
height: 50vh;
background: #fff;
web/src/view/systemTools/autoCode/index.vue
+27 -13
View File
@@ -42,6 +42,8 @@
</el-form>
</el-collapse-item>
</el-collapse>
</div>
<div class="gva-search-box">
<!-- 初始版本自动化代码工具 -->
<el-form ref="autoCodeForm" :rules="rules" :model="form" label-width="120px" :inline="true">
<el-form-item label="Struct名称" prop="structName">
@@ -83,18 +85,18 @@
<el-button size="mini" type="primary" @click="editAndAddField()">新增Field</el-button>
</div>
<el-table :data="form.fields">
<el-table-column type="index" label="序列" width="100" />
<el-table-column prop="fieldName" label="Field名" />
<el-table-column prop="fieldDesc" label="中文名" />
<el-table-column prop="fieldJson" label="FieldJson" />
<el-table-column prop="fieldType" label="Field数据类型" width="130" />
<el-table-column prop="dataType" label="数据库字段类型" width="130" />
<el-table-column prop="dataTypeLong" label="数据库字段长度" width="130" />
<el-table-column prop="columnName" label="数据库字段" width="130" />
<el-table-column prop="comment" label="数据库字段描述" width="130" />
<el-table-column prop="fieldSearchType" label="搜索条件" width="130" />
<el-table-column prop="dictType" label="字典" width="130" />
<el-table-column label="操作" width="300">
<el-table-column align="center" type="index" label="序列" width="100" />
<el-table-column align="center" prop="fieldName" label="Field名" />
<el-table-column align="center" prop="fieldDesc" label="中文名" />
<el-table-column align="center" prop="fieldJson" label="FieldJson" />
<el-table-column align="center" prop="fieldType" label="Field数据类型" width="130" />
<el-table-column align="center" prop="dataType" label="数据库字段类型" width="130" />
<el-table-column align="center" prop="dataTypeLong" label="数据库字段长度" width="130" />
<el-table-column align="center" prop="columnName" label="数据库字段" width="130" />
<el-table-column align="center" prop="comment" label="数据库字段描述" width="130" />
<el-table-column align="center" prop="fieldSearchType" label="搜索条件" width="130" />
<el-table-column align="center" prop="dictType" label="字典" width="130" />
<el-table-column align="center" label="操作" width="300">
<template #default="scope">
<el-button
size="mini"
@@ -146,9 +148,16 @@
</el-dialog>
<el-dialog v-model="previewFlag">
<template #title>
<div class="previewCodeTool">
<p>操作栏：</p>
<el-button size="mini" type="primary" @click="selectText">全选</el-button>
<el-button size="mini" type="primary" @click="copy">复制</el-button>
</div>
</template>
<PreviewCodeDialog v-if="previewFlag" :preview-code="preViewCode" />
<template #footer>
<div class="dialog-footer">
<div class="dialog-footer" style="padding-top:14px;padding-right:14px">
<el-button size="small" type="primary" @click="previewFlag = false">确 定</el-button>
</div>
</template>
@@ -427,6 +436,11 @@ export default {
</script>
<style scoped lang="scss">
.previewCodeTool {
display: flex;
align-items: center;
padding: 5px 0;
}
.button-box {
padding: 10px 20px;
.el-button {
web/src/view/systemTools/autoCodeAdmin/index.vue
+7 -7
View File
@@ -9,14 +9,14 @@
type="selection"
width="55"
/>
<el-table-column label="id" width="60" prop="ID" />
<el-table-column label="日期" width="180">
<el-table-column align="center" label="id" width="60" prop="ID" />
<el-table-column align="center" label="日期" width="180">
<template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
</el-table-column>
<el-table-column label="结构体名" min-width="150" prop="structName" />
<el-table-column label="结构体描述" min-width="150" prop="structCNName" />
<el-table-column label="表名称" min-width="150" prop="tableName" />
<el-table-column label="回滚标记" min-width="150" prop="flag">
<el-table-column align="center" label="结构体名" min-width="150" prop="structName" />
<el-table-column align="center" label="结构体描述" min-width="150" prop="structCNName" />
<el-table-column align="center" label="表名称" min-width="150" prop="tableName" />
<el-table-column align="center" label="回滚标记" min-width="150" prop="flag">
<template #default="scope">
<el-tag
v-if="scope.row.flag"
@@ -36,7 +36,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" min-width="180">
<el-table-column align="center" label="操作" min-width="180">
<template #default="scope">
<div>
<el-button size="mini" type="text" :disabled="scope.row.flag === 1" @click="rollback(scope.row)">回滚</el-button>