From 34ab74c3eec74ad987bc2bb5bf8cae4de9637b9a Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Wed, 31 Jan 2024 15:40:51 +0800 Subject: [PATCH] debug --- src/api/qualityManagement/againFQC.js | 6 ++-- src/api/qualityManagement/firstFQC.js | 6 ++-- src/api/qualityManagement/thirtyFQC.js | 6 ++-- src/views/index.vue | 9 +++-- src/views/productManagement/workorder2.vue | 21 ++++++------ src/views/qualityManagement/FQC/againFQC.vue | 20 ++++++----- src/views/qualityManagement/FQC/firstFQC.vue | 33 ++++++++++++++----- src/views/qualityManagement/FQC/firstFQC2.vue | 2 +- src/views/qualityManagement/FQC/thirtyFQC.vue | 21 +++++++----- .../qualityManagement/FQC/thirtyFQC2.vue | 2 +- 10 files changed, 74 insertions(+), 52 deletions(-) diff --git a/src/api/qualityManagement/againFQC.js b/src/api/qualityManagement/againFQC.js index 6a874e4..438ea9a 100644 --- a/src/api/qualityManagement/againFQC.js +++ b/src/api/qualityManagement/againFQC.js @@ -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, }) diff --git a/src/api/qualityManagement/firstFQC.js b/src/api/qualityManagement/firstFQC.js index 3f2f418..9639096 100644 --- a/src/api/qualityManagement/firstFQC.js +++ b/src/api/qualityManagement/firstFQC.js @@ -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, }) diff --git a/src/api/qualityManagement/thirtyFQC.js b/src/api/qualityManagement/thirtyFQC.js index 1eed949..4b70f70 100644 --- a/src/api/qualityManagement/thirtyFQC.js +++ b/src/api/qualityManagement/thirtyFQC.js @@ -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, }) diff --git a/src/views/index.vue b/src/views/index.vue index eaf6490..44a22f8 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,8 +1,9 @@ @@ -83,6 +83,7 @@ export default { data() { return { imagesArray: [logoImg5, logoImg2, logoImg3, logoImg4, logoImg1], + now_time: new Date(), } }, } @@ -193,6 +194,4 @@ export default { } } } - - diff --git a/src/views/productManagement/workorder2.vue b/src/views/productManagement/workorder2.vue index 066f03d..f7a8e93 100644 --- a/src/views/productManagement/workorder2.vue +++ b/src/views/productManagement/workorder2.vue @@ -88,8 +88,8 @@ :data="workorder_table_data" > - + + @@ -141,7 +141,7 @@ /> - + @@ -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 { diff --git a/src/views/qualityManagement/FQC/againFQC.vue b/src/views/qualityManagement/FQC/againFQC.vue index 4c921f2..acbe3a2 100644 --- a/src/views/qualityManagement/FQC/againFQC.vue +++ b/src/views/qualityManagement/FQC/againFQC.vue @@ -141,7 +141,7 @@ @mouseup="clearTimer" style="visibility: hidden" > -
水渍
+
水斑
{{ device[0].counter }}
-
斑点
+
脏点
{{ device[1].counter }}