样式调整

menu_style
zhangdi 3 months ago
parent 6916082402
commit ebeeeb0159
  1. 4
      src/page/index/index.vue
  2. 31
      src/page/index/logo.vue
  3. 29
      src/page/index/setting.vue
  4. 5
      src/page/index/top/index.vue
  5. 2
      src/store/modules/common.js
  6. 2
      src/styles/theme/bule.scss
  7. 682
      src/views/productionSchedulingPlan/productPlan.vue
  8. 124
      src/views/productionSchedulingPlan/productRlue.vue

@ -2,8 +2,8 @@
<el-watermark :content="watermark" style="height: 100%">
<div class="avue-contail" :class="{ 'avue--collapse': isCollapse }">
<div class="avue-layout" :class="{ 'avue-layout--horizontal': isHorizontal }">
<div class="avue-sidebar" v-show="validSidebar" :style="{ width: setting.styleRadio == '3' && '195px',background: setting.styleRadio == '3' && '#f7fafc'}"
:class="setting.styleRadio == '2' ? 'styleRadio' : ''">
<!-- :style="{ width: setting.styleRadio == '3' && '195px',background: setting.styleRadio == '3' && '#f7fafc'}" -->
<div class="avue-sidebar" v-show="validSidebar" :class="setting.styleRadio == '2' ? 'styleRadio' : ''">
<!-- 左侧导航栏 -->
<logo v-if="setting.styleRadio == '1' || setting.styleRadio == '3'|| setting.styleRadio == '4'" />
<sidebar />

@ -1,15 +1,15 @@
<template>
<div class="avue-logo" :class="setting.styleRadio=='4'?'logo_bg':''">
<div class="avue-logo" :class="setting.styleRadio == '4' ? 'logo_bg' : ''">
<transition name="fade">
<span v-if="getScreen(isCollapse)" class="avue-logo_subtitle" key="0">
<span class="avue-logo_subtitle" key="0">
<img class="logo-img" src="@/assets/logo.png" />
</span>
</transition>
<transition-group name="fade">
<!-- <transition-group name="fade">
<template v-if="getScreen(!isCollapse)">
<span class="logo-title" key="1">{{ website.indexTitle }} </span>
</template>
</transition-group>
</transition-group> -->
</div>
</template>
@ -21,14 +21,14 @@ export default {
data() {
return {};
},
created() {},
created() { },
computed: {
...mapGetters(['isCollapse','setting']),
...mapGetters(['isCollapse', 'setting']),
},
methods: {},
};
</script>
<style scoped>
<style scoped lang="scss">
.logo-title {
font-size: 18px;
background-image: linear-gradient(120deg, #54b6d0 16%, #3f8bdb, #2c77f1);
@ -37,11 +37,22 @@ export default {
font-weight: 700;
padding-left: 15px;
}
.logo_bg {
// .logo-img {
// width: 40px;
// margin-top: 5px;
// }
}
.logo-img {
width: 40px;
margin-top: 5px;
width: calc(100% - 70px);
height:calc(100% - 60px);
// margin: 20px 10px;
margin-top:15px
}
.logo_bg{
.logo_bg {
background: #000 !important;
}
</style>

@ -86,17 +86,17 @@ export default {
...mapGetters(['isHorizontal', 'setting', 'tagWel', 'themeName']),
},
watch: {
setting: function (val) {
if (setting.styleRadio == '3') {
this.$store.commit('SET_THEME_NAME', 'theme-white');
setTheme('theme-white');
if (this.$store.getters.isMacOs) {
this.$router.push(this.tagWel);
setTimeout(() => location.reload());
}
}
// setting: function (val) {
// if (setting.styleRadio == '3') {
// this.$store.commit('SET_THEME_NAME', 'theme-white');
// setTheme('theme-white');
// if (this.$store.getters.isMacOs) {
// this.$router.push(this.tagWel);
// setTimeout(() => location.reload());
// }
// }
},
// },
},
methods: {
styleRadioChange(val) {
@ -114,7 +114,14 @@ export default {
this.$router.push(this.tagWel);
setTimeout(() => location.reload());
}
} else {
} else if (val == '1') {
this.$store.commit('SET_THEME_NAME', 'theme-bule');
setTheme('theme-bule');
if (this.$store.getters.isMacOs) {
this.$router.push(this.tagWel);
setTimeout(() => location.reload());
}
}else{
this.$store.commit('SET_THEME_NAME', 'theme-go');
setTheme('theme-go');
if (this.$store.getters.isMacOs) {

@ -6,7 +6,7 @@
<i class="icon-navicon" @click="setCollapse"></i>
</div>
</div>
<div class="top-bar__title">
<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>
@ -349,4 +349,7 @@ export default {
:deep(.el-sub-menu .el-icon.el-sub-menu__icon-more){
color: #fff !important;
}
.bar__title_fff{
background-color:#fff
}
</style>

@ -11,7 +11,7 @@ const common = {
isRefresh: true,
isLock: getStore({ name: 'isLock' }),
colorName: getStore({ name: 'colorName' }) || '#2C77F1',
themeName: getStore({ name: 'themeName' }) || 'theme-go',
themeName: 'theme-bule',
lockPasswd: getStore({ name: 'lockPasswd' }) || '',
website: website,
setting: website.setting,

@ -13,7 +13,7 @@
}
.el-dropdown {
color: #fff;
// color: #fff;
}
.avue-logo {

@ -1,3 +1,681 @@
<template>
生产计划
</template>
<basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" 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">
<template #menu-left>
<el-button type="danger" icon="el-icon-delete" v-if="permission.role_delete" plain
@click="handleDelete">
</el-button>
<!-- <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> -->
</template>
<template #menu-right>
</template>
<template #rlueStatus="{ row }">
<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>
<el-button type="primary" text plain style="border: 0; background-color: transparent !important"
@click.stop="updateLog(row)">分批
</el-button>
<el-button type="primary" text plain style="border: 0; background-color: transparent !important"
@click.stop="updateLog(row)">关闭
</el-button>
</template>
</avue-crud>
</basic-container>
</template>
<script>
import {
add,
getRole,
getRoleAlias,
getRoleTreeById,
grant,
grantTree,
remove,
update,
} from '@/api/system/role';
import { mapGetters } from 'vuex';
import website from '@/config/website';
import { validatenull } from '@/utils/validate';
import { getList } from '@/api/base/region';
export default {
data() {
return {
form: {},
box: false,
props: {
label: 'title',
value: 'key',
},
menuGrantList: [],
dataScopeGrantList: [],
apiScopeGrantList: [],
apiGrantList: [],
menuTreeObj: [],
dataScopeTreeObj: [],
apiScopeTreeObj: [],
selectionList: [],
query: {},
loading: true,
page: {
pageSize: 10,
currentPage: 1,
total: 0,
},
option: {
tip: false,
simplePage: true,
searchShow: true,
searchMenuSpan: 6,
searchIcon: true,
searchIndex: 3,
tree: false,
border: true,
index: true,
selection: true,
viewBtn: false,
delBtn: false,
editBtnText: '修改',
editBtnIcon: 'aa',
labelWidth: 120,
searchLabelWidth: 100,
menuWidth: 250,
dialogWidth: 900,
dialogClickModal: false,
searchEnter: true,
excelBtn: false,
column: [
{
label: '计划单号',
prop: 'rlueId',
search: true,
sortable: true,
width: 120,
span: 12,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '零件号',
prop: 'rlueName',
search: true,
sortable: true,
width: 120,
span: 12,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '产品型号',
prop: 'rlueType',
search: true,
sortable: true,
disabled:true,
width: 120,
span: 12,
rules: [
{
required: false,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '名称',
prop: 'rluePriority',
search: true,
sortable: true,
disabled:true,
span: 12,
rules: [
{
required: false,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '镀种',
prop: 'rlueStatus',
search: true,
sortable: true,
disabled:true,
span: 12,
rules: [
{
required: false,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '镀种小类',
prop: 'createName',
search: true,
sortable: true,
width: 120,
display:false,
span: 12,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '生产标识',
prop: 'createName',
search: false,
sortable: true,
width: 120,
span: 12,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '使用部门',
prop: 'createName',
search: true,
sortable: true,
disabled:true,
width: 120,
span: 12,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '生产数量',
prop: 'createName',
search: false,
sortable: true,
width: 120,
span: 12,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '面积(d㎡)',
prop: 'createName',
search: false,
sortable: true,
width: 120,
span: 12,
disabled:true,
rules: [
{
required: false,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '需求交期',
prop: 'createName',
search: true,
sortable: true,
width: 120,
span: 12,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '计划员',
prop: 'createName',
search: true,
sortable: true,
width: 120,
span: 12,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '计划下达时间',
prop: 'createName',
search: true,
sortable: true,
width: 150,
span: 12,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '优先级',
prop: 'createName',
search: false,
sortable: true,
hide:true,
span: 12,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '计划类型',
prop: 'createName',
search: false,
sortable: true,
hide:true,
span: 12,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '工艺路线',
prop: 'createName',
search: false,
sortable: true,
disabled:true,
hide:true,
span: 24,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '备注',
prop: 'createName',
search: false,
sortable: true,
span: 24,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '产品系列',
prop: 'createName',
search: false,
sortable: true,
width: 120,
span: 12,
display:false,
rules: [
{
required: false,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '已交付数量',
prop: 'createName',
search: false,
sortable: true,
width: 150,
span: 12,
display:false,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '未交付数量',
prop: 'createName',
search: false,
sortable: true,
width: 150,
span: 12,
display:false,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '状态',
prop: 'createName',
search: true,
sortable: true,
span: 12,
display:false,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '作业中心',
prop: 'createName',
search: false,
sortable: true,
width: 120,
span: 12,
display:false,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
],
},
data: [],
};
},
computed: {
...mapGetters(['userInfo', 'permission']),
permissionList() {
return {
addBtn: this.validData(this.permission.role_add, false),
viewBtn: this.validData(this.permission.role_view, false),
delBtn: this.validData(this.permission.role_delete, false),
editBtn: this.validData(this.permission.role_edit, false),
};
},
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(',');
},
idsArray() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids;
},
},
watch: {
'form.currentAlias'() {
const alias = this.form.currentAlias;
if (!validatenull(alias)) {
this.form.roleAlias = alias;
}
},
},
methods: {
initData(roleId) {
getRoleTreeById(roleId).then(res => {
const column = this.findObject(this.option.column, 'parentId');
column.dicData = res.data.data;
});
},
submit() {
const menuList = this.$refs.treeMenu.getCheckedKeys();
const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
grant(this.idsArray, menuList, dataScopeList, apiScopeList).then(() => {
this.box = false;
this.$message({
type: 'success',
message: '操作成功!',
});
this.selectionList = [];
this.onLoad(this.page);
});
},
rowSave(row, done, loading) {
add(row).then(
() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
done();
},
error => {
window.console.log(error);
loading();
}
);
},
rowUpdate(row, index, done, loading) {
update(row).then(
() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
done();
},
error => {
window.console.log(error);
loading();
}
);
},
rowDel(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
});
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
beforeOpen(done, type) {
if (['add', 'edit'].includes(type)) {
this.initData(this.form.id);
}
if (['edit', 'view'].includes(type)) {
if (this.form.parentId === '0') {
this.form.parentId = '';
}
}
getRoleAlias().then(res => {
const column = this.findObject(this.option.column, 'currentAlias');
column.dicData = res.data.data;
});
done();
},
handleRole() {
if (this.selectionList.length !== 1) {
this.$message.warning('只能选择一条数据');
return;
}
this.menuTreeObj = [];
this.dataScopeTreeObj = [];
this.apiScopeTreeObj = [];
grantTree().then(res => {
this.menuGrantList = res.data.data.menu;
this.dataScopeGrantList = res.data.data.dataScope;
this.apiScopeGrantList = res.data.data.apiScope;
getRole(this.ids).then(res => {
this.menuTreeObj = res.data.data.menu;
this.dataScopeTreeObj = res.data.data.dataScope;
this.apiScopeTreeObj = res.data.data.apiScope;
this.box = true;
});
});
},
handleRowRole(row) {
this.menuTreeObj = [];
this.dataScopeTreeObj = [];
this.apiScopeTreeObj = [];
grantTree().then(res => {
this.menuGrantList = res.data.data.menu;
this.dataScopeGrantList = res.data.data.dataScope;
this.apiScopeGrantList = res.data.data.apiScope;
getRole(row.id).then(res => {
this.menuTreeObj = res.data.data.menu;
this.dataScopeTreeObj = res.data.data.dataScope;
this.apiScopeTreeObj = res.data.data.apiScope;
this.selectionList.push(row);
this.box = true;
});
});
},
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据');
return;
}
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return remove(this.ids);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
this.$refs.crud.toggleSelection();
});
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad(this.page, this.query);
},
handleChange(file, fileList) {
// proxy.$Export.xlsx(file.raw).then((data) => {
// data.value = data.results;
// });
this.$message({
type: 'success',
message: '操作成功!',
});
},
onLoad(page, params = {}) {
this.loading = true;
this.data = [
{
rlueId: '2025001',
rlueName: '规则一',
rlueType: '排序规则',
rluePriority: '1',
rlueStatus: '0',//0 1
createName: 'admin'
}
]
this.page.total = this.data.length
// getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// this.data = res.data.data.records;
this.loading = false;
// this.page.total = res.data.data.total
// this.selectionClear();
// });
},
},
};
</script>

@ -22,7 +22,7 @@
</template>
<template #menu="{ row }">
<el-button type="primary" text icon="el-icon-setting" plain
style="border: 0; background-color: transparent !important" @click.stop="handleRowRole(row)">修改记录
style="border: 0; background-color: transparent !important" @click.stop="updateLog(row)">修改记录
</el-button>
</template>
</avue-crud>
@ -51,6 +51,18 @@
</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"
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>
</span>
</template>
</el-dialog>
</basic-container>
</template>
@ -72,6 +84,7 @@ import { getList } from '@/api/base/region';
export default {
data() {
return {
updateVisible: false,
form: {},
box: false,
props: {
@ -118,6 +131,7 @@ export default {
label: '规则ID',
prop: 'rlueId',
search: true,
sortable: true,
span: 24,
rules: [
{
@ -131,6 +145,7 @@ export default {
label: '名称',
prop: 'rlueName',
search: true,
sortable: true,
span: 24,
rules: [
{
@ -144,6 +159,7 @@ export default {
label: '类型',
prop: 'rlueType',
search: true,
sortable: true,
span: 24,
rules: [
{
@ -157,6 +173,7 @@ export default {
label: '优先级',
prop: 'rluePriority',
search: false,
sortable: true,
span: 24,
rules: [
{
@ -170,6 +187,7 @@ export default {
label: '状态',
prop: 'rlueStatus',
search: true,
sortable: true,
span: 24,
rules: [
{
@ -183,6 +201,107 @@ export default {
label: '创建人',
prop: 'createName',
search: true,
sortable: true,
span: 24,
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
],
},
optionLog: {
tip: false,
simplePage: true,
searchShow: false,
border: true,
index: true,
selection: true,
viewBtn: true,
searchEnter: true,
menu: false,
addBtn: 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: 'createName',
span: 24,
rules: [
{
@ -411,6 +530,9 @@ export default {
message: '操作成功!',
});
},
updateLog() {
this.updateVisible = true
},
onLoad(page, params = {}) {
this.loading = true;
this.data = [

Loading…
Cancel
Save