Teams/shgx_tz_vue-sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

debug

Browse Source
This commit is contained in:
qianhao.xu
2024-01-31 15:40:51 +08:00
parent bed4f3fd1b
commit 34ab74c3ee
10 changed files with 74 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/qualityManagement/againFQC.js
View File

@@ -15,7 +15,7 @@ export function GetcheckItemTable(query) {
export function getcurrent_workorder(query) {
// 返回请求，请求地址为/mes/qc/FQC/getcurrentWorkorder，请求方法为get，参数为query
return request({
url: '/mes/qc/FQC/getcurrentWorkorder',
url: '/mes/qc/FQC/getcurrentWorkorder_again',
method: 'get',
params: query,
})
@@ -25,7 +25,7 @@ export function getcurrent_workorder(query) {
export function get_next_current_workorder(query) {
// 返回请求，请求地址为/mes/qc/FQC/getcurrentWorkorder_next，请求方法为get，参数为query
return request({
url: '/mes/qc/FQC/getcurrentWorkorder_next',
url: '/mes/qc/FQC/getcurrentWorkorder_next_again',
method: 'get',
params: query,
})
@@ -34,7 +34,7 @@ export function get_next_current_workorder(query) {
export function get_previous_current_workorder(query) {
// 返回请求，请求地址为/mes/qc/FQC/getcurrentWorkorder_next，请求方法为get，参数为query
return request({
url: '/mes/qc/FQC/getcurrentWorkorder_previous',
url: '/mes/qc/FQC/getcurrentWorkorder_previous_again',
method: 'get',
params: query,
})

6
src/api/qualityManagement/firstFQC.js
View File

@@ -15,7 +15,7 @@ export function GetcheckItemTable(query) {
export function getcurrent_workorder(query) {
// 返回请求，请求地址为/mes/qc/FQC/getcurrentWorkorder，请求方法为get，参数为query
return request({
url: '/mes/qc/FQC/getcurrentWorkorder',
url: '/mes/qc/FQC/getcurrentWorkorder_first',
method: 'get',
params: query,
})
@@ -25,7 +25,7 @@ export function getcurrent_workorder(query) {
export function get_next_current_workorder(query) {
// 返回请求，请求地址为/mes/qc/FQC/getcurrentWorkorder_next，请求方法为get，参数为query
return request({
url: '/mes/qc/FQC/getcurrentWorkorder_next',
url: '/mes/qc/FQC/getcurrentWorkorder_next_first',
method: 'get',
params: query,
})
@@ -34,7 +34,7 @@ export function get_next_current_workorder(query) {
export function get_previous_current_workorder(query) {
// 返回请求，请求地址为/mes/qc/FQC/getcurrentWorkorder_next，请求方法为get，参数为query
return request({
url: '/mes/qc/FQC/getcurrentWorkorder_previous',
url: '/mes/qc/FQC/getcurrentWorkorder_previous_first',
method: 'get',
params: query,
})

6
src/api/qualityManagement/thirtyFQC.js
View File

@@ -15,7 +15,7 @@ export function GetcheckItemTable(query) {
export function getcurrent_workorder(query) {
// 返回请求，请求地址为/mes/qc/FQC/getcurrentWorkorder，请求方法为get，参数为query
return request({
url: '/mes/qc/FQC/getcurrentWorkorder',
url: '/mes/qc/FQC/getcurrentWorkorder_thirty',
method: 'get',
params: query,
})
@@ -25,7 +25,7 @@ export function getcurrent_workorder(query) {
export function get_next_current_workorder(query) {
// 返回请求，请求地址为/mes/qc/FQC/getcurrentWorkorder_next，请求方法为get，参数为query
return request({
url: '/mes/qc/FQC/getcurrentWorkorder_next',
url: '/mes/qc/FQC/getcurrentWorkorder_next_thirty',
method: 'get',
params: query,
})
@@ -34,7 +34,7 @@ export function get_next_current_workorder(query) {
export function get_previous_current_workorder(query) {
// 返回请求，请求地址为/mes/qc/FQC/getcurrentWorkorder_next，请求方法为get，参数为query
return request({
url: '/mes/qc/FQC/getcurrentWorkorder_previous',
url: '/mes/qc/FQC/getcurrentWorkorder_previous_thirty',
method: 'get',
params: query,
})

9
src/views/index.vue
View File

@@ -1,8 +1,9 @@
<template>
<div class="app-container">
<div style="float: right">{{ now_time }}</div>
<el-carousel :interval="4000" type="card" height="300px">
<el-carousel-item v-for="item in imagesArray" :key="item">
<el-image :src="item" ></el-image>
<el-image :src="item"></el-image>
</el-carousel-item>
</el-carousel>
<div class="idea_main">
@@ -16,7 +17,7 @@
</p>
</div>
<div class="idea_right">
<el-image :src="imagesArray[0]" ></el-image>
<el-image :src="imagesArray[0]"></el-image>
</div>
</div>
<div class="intro_main">
@@ -68,7 +69,6 @@
</div>
</div>
</div>
</div>
</template>
@@ -83,6 +83,7 @@ export default {
data() {
return {
imagesArray: [logoImg5, logoImg2, logoImg3, logoImg4, logoImg1],
now_time: new Date(),
}
},
}
@@ -193,6 +194,4 @@ export default {
}
}
}
</style>

21
src/views/productManagement/workorder2.vue
View File

@@ -88,8 +88,8 @@
:data="workorder_table_data"
>
<vxe-column type="seq" width="60"></vxe-column>
<!-- <vxe-column field="sort" title="序号"></vxe-column>
<vxe-column field="id" title="工单号"></vxe-column> -->
<vxe-column field="sort" title="序号"></vxe-column>
<vxe-column field="id" title="1工单号"></vxe-column>
<vxe-column field="clientWorkorder" title="工单号"></vxe-column>
<vxe-column field="blankNumber" title="毛坯号"></vxe-column>
<vxe-column field="finishedPartNumber" title="成品零件号"></vxe-column>
@@ -141,7 +141,7 @@
/>
<!-- 添加或修改生产工单对话框 -->
<el-dialog :title="dialog.title" :visible.sync="dialog.open" width="63%">
<el-form :model="workorderItem" ref="workorder">
<el-form :model="workorderItem" ref="workorder">
<el-row>
<el-col :span="8"
><el-form-item label="毛坯号" prop="blankNumber">
@@ -234,7 +234,7 @@ import {
deleteworkorder,
updateworkorder,
updateSort,
GenerateWorkorder
GenerateWorkorder,
} from '@/api/productManagement/workoder_v2.js'
import Sortable from 'sortablejs'
import { getToken } from '@/utils/auth'
@@ -319,9 +319,10 @@ export default {
const el1 = document.querySelectorAll('.vxe-table--body-wrapper')[0].querySelectorAll('table > tbody')[0]
Sortable.create(el1, {
disabled: false, // 是否开启拖拽
delay: 5,
dragClass: 'sortable-ghost', //拖拽样式
chosenClass: 'sortable-ghost',
animation: 150, // 拖拽延时，效果更好看
animation: 3000, // 拖拽延时，效果更好看
dataIdAttr: 'rowid',
group: {
// 是否开启跨表拖拽
@@ -555,17 +556,17 @@ export default {
generate_workorder() {
this.$modal
.confirm('是否确认重新生成工单')
.then(()=> {
.then(() => {
if (this.search.year == undefined) {
this.$message.error('请选择年份');
this.$message.error('请选择年份')
return
}
if (this.search.week == undefined) {
this.$message.error('请选择周');
this.$message.error('请选择周')
return
}
if (this.search.date == undefined) {
this.$message.error('请选择日期');
this.$message.error('请选择日期')
return
}
@@ -573,7 +574,7 @@ export default {
})
.then((res) => {
if (res.code == 200) {
if (res.data>0) {
if (res.data > 0) {
this.$notify.success('生成工单成功')
this.getList()
} else {

20
src/views/qualityManagement/FQC/againFQC.vue
View File

@@ -141,7 +141,7 @@
@mouseup="clearTimer"
style="visibility: hidden"
>
<div class="context">水渍</div>
<div class="context">水斑</div>
<div class="number">{{ device[0].counter }}</div>
</div>
<div
@@ -151,7 +151,7 @@
@mouseup="clearTimer"
style="visibility: hidden"
>
<div class="context">斑点</div>
<div class="context">脏点</div>
<div class="number">{{ device[1].counter }}</div>
</div>
<div
@@ -207,11 +207,11 @@
</template>
<template>
<div class="button_" @click="Accumulator(device[7])" @mousedown="startimer(device[7].counter, 'device', 7)" @mouseup="clearTimer">
<div class="context">水渍</div>
<div class="context">水斑</div>
<div class="number">{{ device[7].counter }}</div>
</div>
<div class="button_" @click="Accumulator(device[8])" @mousedown="startimer(device[8].counter, 'device', 8)" @mouseup="clearTimer">
<div class="context">斑点</div>
<div class="context">脏点</div>
<div class="number">{{ device[8].counter }}</div>
</div>
<div class="button_" @click="Accumulator(device[9])" @mousedown="startimer(device[9].counter, 'device', 9)" @mouseup="clearTimer">
@@ -237,11 +237,11 @@
</template>
<template>
<div class="button_" @click="Accumulator(device[14])" @mousedown="startimer(device[14].counter, 'device', 14)" @mouseup="clearTimer">
<div class="context">水渍</div>
<div class="context">水斑</div>
<div class="number">{{ device[14].counter }}</div>
</div>
<div class="button_" @click="Accumulator(device[15])" @mousedown="startimer(device[15].counter, 'device', 15)" @mouseup="clearTimer">
<div class="context">斑点</div>
<div class="context">脏点</div>
<div class="number">{{ device[15].counter }}</div>
</div>
<div class="button_" @click="Accumulator(device[16])" @mousedown="startimer(device[16].counter, 'device', 16)" @mouseup="clearTimer">
@@ -723,7 +723,7 @@ export default {
toUpdateNum: 0, //弹窗更新值
toname: '',
toindex: 0, //索引
timer: null,
timer: null,//定时器
}
},
created() {
@@ -1108,6 +1108,8 @@ export default {
this.CurrentWorkorder.previousNumber = res.data
}
})
//this.getcurrentWorkorder()
}, 4000)
},
stopTimer() {
@@ -1158,7 +1160,7 @@ export default {
}
.grid > * {
height: 320px;
background-color: #ebeef5;
background-color: #032169;;
color: white;
border-radius: 0.5em;
}
@@ -1193,7 +1195,7 @@ export default {
.title_sub {
font-family: Arial, sans-serif;
font-size: 1.5rem;
color: #303133;
color: #da1165;
text-align: center;
}
//油漆块样式

33
src/views/qualityManagement/FQC/firstFQC.vue
View File

@@ -99,11 +99,11 @@
<div class="grid_3">
<template>
<div class="button_" @click="Accumulator(device[0])" @mousedown="startimer(device[0].counter, 'device', 0)" @mouseup="clearTimer">
<div class="context">水渍</div>
<div class="context">水斑</div>
<div class="number">{{ device[0].counter }}</div>
</div>
<div class="button_" @click="Accumulator(device[1])" @mousedown="startimer(device[1].counter, 'device', 1)" @mouseup="clearTimer">
<div class="context">斑点</div>
<div class="context">脏点</div>
<div class="number">{{ device[1].counter }}</div>
</div>
<div class="button_" @click="Accumulator(device[2])" @mousedown="startimer(device[2].counter, 'device', 2)" @mouseup="clearTimer">
@@ -129,11 +129,11 @@
</template>
<template>
<div class="button_" @click="Accumulator(device[7])" @mousedown="startimer(device[7].counter, 'device', 7)" @mouseup="clearTimer">
<div class="context">水渍</div>
<div class="context">水斑</div>
<div class="number">{{ device[7].counter }}</div>
</div>
<div class="button_" @click="Accumulator(device[8])" @mousedown="startimer(device[8].counter, 'device', 8)" @mouseup="clearTimer">
<div class="context">斑点</div>
<div class="context">脏点</div>
<div class="number">{{ device[8].counter }}</div>
</div>
<div class="button_" @click="Accumulator(device[9])" @mousedown="startimer(device[9].counter, 'device', 9)" @mouseup="clearTimer">
@@ -159,11 +159,11 @@
</template>
<template>
<div class="button_" @click="Accumulator(device[14])" @mousedown="startimer(device[14].counter, 'device', 14)" @mouseup="clearTimer">
<div class="context">水渍</div>
<div class="context">水斑</div>
<div class="number">{{ device[14].counter }}</div>
</div>
<div class="button_" @click="Accumulator(device[15])" @mousedown="startimer(device[15].counter, 'device', 15)" @mouseup="clearTimer">
<div class="context">斑点</div>
<div class="context">脏点</div>
<div class="number">{{ device[15].counter }}</div>
</div>
<div class="button_" @click="Accumulator(device[16])" @mousedown="startimer(device[16].counter, 'device', 16)" @mouseup="clearTimer">
@@ -546,6 +546,7 @@ export default {
toUpdateNum: 0, //弹窗更新值
toname: '',
toindex: 0, //索引
timer: null,//定时器
}
},
created() {
@@ -916,7 +917,23 @@ export default {
this.DMLdialog.visiable = false
},
//todo 定时任务 ，每4s 获取一次当前工单
startTimer() {
this.timer = setInterval(() => {
//this.getcurrentWorkorder()
}, 4000)
},
stopTimer() {
clearInterval(this.timer)
},
},
beforeDestroy() {
this.stopTimer()
},
}
</script>
@@ -958,7 +975,7 @@ export default {
}
.grid > * {
height: 320px;
background-color: #ebeef5;
background-color: #032169;
color: white;
border-radius: 0.5em;
}
@@ -993,7 +1010,7 @@ export default {
.title_sub {
font-family: Arial, sans-serif;
font-size: 1.5rem;
color: #303133;
color: #da1165;
text-align: center;
}
//油漆块样式

2
src/views/qualityManagement/FQC/firstFQC2.vue
View File

@@ -620,7 +620,7 @@ export default {
}
.grid > * {
height: 320px;
background-color: #ebeef5;
background-color: #464648;
color: white;
border-radius: 0.5em;
}

21
src/views/qualityManagement/FQC/thirtyFQC.vue
View File

@@ -141,7 +141,7 @@
@mouseup="clearTimer"
style="visibility: hidden"
>
<div class="context">水渍</div>
<div class="context">水斑</div>
<div class="number">{{ device[0].counter }}</div>
</div>
<div
@@ -151,7 +151,7 @@
@mouseup="clearTimer"
style="visibility: hidden"
>
<div class="context">斑点</div>
<div class="context">脏点</div>
<div class="number">{{ device[1].counter }}</div>
</div>
<div
@@ -207,11 +207,11 @@
</template>
<template>
<div class="button_" @click="Accumulator(device[7])" @mousedown="startimer(device[7].counter, 'device', 7)" @mouseup="clearTimer">
<div class="context">水渍</div>
<div class="context">水斑</div>
<div class="number">{{ device[7].counter }}</div>
</div>
<div class="button_" @click="Accumulator(device[8])" @mousedown="startimer(device[8].counter, 'device', 8)" @mouseup="clearTimer">
<div class="context">斑点</div>
<div class="context">脏点</div>
<div class="number">{{ device[8].counter }}</div>
</div>
<div class="button_" @click="Accumulator(device[9])" @mousedown="startimer(device[9].counter, 'device', 9)" @mouseup="clearTimer">
@@ -237,11 +237,11 @@
</template>
<template>
<div class="button_" @click="Accumulator(device[14])" @mousedown="startimer(device[14].counter, 'device', 14)" @mouseup="clearTimer">
<div class="context">水渍</div>
<div class="context">水斑</div>
<div class="number">{{ device[14].counter }}</div>
</div>
<div class="button_" @click="Accumulator(device[15])" @mousedown="startimer(device[15].counter, 'device', 15)" @mouseup="clearTimer">
<div class="context">斑点</div>
<div class="context">脏点</div>
<div class="number">{{ device[15].counter }}</div>
</div>
<div class="button_" @click="Accumulator(device[16])" @mousedown="startimer(device[16].counter, 'device', 16)" @mouseup="clearTimer">
@@ -1078,6 +1078,8 @@ export default {
this.CurrentWorkorder.previousNumber = res.data
}
})
//this.getcurrentWorkorder()
}, 4000)
},
stopTimer() {
@@ -1128,7 +1130,7 @@ export default {
}
.grid > * {
height: 320px;
background-color: #ebeef5;
background-color:#032169;;
color: white;
border-radius: 0.5em;
}
@@ -1148,7 +1150,7 @@ export default {
grid-template-rows: 1fr 1fr 1fr;
grid-gap: 0.5em;
.title_Line {
color: #409eff;
font-family: Arial, sans-serif;
font-size: 1.2rem;
text-align: center;
@@ -1157,13 +1159,14 @@ export default {
border-radius: 0.2em;
transition: all 0.2s ease-in-out;
margin-top: 2rem;
color: #e21313;
}
}
// 块标题块
.title_sub {
font-family: Arial, sans-serif;
font-size: 1.5rem;
color: #303133;
color: #da1165;
text-align: center;
}
//油漆块样式

2
src/views/qualityManagement/FQC/thirtyFQC2.vue
View File

@@ -416,7 +416,7 @@ export default {
}
.grid > * {
height: 320px;
background-color: #ebeef5;
background-color: #464648;
color: white;
border-radius: 0.5em;
}