xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: 构建稳定版本

Browse Source
This commit is contained in:
陈淳
2023-12-11 09:55:12 +08:00
parent 098d4bc85f
commit 769a6a9c63
756 changed files with 10431 additions and 19867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Yi.RuoYi.Vue3/src/App.vue
View File

@@ -7,11 +7,12 @@ import useSettingsStore from '@/store/modules/settings'
import { handleThemeStyle } from '@/utils/theme'
import useUserStore from '@/store/modules/user'
import { storeToRefs } from 'pinia';
// import signalR from '@/utils/signalR'
import signalR from '@/utils/signalR'
const {token}=storeToRefs(useUserStore());
onMounted(() => {
onMounted(async () => {
await signalR.init(`main`);
nextTick(() => {
// 初始化主题样式
handleThemeStyle(useSettingsStore().theme)
@@ -21,8 +22,7 @@ onMounted(() => {
//这里还需要监视token的变化，重新进行signalr连接
watch(()=>token.value,async (newValue,oldValue)=>{
// await signalR.close();
// await signalR.start();
await signalR.init(`main`);
})
</script>

5
Yi.RuoYi.Vue3/src/api/system/config.js
View File

@@ -46,8 +46,9 @@ export function updateConfig(data) {
// 删除参数配置
export function delConfig(configId) {
return request({
url: `/config/${configId}`,
method: 'delete'
url: `/config`,
method: 'delete',
params:{id:configId}
})
}

7
Yi.RuoYi.Vue3/src/api/system/dept.js
View File

@@ -27,6 +27,7 @@ export function getDept(deptId) {
// 新增部门
export function addDept(data) {
data.phone=data.phone==""?null:data.phone;
return request({
url: '/dept',
method: 'post',
@@ -36,6 +37,7 @@ export function addDept(data) {
// 修改部门
export function updateDept(data) {
data.phone=data.phone==""?null:data.phone;
return request({
url: `/dept/${data.id}`,
method: 'put',
@@ -46,8 +48,9 @@ export function updateDept(data) {
// 删除部门
export function delDept(deptId) {
return request({
url: `/dept/${deptId}`,
method: 'delete'
url: `/dept`,
method: 'delete',
params:{id:deptId}
})
}

5
Yi.RuoYi.Vue3/src/api/system/dict/data.js
View File

@@ -47,7 +47,8 @@ export function updateData(data) {
export function delData(dictCode) {
console.log(dictCode,"dictCode")
return request({
url: `/dictionary/${dictCode}`,
method: 'delete'
url: `/dictionary`,
method: 'delete',
params:{id:dictCode}
})
}

3
Yi.RuoYi.Vue3/src/api/system/dict/type.js
View File

@@ -38,8 +38,9 @@ export function updateType(data) {
// 删除字典类型
export function delType(dictId) {
return request({
url: `/dictionary-type/${dictId}`,
url: `/dictionary-type`,
method: 'delete',
params:{id:dictId}
})
}

9
Yi.RuoYi.Vue3/src/api/system/menu.js
View File

@@ -2,6 +2,7 @@ import request from '@/utils/request'
// 查询菜单列表
export function listMenu(query) {
console.log(query,"query")
return request({
url: '/menu',
method: 'get',
@@ -28,13 +29,14 @@ export function treeselect() {
// 根据角色ID查询菜单下拉树结构
export function roleMenuTreeselect(roleId) {
return request({
url: '/menu/list-role-id/' + roleId,
url: '/menu/role-id/' + roleId,
method: 'get'
})
}
// 新增菜单
export function addMenu(data) {
return request({
url: '/menu',
method: 'post',
@@ -55,7 +57,8 @@ export function updateMenu(data) {
export function delMenu(menuId) {
return request({
url: `/menu/${menuId}`,
method: 'delete'
url: `/menu`,
method: 'delete',
params:{id:menuId}
})
}

5
Yi.RuoYi.Vue3/src/api/system/notice.js
View File

@@ -38,7 +38,8 @@ export function updateNotice(data) {
// 删除公告
export function delNotice(noticeId) {
return request({
url: '/system/notice/' + noticeId,
method: 'delete'
url: '/system/notice',
method: 'delete',
params:{id:noticeId}
})
}

5
Yi.RuoYi.Vue3/src/api/system/post.js
View File

@@ -38,8 +38,9 @@ export function updatePost(data) {
// 删除岗位
export function delPost(postId) {
return request({
url: `/post/${postId}`,
method: 'delete'
url: `/post`,
method: 'delete',
params:{id:postId}
})
}

3
Yi.RuoYi.Vue3/src/api/system/role.js
View File

@@ -57,8 +57,9 @@ export function changeRoleStatus(roleId, isDel) {
// 删除角色
export function delRole(roleId) {
return request({
url: `/role/${roleId}`,
url: `/role`,
method: 'delete',
params:{id:roleId}
})
}

5
Yi.RuoYi.Vue3/src/api/system/user.js
View File

@@ -20,6 +20,7 @@ export function getUser(userId) {
// 新增用户
export function addUser(data) {
data.phone=data.phone==""?null:data.phone;
return request({
url: '/user',
method: 'post',
@@ -29,6 +30,7 @@ export function addUser(data) {
// 修改用户
export function updateUser(id, data) {
data.phone=data.phone==""?null:data.phone;
return request({
url: `/user/${id}`,
method: 'put',
@@ -39,8 +41,9 @@ export function updateUser(id, data) {
// 删除用户
export function delUser(userId) {
return request({
url: `/user/${userId}`,
url: `/user`,
method: 'delete',
params:{id:userId}
})
}

10
Yi.RuoYi.Vue3/src/components/Pagination/index.vue
View File

@@ -3,9 +3,9 @@
<el-pagination
:background="background"
v-model:current-page="currentPage"
v-model:page-size="pageSize"
v-model:page-size="maxResultCount"
:layout="layout"
:page-sizes="pageSizes"
:page-sizes="maxResultCounts"
:pager-count="pagerCount"
:total="Number(total)"
@size-change="handleSizeChange"
@@ -30,7 +30,7 @@ const props = defineProps({
type: Number,
default: 20
},
pageSizes: {
maxResultCounts: {
type: Array,
default() {
return [10, 20, 30, 50]
@@ -68,7 +68,7 @@ const currentPage = computed({
emit('update:page', val)
}
})
const pageSize = computed({
const maxResultCount = computed({
get() {
return props.limit
},
@@ -86,7 +86,7 @@ function handleSizeChange(val) {
}
}
function handleCurrentChange(val) {
emit('pagination', { page: val, limit: pageSize.value })
emit('pagination', { page: val, limit: maxResultCount.value })
if (props.autoScroll) {
scrollTo(0, 800)
}

5
Yi.RuoYi.Vue3/src/main.js
View File

@@ -21,7 +21,6 @@ import { download } from '@/utils/ruoyi.js'
import 'virtual:svg-icons-register'
import SvgIcon from '@/components/SvgIcon'
import elementIcons from '@/components/SvgIcon/svgicon'
// import signalR from '@/utils/signalR'
import './permission' // permission control
@@ -78,9 +77,5 @@ app.use(ElementPlus, {
// 支持 large、default、small
size: Cookies.get('size') || 'default'
})
// app.prototype.signalr = signalR
// signalR.init(`${import.meta.env.VITE_APP_BASE_WS}/hub/main`);
// signalR.start();
app.mount('#app')

2
Yi.RuoYi.Vue3/src/router/index.js
View File

@@ -123,7 +123,7 @@ export const dynamicRoutes = [
permissions: ['system:dict:list'],
children: [
{
path: 'index/:dictId(\\d+)',
path: 'index',
component: () => import('@/views/system/dict/data'),
name: 'Data',
meta: { title: '字典数据', activeMenu: '/system/dict' }

59
Yi.RuoYi.Vue3/src/utils/request.js
View File

@@ -7,7 +7,7 @@ import cache from '@/plugins/cache'
import { saveAs } from 'file-saver'
import useUserStore from '@/store/modules/user'
import JsonBig from 'json-bigint'
import qs from 'qs'
let downloadLoadingInstance;
// 是否显示重新登录
@@ -20,6 +20,26 @@ const service = axios.create({
baseURL: import.meta.env.VITE_APP_BASE_API,
// 超时
timeout: 10000,
//处理批零参数
paramsSerializer:params => {
// return qs.stringify(params,{indices:false})
console.log(params,"params")
// if(params.id!=undefined)
// {
// if(Array.isArray(params.id) )
// {
// return "id="+params.id.join("&id=")
// }
// else
// {
// return "id="+params.id;
// }
// }
// return request.param(params);
return qs.stringify(params, {arrayFormat: 'repeat'});
},
transformResponse: [data => {
const json = JsonBig({
storeAsString: true
@@ -87,21 +107,29 @@ service.interceptors.request.use(config => {
// 响应拦截器
service.interceptors.response.use(res => {
// 二进制数据则直接返回
if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
return res.data
}
const code = res.data.statusCode || 200;
// 获取错误信息
const msg = res.data.errors;
handler(code, msg);
return Promise.resolve(res.data);
// //如果code为200，不需要处理，直接返回数据即可
// console.log(res,"res")
// // 二进制数据则直接返回
// if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
// return res.data
// }
// const code = res.data.status || 200;
// // 获取错误信息
// const msg = `${res.data.errors.message},详细信息：${details}` ;
// handler(code, msg);
return Promise.resolve(res);
},
error => {
const code = error.response.status;
const msg = error.message;
console.log(error.response,"error")
const errorRes=error.response;
const code = errorRes.status || 200;
const msg = `${errorRes.data?.error?.message}` ;
handler(code, msg);
return Promise.reject(error)
}
)
@@ -146,7 +174,12 @@ const handler = (code, msg) => {
title: msg
})
break;
//接口异常
case 400:
ElNotification.error({
title: msg
})
break;
//未授权
case 401:
ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {

40
Yi.RuoYi.Vue3/src/utils/signalR.js
View File

@@ -10,14 +10,27 @@ export default {
SR: {},
// 失败连接重试次数
failNum: 4,
baseUrl: '',
init(url) {
async init(url) {
const connection = new signalR.HubConnectionBuilder()
.withUrl(url, {
headers: { Authorization: `Bearer ${getToken()}` }})
.withUrl(`${import.meta.env.VITE_APP_BASE_WS}/` + url,
{
headers: {
'Authorization': `Bearer ${getToken()}`
},
accessTokenFactory: () => {
// 返回授权 token
return `${getToken()}`;
}
}
)
.withAutomaticReconnect()//自动重新连接
.configureLogging(signalR.LogLevel.Information)
.build();
console.log(connection, "connection")
this.SR = connection;
// 断线重连
connection.onclose(async () => {
@@ -32,16 +45,22 @@ export default {
})
this.receiveMsg(connection);
// 启动
this.start();
await this.start();
},
/**
* 调用 this.signalR.start().then(async () => { await this.SR.invoke("method")})
* @returns
*/
async close(){
var that = this;
await this.SR.stop();
},
async close() {
try {
var that = this;
await this.SR.stop();
}
catch
{
}
},
async start() {
@@ -49,6 +68,7 @@ async close(){
try {
//使用async和await 或 promise的then 和catch 处理来自服务端的异常
console.log(this.SR, "执行连接");
await this.SR.start();
//console.assert(this.SR.state === signalR.HubConnectionState.Connected);
//console.log('signalR 连接成功了', this.SR.state);
@@ -72,7 +92,7 @@ async close(){
});
connection.on("forceOut", (msg) => {
useUserStore().logOut().then(() => {
ElMessage.error(msg);
alert(msg);
location.href = '/index';
})
});

12
Yi.RuoYi.Vue3/src/views/ERP/material/index.vue
View File

@@ -181,8 +181,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -274,8 +274,8 @@
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
code: undefined
},
@@ -295,7 +295,7 @@
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
dataList.value = response.data.data;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
@@ -327,7 +327,7 @@
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}

22
Yi.RuoYi.Vue3/src/views/ERP/purchase/index.vue
View File

@@ -251,8 +251,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -425,8 +425,8 @@
<pagination
v-show="materialTotal > 0"
:total="Number(materialTotal) "
v-model:page="queryMaterialParams.pageNum"
v-model:limit="queryMaterialParams.pageSize"
v-model:page="queryMaterialParams.skipCount"
v-model:limit="queryMaterialParams.maxResultCount"
@pagination="getMaterialList"
/>
</el-form>
@@ -560,15 +560,15 @@ const data = reactive({
purchaseDetails: [],
},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
code: undefined,
buyer: undefined,
},
queryMaterialParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
code: undefined,
},
@@ -585,7 +585,7 @@ function getList() {
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
dataList.value = response.data.data;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
@@ -603,7 +603,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */
@@ -687,7 +687,7 @@ function getMaterialList() {
proxy.addDateRange(queryMaterialParams.value, dateRange.value)
).then((response) => {
materialList.value = response.data.data;
materialTotal.value = response.data.total;
materialTotal.value = response.data.totalCount;
});
}
/** 表单改变选择 */

12
Yi.RuoYi.Vue3/src/views/ERP/stock/index.vue
View File

@@ -175,8 +175,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -253,8 +253,8 @@
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
code: undefined,
},
@@ -273,7 +273,7 @@
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
dataList.value = response.data.data;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
@@ -291,7 +291,7 @@
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

12
Yi.RuoYi.Vue3/src/views/ERP/supplier/index.vue
View File

@@ -183,8 +183,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -280,8 +280,8 @@
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
code: undefined,
},
@@ -300,7 +300,7 @@
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
dataList.value = response.data.data;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
@@ -318,7 +318,7 @@
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

12
Yi.RuoYi.Vue3/src/views/ERP/unit/index.vue
View File

@@ -175,8 +175,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -253,8 +253,8 @@
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
code: undefined,
},
@@ -273,7 +273,7 @@
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
dataList.value = response.data.data;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
@@ -291,7 +291,7 @@
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

12
Yi.RuoYi.Vue3/src/views/ERP/warehouse/index.vue
View File

@@ -175,8 +175,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -253,8 +253,8 @@
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
code: undefined,
},
@@ -273,7 +273,7 @@
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
dataList.value = response.data.data;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
@@ -296,7 +296,7 @@
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

12
Yi.RuoYi.Vue3/src/views/bbs/article/index.vue
View File

@@ -189,8 +189,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -263,8 +263,8 @@ const articleId=ref("");
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
title: undefined,
isDeleted: undefined,
},
@@ -282,7 +282,7 @@ function getList() {
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
articleList.value = response.data.data;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
@@ -304,7 +304,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

12
Yi.RuoYi.Vue3/src/views/erp/material/index.vue
View File

@@ -181,8 +181,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -274,8 +274,8 @@
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
code: undefined
},
@@ -295,7 +295,7 @@
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
dataList.value = response.data.data;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
@@ -327,7 +327,7 @@
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}

22
Yi.RuoYi.Vue3/src/views/erp/purchase/index.vue
View File

@@ -251,8 +251,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -425,8 +425,8 @@
<pagination
v-show="materialTotal > 0"
:total="Number(materialTotal) "
v-model:page="queryMaterialParams.pageNum"
v-model:limit="queryMaterialParams.pageSize"
v-model:page="queryMaterialParams.skipCount"
v-model:limit="queryMaterialParams.maxResultCount"
@pagination="getMaterialList"
/>
</el-form>
@@ -560,15 +560,15 @@ const data = reactive({
purchaseDetails: [],
},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
code: undefined,
buyer: undefined,
},
queryMaterialParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
code: undefined,
},
@@ -585,7 +585,7 @@ function getList() {
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
dataList.value = response.data.data;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
@@ -603,7 +603,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */
@@ -687,7 +687,7 @@ function getMaterialList() {
proxy.addDateRange(queryMaterialParams.value, dateRange.value)
).then((response) => {
materialList.value = response.data.data;
materialTotal.value = response.data.total;
materialTotal.value = response.data.totalCount;
});
}
/** 表单改变选择 */

12
Yi.RuoYi.Vue3/src/views/erp/stock/index.vue
View File

@@ -175,8 +175,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -253,8 +253,8 @@
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
code: undefined,
},
@@ -273,7 +273,7 @@
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
dataList.value = response.data.data;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
@@ -291,7 +291,7 @@
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

12
Yi.RuoYi.Vue3/src/views/erp/supplier/index.vue
View File

@@ -183,8 +183,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -280,8 +280,8 @@
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
code: undefined,
},
@@ -300,7 +300,7 @@
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
dataList.value = response.data.data;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
@@ -318,7 +318,7 @@
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

12
Yi.RuoYi.Vue3/src/views/erp/unit/index.vue
View File

@@ -175,8 +175,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -253,8 +253,8 @@
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
code: undefined,
},
@@ -273,7 +273,7 @@
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
dataList.value = response.data.data;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
@@ -291,7 +291,7 @@
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

12
Yi.RuoYi.Vue3/src/views/erp/warehouse/index.vue
View File

@@ -175,8 +175,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -253,8 +253,8 @@
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
code: undefined,
},
@@ -273,7 +273,7 @@
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
dataList.value = response.data.data;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
@@ -296,7 +296,7 @@
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

8
Yi.RuoYi.Vue3/src/views/login.vue
View File

@@ -193,7 +193,9 @@ getCookie();
width: 33%;
height: 40px;
float: right;
margin-left:auto;
border: 1px solid #DCDFE6 !important;
border-radius: 4px;
img {
@@ -214,7 +216,7 @@ getCookie();
letter-spacing: 1px;
}
.login-code-img {
height: 40px;
padding-left: 12px;
height: 100%;
width: 100%;
}
</style>

12
Yi.RuoYi.Vue3/src/views/monitor/job/index.vue
View File

@@ -166,8 +166,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -391,8 +391,8 @@ const IsAdd=ref(true);
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
JobId: undefined,
jobGroup: undefined,
status: undefined
@@ -411,7 +411,7 @@ function getList() {
loading.value = true;
listJob(queryParams.value).then(response => {
jobList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
});
}
@@ -443,7 +443,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

10
Yi.RuoYi.Vue3/src/views/monitor/job/log.vue
View File

@@ -132,8 +132,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -195,8 +195,8 @@ const route = useRoute();
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
dictName: undefined,
dictType: undefined,
status: undefined
@@ -221,7 +221,7 @@ function handleClose() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

20
Yi.RuoYi.Vue3/src/views/monitor/logininfor/index.vue
View File

@@ -100,15 +100,15 @@
<el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<el-table-column label="操作系统" align="center" prop="os" :show-overflow-tooltip="true" />
<el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true" />
<el-table-column label="登录状态" align="center" prop="isDeleted">
<!-- <el-table-column label="登录状态" align="center" prop="isDeleted">
<template #default="scope">
<dict-tag :options="sys_common_status" :value="scope.row.isDeleted" />
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="描述" align="center" prop="msg" />
<el-table-column label="访问时间" align="center" prop="createTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
<el-table-column label="访问时间" align="center" prop="creationTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
<span>{{ parseTime(scope.row.creationTime) }}</span>
</template>
</el-table-column>
</el-table>
@@ -116,8 +116,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
</div>
@@ -142,8 +142,8 @@ const defaultSort = ref({ prop: "createTime", order: "descending" });
// 查询参数
const queryParams = ref({
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
loginIp: undefined,
loginUser: undefined,
isDeleted: undefined,
@@ -156,13 +156,13 @@ function getList() {
loading.value = true;
list(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
logininforList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
});
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

18
Yi.RuoYi.Vue3/src/views/monitor/online/index.vue
View File

@@ -24,12 +24,12 @@
</el-form>
<el-table
v-loading="loading"
:data="onlineList.slice((queryParams.pageNum - 1) * queryParams.pageSize, queryParams.pageNum * queryParams.pageSize)"
:data="onlineList.slice((queryParams.skipCount - 1) * queryParams.maxResultCount, queryParams.skipCount * queryParams.maxResultCount)"
style="width: 100%;"
>
<el-table-column label="序号" width="50" type="index" align="center">
<template #default="scope">
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
<span>{{ (queryParams.skipCount - 1) * queryParams.maxResultCount + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="会话编号" align="center" prop="connnectionId" :show-overflow-tooltip="true" />
@@ -55,7 +55,7 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" />
<pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.skipCount" v-model:limit="queryParams.maxResultCount" />
</div>
</template>
@@ -67,12 +67,12 @@ const { proxy } = getCurrentInstance();
const onlineList = ref([]);
const loading = ref(true);
const total = ref(0);
// const pageNum = ref(1);
// const pageSize = ref(10);
// const skipCount = ref(1);
// const maxResultCount = ref(10);
const queryParams = ref({
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
ipaddr: undefined,
userName: undefined
});
@@ -82,13 +82,13 @@ function getList() {
loading.value = true;
initData(queryParams.value).then(response => {
onlineList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
});
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

24
Yi.RuoYi.Vue3/src/views/monitor/operlog/index.vue
View File

@@ -105,9 +105,9 @@
<dict-tag :options="sys_common_status" :value="scope.row.state" />
</template>
</el-table-column>
<el-table-column label="操作日期" align="center" prop="createTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
<el-table-column label="操作日期" align="center" prop="creationTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
<span>{{ parseTime(scope.row.creationTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -125,8 +125,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -135,7 +135,7 @@
<el-form :model="form" label-width="100px">
<el-row>
<el-col :span="12">
<el-form-item label="操作模块：">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>
<el-form-item label="操作模块：">{{ form.title }}</el-form-item>
<el-form-item
label="登录信息："
>{{ form.operUser }} / {{ form.operIp }} / {{ form.operLocation }}</el-form-item>
@@ -153,14 +153,14 @@
<el-col :span="24">
<el-form-item label="返回参数：">{{ form.requestResult }}</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="操作状态：">
<div v-if="form.state === true">正常</div>
<div v-else-if="form.state === false">失败</div>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<el-form-item label="操作时间：">{{ parseTime(form.createTime) }}</el-form-item>
<el-form-item label="操作时间：">{{ parseTime(form.creationTime) }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="异常信息：" v-if="form.state === 1">{{ form.errorMsg }}</el-form-item>
@@ -197,8 +197,8 @@ const defaultSort = ref({ prop: "operTime", order: "descending" });
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
title: undefined,
operUser: undefined,
operType: undefined,
@@ -213,7 +213,7 @@ function getList() {
loading.value = true;
list(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
operlogList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
});
}
@@ -223,7 +223,7 @@ function typeFormat(row, column) {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

12
Yi.RuoYi.Vue3/src/views/system/config/index.vue
View File

@@ -134,8 +134,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -194,8 +194,8 @@ const dateRange = ref([]);
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
configName: undefined,
configKey: undefined,
configType: undefined
@@ -214,7 +214,7 @@ function getList() {
loading.value = true;
listConfig(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
configList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
});
}
@@ -238,7 +238,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

14
Yi.RuoYi.Vue3/src/views/system/dict/data.vue
View File

@@ -128,8 +128,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -213,8 +213,8 @@ const listClassOptions = ref([
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
dictName: undefined,
dictType: undefined,
state: true
@@ -248,7 +248,7 @@ function getList() {
loading.value = true;
listData(queryParams.value).then(response => {
dataList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
});
}
@@ -273,7 +273,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 返回按钮操作 */
@@ -350,6 +350,6 @@ function handleExport() {
}, `dict_data_${new Date().getTime()}.xlsx`);
}
getTypes(route.params && route.params.dictId);
getTypes(route.query && route.query.dictId);
getTypeList();
</script>

29
Yi.RuoYi.Vue3/src/views/system/dict/index.vue
View File

@@ -107,9 +107,10 @@
<el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true"/>
<el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
<template #default="scope">
<router-link :to="'/system/dict-data/index/' + scope.row.id" class="link-type">
<span>{{ scope.row.dictType }}</span>
</router-link>
<!-- <router-link :to="'/system/dict-data/index/' + scope.row.id" class="link-type">
</router-link> -->
<span @click="handleToPath(scope.row.id)">{{ scope.row.dictType }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="state">
@@ -145,8 +146,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -181,6 +182,7 @@
<script setup name="Dict">
import useDictStore from '@/store/modules/dict'
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import router from '../../../router';
const { proxy } = getCurrentInstance();
const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
@@ -199,8 +201,8 @@ const dateRange = ref([]);
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
dictName: undefined,
dictType: undefined,
state: true
@@ -218,7 +220,7 @@ function getList() {
loading.value = true;
listType(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
typeList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
});
}
@@ -234,7 +236,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */
@@ -310,4 +312,13 @@ function handleRefreshCache() {
}
getList();
const handleToPath = (id) => {
router.push({
path:'/system/dict-data/index',
query:{
dictId:id
}
})
}
</script>

10
Yi.RuoYi.Vue3/src/views/system/menu/index.vue
View File

@@ -310,13 +310,14 @@ const refreshTable = ref(true);
const showChooseIcon = ref(false);
const iconSelectRef = ref(null);
const guidEmpty="00000000-0000-0000-0000-000000000000";
const data = reactive({
form: {
},
queryParams: {
menuName: undefined,
visible: undefined
visible: true
},
rules: {
menuName: [{ required: true, message: "菜单名称不能为空", trigger: "blur" }],
@@ -330,6 +331,7 @@ const { queryParams, form, rules } = toRefs(data);
/** 查询菜单列表 */
function getList() {
loading.value = true;
console.log(queryParams.value,"queryParams.value");
listMenu(queryParams.value).then(response => {
menuList.value = proxy.handleTree(response.data.items, "id");
loading.value = false;
@@ -339,7 +341,7 @@ function getList() {
function getTreeselect() {
menuOptions.value = [];
listMenu().then(response => {
const menu = { id: 0, menuName: "主类目", children: [] };
const menu = { id: guidEmpty, menuName: "主类目", children: [] };
menu.children = proxy.handleTree(response.data.items, "id");
menuOptions.value.push(menu);
});
@@ -353,7 +355,7 @@ function cancel() {
function reset() {
form.value = {
id: undefined,
parentId: 0,
parentId: guidEmpty,
menuName: undefined,
menuIcon: undefined,
menuType: 0,
@@ -399,7 +401,7 @@ function handleAdd(row) {
if (row != null && row.id) {
form.value.parentId = row.id;
} else {
form.value.parentId = 0;
form.value.parentId = "00000000-0000-0000-0000-000000000000";
}
open.value = true;
title.value = "添加菜单";

10
Yi.RuoYi.Vue3/src/views/system/notice/index.vue
View File

@@ -112,8 +112,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -190,8 +190,8 @@ const title = ref("");
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
noticeTitle: undefined,
createBy: undefined,
status: undefined
@@ -231,7 +231,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

12
Yi.RuoYi.Vue3/src/views/system/post/index.vue
View File

@@ -112,8 +112,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -167,8 +167,8 @@ const title = ref("");
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
postCode: undefined,
postName: undefined,
state: undefined
@@ -187,7 +187,7 @@ function getList() {
loading.value = true;
listPost(queryParams.value).then(response => {
postList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
});
}
@@ -210,7 +210,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

12
Yi.RuoYi.Vue3/src/views/system/role/authUser.vue
View File

@@ -88,8 +88,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
<select-user ref="selectRef" :roleId="queryParams.roleId" @ok="handleQuery" />
@@ -112,8 +112,8 @@ const total = ref(0);
const userIds = ref([]);
const queryParams = reactive({
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
roleId: route.params.roleId,
userName: undefined,
phone: undefined,
@@ -124,7 +124,7 @@ function getList() {
loading.value = true;
allocatedUserList(queryParams.roleId,queryParams).then(response => {
userList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
});
}
@@ -135,7 +135,7 @@ function handleClose() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.pageNum = 1;
queryParams.skipCount = 1;
getList();
}
/** 重置按钮操作 */

10
Yi.RuoYi.Vue3/src/views/system/role/index.vue
View File

@@ -82,7 +82,7 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
<pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.skipCount" v-model:limit="queryParams.maxResultCount"
@pagination="getList" />
<!-- 添加或修改角色配置对话框 -->
@@ -222,8 +222,8 @@ const data = reactive({
form: {
},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
roleName: undefined,
roleCode: undefined,
state: undefined,
@@ -249,14 +249,14 @@ function getList() {
listRole(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
roleList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

10
Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue
View File

@@ -44,8 +44,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
</el-row>
@@ -76,8 +76,8 @@ const total = ref(0);
const userIds = ref([]);
const queryParams = reactive({
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
roleId: undefined,
userName: undefined,
phone: undefined
@@ -106,7 +106,7 @@ function getList() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.pageNum = 1;
queryParams.skipCount = 1;
getList();
}
/** 重置按钮操作 */

10
Yi.RuoYi.Vue3/src/views/system/user/authRole.vue
View File

@@ -17,10 +17,10 @@
</el-form>
<h4 class="form-header h4">角色信息</h4>
<el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="roleRef" @selection-change="handleSelectionChange" :data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
<el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="roleRef" @selection-change="handleSelectionChange" :data="roles.slice((skipCount - 1) * maxResultCount, skipCount * maxResultCount)">
<el-table-column label="序号" width="55" type="index" align="center">
<template #default="scope">
<span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
<span>{{ (skipCount - 1) * maxResultCount + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
@@ -34,7 +34,7 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="Number(total)" v-model:page="pageNum" v-model:limit="pageSize" />
<pagination v-show="total > 0" :total="Number(total)" v-model:page="skipCount" v-model:limit="maxResultCount" />
<el-form label-width="100px">
<div style="text-align: center;margin-left:-120px;margin-top:30px;">
@@ -53,8 +53,8 @@ const { proxy } = getCurrentInstance();
const loading = ref(true);
const total = ref(0);
const pageNum = ref(1);
const pageSize = ref(10);
const skipCount = ref(1);
const maxResultCount = ref(10);
const roleIds = ref([]);
const roles = ref([]);
const form = ref({

12
Yi.RuoYi.Vue3/src/views/system/user/index.vue
View File

@@ -107,8 +107,8 @@
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount" @pagination="getList" />
</el-col>
</el-row>
@@ -291,8 +291,8 @@ const data = reactive({
form : {
},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
userName: undefined,
phone: undefined,
state: true,
@@ -337,7 +337,7 @@ function getList() {
loading.value = false;
userList.value = res.data.items;
total.value = res.data.total;
total.value = res.data.totalCount;
});
};
/** 节点单击事件 */
@@ -347,7 +347,7 @@ function handleNodeClick(data) {
};
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
};
/** 重置按钮操作 */

12
Yi.RuoYi.Vue3/src/views/template.txt
View File

@@ -110,8 +110,8 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount" @pagination="getList" />
<!-- ---------------------这里是新增和更新的对话框--------------------- -->
<el-dialog :title="title" v-model="open" width="600px" append-to-body>
@@ -175,8 +175,8 @@ const dateRange = ref([]);
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
code: undefined,
},
@@ -195,7 +195,7 @@ function getList() {
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
dataList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
@@ -213,7 +213,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

2
Yi.RuoYi.Vue3/src/views/tool/gen/editTable.vue
View File

@@ -176,7 +176,7 @@ function getFormPromise(form) {
});
}
function close() {
const obj = { path: "/tool/gen", query: { t: Date.now(), pageNum: route.query.pageNum } };
const obj = { path: "/tool/gen", query: { t: Date.now(), skipCount: route.query.skipCount } };
proxy.$tab.closeOpenPage(obj);
}

10
Yi.RuoYi.Vue3/src/views/tool/gen/importTable.vue
View File

@@ -34,8 +34,8 @@
<pagination
v-show="total>0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
</el-row>
@@ -58,8 +58,8 @@ const dbTableList = ref([]);
const { proxy } = getCurrentInstance();
const queryParams = reactive({
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
tableName: undefined,
tableComment: undefined
});
@@ -88,7 +88,7 @@ function getList() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.pageNum = 1;
queryParams.skipCount = 1;
getList();
}
/** 重置按钮操作 */

16
Yi.RuoYi.Vue3/src/views/tool/gen/index.vue
View File

@@ -79,7 +79,7 @@
<el-table-column type="selection" align="center" width="55"></el-table-column>
<el-table-column label="序号" type="index" width="50" align="center">
<template #default="scope">
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
<span>{{(queryParams.skipCount - 1) * queryParams.maxResultCount + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column
@@ -150,8 +150,8 @@
<pagination
v-show="total>0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
<!-- 预览界面 -->
@@ -193,8 +193,8 @@ const uniqueId = ref("");
const data = reactive({
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
tableName: undefined,
tableComment: undefined
},
@@ -212,7 +212,7 @@ onActivated(() => {
const time = route.query.t;
if (time != null && time != uniqueId.value) {
uniqueId.value = time;
queryParams.value.pageNum = Number(route.query.pageNum);
queryParams.value.skipCount = Number(route.query.skipCount);
dateRange.value = [];
proxy.resetForm("queryForm");
getList();
@@ -230,7 +230,7 @@ function getList() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 生成代码操作 */
@@ -289,7 +289,7 @@ function handleSelectionChange(selection) {
/** 修改按钮操作 */
function handleEditTable(row) {
const tableId = row.tableId || ids.value[0];
router.push({ path: "/tool/gen-edit/index/" + tableId, query: { pageNum: queryParams.value.pageNum } });
router.push({ path: "/tool/gen-edit/index/" + tableId, query: { skipCount: queryParams.value.skipCount } });
}
/** 删除按钮操作 */
function handleDelete(row) {

12
Yi.RuoYi.Vue3/src/views/webfirst/field/components/FieldList.vue
View File

@@ -152,8 +152,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -250,8 +250,8 @@ const data = reactive({
orderNum:0
},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
// props.table.id
},
@@ -293,7 +293,7 @@ function getList() {
tableId: props.table.id,
}).then((response) => {
dataList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
});
}
@@ -321,7 +321,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

12
Yi.RuoYi.Vue3/src/views/webfirst/table/index.vue
View File

@@ -195,8 +195,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -260,8 +260,8 @@ const dateRange = ref([]);
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
code: undefined,
},
@@ -279,7 +279,7 @@ function getList() {
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
dataList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
@@ -296,7 +296,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */

12
Yi.RuoYi.Vue3/src/views/webfirst/template/index.vue
View File

@@ -162,8 +162,8 @@
<pagination
v-show="total > 0"
:total="Number(total)"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.skipCount"
v-model:limit="queryParams.maxResultCount"
@pagination="getList"
/>
@@ -252,8 +252,8 @@ const dateRange = ref([]);
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
skipCount: 1,
maxResultCount: 10,
name: undefined,
},
rules: {
@@ -272,7 +272,7 @@ function getList() {
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
dataList.value = response.data.items;
total.value = response.data.total;
total.value = response.data.totalCount;
loading.value = false;
}
);
@@ -289,7 +289,7 @@ function reset() {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.skipCount = 1;
getList();
}
/** 重置按钮操作 */