Browse Source

Merge remote-tracking branch 'origin/master_hella' into master_hella

hella_online_20240904
gaojs 3 weeks ago
parent
commit
7b1f3e3dd9
  1. 30
      src/components/Verifition/src/Verify/VerifyPoints.vue
  2. 8
      src/views/qms/aql/aql.data.ts
  3. 7
      src/views/qms/counter/counter.data.ts
  4. 6
      src/views/qms/dynamicRule/dynamicRule.data.ts
  5. 6
      src/views/qms/inspectionMethod/inspectionMethod.data.ts
  6. 34
      src/views/qms/inspectionQ1/inspectionQ1.data.ts
  7. 34
      src/views/qms/inspectionQ2/inspectionQ2.data.ts
  8. 35
      src/views/qms/inspectionQ3/inspectionQ3.data.ts
  9. 12
      src/views/qms/inspectionScheme/inspectionScheme.data.ts
  10. 6
      src/views/qms/inspectionTemplate/inspectionTemplate.data.ts
  11. 6
      src/views/qms/samplingProcess/samplingProcess.data.ts
  12. 6
      src/views/qms/selectedSet/selectedSet.data.ts

30
src/components/Verifition/src/Verify/VerifyPoints.vue

@ -147,9 +147,8 @@ onMounted(() => {
return false
}
})
const canvas = ref(null)
const timer1 = ref<NodeJS.Timeout | number>(0)
const timer2 = ref<NodeJS.Timeout | number>(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

8
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
}

7
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',

6
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
}

6
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
}

34
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',

34
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',

35
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',

12
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
}

6
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
}

6
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
}

6
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
}

Loading…
Cancel
Save