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

结石气线分开

This commit is contained in:
shijing 2023-12-18 14:50:04 +08:00
parent 4657a2591d
commit 7ce9f1d9f6
14 changed files with 122 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/bigScreen/index_10dept.vue
View File

@ -456,7 +456,8 @@ export default {
{ value: 1, name: '椭圆弯曲' }, { value: 1, name: '椭圆弯曲' },
{ value: 3, name: '大小头' }, { value: 3, name: '大小头' },
{ value: 0, name: '偏壁' }, { value: 0, name: '偏壁' },
{ value: 5, name: '结石气线' }, { value: 5, name: '结石' },
{ value: 5, name: '气线' },
{ value: 200, name: '合格' }, { value: 200, name: '合格' },
], ],
emphasis: { emphasis: {

3
src/views/bigScreen/index_7dept.vue
View File

@ -340,7 +340,8 @@ export default {
{ value: 1, name: '椭圆弯曲' }, { value: 1, name: '椭圆弯曲' },
{ value: 3, name: '大小头' }, { value: 3, name: '大小头' },
{ value: 0, name: '偏壁' }, { value: 0, name: '偏壁' },
{ value: 5, name: '结石气线' }, { value: 5, name: '结石' },
{ value: 5, name: '气线' },
{ value: 200, name: '合格' }, { value: 200, name: '合格' },
], ],
emphasis: { emphasis: {

3
src/views/bigScreen/index_photon.vue
View File

@ -1313,7 +1313,8 @@ export default {
{ value: 8, name: '椭圆弯曲' }, { value: 8, name: '椭圆弯曲' },
{ value: 0, name: '大小头' }, { value: 0, name: '大小头' },
{ value: 2, name: '偏壁' }, { value: 2, name: '偏壁' },
{ value: 6, name: '结石气线' }, { value: 6, name: '结石' },
{ value: 6, name: '气线' },
] ]

3
src/views/bigScreen/textIndex.vue
View File

@ -1250,7 +1250,8 @@ export default {
{ value: 8, name: '椭圆弯曲' }, { value: 8, name: '椭圆弯曲' },
{ value: 0, name: '大小头' }, { value: 0, name: '大小头' },
{ value: 2, name: '偏壁' }, { value: 2, name: '偏壁' },
{ value: 6, name: '结石气线' }, { value: 6, name: '结石' },
{ value: 6, name: '气线' },
] ]

13
src/views/inm/mioitem.vue
View File

@ -44,13 +44,14 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="100px"> <el-table-column label="操作" fixed="right" align="center" width="100px">
<template #default="scope"> <template #default="scope">
<el-link type="primary" @click="table_check(scope.row)" v-if="mioObj.state==20&&mioObj.type=='do_in'"> <!-- <el-link type="primary" @click="table_check(scope.row)" v-if="mioObj.state==20&&mioObj.type=='do_in'"> -->
<el-link type="primary" @click="table_check(scope.row)" v-if="scope.row.test_date==null">
检验 检验
</el-link> </el-link>
<!-- <el-link type="primary" @click="table_Show(scope.row)" v-else> <el-link type="primary" @click="check_Show(scope.row)" v-else>
查看 查看
</el-link> --> </el-link>
<el-link type="danger" @click="table_del(scope.row)" v-if="mioObj.state == 10"> <el-link type="danger" @click="table_del(scope.row)" v-if="scope.row.test_date==null">
删除 删除
</el-link> </el-link>
</template> </template>
@ -161,11 +162,11 @@ export default {
this.$refs.checkDialog.open("add"); this.$refs.checkDialog.open("add");
}); });
}, },
table_Show(row){ check_Show(row){
this.dialog.check = true; this.dialog.check = true;
this.mioitemId = row.id; this.mioitemId = row.id;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.checkDialog.open("add"); this.$refs.checkDialog.open("show").setData(row);
}); });
}, },
//本地更新数据 //本地更新数据

14
src/views/inm/mioitem_check.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<el-dialog <el-dialog
title="过程检验" title="检验"
v-model="visible" v-model="visible"
:size="1000" :size="1000"
destroy-on-close destroy-on-close
@ -91,8 +91,14 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="结石气线"> <el-form-item label="结石">
<el-input-number v-model="form.count_n_jsqx" :min="0" style="width:100%" controls-position="right"> <el-input-number v-model="form.count_n_js" :min="0" style="width:100%" controls-position="right">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="气线">
<el-input-number v-model="form.count_n_qx" :min="0" style="width:100%" controls-position="right">
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -105,7 +111,7 @@
</el-row> </el-row>
</el-form> </el-form>
</el-main> </el-main>
<el-footer> <el-footer v-if="mode=='add'">
<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button> <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
<el-button @click="visible = false">取消</el-button> <el-button @click="visible = false">取消</el-button>
</el-footer> </el-footer>

4
src/views/statistics/inm_check.vue
View File

@ -100,7 +100,9 @@
</el-table-column> </el-table-column>
<el-table-column label="大小头" prop="count_n_dxt"> <el-table-column label="大小头" prop="count_n_dxt">
</el-table-column> </el-table-column>
<el-table-column label="结石气绒" prop="count_n_jsqx"> <el-table-column label="结石" prop="count_n_js">
</el-table-column>
<el-table-column label="气线" prop="count_n_qx">
</el-table-column> </el-table-column>
<el-table-column label="合计" prop="count_n_qt"> <el-table-column label="合计" prop="count_n_qt">
</el-table-column> </el-table-column>

14
src/views/statistics/product_check.vue
View File

@ -91,7 +91,9 @@
</el-table-column> </el-table-column>
<el-table-column label="大小头" prop="count_n_dxt"> <el-table-column label="大小头" prop="count_n_dxt">
</el-table-column> </el-table-column>
<el-table-column label="结石气绒" prop="count_n_jsqx"> <el-table-column label="结石" prop="count_n_js">
</el-table-column>
<el-table-column label="气线" prop="count_n_qx">
</el-table-column> </el-table-column>
<el-table-column label="合计" prop="count_n_qt"> <el-table-column label="合计" prop="count_n_qt">
</el-table-column> </el-table-column>
@ -126,7 +128,9 @@
</el-table-column> </el-table-column>
<el-table-column label="大小头" prop="count_n_dxt"> <el-table-column label="大小头" prop="count_n_dxt">
</el-table-column> </el-table-column>
<el-table-column label="结石气绒" prop="count_n_jsqx"> <el-table-column label="结石" prop="count_n_js">
</el-table-column>
<el-table-column label="气线" prop="count_n_qx">
</el-table-column> </el-table-column>
<el-table-column label="合计" prop="count_n_qt"> <el-table-column label="合计" prop="count_n_qt">
</el-table-column> </el-table-column>
@ -202,7 +206,8 @@
{value: 5, name: '断裂'}, {value: 5, name: '断裂'},
{value: 6, name: '偏壁'}, {value: 6, name: '偏壁'},
{value: 3, name: '大小头'}, {value: 3, name: '大小头'},
{value: 2, name: '结石气绒'}, {value: 2, name: '结石'},
{value: 2, name: '气线'},
] ]
} }
] ]
@ -229,7 +234,8 @@
{value: 6, name: '断裂'}, {value: 6, name: '断裂'},
{value: 3, name: '偏壁'}, {value: 3, name: '偏壁'},
{value: 2, name: '大小头'}, {value: 2, name: '大小头'},
{value: 3, name: '结石气绒'}, {value: 3, name: '结石'},
{value: 3, name: '气线'},
{value: 4, name: '箱中破'}, {value: 4, name: '箱中破'},
] ]
} }

27
src/views/wpm/mlog6_form.vue
View File

@ -244,15 +244,30 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="结石气绒"> <el-form-item label="结石">
<el-input-number <el-input-number
v-model="form.count_n_jsqx" v-model="form.count_n_js"
controls-position="right" controls-position="right"
:min="0" :min="0"
:step="1" :step="1"
:step-strictly="true" :step-strictly="true"
style="width: 100%" style="width: 100%"
placeholder="结石气绒" placeholder="结石"
@change="countNotOkSun"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="气线">
<el-input-number
v-model="form.count_n_qx"
controls-position="right"
:min="0"
:step="1"
:step-strictly="true"
style="width: 100%"
placeholder="气线"
@change="countNotOkSun" @change="countNotOkSun"
> >
</el-input-number> </el-input-number>
@ -326,7 +341,8 @@ export default {
count_n_dl:0, count_n_dl:0,
count_n_pb:0, count_n_pb:0,
count_n_dxt:0, count_n_dxt:0,
count_n_jsqx:0, count_n_js:0,
count_n_qx:0,
count_n_qt:0, count_n_qt:0,
handle_user:'' handle_user:''
}, },
@ -432,7 +448,8 @@ export default {
Number(this.form.count_n_dl) + Number(this.form.count_n_dl) +
Number(this.form.count_n_pb) + Number(this.form.count_n_pb) +
Number(this.form.count_n_dxt) + Number(this.form.count_n_dxt) +
Number(this.form.count_n_jsqx) + Number(this.form.count_n_js) +
Number(this.form.count_n_qx) +
Number(this.form.count_n_qt); Number(this.form.count_n_qt);
}, },
//提交 //提交

4
src/views/wpm/mlog_dept10.vue
View File

@ -126,7 +126,9 @@
</el-table-column> </el-table-column>
<el-table-column label="大小头" prop="count_n_dxt"> <el-table-column label="大小头" prop="count_n_dxt">
</el-table-column> </el-table-column>
<el-table-column label="结石气绒" prop="count_n_jsqx"> <el-table-column label="结石" prop="count_n_js">
</el-table-column>
<el-table-column label="气线" prop="count_n_qx">
</el-table-column> </el-table-column>
<el-table-column label="合计" prop="count_n_qt"> <el-table-column label="合计" prop="count_n_qt">
</el-table-column> </el-table-column>

3
src/views/wpm/mlog_dept6_detail.vue
View File

@ -51,7 +51,8 @@
<el-table-column prop="count_n_dl" label="断裂" /> <el-table-column prop="count_n_dl" label="断裂" />
<el-table-column prop="count_n_pb" label="偏壁" /> <el-table-column prop="count_n_pb" label="偏壁" />
<el-table-column prop="count_n_dxt" label="大小头" /> <el-table-column prop="count_n_dxt" label="大小头" />
<el-table-column prop="count_n_jsqx" label="结石气绒" /> <el-table-column prop="count_n_js" label="结石" />
<el-table-column prop="count_n_qx" label="气线" />
<el-table-column prop="count_n_qt" label="其他" /> <el-table-column prop="count_n_qt" label="其他" />
</el-table-column> </el-table-column>
<el-table-column label="操作人" prop="update_by_name"></el-table-column> <el-table-column label="操作人" prop="update_by_name"></el-table-column>

9
src/views/wpm/mlog_drawer.vue
View File

@ -84,9 +84,14 @@
<span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_dxt }}</span> <span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_dxt }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结石气绒"> <el-table-column label="结石">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_jsqx }}</span> <span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_js }}</span>
</template>
</el-table-column>
<el-table-column label="气线">
<template #default="scope">
<span v-if="scope.row.val_new">{{ scope.row.val_new.count_n_qx }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="其他"> <el-table-column label="其他">

4
src/views/wpm/worktask.vue
View File

@ -431,7 +431,9 @@
</el-table-column> </el-table-column>
<el-table-column label="大小头" prop="count_n_dxt"> <el-table-column label="大小头" prop="count_n_dxt">
</el-table-column> </el-table-column>
<el-table-column label="结石气绒" prop="count_n_jsqx"> <el-table-column label="结石" prop="count_n_js">
</el-table-column>
<el-table-column label="气线" prop="count_n_qx">
</el-table-column> </el-table-column>
<el-table-column label="合计" prop="count_n_qt"> <el-table-column label="合计" prop="count_n_qt">
</el-table-column> </el-table-column>

58
src/views/wpm/worktask_form.vue
View File

@ -332,15 +332,30 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="结石气绒"> <el-form-item label="结石">
<el-input-number <el-input-number
v-model="form.count_n_jsqx" v-model="form.count_n_js"
controls-position="right" controls-position="right"
:min="0" :min="0"
:step="1" :step="1"
:step-strictly="true" :step-strictly="true"
style="width: 100%" style="width: 100%"
placeholder="结石气绒" placeholder="结石"
@change="countNotOkSun"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="气线">
<el-input-number
v-model="form.count_n_qx"
controls-position="right"
:min="0"
:step="1"
:step-strictly="true"
style="width: 100%"
placeholder="气线"
@change="countNotOkSun" @change="countNotOkSun"
> >
</el-input-number> </el-input-number>
@ -957,15 +972,30 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="结石气绒"> <el-form-item label="结石">
<el-input-number <el-input-number
v-model="form.count_n_jsqx" v-model="form.count_n_js"
controls-position="right" controls-position="right"
:min="0" :min="0"
:step="1" :step="1"
:step-strictly="true" :step-strictly="true"
style="width: 100%" style="width: 100%"
placeholder="结石气绒" placeholder="结石"
@change="countNotOkSun"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="气线">
<el-input-number
v-model="form.count_n_qx"
controls-position="right"
:min="0"
:step="1"
:step-strictly="true"
style="width: 100%"
placeholder="气线"
@change="countNotOkSun" @change="countNotOkSun"
> >
</el-input-number> </el-input-number>
@ -1032,8 +1062,10 @@ export default {
count_n_dl: 0, count_n_dl: 0,
count_n_pb: 0, count_n_pb: 0,
count_n_dxt: 0, count_n_dxt: 0,
count_n_jsqx: 0, count_n_js: 0,
count_n_qx: 0,
count_n_qt: 0, count_n_qt: 0,
count_break:0,
mlogb: [], mlogb: [],
}, },
mlogb: [], mlogb: [],
@ -1218,7 +1250,8 @@ export default {
this.form.count_n_dl + this.form.count_n_dl +
this.form.count_n_pb + this.form.count_n_pb +
this.form.count_n_dxt + this.form.count_n_dxt +
this.form.count_n_jsqx; this.form.count_n_js+
this.form.count_n_qx;
} else if (this.activeType == "退火") { } else if (this.activeType == "退火") {
this.form.count_notok = this.form.count_notok =
this.form.count_n_wq + this.form.count_n_wq +
@ -1226,7 +1259,8 @@ export default {
this.form.count_n_dl + this.form.count_n_dl +
this.form.count_n_pb + this.form.count_n_pb +
this.form.count_n_dxt + this.form.count_n_dxt +
this.form.count_n_jsqx + this.form.count_n_js +
this.form.count_n_qx +
this.form.count_break; this.form.count_break;
} }
}, },
@ -1259,7 +1293,8 @@ export default {
this.form.count_n_dl + this.form.count_n_dl +
this.form.count_n_pb + this.form.count_n_pb +
this.form.count_n_dxt + this.form.count_n_dxt +
this.form.count_n_jsqx; this.form.count_n_js +
this.form.count_n_qx;
let ok_number = 0; let ok_number = 0;
this.mlogb.forEach((item) => { this.mlogb.forEach((item) => {
ok_number += item.count_ok; ok_number += item.count_ok;
@ -1273,7 +1308,8 @@ export default {
this.form.count_n_dl + this.form.count_n_dl +
this.form.count_n_pb + this.form.count_n_pb +
this.form.count_n_dxt + this.form.count_n_dxt +
this.form.count_n_jsqx + this.form.count_n_js +
this.form.count_n_qx +
this.form.count_break; this.form.count_break;
} }
if (this.activeType == "10车间") { if (this.activeType == "10车间") {