suojin
/
jonhon-mes-web
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

表格和logo样式调整

Browse Source
menu_style
zhangdi 3 months ago
parent 1c73633db6
commit f0d8dad597
7 changed files with 124 additions and 113 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      src/assets/logo.png
  2. BIN
      src/assets/logo_bai.png
  3. 14
      src/page/index/sidebar/leftMenu.vue
  4. 23
      src/page/index/top/index.vue
  5. 2
      src/styles/theme/bule.scss
  6. 20
      src/views/productionSchedulingPlan/productPlan.vue
  7. 178
      src/views/productionSchedulingPlan/productRlue.vue

BIN
src/assets/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
src/assets/logo_bai.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

14
src/page/index/sidebar/leftMenu.vue
Unescape View File

@ -17,7 +17,7 @@
</span> </span>
</transition> </transition>
<transition name="fade"> <transition name="fade">
<span class="logo-name">电镀智能化-MES{{ setting.styleRadio }}</span> <span class="logo-name">电镀智能化生产管理{{ setting.styleRadio }}</span>
</transition> </transition>
<transition name="fade"> <transition name="fade">
<span class="logo-version">版本V2.1.8</span> <span class="logo-version">版本V2.1.8</span>
@ -215,19 +215,19 @@ onMounted(() => {
.logo-name { .logo-name {
color: rgb(102, 102, 102); color: rgb(102, 102, 102);
font-size: 14px; font-size: 13px;
font-weight: 550; font-weight: 600;
line-height: 27px; line-height: 27px;
text-align: center; text-align: center;
display: block; display: block;
margin-top: 24px; margin-top: 24px;
margin-bottom: 18px; margin-bottom: 5px;
font-style: italic; font-style: italic;
} }
.logo-version { .logo-version {
color: rgba(66, 66, 66, 1); color: rgba(66, 66, 66, 0.7);
font-size: 14px; font-size: 11px;
font-weight: 400; font-weight: 400;
line-height: 20px; line-height: 20px;
display: block; display: block;
@ -242,7 +242,7 @@ onMounted(() => {
line-height: 25px; line-height: 25px;
margin-top: 18px; margin-top: 18px;
position: relative; position: relative;
margin-bottom: 18px; margin-bottom: 10px;
&::after { &::after {
content: ''; content: '';

23
src/page/index/top/index.vue
Unescape View File

@ -6,8 +6,9 @@
<i class="icon-navicon" @click="setCollapse"></i> <i class="icon-navicon" @click="setCollapse"></i>
</div> </div>
</div> </div>
<div class="top-bar__title" :class="setting.styleRadio == '1'?'bar__title_fff':''"> <div class="top-bar__title" :class="setting.styleRadio == '1' ? 'bar__title_fff' : ''">
<top-menu ref="topMenu" v-if="setting.menu && (setting.styleRadio == '3' || setting.styleRadio == '4')"></top-menu> <top-menu ref="topMenu"
v-if="setting.menu && (setting.styleRadio == '3' || setting.styleRadio == '4')"></top-menu>
<top-search class="top-bar__item" v-if="setting.search"></top-search> <top-search class="top-bar__item" v-if="setting.search"></top-search>
</div> </div>
<div class="top-bar__right"> <div class="top-bar__right">
@ -16,6 +17,16 @@
</div> --> </div> -->
<div v-if="setting.theme" class="top-bar__item"> <div v-if="setting.theme" class="top-bar__item">
<top-theme></top-theme> <top-theme></top-theme>
</div>
<div class="top-bar__item" :title="'消息'">
<el-badge :value="200" :max="99" class="item">
<el-icon>
<Bell />
</el-icon>
</el-badge>
</div>
<div class="top-bar__item" :title="'消息'">
</div> </div>
<!-- <div v-if="setting.lock" class="top-bar__item"> <!-- <div v-if="setting.lock" class="top-bar__item">
<top-lock></top-lock> <top-lock></top-lock>
@ -346,10 +357,12 @@ export default {
.logo_bg { .logo_bg {
background: #000 !important; background: #000 !important;
} }
:deep(.el-sub-menu .el-icon.el-sub-menu__icon-more){
:deep(.el-sub-menu .el-icon.el-sub-menu__icon-more) {
color: #fff !important; color: #fff !important;
} }
.bar__title_fff{
background-color:#fff .bar__title_fff {
background-color: #fff
} }
</style> </style>

2
src/styles/theme/bule.scss
Unescape View File

@ -30,7 +30,7 @@
.top-bar__item { .top-bar__item {
i { i {
color: #fff; // color: #fff;
} }
} }

20
src/views/productionSchedulingPlan/productPlan.vue
Unescape View File

@ -5,7 +5,7 @@
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange" @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad"> @refresh-change="refreshChange" @on-load="onLoad">
<template #menu-left> <template #menu-left>
<el-button type="danger" icon="el-icon-delete" v-if="permission.role_delete" plain <el-button type="danger" icon="el-icon-delete" v-if="permission.role_delete" plain size="small"
@click="handleDelete">删 除 @click="handleDelete">删 除
</el-button> </el-button>
<!-- <el-upload :auto-upload="false" :show-file-list="false" action="action" :on-change="handleChange" <!-- <el-upload :auto-upload="false" :show-file-list="false" action="action" :on-change="handleChange"
@ -20,14 +20,14 @@
<el-switch v-model="row.rlueStatus" /> <el-switch v-model="row.rlueStatus" />
</template> </template>
<template #menu="{ row }"> <template #menu="{ row }">
<el-button type="primary" text plain style="border: 0; background-color: transparent !important" <el-button type="primary" text plain style="border: 0; background-color: transparent !important" size="small"
@click.stop="updateLog(row)">查看工艺路线 @click.stop="updateLog(row)" icon="el-icon-view">查看工艺路线
</el-button> </el-button>
<el-button type="primary" text plain style="border: 0; background-color: transparent !important" <el-button type="primary" text plain style="border: 0; background-color: transparent !important" size="small"
@click.stop="updateLog(row)">分批 @click.stop="updateLog(row)" icon="el-icon-reading">分批
</el-button> </el-button>
<el-button type="primary" text plain style="border: 0; background-color: transparent !important" <el-button type="primary" text plain style="border: 0; background-color: transparent !important" size="small"
@click.stop="updateLog(row)">关闭 @click.stop="updateLog(row)" icon="el-icon-remove">关闭
</el-button> </el-button>
</template> </template>
</avue-crud> </avue-crud>
@ -76,6 +76,7 @@ export default {
}, },
option: { option: {
tip: false, tip: false,
size:'small',
simplePage: true, simplePage: true,
searchShow: true, searchShow: true,
searchMenuSpan: 6, searchMenuSpan: 6,
@ -88,7 +89,6 @@ export default {
viewBtn: false, viewBtn: false,
delBtn: false, delBtn: false,
editBtnText: '修改', editBtnText: '修改',
editBtnIcon: 'aa',
labelWidth: 120, labelWidth: 120,
searchLabelWidth: 100, searchLabelWidth: 100,
menuWidth: 300, menuWidth: 300,
@ -96,6 +96,10 @@ export default {
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
excelBtn: false, excelBtn: false,
filterBtn:true,
searchShowBtn:false,
excelBtn: true,
index:false,
column: [ column: [
{ {
label: '计划单号', label: '计划单号',

178
src/views/productionSchedulingPlan/productRlue.vue
Unescape View File

@ -5,24 +5,33 @@
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange" @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad"> @refresh-change="refreshChange" @on-load="onLoad">
<template #menu-left> <template #menu-left>
<el-button type="danger" icon="el-icon-delete" v-if="permission.role_delete" plain <el-button type="danger" icon="el-icon-delete" v-if="permission.role_delete" plain @click="handleDelete"
@click="handleDelete">删 除 size="small">删 除
</el-button> </el-button>
<!-- <el-button type="primary" @click="handleGet">下载模版</el-button> --> <!-- <el-button type="primary" @click="handleGet">下载模版</el-button> -->
<el-upload :auto-upload="false" :show-file-list="false" action="action" :on-change="handleChange" <!-- <el-upload :auto-upload="false" :show-file-list="false" action="action" :on-change="handleChange"
style="float: right;margin-left: 12px;"> style="float: right;margin-left: 12px;">
<el-button type="primary">导入</el-button> <el-button type="primary" size="small" icon="el-icon-delete">导入</el-button>
</el-upload> </el-upload> -->
</template> </template>
<template #menu-right> <template #menu-right>
</template>
<template #rlueId="{ row }">
<el-text v-if="row.rlueStatus" tag="b" type="primary">{{ row.rlueId }}</el-text>
<el-text v-else tag="b" type="danger">{{ row.rlueId }}</el-text>
</template> </template>
<template #rlueStatus="{ row }"> <template #rlueStatus="{ row }">
<el-switch v-model="row.rlueStatus" /> <el-switch v-model="row.rlueStatus" @change="rlueStatusFn" />
</template>
<template #rluePriority="{ row }">
<el-tag v-if="row.rlueStatus">{{ row.rluePriority }}</el-tag>
<el-tag type="error" v-else>{{ row.rluePriority }}</el-tag>
</template> </template>
<template #menu="{ row }"> <template #menu="{ row }">
<el-button type="primary" text icon="el-icon-setting" plain <el-button type="primary" text icon="el-icon-tickets" plain
style="border: 0; background-color: transparent !important" @click.stop="updateLog(row)">修改记录 style="border: 0; background-color: transparent !important" @click.stop="updateLog(row)"
size="small">修改记录
</el-button> </el-button>
</template> </template>
</avue-crud> </avue-crud>
@ -46,20 +55,20 @@
</el-tabs> </el-tabs>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="box = false">取 消</el-button> <el-button @click="box = false" size="small">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button> <el-button type="primary" @click="submit" size="small">确 定</el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
<el-dialog title="修改记录" append-to-body v-model="updateVisible" width="820px"> <el-dialog title="修改记录" append-to-body v-model="updateVisible" width="820px">
<avue-crud :option="optionLog" :table-loading="loading" :data="data" v-model="form" v-model:page="page" <avue-crud :option="optionLog" :table-loading="loading" :data="dataLog" v-model="form" v-model:page="page"
ref="crud" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" ref="crud" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange" @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad"> @refresh-change="refreshChange" @on-load="onLoad">
</avue-crud> </avue-crud>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="updateVisible = false">取 消</el-button> <el-button @click="updateVisible = false" size="small">取 消</el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
@ -107,6 +116,7 @@ export default {
total: 0, total: 0,
}, },
option: { option: {
size: 'small',
tip: false, tip: false,
simplePage: true, simplePage: true,
searchShow: true, searchShow: true,
@ -125,14 +135,16 @@ export default {
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
excelBtn: true, excelBtn: true,
filterBtn: true,
index: false,
searchShowBtn:false,
column: [ column: [
{ {
label: '规则ID', label: '规则ID',
prop: 'rlueId', prop: 'rlueId',
search: true, search: true,
sortable: true, sortable: true,
span: 24, span: 12,
rules: [ rules: [
{ {
required: true, required: true,
@ -146,7 +158,7 @@ export default {
prop: 'rlueName', prop: 'rlueName',
search: true, search: true,
sortable: true, sortable: true,
span: 24, span: 12,
rules: [ rules: [
{ {
required: true, required: true,
@ -160,7 +172,7 @@ export default {
prop: 'rlueType', prop: 'rlueType',
search: true, search: true,
sortable: true, sortable: true,
span: 24, span: 12,
rules: [ rules: [
{ {
required: true, required: true,
@ -174,7 +186,7 @@ export default {
prop: 'rluePriority', prop: 'rluePriority',
search: false, search: false,
sortable: true, sortable: true,
span: 24, span: 12,
rules: [ rules: [
{ {
required: true, required: true,
@ -188,7 +200,7 @@ export default {
prop: 'rlueStatus', prop: 'rlueStatus',
search: true, search: true,
sortable: true, sortable: true,
span: 24, span: 12,
rules: [ rules: [
{ {
required: true, required: true,
@ -202,7 +214,7 @@ export default {
prop: 'createName', prop: 'createName',
search: true, search: true,
sortable: true, sortable: true,
span: 24, span: 12,
rules: [ rules: [
{ {
required: true, required: true,
@ -215,6 +227,7 @@ export default {
], ],
}, },
optionLog: { optionLog: {
size: 'small',
tip: false, tip: false,
simplePage: true, simplePage: true,
searchShow: false, searchShow: false,
@ -225,95 +238,31 @@ export default {
searchEnter: true, searchEnter: true,
menu: false, menu: false,
addBtn: false, addBtn: false,
index: false,
column: [ column: [
{ {
label: '规则ID', label: '规则ID',
prop: 'rlueId', prop: 'rlueId',
span: 24,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
}, },
{ {
label: '名称', label: '名称',
prop: 'rlueName', prop: 'rlueName',
span: 24,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
}, },
{ {
label: '类型', label: '修改人',
prop: 'rlueType', prop: 'updateName',
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: '修改时间', label: '修改时间',
prop: 'createName', prop: 'updateTime',
span: 24, width:150,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
}, },
], ],
}, },
dataLog: [],
data: [], data: [],
}; };
}, },
@ -532,6 +481,35 @@ export default {
}, },
updateLog() { updateLog() {
this.updateVisible = true 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 = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
@ -541,7 +519,23 @@ export default {
rlueName: '规则一', rlueName: '规则一',
rlueType: '排序规则', rlueType: '排序规则',
rluePriority: '1', 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' createName: 'admin'
} }
] ]

Write Preview
Loading…
Cancel
Save