kelvin/wms-gj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

refactor: 系统标题修改

Browse Source
This commit is contained in:
Kelvin 2024-10-30 16:30:23 +08:00
parent 24774d7fc3
commit 8b432ab183
11 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = 苦糖果MES-软件开发记录
VUE_APP_TITLE = 工刀具库WMS
# 开发环境配置
ENV = 'development'

2
.env.production
View File

@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = 苦糖果MES-软件开发记录
VUE_APP_TITLE = 工刀具库WMS
# 生产环境配置
ENV = 'production'

2
.env.staging
View File

@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = 苦糖果MES-软件开发记录
VUE_APP_TITLE = 工刀具库WMS
NODE_ENV = production

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "ktg-mes-ui",
"version": "3.8.2",
"description": "苦糖果MES",
"description": "工刀具库WMS",
"author": "YinJinLu",
"license": "MIT",
"scripts": {

BIN
src/assets/logo/logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

7
src/layout/components/Sidebar/Logo.vue
View File

@ -2,11 +2,9 @@
<div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
<transition name="sidebarLogoFade">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
<h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
</router-link>
</transition>
@ -14,7 +12,6 @@
</template>
<script>
import logoImg from '@/assets/logo/logo.png'
import variables from '@/assets/styles/variables.scss'
export default {
@ -35,7 +32,7 @@ export default {
},
data() {
return {
title: '苦糖果MES',
title: '工刀具库WMS',
logo: logoImg
}
}

4
src/views/login.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">苦糖果生产执行管理系统</h3>
<h3 class="title">工刀具库WMS</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
@ -55,7 +55,7 @@
</el-form-item>
</el-form>
<!-- 底部 -->
<div class="el-login-footer">
<div class="el-login-footer">
<span @click="toIPC">陕ICP备2022002135号-1</span>
</div>
</div>

19
src/views/mes/pro/schedule/ganttx.vue
View File

@ -77,7 +77,7 @@ export default {
}else{
gantt.config.readonly = false;
}
// 1.2 表格列设置
gantt.config.duration_unit="hour";
gantt.config.duration_step=8;
@ -85,7 +85,7 @@ export default {
gantt.config.columns = [
{name:"text", label:"任务名", tree:true, width:'200' },
{name:"workstation",label:"工作站",align:"center",width:'*'},
{name:"process",label:"工序",align:"center",width:'*'},
{name:"process",label:"工序",align:"center",width:'*'},
{name:"start_date", label:"开始时间", align:"center", width:'*' },
{name:"end_date", label:"结束时间", align:"center" , width:'*'},
];
@ -111,7 +111,7 @@ export default {
}else{
return "<b style='text-align:left;'>生产任务:</b> "+task.process+" "+ task.text +" <span style='text-align:left;'>" +" 完成比例："+ Math.round(task.progress * 100) + "% </span>";
}
};
// 1.7 显示单元格
gantt.config.show_task_cells = true;
@ -123,7 +123,7 @@ export default {
// gantt.config.date_scale = "%H";
// 2.3 时间坐标为月份的时候 先显示年份再月份
// gantt.config.subscales = [{unit: "month", step: 1, date: "%Y,%F"}];
var weekScaleTemplate = function (date) {
var dateToStr = gantt.date.date_to_str("%M %d");
var endDate = gantt.date.add(gantt.date.add(date, 1, "week"), -1, "day");
@ -152,7 +152,7 @@ export default {
{unit:"day", step:1,format: dayTemplate,css: daysStyle},
{unit:"hour", step:8,format: "%H:%i"}, //这里的step要根据当前的班次设置来。如果是三班倒则是8，如果是两班倒则是12。
]
gantt.config.scale_height = 50;
// 2.4 定义从后端获取或发送到后端的日期数据解析格式
@ -181,8 +181,8 @@ export default {
gantt.attachEvent("onAfterTaskUpdate",function(id,obj){
debugger;
let tt = t.data.filter( item=> item.id == id);
tt=obj;
c.push(id);
tt=obj;
c.push(id);
});
@ -218,7 +218,6 @@ export default {
height: 16px;
margin-left: 40px;
transform: rotate(0deg) !important;
background-image: url('../../../../assets/logo/logo.png') !important;
}
/* 左侧悬浮单元格背景色 */
.gantt_grid_data .gantt_row.odd:hover, .gantt_grid_data .gantt_row:hover{background-color: #f3f1fe !important;}
@ -291,5 +290,5 @@ export default {
.weekend{
background: rgb(189, 185, 186) !important;
width: 30s
}
</style>
}
</style>

2
src/views/register.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">苦糖果MES</h3>
<h3 class="title">工刀具库WMS</h3>
<el-form-item prop="username">
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

2
src/views/tool/build/index.vue
View File

@ -147,7 +147,6 @@ import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/
import { makeUpJs } from '@/utils/generator/js'
import { makeUpCss } from '@/utils/generator/css'
import drawingDefault from '@/utils/generator/drawingDefault'
import logo from '@/assets/logo/logo.png'
import CodeTypeDialog from './CodeTypeDialog'
import DraggableItem from './DraggableItem'
@ -164,7 +163,6 @@ export default {
},
data() {
return {
logo,
idGlobal: 100,
formConf,
inputComponents,

2
vue.config.js
View File

@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '苦糖果MES-软件开发记录' // 网页标题
const name = process.env.VUE_APP_TITLE || '工刀具库WMS' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口