From d709c858da839c3fd654181bc41283ccb0e3bab8 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 29 Aug 2024 15:28:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=94=A8=E5=88=B0=E7=9A=84=E4=B8=9A=E5=8A=A1=EF=BC=9A-?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81=E9=87=8C?= =?UTF-8?q?=E7=9A=84=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Verifition/src/Verify/VerifyPoints.vue | 30 ++++--------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/src/components/Verifition/src/Verify/VerifyPoints.vue b/src/components/Verifition/src/Verify/VerifyPoints.vue index 0c2745048..86aff851c 100644 --- a/src/components/Verifition/src/Verify/VerifyPoints.vue +++ b/src/components/Verifition/src/Verify/VerifyPoints.vue @@ -147,9 +147,8 @@ onMounted(() => { return false } }) + const canvas = ref(null) -const timer1 = ref(0) -const timer2 = ref(0) const canvasClick = (e) => { checkPosArr.push(getMousePos(canvas, e)) if (num.value == checkNum.value) { @@ -159,7 +158,7 @@ const canvasClick = (e) => { checkPosArr.length = 0 checkPosArr.push(...arr) //等创建坐标执行完 - timer1.value = setTimeout(() => { + setTimeout(() => { // var flag = this.comparePos(this.fontPos, this.checkPosArr); //发送后端请求 var captchaVerification = secretKey.value @@ -179,13 +178,9 @@ const canvasClick = (e) => { text.value = t('captcha.success') bindingClick.value = false if (mode.value == 'pop') { - timer2.value = setTimeout(() => { + setTimeout(() => { proxy.$parent.clickShow = false refresh() - if(timer2.value){ - clearTimeout(timer2.value) - timer2.value = 0 - } }, 1500) } proxy.$parent.$emit('success', { captchaVerification }) @@ -194,33 +189,18 @@ const canvasClick = (e) => { barAreaColor.value = '#d9534f' barAreaBorderColor.value = '#d9534f' text.value = t('captcha.fail') - timer2.value = setTimeout(() => { + setTimeout(() => { refresh() - if(timer2.value){ - clearTimeout(timer2.value) - timer2.value = 0 - } }, 700) } }) - if(timer1.value){ - clearTimeout(timer1.value) - timer1.value = 0 - } }, 400) } if (num.value < checkNum.value) { num.value = createPoint(getMousePos(canvas, e)) } } -onBeforeUnmount(() => { - if(timer1.value){ - clearTimeout(timer1.value) - } - if(timer2.value){ - clearTimeout(timer2.value) - } -}) + //获取坐标 const getMousePos = function (obj, e) { var x = e.offsetX From 078915b9591953b618ce98ba71b77c39ebb99633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Thu, 29 Aug 2024 16:50:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?QMS=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD=E7=9A=84=E6=A3=80=E6=9F=A5=E4=B8=8E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=20HL-5424?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/aql/aql.data.ts | 8 ++--- src/views/qms/counter/counter.data.ts | 7 ++-- src/views/qms/dynamicRule/dynamicRule.data.ts | 6 ++-- .../inspectionMethod/inspectionMethod.data.ts | 6 ++-- .../qms/inspectionQ1/inspectionQ1.data.ts | 34 ++++++++++++++++++ .../qms/inspectionQ2/inspectionQ2.data.ts | 34 ++++++++++++++++++ .../qms/inspectionQ3/inspectionQ3.data.ts | 35 ++++++++++++++++++- .../inspectionScheme/inspectionScheme.data.ts | 12 +++---- .../inspectionTemplate.data.ts | 6 ++-- .../samplingProcess/samplingProcess.data.ts | 6 ++-- src/views/qms/selectedSet/selectedSet.data.ts | 6 ++-- 11 files changed, 130 insertions(+), 30 deletions(-) diff --git a/src/views/qms/aql/aql.data.ts b/src/views/qms/aql/aql.data.ts index 4e860979f..ff1b95012 100644 --- a/src/views/qms/aql/aql.data.ts +++ b/src/views/qms/aql/aql.data.ts @@ -586,8 +586,8 @@ export const Aql = useCrudSchemas( valueFormat: 'YYYY-MM-DD HH:mm:ss', type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - }, - }, + } + } }, { label: '创建者', @@ -604,7 +604,7 @@ export const Aql = useCrudSchemas( sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -627,7 +627,7 @@ export const Aql = useCrudSchemas( field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/qms/counter/counter.data.ts b/src/views/qms/counter/counter.data.ts index c68b864b3..f885c7e67 100644 --- a/src/views/qms/counter/counter.data.ts +++ b/src/views/qms/counter/counter.data.ts @@ -217,7 +217,7 @@ export const Counter = useCrudSchemas( type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } - }, + } }, { label: '创建者', @@ -234,7 +234,7 @@ export const Counter = useCrudSchemas( sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -257,12 +257,11 @@ export const Counter = useCrudSchemas( field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } }, - { label: '操作', field: 'action', diff --git a/src/views/qms/dynamicRule/dynamicRule.data.ts b/src/views/qms/dynamicRule/dynamicRule.data.ts index c502fe5c5..56fbce496 100644 --- a/src/views/qms/dynamicRule/dynamicRule.data.ts +++ b/src/views/qms/dynamicRule/dynamicRule.data.ts @@ -85,7 +85,7 @@ export const DynamicRule = useCrudSchemas( type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } - }, + } }, { label: '创建者', @@ -102,7 +102,7 @@ export const DynamicRule = useCrudSchemas( sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -125,7 +125,7 @@ export const DynamicRule = useCrudSchemas( field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/qms/inspectionMethod/inspectionMethod.data.ts b/src/views/qms/inspectionMethod/inspectionMethod.data.ts index 519f40e06..e08d24a4e 100644 --- a/src/views/qms/inspectionMethod/inspectionMethod.data.ts +++ b/src/views/qms/inspectionMethod/inspectionMethod.data.ts @@ -102,7 +102,7 @@ export const InspectionMethod = useCrudSchemas( type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } - }, + } }, { label: '创建者', @@ -119,7 +119,7 @@ export const InspectionMethod = useCrudSchemas( sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -142,7 +142,7 @@ export const InspectionMethod = useCrudSchemas( field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/qms/inspectionQ1/inspectionQ1.data.ts b/src/views/qms/inspectionQ1/inspectionQ1.data.ts index 7d9524317..18676f833 100644 --- a/src/views/qms/inspectionQ1/inspectionQ1.data.ts +++ b/src/views/qms/inspectionQ1/inspectionQ1.data.ts @@ -431,6 +431,40 @@ export const Q1 = useCrudSchemas( isForm: false, isTable: true }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: true, + table: { + width: 150 + } + }, { label: '操作', field: 'action', diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 3ef1e9b44..ea33b0796 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -713,6 +713,40 @@ export const Q2 = useCrudSchemas( isForm: false, isTable: true }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: true, + table: { + width: 150 + } + }, { label: '操作', field: 'action', diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts index 0f1e65eaf..df2324691 100644 --- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts +++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts @@ -230,7 +230,40 @@ export const InspectionQ3Main = useCrudSchemas( } } }, - + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: true, + table: { + width: 150 + } + }, { label: '操作', field: 'action', diff --git a/src/views/qms/inspectionScheme/inspectionScheme.data.ts b/src/views/qms/inspectionScheme/inspectionScheme.data.ts index eb2c99142..9d8f3e6ef 100644 --- a/src/views/qms/inspectionScheme/inspectionScheme.data.ts +++ b/src/views/qms/inspectionScheme/inspectionScheme.data.ts @@ -62,7 +62,7 @@ export const InspectionSchemeMain = useCrudSchemas( }, isSearch: true }, - + { label: '方案描述', field: 'description', @@ -98,7 +98,7 @@ export const InspectionSchemeMain = useCrudSchemas( width: 175 } }, - + { label: '动态修改规则', field: 'dynamicUpdateCode', @@ -115,7 +115,7 @@ export const InspectionSchemeMain = useCrudSchemas( width: 140 } }, - + { label: '生效时间', field: 'effectiveDate', @@ -210,7 +210,7 @@ export const InspectionSchemeMain = useCrudSchemas( type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } - }, + } }, { label: '创建者', @@ -227,7 +227,7 @@ export const InspectionSchemeMain = useCrudSchemas( sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -250,7 +250,7 @@ export const InspectionSchemeMain = useCrudSchemas( field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts b/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts index ccf501190..6bc8f4dc9 100644 --- a/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts +++ b/src/views/qms/inspectionTemplate/inspectionTemplate.data.ts @@ -105,7 +105,7 @@ export const InspectionTemplateMain = useCrudSchemas( type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } - }, + } }, { label: '创建者', @@ -122,7 +122,7 @@ export const InspectionTemplateMain = useCrudSchemas( sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -145,7 +145,7 @@ export const InspectionTemplateMain = useCrudSchemas( field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/qms/samplingProcess/samplingProcess.data.ts b/src/views/qms/samplingProcess/samplingProcess.data.ts index 623ac34c3..bec35a6bb 100644 --- a/src/views/qms/samplingProcess/samplingProcess.data.ts +++ b/src/views/qms/samplingProcess/samplingProcess.data.ts @@ -131,7 +131,7 @@ export const SamplingProcess = useCrudSchemas( type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } - }, + } }, { label: '创建者', @@ -148,7 +148,7 @@ export const SamplingProcess = useCrudSchemas( sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -171,7 +171,7 @@ export const SamplingProcess = useCrudSchemas( field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/qms/selectedSet/selectedSet.data.ts b/src/views/qms/selectedSet/selectedSet.data.ts index b815c9753..9043d231c 100644 --- a/src/views/qms/selectedSet/selectedSet.data.ts +++ b/src/views/qms/selectedSet/selectedSet.data.ts @@ -77,7 +77,7 @@ export const SelectedSet = useCrudSchemas( type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } - }, + } }, { label: '创建者', @@ -94,7 +94,7 @@ export const SelectedSet = useCrudSchemas( sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -117,7 +117,7 @@ export const SelectedSet = useCrudSchemas( field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 }