diff --git a/src/assets/logo.png b/src/assets/logo.png index 11cee19..b2b120e 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/assets/logo_bai.png b/src/assets/logo_bai.png new file mode 100644 index 0000000..9c9b544 Binary files /dev/null and b/src/assets/logo_bai.png differ diff --git a/src/page/index/sidebar/leftMenu.vue b/src/page/index/sidebar/leftMenu.vue index 03d6cc8..650de6e 100644 --- a/src/page/index/sidebar/leftMenu.vue +++ b/src/page/index/sidebar/leftMenu.vue @@ -17,7 +17,7 @@ - 电镀智能化-MES{{ setting.styleRadio }} + 电镀智能化生产管理{{ setting.styleRadio }} 版本V2.1.8 @@ -215,19 +215,19 @@ onMounted(() => { .logo-name { color: rgb(102, 102, 102); - font-size: 14px; - font-weight: 550; + font-size: 13px; + font-weight: 600; line-height: 27px; text-align: center; display: block; margin-top: 24px; - margin-bottom: 18px; + margin-bottom: 5px; font-style: italic; } .logo-version { - color: rgba(66, 66, 66, 1); - font-size: 14px; + color: rgba(66, 66, 66, 0.7); + font-size: 11px; font-weight: 400; line-height: 20px; display: block; @@ -242,7 +242,7 @@ onMounted(() => { line-height: 25px; margin-top: 18px; position: relative; - margin-bottom: 18px; + margin-bottom: 10px; &::after { content: ''; diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index c6352be..1dd7b73 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -6,8 +6,9 @@ -
- +
+
@@ -16,6 +17,16 @@
-->
+
+
+ + + + + +
+
+
- - 导入 - + 导入 + --> + + @@ -46,20 +55,20 @@ - @@ -107,6 +116,7 @@ export default { total: 0, }, option: { + size: 'small', tip: false, simplePage: true, searchShow: true, @@ -125,14 +135,16 @@ export default { dialogClickModal: false, searchEnter: true, excelBtn: true, - + filterBtn: true, + index: false, + searchShowBtn:false, column: [ { label: '规则ID', prop: 'rlueId', search: true, sortable: true, - span: 24, + span: 12, rules: [ { required: true, @@ -146,7 +158,7 @@ export default { prop: 'rlueName', search: true, sortable: true, - span: 24, + span: 12, rules: [ { required: true, @@ -160,7 +172,7 @@ export default { prop: 'rlueType', search: true, sortable: true, - span: 24, + span: 12, rules: [ { required: true, @@ -174,7 +186,7 @@ export default { prop: 'rluePriority', search: false, sortable: true, - span: 24, + span: 12, rules: [ { required: true, @@ -188,7 +200,7 @@ export default { prop: 'rlueStatus', search: true, sortable: true, - span: 24, + span: 12, rules: [ { required: true, @@ -202,7 +214,7 @@ export default { prop: 'createName', search: true, sortable: true, - span: 24, + span: 12, rules: [ { required: true, @@ -215,6 +227,7 @@ export default { ], }, optionLog: { + size: 'small', tip: false, simplePage: true, searchShow: false, @@ -225,95 +238,31 @@ export default { searchEnter: true, menu: false, addBtn: false, - + index: false, column: [ { label: '规则ID', prop: 'rlueId', - span: 24, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], }, { label: '名称', prop: 'rlueName', - span: 24, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '类型', - prop: 'rlueType', - span: 24, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '优先级', - prop: 'rluePriority', - span: 24, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '状态', - prop: 'rlueStatus', - span: 24, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], }, { - label: '创建人', - prop: 'createName', - span: 24, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], + label: '修改人', + prop: 'updateName', + }, { label: '修改时间', - prop: 'createName', - span: 24, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], + prop: 'updateTime', + width:150, + }, ], }, + dataLog: [], data: [], }; }, @@ -532,6 +481,35 @@ export default { }, updateLog() { this.updateVisible = true + this.dataLog = [ + { + rlueId: '2025001', + rlueName: '规则一', + createName: 'admin', + updateTime: '2025-09-05 12:04:40', + updateName:'admin', + }, + { + rlueId: '2025001', + rlueName: '规则一', + createName: 'admin', + updateTime: '2025-09-04 12:04:40', + updateName:'张迪', + } + ] + }, + rlueStatusFn(val) { + if (val) { + this.$message({ + type: 'success', + message: '启用成功!', + }); + } else { + this.$message({ + type: 'error', + message: '禁用成功!', + }); + } }, onLoad(page, params = {}) { this.loading = true; @@ -541,7 +519,23 @@ export default { rlueName: '规则一', rlueType: '排序规则', rluePriority: '1', - rlueStatus: '0',//0 否 1 是 + rlueStatus: false,//false 否 true 是 + createName: 'admin' + }, + { + rlueId: '2025002', + rlueName: '规则二', + rlueType: '排序规则', + rluePriority: '2', + rlueStatus: true,//false 否 true 是 + createName: '张迪' + }, + { + rlueId: '2025003', + rlueName: '规则三', + rlueType: '排序规则', + rluePriority: '3', + rlueStatus: true,//false 否 true 是 createName: 'admin' } ]