mirror of
https://github.com/yzcheng90/x-springboot-ui
synced 2025-11-05 14:40:56 +08:00
更新部分内容
This commit is contained in:
15739
package-lock.json
generated
15739
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -5,34 +5,34 @@ import request from '@/utils/request';
|
||||
*
|
||||
* @author czx
|
||||
* @email object_czx@163.com
|
||||
* @date 2023-01-22 17:15:11
|
||||
* @date 2023-01-26 20:32:33
|
||||
*/
|
||||
export function useApkApi() {
|
||||
return {
|
||||
list: (params) => {
|
||||
return request({
|
||||
url: '/sys/apk/list',
|
||||
url: '/apk/version/list',
|
||||
method: 'get',
|
||||
params
|
||||
});
|
||||
},
|
||||
add: (params) => {
|
||||
return request({
|
||||
url: '/sys/apk/save',
|
||||
url: '/apk/version/save',
|
||||
method: 'post',
|
||||
data: params
|
||||
});
|
||||
},
|
||||
update: (params) => {
|
||||
return request({
|
||||
url: '/sys/apk/update',
|
||||
url: '/apk/version/update',
|
||||
method: 'post',
|
||||
data: params
|
||||
});
|
||||
},
|
||||
delete: (params) => {
|
||||
return request({
|
||||
url: '/sys/apk/delete',
|
||||
url: '/apk/version/delete',
|
||||
method: 'post',
|
||||
data: params
|
||||
});
|
||||
|
||||
@@ -41,6 +41,13 @@ export function useMenuApi() {
|
||||
method: 'get',
|
||||
params
|
||||
});
|
||||
}
|
||||
},
|
||||
delete: (params) => {
|
||||
return request({
|
||||
url: '/sys/menu/delete',
|
||||
method: 'post',
|
||||
data: params
|
||||
});
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div class="layout-footer mt15">
|
||||
<div class="layout-footer-warp">
|
||||
<div>vue-prev-admin,Made by lyt with ❤️</div>
|
||||
<div>任务管理平台 后台管理系统 ️</div>
|
||||
<div class="mt5">{{ $t('message.login.copyright.one5') }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -29,16 +29,6 @@
|
||||
<div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
|
||||
<i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>
|
||||
</div>
|
||||
<div class="layout-navbars-breadcrumb-user-icon">
|
||||
<el-popover placement="bottom" trigger="click" v-model="isShowUserNewsPopover" :width="300" popper-class="el-popover-pupop-user-news">
|
||||
<el-badge :is-dot="true" @click.stop="isShowUserNewsPopover = !isShowUserNewsPopover" slot="reference">
|
||||
<i class="el-icon-bell" :title="$t('message.user.title4')"></i>
|
||||
</el-badge>
|
||||
<transition name="el-zoom-in-top">
|
||||
<UserNews v-show="isShowUserNewsPopover" />
|
||||
</transition>
|
||||
</el-popover>
|
||||
</div>
|
||||
<div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
|
||||
<i
|
||||
class="iconfont"
|
||||
@@ -54,10 +44,6 @@
|
||||
</span>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item command="/home">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
|
||||
<el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>
|
||||
<el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
|
||||
<el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>
|
||||
<el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item>
|
||||
<el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
@@ -68,14 +54,13 @@
|
||||
<script>
|
||||
import screenfull from 'screenfull';
|
||||
import { Session, Local } from '@/utils/storage.js';
|
||||
import UserNews from '@/layout/navBars/breadcrumb/userNews.vue';
|
||||
import Search from '@/layout/navBars/breadcrumb/search.vue';
|
||||
import { useLoginApi } from '@/api/login';
|
||||
import {Message} from "element-ui";
|
||||
|
||||
export default {
|
||||
name: 'layoutBreadcrumbUser',
|
||||
components: { UserNews, Search },
|
||||
components: { Search },
|
||||
data() {
|
||||
return {
|
||||
isScreenfull: false,
|
||||
@@ -200,8 +185,6 @@ export default {
|
||||
}).then(() => {
|
||||
|
||||
}).catch(() => {});
|
||||
} else if (path === 'wareHouse') {
|
||||
window.open('https://github.com/yzcheng90/x-springboot');
|
||||
} else {
|
||||
this.$router.push(path);
|
||||
}
|
||||
|
||||
@@ -96,9 +96,9 @@ const themeConfigModule = {
|
||||
// 网站主标题(菜单导航、浏览器当前网页标题)
|
||||
globalTitle: '后台管理系统',
|
||||
// 网站副标题(登录页顶部文字)
|
||||
globalViceTitle: 'x-springboot',
|
||||
globalViceTitle: '任务管理',
|
||||
// 网站描述(登录页顶部文字)
|
||||
globalViceDes: 'vue2.x后台管理系统免费开源模板',
|
||||
globalViceDes: '任务分发平台后台管理系统',
|
||||
// 默认初始语言,可选值"<zh-cn|en|zh-tw>",默认 zh-cn
|
||||
globalI18n: 'zh-cn',
|
||||
// 默认全局组件大小,可选值"<|medium|small|mini>",默认 ''
|
||||
|
||||
@@ -59,7 +59,7 @@ service.interceptors.response.use(
|
||||
} else if (error.message == 'Network Error') {
|
||||
Message.error('网络连接错误');
|
||||
} else {
|
||||
Message.error(error.response.data.message);
|
||||
Message.error(error.message);
|
||||
}
|
||||
return Promise.reject(error);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div class="system-user-container layout-padding">
|
||||
<div class="system-user-container layout-padding" v-loading.fullscreen.lock="state.fullscreenLoading">
|
||||
<el-card shadow="hover" class="layout-padding-auto">
|
||||
<div class="system-user-search mb15">
|
||||
<el-input size="default" v-model="state.tableData.param.keyword" placeholder="请输入名称"
|
||||
@@ -10,33 +10,45 @@
|
||||
</el-icon>
|
||||
查询
|
||||
</el-button>
|
||||
<el-button size="default" type="success" class="ml10" @click="onOpenAddOrEdit('add')">
|
||||
<el-button size="default" type="success" class="ml10" @click="showUploadDialog()">
|
||||
<el-icon>
|
||||
<ele-FolderAdd/>
|
||||
</el-icon>
|
||||
新增
|
||||
上传APK
|
||||
</el-button>
|
||||
</div>
|
||||
<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
|
||||
<el-table-column type="index" label="序号" width="60"/>
|
||||
<el-table-column prop="updateContent" label="更新内容" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="appName" label="APP名" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="versionCode" label="版本码" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="versionName" label="版本号" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="packageName" label="包名" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="downloadUrl" label="下载地址" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="appName" label="APP名" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="md5Value" label="MD5值" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="fileName" label="文件名" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="md5Value" label="MD5值" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="fileSize" label="文件大小" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="updateTime" label="修改时间" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="userId" label="上传人" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="isForce" label="是否强制安装" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="isIgnorable" label="是否可忽略该版本" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="isSilent" label="是否静默下载" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="操作" width="200">
|
||||
<el-table-column prop="isForce" label="强制安装" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<el-tag type="primary" v-if="scope.row.isForce == 0">是</el-tag>
|
||||
<el-tag type="info" v-else>否</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="isIgnorable" label="忽略该版本" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<el-tag type="primary" v-if="scope.row.isIgnorable == 0">是</el-tag>
|
||||
<el-tag type="info" v-else>否</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="isSilent" label="静默下载" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<el-tag type="primary" v-if="scope.row.isSilent == 0">是</el-tag>
|
||||
<el-tag type="info" v-else>否</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="操作" width="100">
|
||||
<template #default="scope">
|
||||
<el-button size="small" text type="primary" @click="onOpenAddOrEdit('edit', scope.row)">修改</el-button>
|
||||
<el-button size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -55,111 +67,103 @@
|
||||
>
|
||||
</el-pagination>
|
||||
</el-card>
|
||||
<el-dialog title="上传APK" :visible.sync="state.dialog.isShowUploadDialog" width="400px">
|
||||
<el-upload
|
||||
class="upload-demo"
|
||||
drag
|
||||
list-type="apk"
|
||||
action="/sys/oss/upload/apk"
|
||||
:on-success="apkUploadSuccess"
|
||||
:on-progress="apkUploading"
|
||||
>
|
||||
<i class="el-icon-upload"></i>
|
||||
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
|
||||
<div class="el-upload__tip" slot="tip">只能上传APK文件,且不超过100MB</div>
|
||||
</el-upload>
|
||||
</el-dialog>
|
||||
<el-dialog :title="state.dialog.title" :visible.sync="state.dialog.isShowDialog" width="769px">
|
||||
<div>
|
||||
<el-form ref="userDialogFormRef" :model="state.ruleForm" size="default" label-width="90px">
|
||||
<el-form ref="userDialogFormRef" :model="state.ruleForm" size="default" label-width="120px">
|
||||
<el-row :gutter="35">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="更新内容">
|
||||
<el-input v-model="state.ruleForm.updateContent" placeholder="更新内容" clearable></el-input>
|
||||
<el-form-item label="APP名">
|
||||
<el-input disabled v-model="state.ruleForm.appName" placeholder="APP名" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="包名">
|
||||
<el-input disabled v-model="state.ruleForm.packageName" placeholder="包名" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="35">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="版本码">
|
||||
<el-input v-model="state.ruleForm.versionCode" placeholder="版本码" clearable></el-input>
|
||||
<el-input disabled v-model="state.ruleForm.versionCode" placeholder="版本码" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="35">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="版本号">
|
||||
<el-input v-model="state.ruleForm.versionName" placeholder="版本号" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="35">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="包名">
|
||||
<el-input v-model="state.ruleForm.packageName" placeholder="包名" clearable></el-input>
|
||||
<el-input disabled v-model="state.ruleForm.versionName" placeholder="版本号" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="35">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="下载地址">
|
||||
<el-input v-model="state.ruleForm.downloadUrl" placeholder="下载地址" clearable></el-input>
|
||||
<el-input disabled v-model="state.ruleForm.downloadUrl" placeholder="下载地址" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="35">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="APP名">
|
||||
<el-input v-model="state.ruleForm.appName" placeholder="APP名" clearable></el-input>
|
||||
<el-form-item label="文件名">
|
||||
<el-input disabled v-model="state.ruleForm.fileName" placeholder="文件名" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="35">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="MD5值">
|
||||
<el-input v-model="state.ruleForm.md5Value" placeholder="MD5值" clearable></el-input>
|
||||
<el-input disabled v-model="state.ruleForm.md5Value" placeholder="MD5值" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="35">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="文件名">
|
||||
<el-input v-model="state.ruleForm.fileName" placeholder="文件名" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="35">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="文件大小">
|
||||
<el-input v-model="state.ruleForm.fileSize" placeholder="文件大小" clearable></el-input>
|
||||
<el-input disabled v-model="state.ruleForm.fileSize" placeholder="文件大小" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="35">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="创建时间">
|
||||
<el-input v-model="state.ruleForm.createTime" placeholder="创建时间" clearable></el-input>
|
||||
<el-form-item label="强制安装">
|
||||
<el-radio-group v-model="state.ruleForm.isForce">
|
||||
<el-radio-button :label="0">是</el-radio-button>
|
||||
<el-radio-button :label="1">否</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="可忽略该版本">
|
||||
<el-radio-group v-model="state.ruleForm.isIgnorable">
|
||||
<el-radio-button :label="0">是</el-radio-button>
|
||||
<el-radio-button :label="1">否</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="35">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="修改时间">
|
||||
<el-input v-model="state.ruleForm.updateTime" placeholder="修改时间" clearable></el-input>
|
||||
<el-form-item label="静默下载">
|
||||
<el-radio-group v-model="state.ruleForm.isSilent">
|
||||
<el-radio-button :label="0">是</el-radio-button>
|
||||
<el-radio-button :label="1">否</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="35">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="上传人">
|
||||
<el-input v-model="state.ruleForm.userId" placeholder="上传人" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="35">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="是否强制安装">
|
||||
<el-input v-model="state.ruleForm.isForce" placeholder="是否强制安装" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="35">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="是否可忽略该版本">
|
||||
<el-input v-model="state.ruleForm.isIgnorable" placeholder="是否可忽略该版本" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="35">
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="是否静默下载">
|
||||
<el-input v-model="state.ruleForm.isSilent" placeholder="是否静默下载" clearable></el-input>
|
||||
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
|
||||
<el-form-item label="更新内容">
|
||||
<el-input v-model="state.ruleForm.updateContent" type="textarea" :rows="3" placeholder="更新内容" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -184,6 +188,7 @@
|
||||
data() {
|
||||
return {
|
||||
state: {
|
||||
fullscreenLoading: false,
|
||||
tableData: {
|
||||
data: [],
|
||||
total: 0,
|
||||
@@ -195,6 +200,7 @@
|
||||
}
|
||||
},
|
||||
dialog: {
|
||||
isShowUploadDialog: false,
|
||||
isShowDialog: false,
|
||||
type: '',
|
||||
title: '',
|
||||
@@ -209,13 +215,10 @@
|
||||
appName: '', // APP名
|
||||
md5Value: '', // MD5值
|
||||
fileName: '', // 文件名
|
||||
fileSize: '', // 文件大小
|
||||
createTime: '', // 创建时间
|
||||
updateTime: '', // 修改时间
|
||||
userId: '', // 上传人
|
||||
isForce: '', // 是否强制安装
|
||||
isIgnorable: '', // 是否可忽略该版本
|
||||
isSilent: '', // 是否静默下载
|
||||
fileSize: 0, // 文件大小
|
||||
isForce: 0, // 是否强制安装
|
||||
isIgnorable: 1, // 是否可忽略该版本
|
||||
isSilent: 0, // 是否静默下载
|
||||
},
|
||||
submitBtn: {
|
||||
loading: false,
|
||||
@@ -234,38 +237,43 @@
|
||||
this.state.tableData.loading = false
|
||||
})
|
||||
},
|
||||
onOpenAddOrEdit(type, row) {
|
||||
if (type === 'edit') {
|
||||
this.state.submitBtn.type = 'edit';
|
||||
this.state.ruleForm = row;
|
||||
this.state.dialog.title = '修改${column.columnComment}';
|
||||
this.state.dialog.submitTxt = '修 改';
|
||||
showUploadDialog(){
|
||||
this.state.dialog.isShowUploadDialog = true;
|
||||
},
|
||||
apkUploading(event, file, fileList){
|
||||
this.state.fullscreenLoading = true;
|
||||
},
|
||||
apkUploadSuccess(response, file, fileList){
|
||||
console.log(response)
|
||||
this.state.fullscreenLoading = false;
|
||||
if(response.code == 0){
|
||||
this.onOpenAddOrEdit(response.data);
|
||||
}else {
|
||||
Message.error(response.msg);
|
||||
}
|
||||
},
|
||||
onOpenAddOrEdit(data) {
|
||||
this.state.submitBtn.type = 'add';
|
||||
this.state.ruleForm = {
|
||||
updateContent: '', // 更新内容
|
||||
versionCode: '', // 版本码
|
||||
versionName: '', // 版本号
|
||||
packageName: '', // 包名
|
||||
downloadUrl: '', // 下载地址
|
||||
appName: '', // APP名
|
||||
md5Value: '', // MD5值
|
||||
fileName: '', // 文件名
|
||||
fileSize: '', // 文件大小
|
||||
createTime: '', // 创建时间
|
||||
updateTime: '', // 修改时间
|
||||
userId: '', // 上传人
|
||||
isForce: '', // 是否强制安装
|
||||
isIgnorable: '', // 是否可忽略该版本
|
||||
isSilent: '', // 是否静默下载
|
||||
versionCode: data.versionCode, // 版本码
|
||||
versionName: data.versionName, // 版本号
|
||||
packageName: data.packageName, // 包名
|
||||
downloadUrl: data.downloadUrl, // 下载地址
|
||||
appName: data.appName, // APP名
|
||||
md5Value: data.md5Value, // MD5值
|
||||
fileName: data.fileName, // 文件名
|
||||
fileSize: data.fileSize, // 文件大小
|
||||
isForce: 0, // 是否强制安装
|
||||
isIgnorable: 1, // 是否可忽略该版本
|
||||
isSilent: 0, // 是否静默下载
|
||||
};
|
||||
this.state.dialog.title = '新增${column.columnComment}';
|
||||
this.state.dialog.title = '上传APK';
|
||||
this.state.dialog.submitTxt = '新 增';
|
||||
}
|
||||
this.state.dialog.isShowDialog = true;
|
||||
},
|
||||
onRowDel(row) {
|
||||
MessageBox.confirm(`此操作将永久删除${column.columnComment}:“${row.roleName}”,是否继续?`, '提示', {
|
||||
MessageBox.confirm(`此操作将永久删除,是否继续?`, '提示', {
|
||||
confirmButtonText: '确认',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
@@ -286,21 +294,13 @@
|
||||
},
|
||||
closeDialog() {
|
||||
this.state.dialog.isShowDialog = false;
|
||||
this.state.dialog.isShowUploadDialog = false;
|
||||
},
|
||||
onCancel() {
|
||||
this.closeDialog();
|
||||
},
|
||||
onSubmit() {
|
||||
this.state.submitBtn.loading = true;
|
||||
if(this.state.submitBtn.type === 'edit'){
|
||||
useApkApi().update(this.state.ruleForm).then(response => {
|
||||
this.state.submitBtn.loading = false;
|
||||
this.closeDialog();
|
||||
this.fetchData()
|
||||
}).catch(() => {
|
||||
this.state.submitBtn.loading = false
|
||||
})
|
||||
}else {
|
||||
useApkApi().add(this.state.ruleForm).then(response => {
|
||||
this.state.submitBtn.loading = false;
|
||||
this.closeDialog();
|
||||
@@ -308,7 +308,6 @@
|
||||
}).catch(() => {
|
||||
this.state.submitBtn.loading = false
|
||||
})
|
||||
}
|
||||
},
|
||||
deleteInfo(row) {
|
||||
useApkApi().delete(row).then(response => {
|
||||
|
||||
@@ -89,9 +89,14 @@
|
||||
<el-input v-model="state.ruleForm.filePath"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="是否生成UI页面">
|
||||
<el-switch v-model="state.ruleForm.genUi"></el-switch>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
|
||||
<el-form-item label="前台项目目录">
|
||||
<el-input v-model="state.ruleForm.uiFilePath"></el-input>
|
||||
<el-input :disabled="!state.ruleForm.genUi" v-model="state.ruleForm.uiFilePath"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
@@ -147,8 +152,8 @@ export default {
|
||||
tableName: "",
|
||||
mainPath: "com.suke.czx",
|
||||
packagePath: "com.suke.czx.modules",
|
||||
filePath: "D:\\github_project\\X-SpringBoot",
|
||||
uiFilePath: "D:\\github_project\\x-springboot-ui",
|
||||
filePath: "E:\\github\\X-SpringBoot",
|
||||
uiFilePath: "E:\\github\\x-springboot-ui",
|
||||
moduleName: "user",
|
||||
requestMapping: "user",
|
||||
author: "czx",
|
||||
@@ -159,7 +164,8 @@ export default {
|
||||
fileServiceImpl: true,
|
||||
fileMapper: true,
|
||||
fileMapperXml: false,
|
||||
fileEntity: true
|
||||
fileEntity: true,
|
||||
genUi: true
|
||||
},
|
||||
submitBtn: {
|
||||
loading: false,
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<el-col :span="24">
|
||||
<el-col :xs="12" :sm="12" :md="8" class="right-l-v">
|
||||
<div class="right-label">昵称:</div>
|
||||
<div class="right-value">小柒</div>
|
||||
<div class="right-value">{{userInfo.name}}</div>
|
||||
</el-col>
|
||||
<el-col :xs="12" :sm="12" :md="16" class="right-l-v">
|
||||
<div class="right-label">身份:</div>
|
||||
@@ -29,7 +29,7 @@
|
||||
<el-col :span="24" class="mt5">
|
||||
<el-col :xs="12" :sm="12" :md="8" class="right-l-v">
|
||||
<div class="right-label one-text-overflow">IP:</div>
|
||||
<div class="right-value one-text-overflow">192.168.1.1</div>
|
||||
<div class="right-value one-text-overflow">{{userInfo.loginIp}}</div>
|
||||
</el-col>
|
||||
<el-col :xs="12" :sm="12" :md="16" class="right-l-v">
|
||||
<div class="right-label one-text-overflow">时间:</div>
|
||||
@@ -69,7 +69,7 @@
|
||||
<el-card shadow="hover">
|
||||
<div slot="header">
|
||||
<span>{{ $t('message.card.title4') }}</span>
|
||||
<el-button class="home-card-more" type="text" @click="onOpenGitee">{{ $t('message.card.title5') }}</el-button>
|
||||
<el-button class="home-card-more" type="text" @click="onOpenGithub">{{ $t('message.card.title5') }}</el-button>
|
||||
</div>
|
||||
<el-row :gutter="15" class="home-recommend-row">
|
||||
<el-col :sm="24" :md="12" :lg="6" :xl="6" v-for="(v, k) in recommendList" :key="k">
|
||||
@@ -371,9 +371,9 @@ export default {
|
||||
onNewsInfoListClick(v) {
|
||||
window.open(v.link);
|
||||
},
|
||||
// 跳转到 gitee
|
||||
onOpenGitee() {
|
||||
window.open('https://gitee.com/lyt-top/vue-next-admin');
|
||||
// 跳转到 github
|
||||
onOpenGithub() {
|
||||
window.open('https://github.com/yzcheng90/x-springboot-ui');
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
|
||||
@@ -56,29 +56,9 @@ export const chartsRightList = [
|
||||
|
||||
export const newsInfoList = [
|
||||
{
|
||||
title: '[发布] 2021年02月28日发布基于 vue3.x + vite v1.0.0 版本',
|
||||
date: '02/28',
|
||||
link: 'https://gitee.com/lyt-top/vue-next-admin',
|
||||
},
|
||||
{
|
||||
title: '[发布] 2021年04月15日发布 vue2.x + webpack 重构版本',
|
||||
date: '04/15',
|
||||
link: 'https://gitee.com/lyt-top/vue-next-admin/tree/vue-prev-admin/',
|
||||
},
|
||||
{
|
||||
title: '[重构] 2021年04月10日 重构 vue2.x + webpack v1.0.0 版本',
|
||||
date: '04/10',
|
||||
link: 'https://gitee.com/lyt-top/vue-next-admin/tree/vue-prev-admin/',
|
||||
},
|
||||
{
|
||||
title: '[预览] 2020年12月08日,基于 vue3.x 版本后台模板的预览',
|
||||
date: '12/08',
|
||||
link: 'http://lyt-top.gitee.io/vue-next-admin-preview/#/login',
|
||||
},
|
||||
{
|
||||
title: '[预览] 2020年11月15日,基于 vue2.x 版本后台模板的预览',
|
||||
date: '11/15',
|
||||
link: 'https://lyt-top.gitee.io/vue-prev-admin-preview/#/login',
|
||||
title: '[发布] 2023年01月22日发布基于1.0版本',
|
||||
date: '01/22',
|
||||
link: 'https://github.com/yzcheng90/x-springboot-ui',
|
||||
},
|
||||
];
|
||||
|
||||
|
||||
@@ -64,27 +64,29 @@
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item style="margin: 40px 0px 0">
|
||||
<el-button type="primary" class="login-submit" @click="submitForm" :loading="submit.loading">
|
||||
<el-button type="primary" class="login-submit" @click="submitForm"
|
||||
:loading="submit.loading">
|
||||
<span>{{ $t('message.login.btnText') }}</span>
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="login-menu">
|
||||
<a href="javascript:;">{{ $t('message.login.link.one1') }}</a>
|
||||
<a href="javascript:;">{{ $t('message.login.link.one2') }}</a>
|
||||
</div>
|
||||
<!-- <div class="login-menu">-->
|
||||
<!-- <a href="javascript:;">{{ $t('message.login.link.one1') }}</a>-->
|
||||
<!-- <a href="javascript:;">{{ $t('message.login.link.one2') }}</a>-->
|
||||
<!-- </div>-->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="vue-particles">
|
||||
<vue-particles color="#dedede" shapeType="star" linesColor="#dedede" hoverMode="grab" clickMode="push" style="height: 100%"></vue-particles>
|
||||
<vue-particles color="#dedede" shapeType="star" linesColor="#dedede" hoverMode="grab" clickMode="push"
|
||||
style="height: 100%"></vue-particles>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {Session} from '@/utils/storage';
|
||||
import { formatDate, formatAxis } from '@/utils/formatTime';
|
||||
import {formatAxis, formatDate} from '@/utils/formatTime';
|
||||
import {PrevLoading} from '@/utils/loading.js';
|
||||
import {quotationsList} from './mock';
|
||||
import {useLoginApi} from '@/api/login';
|
||||
@@ -181,6 +183,7 @@ export default {
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
position: relative;
|
||||
|
||||
.vue-particles {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
@@ -189,6 +192,7 @@ export default {
|
||||
height: 100%;
|
||||
background: radial-gradient(ellipse at top left, rgba(105, 155, 200, 1) 0%, rgba(181, 197, 216, 1) 57%);
|
||||
}
|
||||
|
||||
.login-weaper {
|
||||
margin: auto;
|
||||
height: 500px;
|
||||
@@ -198,6 +202,7 @@ export default {
|
||||
z-index: 1;
|
||||
border: none;
|
||||
box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
|
||||
|
||||
.login-left {
|
||||
width: 491px;
|
||||
padding: 20px;
|
||||
@@ -209,6 +214,7 @@ export default {
|
||||
flex-direction: column;
|
||||
border-top-left-radius: 4px;
|
||||
border-bottom-left-radius: 4px;
|
||||
|
||||
.login-time {
|
||||
width: 100%;
|
||||
color: var(--prev-color-text-white);
|
||||
@@ -216,6 +222,7 @@ export default {
|
||||
font-size: 14px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.login-left-box {
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
@@ -224,26 +231,32 @@ export default {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 80px 45px;
|
||||
|
||||
.logo {
|
||||
font-size: 22px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.title {
|
||||
color: var(--prev-color-text-white);
|
||||
font-weight: 300;
|
||||
letter-spacing: 2px;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.msg {
|
||||
color: var(--prev-color-text-white);
|
||||
font-size: 13px;
|
||||
margin-top: 35px;
|
||||
|
||||
.msg-author {
|
||||
opacity: 0.6;
|
||||
|
||||
span:last-of-type {
|
||||
margin-left: 15px;
|
||||
}
|
||||
}
|
||||
|
||||
.msg-txt {
|
||||
margin-top: 15px;
|
||||
line-height: 22px;
|
||||
@@ -251,6 +264,7 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.login-right {
|
||||
width: 491px;
|
||||
padding: 20px;
|
||||
@@ -260,9 +274,11 @@ export default {
|
||||
background-color: var(--prev-bg-white);
|
||||
border-top-right-radius: 4px;
|
||||
border-bottom-right-radius: 4px;
|
||||
|
||||
.login-main {
|
||||
margin: 0 auto;
|
||||
width: 70%;
|
||||
|
||||
.login-title {
|
||||
color: var(--prev-color-text-primary);
|
||||
margin-bottom: 40px;
|
||||
@@ -271,19 +287,24 @@ export default {
|
||||
text-align: center;
|
||||
letter-spacing: 4px;
|
||||
}
|
||||
|
||||
.login-form {
|
||||
margin: 10px 0;
|
||||
|
||||
i {
|
||||
color: var(--prev-color-text-primary);
|
||||
}
|
||||
|
||||
.el-form-item {
|
||||
margin-bottom: 20px !important;
|
||||
|
||||
.login-code {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-around;
|
||||
margin: 0 0 0 10px;
|
||||
user-select: none;
|
||||
|
||||
.login-code-img {
|
||||
margin-top: 2px;
|
||||
width: 120px;
|
||||
@@ -299,27 +320,32 @@ export default {
|
||||
cursor: pointer;
|
||||
transition: all ease 0.2s;
|
||||
border-radius: 4px;
|
||||
|
||||
&:hover {
|
||||
border-color: var(--prev-border-color-hover);
|
||||
transition: all ease 0.2s;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.login-submit {
|
||||
width: 100%;
|
||||
letter-spacing: 2px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.login-menu {
|
||||
margin-top: 30px;
|
||||
width: 100%;
|
||||
text-align: left;
|
||||
|
||||
a {
|
||||
color: var(--prev-color-text-secondary);
|
||||
font-size: 12px;
|
||||
margin: 0 8px;
|
||||
text-decoration: none;
|
||||
|
||||
&:hover {
|
||||
color: var(--prev-color-primary);
|
||||
text-decoration: underline;
|
||||
|
||||
@@ -429,13 +429,12 @@ export default {
|
||||
this.state.dialog.isShowDialog = true;
|
||||
},
|
||||
onRowDel(row){
|
||||
MessageBox.confirm(`此操作将永久删除账户名称:“${row.username}”,是否继续?`, '提示', {
|
||||
MessageBox.confirm(`此操作将永久删除名称:“${row.title}”,是否继续?`, '提示', {
|
||||
confirmButtonText: '确认',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
}).then(() => {
|
||||
this.fetchData()
|
||||
Message.success('删除成功');
|
||||
this.deleteInfo(row);
|
||||
}).catch(() => {});
|
||||
},
|
||||
onSelectIframeChange(){
|
||||
@@ -463,7 +462,18 @@ export default {
|
||||
},
|
||||
onSubmit(){
|
||||
|
||||
}
|
||||
},
|
||||
deleteInfo(row) {
|
||||
let param = {
|
||||
menuId: row.menuId
|
||||
};
|
||||
useMenuApi().delete(param).then(response => {
|
||||
Message.success('删除成功');
|
||||
this.fetchData()
|
||||
}).catch(() => {
|
||||
this.fetchData()
|
||||
})
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<el-table-column prop="roleId" label="角色ID" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="roleName" label="角色名称" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="createUserId" label="创建者ID" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="createUserName" label="创建者" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="操作" width="200">
|
||||
<template #default="scope">
|
||||
@@ -75,7 +75,8 @@
|
||||
node-key="menuId"
|
||||
:default-checked-keys="state.ruleForm.menuIdList"
|
||||
@check="selectedTree"
|
||||
:props="state.defaultProps">
|
||||
:check-strictly="true"
|
||||
:props="{children: 'children',label: 'title'}">
|
||||
</el-tree>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@@ -127,10 +128,6 @@ export default {
|
||||
menuIdList: []
|
||||
},
|
||||
menuList: [],
|
||||
defaultProps: {
|
||||
children: 'children',
|
||||
label: 'title'
|
||||
},
|
||||
submitBtn: {
|
||||
loading: false,
|
||||
type:''
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
<div class="system-user-container layout-padding">
|
||||
<el-card shadow="hover" class="layout-padding-auto">
|
||||
<div class="system-user-search mb15">
|
||||
<el-input size="default" v-model="state.tableData.param.keyword" placeholder="请输入用户名称" style="max-width: 180px"> </el-input>
|
||||
<el-input size="default" v-model="state.tableData.param.keyword" placeholder="请输入用户名称"
|
||||
style="max-width: 180px"></el-input>
|
||||
<el-button size="default" type="primary" class="ml10" @click="fetchData()">
|
||||
<el-icon>
|
||||
<ele-Search/>
|
||||
@@ -31,10 +32,14 @@
|
||||
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="操作" width="200">
|
||||
<template #default="scope">
|
||||
<el-button :disabled="scope.row.username === 'admin'" size="small" text type="primary" @click="onOpenAddOrEdit('edit', scope.row)"
|
||||
>修改</el-button
|
||||
<el-button :disabled="scope.row.username === 'admin'" size="small" text type="primary"
|
||||
@click="onOpenAddOrEdit('edit', scope.row)"
|
||||
>修改
|
||||
</el-button
|
||||
>
|
||||
<el-button :disabled="scope.row.username === 'admin'" size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
|
||||
<el-button :disabled="scope.row.username === 'admin'" size="small" text type="primary"
|
||||
@click="onRowDel(scope.row)">删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -63,7 +68,8 @@
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="账户密码">
|
||||
<el-input v-model="state.ruleForm.password" placeholder="请输入" type="password" clearable></el-input>
|
||||
<el-input v-model="state.ruleForm.password" placeholder="请输入" type="password"
|
||||
clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
@@ -78,7 +84,11 @@
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
<el-form-item label="用户状态">
|
||||
<el-switch v-model="state.ruleForm.userStatus" inline-prompt active-text="启" inactive-text="禁"></el-switch>
|
||||
<el-radio-group v-model="state.ruleForm.status">
|
||||
<el-radio-button :label="0">禁用</el-radio-button>
|
||||
<el-radio-button :label="1">正常</el-radio-button>
|
||||
</el-radio-group>
|
||||
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
|
||||
@@ -140,7 +150,6 @@ export default {
|
||||
email: '', // 邮箱
|
||||
password: '', // 账户密码
|
||||
status: 1, // 用户状态
|
||||
userStatus: true, // 用户状态
|
||||
roleIdList: [] // 角色
|
||||
},
|
||||
submitBtn: {
|
||||
@@ -179,7 +188,6 @@ export default {
|
||||
email: '', // 邮箱
|
||||
password: '', // 账户密码
|
||||
status: 1, // 用户状态
|
||||
userStatus: true // 用户状态
|
||||
};
|
||||
this.state.submitBtn.type = 'add';
|
||||
this.state.dialog.title = '新增用户';
|
||||
@@ -194,7 +202,8 @@ export default {
|
||||
type: 'warning',
|
||||
}).then(() => {
|
||||
this.deleteInfo(row)
|
||||
}).catch(() => {});
|
||||
}).catch(() => {
|
||||
});
|
||||
},
|
||||
deleteInfo(row) {
|
||||
useListApi().delete(row).then(response => {
|
||||
@@ -241,9 +250,7 @@ export default {
|
||||
}
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
|
||||
},
|
||||
computed: {},
|
||||
created() {
|
||||
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user