工艺管理问题调整

dev-scheduling
zhangdi 2 months ago
parent 49eb115b80
commit 9047893745
  1. 3
      src/views/processManagement/components/processMainte/processPlanning.vue
  2. 7
      src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
  3. 17
      vite.config.mjs

@ -140,6 +140,7 @@
:data="form1.tableData1" :data="form1.tableData1"
style="width: 100%" style="width: 100%"
@selection-change="handleSelectionChange1" @selection-change="handleSelectionChange1"
class="tableHeight"
> >
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="processNo" label="工序号"> <el-table-column prop="processNo" label="工序号">
@ -264,6 +265,7 @@
:data="form2.tableData2" :data="form2.tableData2"
style="width: 100%" style="width: 100%"
@selection-change="handleSelectionChange2" @selection-change="handleSelectionChange2"
class="tableHeight"
> >
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="trialNo" label="工序号"> <el-table-column prop="trialNo" label="工序号">
@ -371,6 +373,7 @@
class="tableHeight" class="tableHeight"
style="width: 100%" style="width: 100%"
@selection-change="handleSelectionChange3" @selection-change="handleSelectionChange3"
> >
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="trialNo" label="工序号"> <el-table-column prop="trialNo" label="工序号">

@ -84,6 +84,7 @@
style="width: 100%" style="width: 100%"
v-if="activeName == '1'" v-if="activeName == '1'"
@selection-change="handleSelectionChange1" @selection-change="handleSelectionChange1"
class="tableHeight"
> >
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="processInfo.reworkNo" label="返工序号"> <el-table-column prop="processInfo.reworkNo" label="返工序号">
@ -249,6 +250,7 @@
:data="form2.tableData2" :data="form2.tableData2"
style="width: 100%" style="width: 100%"
@selection-change="handleSelectionChange2" @selection-change="handleSelectionChange2"
class="tableHeight"
> >
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="date" label="工序号"> <el-table-column prop="date" label="工序号">
@ -366,6 +368,7 @@
:data="form3.tableData3" :data="form3.tableData3"
style="width: 100%" style="width: 100%"
@selection-change="handleSelectionChange3" @selection-change="handleSelectionChange3"
class="tableHeight"
> >
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="trialNo" label="工序号"> <el-table-column prop="trialNo" label="工序号">
@ -438,6 +441,7 @@
:data="form4.tableData4" :data="form4.tableData4"
style="width: 100%" style="width: 100%"
@selection-change="handleSelectionChange4" @selection-change="handleSelectionChange4"
class="tableHeight"
> >
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="date" label="工序号"> <el-table-column prop="date" label="工序号">
@ -1190,4 +1194,7 @@ export default {
padding: 0 !important; padding: 0 !important;
line-height: 50px !important; line-height: 50px !important;
} }
.tableHeight {
height: calc(100vh - 50px - 80px - 40px - 94px - 50px - 50px);
}
</style> </style>

@ -19,6 +19,15 @@ export default ({ mode, command }) => {
// 如果是生产环境,添加Terser的配置 // 如果是生产环境,添加Terser的配置
if (isProd) { if (isProd) {
const now = new Date();
const timestamp = [
now.getFullYear(),
String(now.getMonth() + 1).padStart(2, '0'),
String(now.getDate()).padStart(2, '0'),
String(now.getHours()).padStart(2, '0'),
String(now.getMinutes()).padStart(2, '0'),
String(now.getSeconds()).padStart(2, '0')
].join('');
buildConfig.terserOptions = { buildConfig.terserOptions = {
compress: { compress: {
drop_console: true, // 删除 console drop_console: true, // 删除 console
@ -30,6 +39,10 @@ export default ({ mode, command }) => {
}; };
buildConfig.rollupOptions = { buildConfig.rollupOptions = {
output: { output: {
// 添加带时间戳的文件名
entryFileNames: `assets/[name].${timestamp}.js`,
chunkFileNames: `assets/[name].${timestamp}.js`,
assetFileNames: `assets/[name].${timestamp}[extname]`,
manualChunks: { manualChunks: {
'element-plus': ['element-plus'], 'element-plus': ['element-plus'],
'@smallwei/avue': ['@smallwei/avue'], '@smallwei/avue': ['@smallwei/avue'],
@ -51,7 +64,7 @@ export default ({ mode, command }) => {
// target: 'http://192.168.1.5:82', // target: 'http://192.168.1.5:82',
// target: "http://192.168.1.4:82", // target: "http://192.168.1.4:82",
// target:'http://49.232.74.228:82', // target:'http://49.232.74.228:82',
// target: "http://192.168.0.120", // target: "http://192.168.0.103",
//target: 'https://saber3.bladex.cn/api', //target: 'https://saber3.bladex.cn/api',
// target: 'http://49.232.74.228:82', // target: 'http://49.232.74.228:82',
// target: "http:192.168.0.220:80", // target: "http:192.168.0.220:80",
@ -61,7 +74,7 @@ export default ({ mode, command }) => {
rewrite: path => path.replace(/^\/api/, ''), rewrite: path => path.replace(/^\/api/, ''),
}, },
}, },
}, },
resolve: { resolve: {
alias: { alias: {
'~': resolve(__dirname, './'), '~': resolve(__dirname, './'),

Loading…
Cancel
Save