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:
TianyangZhang 2026-03-20 09:21:07 +08:00
parent ab030d2487 0a27aa67ff
commit b0e4dc830a
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/index.js
View File

@ -6,7 +6,7 @@ const DEFAULT_CONFIG = {
DASHBOARD_URL: "/dashboard", DASHBOARD_URL: "/dashboard",
//版本号 //版本号
APP_VER: "2.7.2025092816", APP_VER: "3.1.2026031316",
//内核版本号 //内核版本号
CORE_VER: "1.6.9", CORE_VER: "1.6.9",

5
src/views/statistics/bxerp/workHoursPB.vue
View File

@ -110,6 +110,8 @@
<el-table-column type="index" width="50" fixed="left"/> <el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="员工" prop="员工"> <el-table-column label="员工" prop="员工">
</el-table-column> </el-table-column>
<el-table-column label="物料名" prop="物料名">
</el-table-column>
<el-table-column label="总数"> <el-table-column label="总数">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.总切片数" @click="handleClick(scope.row)" style="color:#0052d9;">{{ scope.row.总切片数 }}</span> <span v-if="scope.row.总切片数" @click="handleClick(scope.row)" style="color:#0052d9;">{{ scope.row.总切片数 }}</span>
@ -391,7 +393,8 @@ export default {
let that = this; let that = this;
let params = {}; let params = {};
params.query = that.query; params.query = that.query;
that.$API.bi.dataset.exec.req('prodect_defect_pb1', params).then((res) => { params.query.select_cols = '';
that.$API.bi.dataset.exec.req('product_defect_pb_user_mname', params).then((res) => {
let data = res.data2.ds0; let data = res.data2.ds0;
data.forEach(item=>{ data.forEach(item=>{
if(item.缺陷分布!==null){ if(item.缺陷分布!==null){

5
src/views/wpm_bx/mlogbw_check_table.vue
View File

@ -1142,6 +1142,9 @@ tbody tr:nth-child(odd) {
background-color: #f5f7fa; background-color: #f5f7fa;
} }
th{
text-align: left;
}
tr{ tr{
min-height: 40px; min-height: 40px;
} }
@ -1154,7 +1157,7 @@ td {
border-bottom: 1px solid #ebeef5; border-bottom: 1px solid #ebeef5;
} }
th{ th{
padding: 12px 0; padding: 12px 5px;
min-height: 40px; min-height: 40px;
font-size: 12px; font-size: 12px;
color: #909399; color: #909399;

2
src/views/wpm_gx/f_mlogs_form.vue
View File

@ -513,7 +513,7 @@ export default {
getdefects(route,material_in,material_out){ getdefects(route,material_in,material_out){
let that = this; let that = this;
if(that.is_fix&&that.materialFix!==null&&that.materialFix!==''){ if(that.is_fix&&that.materialFix!==null&&that.materialFix!==''){
that.$API.qm.qct.getQct.req({material: that.materialFix,tag:'process'}).then((res) => { that.$API.qm.qct.getQct.req({material: that.materialFix,tag:'process',type:'out'}).then((res) => {
res.qct_defects.forEach((item) => { res.qct_defects.forEach((item) => {
that.defectform[item.defect_name] = 0; that.defectform[item.defect_name] = 0;
}) })