表格和logo样式调整

menu_style
zhangdi 3 months ago
parent 1c73633db6
commit f0d8dad597
  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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

@ -17,7 +17,7 @@
</span>
</transition>
<transition name="fade">
<span class="logo-name">电镀智能化-MES{{ setting.styleRadio }}</span>
<span class="logo-name">电镀智能化生产管理{{ setting.styleRadio }}</span>
</transition>
<transition name="fade">
<span class="logo-version">版本V2.1.8</span>
@ -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: '';

@ -6,8 +6,9 @@
<i class="icon-navicon" @click="setCollapse"></i>
</div>
</div>
<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>
<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-search class="top-bar__item" v-if="setting.search"></top-search>
</div>
<div class="top-bar__right">
@ -16,6 +17,16 @@
</div> -->
<div v-if="setting.theme" class="top-bar__item">
<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 v-if="setting.lock" class="top-bar__item">
<top-lock></top-lock>
@ -346,10 +357,12 @@ export default {
.logo_bg {
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;
}
.bar__title_fff{
background-color:#fff
.bar__title_fff {
background-color: #fff
}
</style>

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

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

@ -5,24 +5,33 @@
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad">
<template #menu-left>
<el-button type="danger" icon="el-icon-delete" v-if="permission.role_delete" plain
@click="handleDelete">
<el-button type="danger" icon="el-icon-delete" v-if="permission.role_delete" plain @click="handleDelete"
size="small">
</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;">
<el-button type="primary">导入</el-button>
</el-upload>
<el-button type="primary" size="small" icon="el-icon-delete">导入</el-button>
</el-upload> -->
</template>
<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 #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 #menu="{ row }">
<el-button type="primary" text icon="el-icon-setting" plain
style="border: 0; background-color: transparent !important" @click.stop="updateLog(row)">修改记录
<el-button type="primary" text icon="el-icon-tickets" plain
style="border: 0; background-color: transparent !important" @click.stop="updateLog(row)"
size="small">修改记录
</el-button>
</template>
</avue-crud>
@ -46,20 +55,20 @@
</el-tabs>
<template #footer>
<span class="dialog-footer">
<el-button @click="box = false"> </el-button>
<el-button type="primary" @click="submit"> </el-button>
<el-button @click="box = false" size="small"> </el-button>
<el-button type="primary" @click="submit" size="small"> </el-button>
</span>
</template>
</el-dialog>
<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"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad">
</avue-crud>
<template #footer>
<span class="dialog-footer">
<el-button @click="updateVisible = false"> </el-button>
<el-button @click="updateVisible = false" size="small"> </el-button>
</span>
</template>
</el-dialog>
@ -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'
}
]

Loading…
Cancel
Save