From d4f427bf7c0ff1cf0ed1ac420bba8a063f9ef840 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 02 七月 2024 17:25:39 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/views/system/operationRecord/index.vue | 11 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java | 4
zy-asrs-admin/src/views/system/userLogin/edit.vue | 113 +++++++--------------------
zy-asrs-wms/src/main/java/operationRecord.sql | 9 ++
zy-asrs-admin/src/views/system/operationRecord/edit.vue | 28 +++---
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java | 5
zy-asrs-admin/src/locales/en_US.js | 19 ++++
7 files changed, 88 insertions(+), 101 deletions(-)
diff --git a/zy-asrs-admin/src/locales/en_US.js b/zy-asrs-admin/src/locales/en_US.js
index c413ba3..9f17a4b 100644
--- a/zy-asrs-admin/src/locales/en_US.js
+++ b/zy-asrs-admin/src/locales/en_US.js
@@ -181,4 +181,23 @@
'db.sys_dept.update_time':'UpdateTime',
'db.sys_dept.update_by':'UpdateBy',
'db.sys_dept.sort':'Sort',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
+ 'db.sys_operation_record.namespace':'Namespace',
+ 'db.sys_operation_record.url':'Url',
+ 'db.sys_operation_record.appkey':'Appkey',
+ 'db.sys_operation_record.timestamp':'Timestamp',
+ 'db.sys_operation_record.client_ip':'ClientIp',
+ 'db.sys_operation_record.request':'Request',
+ 'db.sys_operation_record.response':'Response',
+ 'db.sys_operation_record.spend_time':'SpendTime',
+ 'db.sys_operation_record.err':'Err',
+ 'db.sys_operation_record.result':'Result',
+ 'db.sys_operation_record.user_id':'UserId',
+ 'db.sys_operation_record.create_time':'CreateTime',
+ 'db.sys_operation_record.memo':'Memo',
};
\ No newline at end of file
diff --git a/zy-asrs-admin/src/views/system/operationRecord/edit.vue b/zy-asrs-admin/src/views/system/operationRecord/edit.vue
index 19d416f..49a3e70 100644
--- a/zy-asrs-admin/src/views/system/operationRecord/edit.vue
+++ b/zy-asrs-admin/src/views/system/operationRecord/edit.vue
@@ -9,7 +9,6 @@
const open = ref(false);
const initFormData = {}
let formData = ref(initFormData);
-const treeData = ref(null);
const emit = defineEmits(['tableReload'])
@@ -52,7 +51,6 @@
open,
formData,
initFormData,
- treeData,
isSave,
})
@@ -73,7 +71,7 @@
style="display: flex;justify-content: space-between;flex-wrap: wrap;" autocomplete="off"
@finish="onFinish" @finishFailed="onFinishFailed">
<a-form-item
- label="鍚嶇О绌洪棿"
+ :label="formatMessage('db.sys_operation_record.namespace', '鍚嶇О绌洪棿') "
name="namespace"
style="width: 250px;"
>
@@ -82,7 +80,7 @@
/>
</a-form-item>
<a-form-item
- label="鎺ュ彛鍦板潃"
+ :label="formatMessage('db.sys_operation_record.url', '鎺ュ彛鍦板潃') "
name="url"
style="width: 250px;"
>
@@ -91,7 +89,7 @@
/>
</a-form-item>
<a-form-item
- label="骞冲彴瀵嗛挜"
+ :label="formatMessage('db.sys_operation_record.appkey', '骞冲彴瀵嗛挜') "
name="appkey"
style="width: 250px;"
>
@@ -100,7 +98,7 @@
/>
</a-form-item>
<a-form-item
- label="鏃堕棿鎴�"
+ :label="formatMessage('db.sys_operation_record.timestamp', '鏃堕棿鎴�') "
name="timestamp"
style="width: 250px;"
>
@@ -109,7 +107,7 @@
/>
</a-form-item>
<a-form-item
- label="瀹㈡埛绔疘P"
+ :label="formatMessage('db.sys_operation_record.client_ip', '瀹㈡埛绔疘P') "
name="clientIp"
style="width: 250px;"
>
@@ -118,7 +116,7 @@
/>
</a-form-item>
<a-form-item
- label="璇锋眰鍐呭"
+ :label="formatMessage('db.sys_operation_record.request', '璇锋眰鍐呭') "
name="request"
style="width: 250px;"
>
@@ -127,7 +125,7 @@
/>
</a-form-item>
<a-form-item
- label="鍝嶅簲鍐呭"
+ :label="formatMessage('db.sys_operation_record.response', '鍝嶅簲鍐呭') "
name="response"
style="width: 250px;"
>
@@ -136,7 +134,7 @@
/>
</a-form-item>
<a-form-item
- label="娑堣�楁椂闂�"
+ :label="formatMessage('db.sys_operation_record.spend_time', '娑堣�楁椂闂�') "
name="spendTime"
style="width: 250px;"
>
@@ -145,7 +143,7 @@
/>
</a-form-item>
<a-form-item
- label="寮傚父鍐呭"
+ :label="formatMessage('db.sys_operation_record.err', '寮傚父鍐呭') "
name="err"
style="width: 250px;"
>
@@ -154,7 +152,7 @@
/>
</a-form-item>
<a-form-item
- label="缁撴灉"
+ :label="formatMessage('db.sys_operation_record.result', '缁撴灉') "
name="result"
style="width: 250px;"
>
@@ -168,7 +166,7 @@
</a-select>
</a-form-item>
<a-form-item
- label="鐢ㄦ埛"
+ :label="formatMessage('db.sys_operation_record.user_id', '鐢ㄦ埛') "
name="userId"
style="width: 250px;"
>
@@ -184,7 +182,7 @@
</a-select>
</a-form-item>
<a-form-item
- label="娣诲姞鏃堕棿"
+ :label="formatMessage('db.sys_operation_record.create_time', '娣诲姞鏃堕棿') "
name="createTime"
style="width: 250px;"
>
@@ -196,7 +194,7 @@
/>
</a-form-item>
<a-form-item
- label="澶囨敞"
+ :label="formatMessage('db.sys_operation_record.memo', '澶囨敞') "
name="memo"
style="width: 250px;"
>
diff --git a/zy-asrs-admin/src/views/system/operationRecord/index.vue b/zy-asrs-admin/src/views/system/operationRecord/index.vue
index e69d0b5..e041f71 100644
--- a/zy-asrs-admin/src/views/system/operationRecord/index.vue
+++ b/zy-asrs-admin/src/views/system/operationRecord/index.vue
@@ -24,26 +24,31 @@
title: formatMessage('db.sys_operation_record.namespace', '鍚嶇О绌洪棿'),
dataIndex: 'namespace',
width: 140,
+ ellipsis: true,
},
{
title: formatMessage('db.sys_operation_record.url', '鎺ュ彛鍦板潃'),
dataIndex: 'url',
width: 140,
+ ellipsis: true,
},
{
title: formatMessage('db.sys_operation_record.appkey', '骞冲彴瀵嗛挜'),
dataIndex: 'appkey',
width: 140,
+ ellipsis: true,
},
{
title: formatMessage('db.sys_operation_record.timestamp', '鏃堕棿鎴�'),
dataIndex: 'timestamp',
width: 140,
+ ellipsis: true,
},
{
title: formatMessage('db.sys_operation_record.client_ip', '瀹㈡埛绔疘P'),
dataIndex: 'clientIp',
width: 140,
+ ellipsis: true,
},
{
title: formatMessage('db.sys_operation_record.request', '璇锋眰鍐呭'),
@@ -61,31 +66,37 @@
title: formatMessage('db.sys_operation_record.spend_time', '娑堣�楁椂闂�'),
dataIndex: 'spendTime',
width: 140,
+ ellipsis: true,
},
{
title: formatMessage('db.sys_operation_record.err', '寮傚父鍐呭'),
dataIndex: 'err',
width: 140,
+ ellipsis: true,
},
{
title: formatMessage('db.sys_operation_record.result', '缁撴灉'),
dataIndex: 'result$',
width: 140,
+ ellipsis: true,
},
{
title: formatMessage('db.sys_operation_record.user_id', '鐢ㄦ埛'),
dataIndex: 'userId$',
width: 140,
+ ellipsis: true,
},
{
title: formatMessage('db.sys_operation_record.create_time', '娣诲姞鏃堕棿'),
dataIndex: 'createTime$',
width: 140,
+ ellipsis: true,
},
{
title: formatMessage('db.sys_operation_record.memo', '澶囨敞'),
dataIndex: 'memo',
width: 140,
+ ellipsis: true,
},
{
diff --git a/zy-asrs-admin/src/views/system/userLogin/edit.vue b/zy-asrs-admin/src/views/system/userLogin/edit.vue
index 22e5082..b1a15d6 100644
--- a/zy-asrs-admin/src/views/system/userLogin/edit.vue
+++ b/zy-asrs-admin/src/views/system/userLogin/edit.vue
@@ -38,10 +38,10 @@
console.log('Failed:', errorInfo);
};
-const UserQueryList = ref(null);
+const UserQueryList = ref(null);
UserQuery();
-function UserQuery() {
- postForm('/api/user/query', {}).then(resp => {
+function UserQuery() {
+ postForm('/api/user/query', {}).then(resp => {
let result = resp.data;
UserQueryList.value = result.data;
})
@@ -72,87 +72,36 @@
<a-form :model="formData" name="formTable" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }"
style="display: flex;justify-content: space-between;flex-wrap: wrap;" autocomplete="off"
@finish="onFinish" @finishFailed="onFinishFailed">
- <a-form-item
- label="鐢ㄦ埛"
- name="userId"
- style="width: 250px;"
- :rules="[{ required: true }]"
- >
- <a-select
- v-model:value="formData.userId"
- placeholder="Select users"
- style="width: 100%"
- show-search
- :options="UserQueryList"
- optionFilterProp="label"
- optionLabelProp="label"
- >
+ <a-form-item label="鐢ㄦ埛" name="userId" style="width: 250px;" :rules="[{ required: true }]">
+ <a-select v-model:value="formData.userId" placeholder="Select users" style="width: 100%" show-search
+ :options="UserQueryList" optionFilterProp="label" optionLabelProp="label">
</a-select>
- </a-form-item>
- <a-form-item
- label="瀵嗛挜"
- name="token"
- style="width: 250px;"
- >
- <a-input
- v-model:value="formData.token"
- />
- </a-form-item>
- <a-form-item
- label="鐧诲綍ip"
- name="ip"
- style="width: 250px;"
- >
- <a-input
- v-model:value="formData.ip"
- />
- </a-form-item>
- <a-form-item
- label="绫诲瀷"
- name="type"
- style="width: 250px;"
- >
- <a-select
- v-model:value="formData.type"
- :options="[
- { label: '鐧诲綍鎴愬姛', value: 0 },
- { label: '鐧诲綍澶辫触', value: 1 },
- { label: '閫�鍑虹櫥褰�', value: 2 },
- { label: '缁token', value: 3 },
- ]"
- >
+ </a-form-item>
+ <a-form-item label="瀵嗛挜" name="token" style="width: 250px;">
+ <a-input v-model:value="formData.token" />
+ </a-form-item>
+ <a-form-item label="鐧诲綍ip" name="ip" style="width: 250px;">
+ <a-input v-model:value="formData.ip" />
+ </a-form-item>
+ <a-form-item label="绫诲瀷" name="type" style="width: 250px;">
+ <a-select v-model:value="formData.type" :options="[
+ { label: '鐧诲綍鎴愬姛', value: 0 },
+ { label: '鐧诲綍澶辫触', value: 1 },
+ { label: '閫�鍑虹櫥褰�', value: 2 },
+ { label: '缁token', value: 3 },
+ ]">
</a-select>
- </a-form-item>
- <a-form-item
- label="娣诲姞鏃堕棿"
- name="createTime"
- style="width: 250px;"
- >
- <a-date-picker
- v-model:value="formData.createTime"
- show-time
- format="YYYY-MM-DD HH:mm:ss"
- value-format="YYYY-MM-DD HH:mm:ss"
- />
- </a-form-item>
- <a-form-item
- label="鐧诲綍绯荤粺"
- name="system"
- style="width: 250px;"
- >
- <a-input
- v-model:value="formData.system"
- />
- </a-form-item>
- <a-form-item
- label="澶囨敞"
- name="memo"
- style="width: 250px;"
- >
- <a-input
- v-model:value="formData.memo"
- />
- </a-form-item>
+ </a-form-item>
+ <a-form-item label="娣诲姞鏃堕棿" name="createTime" style="width: 250px;">
+ <a-date-picker v-model:value="formData.createTime" show-time format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss" />
+ </a-form-item>
+ <a-form-item label="鐧诲綍绯荤粺" name="system" style="width: 250px;">
+ <a-input v-model:value="formData.system" />
+ </a-form-item>
+ <a-form-item label="澶囨敞" name="memo" style="width: 250px;">
+ <a-input v-model:value="formData.memo" />
+ </a-form-item>
<a-form-item>
<a-button type="primary" html-type="submit" ref="submitButton"
diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java
index b248609..5aacc58 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java
@@ -788,7 +788,8 @@
sb.append(column.getHumpName());
}
sb.append("',\n")
- .append(" width: 140,\n");
+ .append(" width: 140,\n")
+ .append(" ellipsis: true,\n");
// if (!Cools.isEmpty(column.getEnums())) {
// sb.append(" customRender: (column) => {\n");
// sb.append(" let typeMap = {");
@@ -861,7 +862,7 @@
}
sb.append(" <a-form-item \n");
- sb.append(" label=\"").append(column.getComment()).append("\" \n");
+ sb.append(" :label=\"formatMessage('db.").append(table).append(".").append(column.getName()).append("', '").append(column.getComment()).append("') ").append("\" \n");
sb.append(" name=\"").append(column.getHumpName()).append("\" \n");
sb.append(" style=\"width: 250px;\" \n");
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
index fb90abb..47ab7ed 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
@@ -22,8 +22,8 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="sys_dept";
- generator.tableName="閮ㄩ棬绠＄悊";
+ generator.table="sys_operation_record";
+ generator.tableName="鎿嶄綔鏃ュ織";
generator.packagePath="com.zy.asrs.wms.system";
generator.build();
diff --git a/zy-asrs-wms/src/main/java/operationRecord.sql b/zy-asrs-wms/src/main/java/operationRecord.sql
new file mode 100644
index 0000000..3046e93
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/operationRecord.sql
@@ -0,0 +1,9 @@
+-- save operationRecord record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '鎿嶄綔鏃ュ織绠＄悊', '0', '/system/operationRecord', '/system/operationRecord', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ鎿嶄綔鏃ュ織', '', '1', 'system:operationRecord:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞鎿嶄綔鏃ュ織', '', '1', 'system:operationRecord:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼鎿嶄綔鏃ュ織', '', '1', 'system:operationRecord:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎鎿嶄綔鏃ュ織', '', '1', 'system:operationRecord:remove', '3', '1', '1');
+
--
Gitblit v1.9.1