zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

This commit is contained in:
caoqianming 2025-09-19 09:21:08 +08:00
parent d1d4c6e7f1 3b444b427e
commit 2a3fa5b96f
9 changed files with 186 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package.json
View File

@ -13,37 +13,29 @@
"@tinymce/tinymce-vue": "5.0.0",
"animate.css": "^4.1.1",
"axios": "1.3.4",
"babylon": "^6.18.0",
"babylonjs": "^6.46.0",
"babylonjs-gui": "^6.46.0",
"babylonjs-loaders": "^6.46.0",
"cesium": "^1.126.0",
"codemirror": "^5.65.17",
"codemirror-editor-vue3": "^2.7.0",
"compression-webpack-plugin": "^11.1.0",
"copy-webpack-plugin": "^12.0.2",
"core-js": "3.29.0",
"cropperjs": "1.5.13",
"crypto-browserify": "^3.12.0",
"crypto-js": "4.1.1",
"d3": "^7.6.1",
"dagre": "^0.8.5",
"dagre-d3": "^0.6.4",
"dhtmlx-gantt": "^8.0.6",
"echarts": "^5.5.1",
"element-plus": "^2.8.4",
"file-saver": "^2.0.5",
"html2canvas": "^1.4.1",
"json-editor-vue3": "^1.0.6",
"jspdf": "^2.5.1",
"moment": "^2.30.1",
"node-polyfill-webpack-plugin": "^4.0.0",
"nprogress": "0.2.0",
"path": "^0.12.7",
"print-js": "^1.6.0",
"qrcodejs2": "0.0.2",
"sortablejs": "1.15.0",
"three": "^0.155.0",
"tinymce": "6.3.2",
"vue": "3.2.47",
"vue-i18n": "9.2.2",

38
src/views/bigScreen/index_gx.vue
View File

@ -506,6 +506,7 @@ export default {
configData5:{},
scrollNum:0,
scrollInterval:null,
reloadInterval:null,
//近七天日数组
dayArr:[],
visibals0: false,
@ -525,6 +526,7 @@ export default {
lineWidth:0,
pieHeight:0,
lineHeight:0,
timeoutDuration : 86400000,
setIntervals:null,
};
},
@ -544,6 +546,38 @@ export default {
this.timerTime = setInterval(() => {
this.showTime();
}, 1000);
let lastActiveTime = new Date().getTime();
let timer;
// 重置最后活动时间并重启计时器
function resetActiveTime() {
console.log('用户活动');
lastActiveTime = new Date().getTime();
clearTimeout(timer);
timer = setTimeout(checkIdleTime, that.timeoutDuration);
}
// 检查是否超时
function checkIdleTime() {
let currentTime = new Date().getTime();
if (currentTime - lastActiveTime > that.timeoutDuration) {
refreshPage();
} else {
resetActiveTime();
}
}
// 刷新页面函数
function refreshPage() {
window.location.reload(true);
}
// 监听所有可能触发用户活动的行为并重置最后活动时间
document.addEventListener('click', resetActiveTime);
document.addEventListener('keypress', resetActiveTime);
document.addEventListener('scroll', resetActiveTime);
document.addEventListener('mousemove', resetActiveTime);
that.reloadInterval = setInterval(() => {
window.location.reload(true);
},86400000)
},
methods: {
//初始化视图
@ -1026,9 +1060,11 @@ export default {
clearInterval(that.timerTime);
clearInterval(that.scrollInterval);
clearInterval(that.setIntervals);
clearInterval(that.reloadInterval);
that.timerTime = null;
that.scrollInterval = null;
that.setIntervals = null;
that.reloadInterval = null;
},
beforeDestoryed() {
let that = this;
@ -1036,9 +1072,11 @@ export default {
clearInterval(that.timerTime);
clearInterval(that.scrollInterval);
clearInterval(that.setIntervals);
clearInterval(that.reloadInterval);
that.timerTime = null;
that.scrollInterval = null;
that.setIntervals = null;
that.reloadInterval = null;
},
};
</script>

1
src/views/hrm/clock_record.vue
View File

@ -102,7 +102,6 @@
import config from "@/config"
import * as XLSX2 from "xlsx";
import * as XLSX from "xlsx-style";
import { fill } from "lodash";
export default {
name: "clock_record",
components: {},

5
src/views/mtm/routepack_form.vue
View File

@ -296,6 +296,11 @@ export default {
//组件点击下一步
handleNextStep() {
let that = this;
// that.routepack = that.form.id;
// that.query.routepack = that.form.id;
// that.apiObj = that.$API.mtm.route.list;
// that.active = 1;
// that.getDEGdatas();
let form = {};
form.name = that.form.name;
form.material = that.form.material;

133
src/views/statistics/good_check_gx.vue
View File

@ -100,7 +100,6 @@
style="height: 100%;"
:summary-method="getSummaries"
show-summary
>
<el-table-column label="批次号" prop="batch" min-width="240" fixed="left">
<template #default="scope"><span>{{ scope.row.data.批次号 }}</span></template>
@ -109,6 +108,9 @@
<el-table-column label="日期" class-name="colorheader1" width="90">
<template #default="scope"><span>{{ scope.row.data.尺寸检验_日期 }}</span></template>
</el-table-column>
<el-table-column label="班次" class-name="colorheader1" width="60">
<template #default="scope"><span>{{ scope.row.data.尺寸检验_班次 }}</span></template>
</el-table-column>
<el-table-column label="检验人" class-name="colorheader1">
<template #default="scope"><span>{{ scope.row.data.尺寸检验_操作人 }}</span></template>
</el-table-column>
@ -177,6 +179,9 @@
<el-table-column label="日期" class-name="colorheader2" width="90">
<template #default="scope"><span>{{ scope.row.data.外观检验_日期 }}</span></template>
</el-table-column>
<el-table-column label="班次" class-name="colorheader2" width="60">
<template #default="scope"><span>{{ scope.row.data.外观检验_班次 }}</span></template>
</el-table-column>
<el-table-column label="检验人" class-name="colorheader2">
<template #default="scope"><span>{{ scope.row.data.外观检验_操作人 }}</span></template>
</el-table-column>
@ -485,7 +490,7 @@ export default {
}
let propert = '';
//尺寸检验
if(index == 3&&column.label=='检验数'){
if(index == 4&&column.label=='检验数'){
propert = '尺寸检验_count_real';
}else if(column.label=='黑圈内径'){
propert = '尺寸检验_缺陷_黑圈内径';
@ -499,13 +504,13 @@ export default {
propert = '尺寸检验_缺陷_产品外径小';
}else if(column.label=='产品外径大(返修)'){
propert = '尺寸检验_缺陷_产品外径大(返修)';
}else if(index == 14&&column.label=='黑圈缺口'){
}else if(index == 15&&column.label=='黑圈缺口'){
propert = '尺寸检验_缺陷_黑圈缺口';
}else if(column.label=='外径发货片(B)'){
propert = '尺寸检验_缺陷_外径发货片(B)';
}else if(column.label=='前道崩'){
propert = '尺寸检验_缺陷_前道崩';
}else if(index==17&&column.label=='合格数'){
}else if(index==18&&column.label=='合格数'){
propert = '尺寸检验_count_ok_full';
}else if(column.label=='准合格(B)'){
propert = '尺寸检验_缺陷_准合格(B)';
@ -513,83 +518,83 @@ export default {
propert = '尺寸检验_缺陷_圆准(B)';
}else if(column.label=='总合格数'){
propert = '尺寸检验_count_ok';
}else if(index == 25&&column.label=='检验数'){
}else if(index == 27&&column.label=='检验数'){
propert = '外观检验_count_real';
}else if(index==26&&column.label=='合格数'){
}else if(index==28&&column.label=='合格数'){
propert = '外观检验_count_ok_full';
}else if(index==28&&column.label=='划麻(返修)'){
}else if(index==30&&column.label=='划麻(返修)'){
propert = '外观检验_缺陷_划麻(返修)';
}else if(index==30&&column.label=='脏(返修)'){
}else if(index==32&&column.label=='脏(返修)'){
propert = '外观检验_缺陷_脏(返修)';
}else if(index==32&&column.label=='气泡'){
}else if(index==34&&column.label=='气泡'){
propert = '外观检验_缺陷_气泡';
}else if(index==34&&column.label=='浅气泡(B)'){
}else if(index==36&&column.label=='浅气泡(B)'){
propert = '外观检验_缺陷_浅气泡(B)';
}else if(index==35&&column.label=='黑圈变形'){
}else if(index==37&&column.label=='黑圈变形'){
propert = '外观检验_缺陷_黑圈变形';
}else if(index==36&&column.label=='黑圈缺口'){
}else if(index==38&&column.label=='黑圈缺口'){
propert = '外观检验_缺陷_黑圈缺口';
}else if(index==37&&column.label=='重水纹'){
}else if(index==39&&column.label=='重水纹'){
propert = '外观检验_缺陷_重水纹';
}else if(index==38&&column.label=='浅水纹(B)'){
}else if(index==40&&column.label=='浅水纹(B)'){
propert = '外观检验_缺陷_浅水纹(B)';
}else if(index==39&&column.label=='大崩'){
}else if(index==41&&column.label=='大崩'){
propert = '外观检验_缺陷_大崩';
}else if(index==40&&column.label=='小崩边(B)'){
}else if(index==42&&column.label=='小崩边(B)'){
propert = '外观检验_缺陷_小崩边(B)';
}else if(index==42&&column.label=='棕点'){
}else if(index==44&&column.label=='棕点'){
propert = '外观检验_缺陷_棕点';
}else if(index==43&&column.label=='浅划麻(B)'){
}else if(index==45&&column.label=='浅划麻(B)'){
propert = '外观检验_缺陷_浅划麻(B)';
}else if(index==44&&column.label=='双面划麻'){
}else if(index==46&&column.label=='双面划麻'){
propert = '外观检验_缺陷_双面划麻';
}else if(index==45&&column.label=='倒角'){
}else if(index==47&&column.label=='倒角'){
propert = '外观检验_缺陷_倒角';
}else if(index==46&&column.label=='棕圈'){
}else if(index==48&&column.label=='棕圈'){
propert = '外观检验_缺陷_棕圈';
}else if(index==47&&column.label=='蓝圈'){
}else if(index==49&&column.label=='蓝圈'){
propert = '外观检验_缺陷_蓝圈';
}else if(index==48&&column.label=='尺寸小'){
}else if(index==50&&column.label=='尺寸小'){
propert = '外观检验_缺陷_尺寸小';
}else if(index==49&&column.label=='破损'){
}else if(index==51&&column.label=='破损'){
propert = '外观检验_缺陷_破损';
}else if(index==50&&column.label=='发白'){
}else if(index==52&&column.label=='发白'){
propert = '外观检验_缺陷_发白';
}else if(index==51&&column.label=='漏光'){
}else if(index==53&&column.label=='漏光'){
propert = '外观检验_缺陷_漏光';
}else if(index == 54&&column.label=='返修数'){
}else if(index == 56&&column.label=='返修数'){
propert = '外观检验_返修_count_real';
}else if(index==55&&column.label=='合格数'){
}else if(index==57&&column.label=='合格数'){
propert = '外观检验_返修_count_ok_full';
}else if(index==56&&column.label=='黑圈变形'){
}else if(index==58&&column.label=='黑圈变形'){
propert = '外观检验_返修_缺陷_黑圈变形';
}else if(index==57&&column.label=='气泡'){
}else if(index==59&&column.label=='气泡'){
propert = '外观检验_返修_缺陷_气泡';
}else if(index==58&&column.label=='浅气泡(B)'){
}else if(index==60&&column.label=='浅气泡(B)'){
propert = '外观检验_返修_缺陷_浅气泡(B)';
}else if(index==59&&column.label=='浅划麻(B)'){
}else if(index==61&&column.label=='浅划麻(B)'){
propert = '外观检验_返修_缺陷_浅划麻(B)';
}else if(index==60&&column.label=='双面划麻'){
}else if(index==62&&column.label=='双面划麻'){
propert = '外观检验_返修_缺陷_双面划麻';
}else if(index==61&&column.label=='浅水纹(B)'){
}else if(index==63&&column.label=='浅水纹(B)'){
propert = '外观检验_返修_缺陷_浅水纹(B)';
}else if(index==62&&column.label=='重水纹'){
}else if(index==64&&column.label=='重水纹'){
propert = '外观检验_返修_缺陷_重水纹';
}else if(index==63&&column.label=='大崩'){
}else if(index==65&&column.label=='大崩'){
propert = '外观检验_返修_缺陷_大崩';
}else if(index==64&&column.label=='小崩边(B)'){
}else if(index==66&&column.label=='小崩边(B)'){
propert = '外观检验_返修_缺陷_小崩边(B)';
}else if(index==65&&column.label=='倒角'){
}else if(index==67&&column.label=='倒角'){
propert = '外观检验_返修_缺陷_倒角';
}else if(index==66&&column.label=='棕点'){
}else if(index==68&&column.label=='棕点'){
propert = '外观检验_返修_缺陷_棕点';
}else if(index==67&&column.label=='漏光'){
}else if(index==69&&column.label=='漏光'){
propert = '外观检验_返修_缺陷_漏光';
}else if(index==68&&column.label=='黑圈缺口'){
}else if(index==70&&column.label=='黑圈缺口'){
propert = '外观检验_返修_缺陷_黑圈缺口';
}else if(index==69&&column.label=='破损'){
}else if(index==71&&column.label=='破损'){
propert = '外观检验_返修_缺陷_破损';
}else if(index==70&&column.label=='尺寸小'){
}else if(index==72&&column.label=='尺寸小'){
propert = '外观检验_返修_缺陷_尺寸小';
}else if(column.label=='外观总合格数'){
propert = '外观检验_完全总合格数';
@ -611,34 +616,34 @@ export default {
}
}
if(index==5||index==7||index==9||index==11||index==18||index==22){
if(index==6||index==8||index==10||index==12||index==19||index==23){
if(sums[index-1]){
sums[index] = ((sums[index-1]/sums[3])*100).toFixed(4);
sums[index] = ((sums[index-1]/sums[4])*100).toFixed(4);
}
}
if(index==27||index==29||index==31||index==33||index==41){
if(index==29||index==31||index==33||index==35||index==43){
if(sums[index-1]){
sums[index] = ((sums[index-1]/sums[25])*100).toFixed(4);
}
}
if(index==71){
let sum = 0;
if(sums[26]){
sum += sums[26];
}
if(sums[55]){
sum += sums[55];
}
sums[index] = sum;
}
if(index==72){
if(sums[71]&&sums[25]){
sums[index] = ((sums[71]/sums[25])*100).toFixed(2);
sums[index] = ((sums[index-1]/sums[27])*100).toFixed(4);
}
}
if(index==73){
if(sums[72]&&sums[22]){
sums[index] = ((sums[72]*sums[22])/100).toFixed(2);
let sum = 0;
if(sums[28]){
sum += sums[28];
}
if(sums[57]){
sum += sums[57];
}
sums[index] = sum;
}
if(index==74){
if(sums[73]&&sums[27]){
sums[index] = ((sums[73]/sums[27])*100).toFixed(2);
}
}
if(index==75){
if(sums[74]&&sums[23]){
sums[index] = ((sums[74]*sums[23])/100).toFixed(2);
}
}
});

100
src/views/statistics/good_check_gx2.vue
View File

@ -109,6 +109,9 @@
<el-table-column label="日期" class-name="colorheader1" width="90">
<template #default="scope"><span>{{ scope.row.data.尺寸检验_日期 }}</span></template>
</el-table-column>
<el-table-column label="班次" class-name="colorheader1" width="60">
<template #default="scope"><span>{{ scope.row.data.尺寸检验_班次 }}</span></template>
</el-table-column>
<el-table-column label="检验数" class-name="colorheader1">
<template #default="scope"><span>{{ scope.row.data.尺寸检验_count_real }}</span></template>
</el-table-column>
@ -174,6 +177,9 @@
<el-table-column label="日期" class-name="colorheader2" width="90">
<template #default="scope"><span>{{ scope.row.data.外观检验_日期 }}</span></template>
</el-table-column>
<el-table-column label="班次" class-name="colorheader2" width="60">
<template #default="scope"><span>{{ scope.row.data.外观检验_班次 }}</span></template>
</el-table-column>
<el-table-column label="检验数" class-name="colorheader2">
<template #default="scope"><span>{{ scope.row.data.外观检验_count_real }}</span></template>
</el-table-column>
@ -426,7 +432,7 @@ export default {
}
let propert = '';
//尺寸检验
if(index == 2&&column.label=='检验数'){
if(index == 3&&column.label=='检验数'){
propert = '尺寸检验_count_real';
}else if(column.label=='黑圈内径'){
propert = '尺寸检验_缺陷_黑圈内径';
@ -446,7 +452,7 @@ export default {
propert = '尺寸检验_缺陷_外径发货片(B)';
}else if(column.label=='前道崩'){
propert = '尺寸检验_缺陷_前道崩';
}else if(index==16&&column.label=='合格数'){
}else if(index==17&&column.label=='合格数'){
propert = '尺寸检验_count_ok_full';
}else if(column.label=='准合格(B)'){
propert = '尺寸检验_缺陷_准合格(B)';
@ -454,53 +460,53 @@ export default {
propert = '尺寸检验_缺陷_圆准(B)';
}else if(column.label=='总合格数'){
propert = '尺寸检验_count_ok';
}else if(index == 23&&column.label=='检验数'){
}else if(index == 25&&column.label=='检验数'){
propert = '外观检验_count_real';
}else if(index==24&&column.label=='合格数'){
}else if(index==26&&column.label=='合格数'){
propert = '外观检验_count_ok_full';
}else if(index==26&&column.label=='划麻(返修)'){
}else if(index==28&&column.label=='划麻(返修)'){
propert = '外观检验_缺陷_划麻(返修)';
}else if(index==28&&column.label=='脏(返修)'){
}else if(index==30&&column.label=='脏(返修)'){
propert = '外观检验_缺陷_脏(返修)';
}else if(index==30&&column.label=='气泡'){
}else if(index==32&&column.label=='气泡'){
propert = '外观检验_缺陷_气泡';
}else if(index==32&&column.label=='浅气泡(B)'){
}else if(index==34&&column.label=='浅气泡(B)'){
propert = '外观检验_缺陷_浅气泡(B)';
}else if(index==33&&column.label=='黑圈变形'){
}else if(index==35&&column.label=='黑圈变形'){
propert = '外观检验_缺陷_黑圈变形';
}else if(index==34&&column.label=='黑圈缺口'){
}else if(index==36&&column.label=='黑圈缺口'){
propert = '外观检验_缺陷_黑圈缺口';
}else if(index==35&&column.label=='重水纹'){
}else if(index==37&&column.label=='重水纹'){
propert = '外观检验_缺陷_重水纹';
}else if(index==36&&column.label=='浅水纹(B)'){
}else if(index==38&&column.label=='浅水纹(B)'){
propert = '外观检验_缺陷_浅水纹(B)';
}else if(index==37&&column.label=='大崩'){
}else if(index==39&&column.label=='大崩'){
propert = '外观检验_缺陷_大崩';
}else if(index==38&&column.label=='小崩边(B)'){
}else if(index==40&&column.label=='小崩边(B)'){
propert = '外观检验_缺陷_小崩边(B)';
}else if(index==40&&column.label=='棕点'){
}else if(index==42&&column.label=='棕点'){
propert = '外观检验_缺陷_棕点';
}else if(index==41&&column.label=='浅划麻(B)'){
}else if(index==43&&column.label=='浅划麻(B)'){
propert = '外观检验_缺陷_浅划麻(B)';
}else if(index==42&&column.label=='双面划麻'){
}else if(index==44&&column.label=='双面划麻'){
propert = '外观检验_缺陷_双面划麻';
}else if(index==43&&column.label=='倒角'){
}else if(index==45&&column.label=='倒角'){
propert = '外观检验_缺陷_倒角';
}else if(index==44&&column.label=='棕圈'){
}else if(index==46&&column.label=='棕圈'){
propert = '外观检验_缺陷_棕圈';
}else if(index==45&&column.label=='蓝圈'){
}else if(index==47&&column.label=='蓝圈'){
propert = '外观检验_缺陷_蓝圈';
}else if(index==46&&column.label=='尺寸小'){
}else if(index==48&&column.label=='尺寸小'){
propert = '外观检验_缺陷_尺寸小';
}else if(index==47&&column.label=='破损'){
}else if(index==49&&column.label=='破损'){
propert = '外观检验_缺陷_破损';
}else if(index==48&&column.label=='发白'){
}else if(index==50&&column.label=='发白'){
propert = '外观检验_缺陷_发白';
}else if(index==49&&column.label=='漏光'){
}else if(index==51&&column.label=='漏光'){
propert = '外观检验_缺陷_漏光';
}else if(index == 50&&column.label=='返修数'){
}else if(index == 52&&column.label=='返修数'){
propert = '外观检验_返修_count_real';
}else if(index==51&&column.label=='合格数'){
}else if(index==53&&column.label=='合格数'){
propert = '外观检验_返修_count_ok_full';
}else if(column.label=='外观总合格数'){
propert = '外观检验_完全总合格数';
@ -522,38 +528,38 @@ export default {
}
}
if(index==4||index==6||index==8||index==10||index==17||index==21){
if(index==5||index==7||index==9||index==11||index==18||index==22){
if(sums[index-1]){
sums[index] = ((sums[index-1]/sums[2])*100).toFixed(4);
sums[index] = ((sums[index-1]/sums[3])*100).toFixed(4);
}else{
sums[index] = null;
}
}
if(index==25||index==27||index==29||index==31||index==39){
if(index==27||index==29||index==31||index==33||index==41){
if(sums[index-1]){
sums[index] = ((sums[index-1]/sums[23])*100).toFixed(4);
sums[index] = ((sums[index-1]/sums[25])*100).toFixed(4);
}else{
sums[index] = null;
}
}
if(index==52){
let sum = 0;
if(sums[24]){
sum += sums[24];
}
if(sums[51]){
sum += sums[51];
}
sums[index] = sum;
}
if(index==53){
if(sums[52]&&sums[23]){
sums[index] = ((sums[52]/sums[23])*100).toFixed(2);
}
}
if(index==54){
if(sums[53]&&sums[21]){
sums[index] = ((sums[53]*sums[21])/100).toFixed(2);
let sum = 0;
if(sums[25]){
sum += sums[25];
}
if(sums[53]){
sum += sums[53];
}
sums[index] = sum;
}
if(index==55){
if(sums[54]&&sums[25]){
sums[index] = ((sums[54]/sums[25])*100).toFixed(2);
}
}
if(index==56){
if(sums[55]&&sums[22]){
sums[index] = ((sums[55]*sums[22])/100).toFixed(2);
}
}
});

7
src/views/wpm_bx/mlog_detail.vue
View File

@ -3,7 +3,7 @@
<el-drawer v-model="visible" :size="'95%'" :show-close="false">
<template #header>
<h4>日志详情</h4>
<el-button type="danger" @click="$emit('closed')">关闭</el-button>
<el-button type="danger" @click="closedPage()">关闭</el-button>
</template>
<div>
<el-card style="width: 100%" header="基本信息" shadow="never">
@ -1048,6 +1048,11 @@ export default {
});
})
},
closedPage(){
let that = this;
that.visible = false;
that.$emit('closed',that.isSubmit);
},
},
};
</script>

16
src/views/wpm_bx/mlog_form2.vue
View File

@ -463,12 +463,18 @@ export default {
that.bwItemForms.forEach(item=>{
item.mlogb = res.mlogbin;
})
that.$API.wpm.mlogbw.create.req(that.bwItemForms).then((res1) => {})
that.$API.wpm.mlogbw.create.req(that.bwItemForms).then((res1) => {
that.isSaveing = false;
that.$emit("success",res.mlog);
that.visible = false;
that.$message.success("操作成功");
})
}else{
that.isSaveing = false;
that.$emit("success",res.mlog);
that.visible = false;
that.$message.success("操作成功");
}
that.isSaveing = false;
that.$emit("success",res.mlog);
that.visible = false;
that.$message.success("操作成功");
}).catch(()=>{
that.isSaveing = false;
});

6
src/views/wpm_bx/mlogs.vue
View File

@ -374,9 +374,11 @@ export default {
}
}
},
detailClose() {
detailClose(data) {
this.dialog.detail = false;
this.$refs.table.refresh();
if(data){}else{
this.$refs.table.refresh();
}
},
table_monitor(row){
let that= this;