diff --git a/src/page/index/index.vue b/src/page/index/index.vue index 7625922..ec277bf 100644 --- a/src/page/index/index.vue +++ b/src/page/index/index.vue @@ -2,8 +2,8 @@
-
+ +
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue index f8ded4b..905f8ef 100644 --- a/src/page/index/logo.vue +++ b/src/page/index/logo.vue @@ -1,15 +1,15 @@ @@ -21,14 +21,14 @@ export default { data() { return {}; }, - created() {}, + created() { }, computed: { - ...mapGetters(['isCollapse','setting']), + ...mapGetters(['isCollapse', 'setting']), }, methods: {}, }; - diff --git a/src/page/index/setting.vue b/src/page/index/setting.vue index a5a8869..6065e3d 100644 --- a/src/page/index/setting.vue +++ b/src/page/index/setting.vue @@ -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) { diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index 8a098b3..c6352be 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -6,7 +6,7 @@
-
+
@@ -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 +} diff --git a/src/store/modules/common.js b/src/store/modules/common.js index 507143b..6374447 100644 --- a/src/store/modules/common.js +++ b/src/store/modules/common.js @@ -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, diff --git a/src/styles/theme/bule.scss b/src/styles/theme/bule.scss index 0c59765..bd2e6f7 100644 --- a/src/styles/theme/bule.scss +++ b/src/styles/theme/bule.scss @@ -13,7 +13,7 @@ } .el-dropdown { - color: #fff; + // color: #fff; } .avue-logo { diff --git a/src/views/productionSchedulingPlan/productPlan.vue b/src/views/productionSchedulingPlan/productPlan.vue index bee5d77..ffee596 100644 --- a/src/views/productionSchedulingPlan/productPlan.vue +++ b/src/views/productionSchedulingPlan/productPlan.vue @@ -1,3 +1,681 @@ \ No newline at end of file + + + + + + + + + + + + diff --git a/src/views/productionSchedulingPlan/productRlue.vue b/src/views/productionSchedulingPlan/productRlue.vue index 3de1993..baf49c6 100644 --- a/src/views/productionSchedulingPlan/productRlue.vue +++ b/src/views/productionSchedulingPlan/productRlue.vue @@ -22,7 +22,7 @@ @@ -51,6 +51,18 @@ + + + + + @@ -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 = [