refactor: 系统标题修改
This commit is contained in:
parent
24774d7fc3
commit
8b432ab183
@ -1,5 +1,5 @@
|
|||||||
# 页面标题
|
# 页面标题
|
||||||
VUE_APP_TITLE = 苦糖果MES-软件开发记录
|
VUE_APP_TITLE = 工刀具库WMS
|
||||||
|
|
||||||
# 开发环境配置
|
# 开发环境配置
|
||||||
ENV = 'development'
|
ENV = 'development'
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# 页面标题
|
# 页面标题
|
||||||
VUE_APP_TITLE = 苦糖果MES-软件开发记录
|
VUE_APP_TITLE = 工刀具库WMS
|
||||||
|
|
||||||
# 生产环境配置
|
# 生产环境配置
|
||||||
ENV = 'production'
|
ENV = 'production'
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# 页面标题
|
# 页面标题
|
||||||
VUE_APP_TITLE = 苦糖果MES-软件开发记录
|
VUE_APP_TITLE = 工刀具库WMS
|
||||||
|
|
||||||
NODE_ENV = production
|
NODE_ENV = production
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "ktg-mes-ui",
|
"name": "ktg-mes-ui",
|
||||||
"version": "3.8.2",
|
"version": "3.8.2",
|
||||||
"description": "苦糖果MES",
|
"description": "工刀具库WMS",
|
||||||
"author": "YinJinLu",
|
"author": "YinJinLu",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 30 KiB |
@ -2,11 +2,9 @@
|
|||||||
<div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
|
<div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
|
||||||
<transition name="sidebarLogoFade">
|
<transition name="sidebarLogoFade">
|
||||||
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
|
<router-link v-if="collapse" key="collapse" 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>
|
||||||
<h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
|
|
||||||
</router-link>
|
</router-link>
|
||||||
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
|
<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>
|
<h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
|
||||||
</router-link>
|
</router-link>
|
||||||
</transition>
|
</transition>
|
||||||
@ -14,7 +12,6 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import logoImg from '@/assets/logo/logo.png'
|
|
||||||
import variables from '@/assets/styles/variables.scss'
|
import variables from '@/assets/styles/variables.scss'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@ -35,7 +32,7 @@ export default {
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
title: '苦糖果MES',
|
title: '工刀具库WMS',
|
||||||
logo: logoImg
|
logo: logoImg
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="login">
|
<div class="login">
|
||||||
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
|
<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-form-item prop="username">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="loginForm.username"
|
v-model="loginForm.username"
|
||||||
@ -55,7 +55,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<!-- 底部 -->
|
<!-- 底部 -->
|
||||||
<div class="el-login-footer">
|
<div class="el-login-footer">
|
||||||
<span @click="toIPC">陕ICP备2022002135号-1</span>
|
<span @click="toIPC">陕ICP备2022002135号-1</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -77,7 +77,7 @@ export default {
|
|||||||
}else{
|
}else{
|
||||||
gantt.config.readonly = false;
|
gantt.config.readonly = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1.2 表格列设置
|
// 1.2 表格列设置
|
||||||
gantt.config.duration_unit="hour";
|
gantt.config.duration_unit="hour";
|
||||||
gantt.config.duration_step=8;
|
gantt.config.duration_step=8;
|
||||||
@ -85,7 +85,7 @@ export default {
|
|||||||
gantt.config.columns = [
|
gantt.config.columns = [
|
||||||
{name:"text", label:"任务名", tree:true, width:'200' },
|
{name:"text", label:"任务名", tree:true, width:'200' },
|
||||||
{name:"workstation",label:"工作站",align:"center",width:'*'},
|
{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:"start_date", label:"开始时间", align:"center", width:'*' },
|
||||||
{name:"end_date", label:"结束时间", align:"center" , width:'*'},
|
{name:"end_date", label:"结束时间", align:"center" , width:'*'},
|
||||||
];
|
];
|
||||||
@ -111,7 +111,7 @@ export default {
|
|||||||
}else{
|
}else{
|
||||||
return "<b style='text-align:left;'>生产任务:</b> "+task.process+" "+ task.text +" <span style='text-align:left;'>" +" 完成比例:"+ Math.round(task.progress * 100) + "% </span>";
|
return "<b style='text-align:left;'>生产任务:</b> "+task.process+" "+ task.text +" <span style='text-align:left;'>" +" 完成比例:"+ Math.round(task.progress * 100) + "% </span>";
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
// 1.7 显示单元格
|
// 1.7 显示单元格
|
||||||
gantt.config.show_task_cells = true;
|
gantt.config.show_task_cells = true;
|
||||||
@ -123,7 +123,7 @@ export default {
|
|||||||
// gantt.config.date_scale = "%H";
|
// gantt.config.date_scale = "%H";
|
||||||
// 2.3 时间坐标为月份的时候 先显示年份再月份
|
// 2.3 时间坐标为月份的时候 先显示年份再月份
|
||||||
// gantt.config.subscales = [{unit: "month", step: 1, date: "%Y,%F"}];
|
// gantt.config.subscales = [{unit: "month", step: 1, date: "%Y,%F"}];
|
||||||
|
|
||||||
var weekScaleTemplate = function (date) {
|
var weekScaleTemplate = function (date) {
|
||||||
var dateToStr = gantt.date.date_to_str("%M %d");
|
var dateToStr = gantt.date.date_to_str("%M %d");
|
||||||
var endDate = gantt.date.add(gantt.date.add(date, 1, "week"), -1, "day");
|
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:"day", step:1,format: dayTemplate,css: daysStyle},
|
||||||
{unit:"hour", step:8,format: "%H:%i"}, //这里的step要根据当前的班次设置来。如果是三班倒则是8,如果是两班倒则是12。
|
{unit:"hour", step:8,format: "%H:%i"}, //这里的step要根据当前的班次设置来。如果是三班倒则是8,如果是两班倒则是12。
|
||||||
]
|
]
|
||||||
|
|
||||||
gantt.config.scale_height = 50;
|
gantt.config.scale_height = 50;
|
||||||
|
|
||||||
// 2.4 定义从后端获取或发送到后端的日期数据解析格式
|
// 2.4 定义从后端获取或发送到后端的日期数据解析格式
|
||||||
@ -181,8 +181,8 @@ export default {
|
|||||||
gantt.attachEvent("onAfterTaskUpdate",function(id,obj){
|
gantt.attachEvent("onAfterTaskUpdate",function(id,obj){
|
||||||
debugger;
|
debugger;
|
||||||
let tt = t.data.filter( item=> item.id == id);
|
let tt = t.data.filter( item=> item.id == id);
|
||||||
tt=obj;
|
tt=obj;
|
||||||
c.push(id);
|
c.push(id);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
@ -218,7 +218,6 @@ export default {
|
|||||||
height: 16px;
|
height: 16px;
|
||||||
margin-left: 40px;
|
margin-left: 40px;
|
||||||
transform: rotate(0deg) !important;
|
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;}
|
.gantt_grid_data .gantt_row.odd:hover, .gantt_grid_data .gantt_row:hover{background-color: #f3f1fe !important;}
|
||||||
@ -291,5 +290,5 @@ export default {
|
|||||||
.weekend{
|
.weekend{
|
||||||
background: rgb(189, 185, 186) !important;
|
background: rgb(189, 185, 186) !important;
|
||||||
width: 30s
|
width: 30s
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="register">
|
<div class="register">
|
||||||
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
|
<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-form-item prop="username">
|
||||||
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
|
<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" />
|
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
|
||||||
|
@ -147,7 +147,6 @@ import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/
|
|||||||
import { makeUpJs } from '@/utils/generator/js'
|
import { makeUpJs } from '@/utils/generator/js'
|
||||||
import { makeUpCss } from '@/utils/generator/css'
|
import { makeUpCss } from '@/utils/generator/css'
|
||||||
import drawingDefault from '@/utils/generator/drawingDefault'
|
import drawingDefault from '@/utils/generator/drawingDefault'
|
||||||
import logo from '@/assets/logo/logo.png'
|
|
||||||
import CodeTypeDialog from './CodeTypeDialog'
|
import CodeTypeDialog from './CodeTypeDialog'
|
||||||
import DraggableItem from './DraggableItem'
|
import DraggableItem from './DraggableItem'
|
||||||
|
|
||||||
@ -164,7 +163,6 @@ export default {
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
logo,
|
|
||||||
idGlobal: 100,
|
idGlobal: 100,
|
||||||
formConf,
|
formConf,
|
||||||
inputComponents,
|
inputComponents,
|
||||||
|
@ -7,7 +7,7 @@ function resolve(dir) {
|
|||||||
|
|
||||||
const CompressionPlugin = require('compression-webpack-plugin')
|
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 // 端口
|
const port = process.env.port || process.env.npm_config_port || 80 // 端口
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user