Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
12d4a28751
|
@ -1966,7 +1966,7 @@ export default {
|
||||||
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
|
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
|
||||||
|
|
||||||
picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
|
picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
|
||||||
|
}
|
||||||
var answers = []
|
var answers = []
|
||||||
var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
|
var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
|
||||||
for (const k in this.questionForm) {
|
for (const k in this.questionForm) {
|
||||||
|
@ -2027,7 +2027,6 @@ export default {
|
||||||
DicomEvent.$emit('getReportInfo', true)
|
DicomEvent.$emit('getReportInfo', true)
|
||||||
DicomEvent.$emit('setMeasuredToolsPassive')
|
DicomEvent.$emit('setMeasuredToolsPassive')
|
||||||
}).catch(() => { loading.close() })
|
}).catch(() => { loading.close() })
|
||||||
}
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
|
@ -1583,7 +1583,7 @@ export default {
|
||||||
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
|
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
|
||||||
|
|
||||||
picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
|
picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
|
||||||
|
}
|
||||||
var answers = []
|
var answers = []
|
||||||
var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
|
var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
|
||||||
for (const k in this.questionForm) {
|
for (const k in this.questionForm) {
|
||||||
|
@ -1643,7 +1643,6 @@ export default {
|
||||||
DicomEvent.$emit('getReportInfo', true)
|
DicomEvent.$emit('getReportInfo', true)
|
||||||
DicomEvent.$emit('setMeasuredToolsPassive')
|
DicomEvent.$emit('setMeasuredToolsPassive')
|
||||||
}).catch(() => { loading.close() })
|
}).catch(() => { loading.close() })
|
||||||
}
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
|
@ -1323,12 +1323,13 @@ export default {
|
||||||
// 靶病灶状态为0(存在)时,一定存在长径或者长短径(长径、十字线 )
|
// 靶病灶状态为0(存在)时,一定存在长径或者长短径(长径、十字线 )
|
||||||
// 普通靶病灶:长径大于10mm且不小于2倍层厚(基线校验)
|
// 普通靶病灶:长径大于10mm且不小于2倍层厚(基线校验)
|
||||||
// 淋巴结靶病灶:短径大于15mm且不小于2倍层厚(基线校验)
|
// 淋巴结靶病灶:短径大于15mm且不小于2倍层厚(基线校验)
|
||||||
|
|
||||||
var picturePath = ''
|
var picturePath = ''
|
||||||
if (val && measureData) {
|
if (val && measureData) {
|
||||||
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
|
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
|
||||||
|
|
||||||
picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
|
picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
|
||||||
|
}
|
||||||
var answers = []
|
var answers = []
|
||||||
var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
|
var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
|
||||||
for (const k in this.questionForm) {
|
for (const k in this.questionForm) {
|
||||||
|
@ -1387,7 +1388,6 @@ export default {
|
||||||
DicomEvent.$emit('getReportInfo', true)
|
DicomEvent.$emit('getReportInfo', true)
|
||||||
DicomEvent.$emit('setMeasuredToolsPassive')
|
DicomEvent.$emit('setMeasuredToolsPassive')
|
||||||
}).catch(() => { loading.close() })
|
}).catch(() => { loading.close() })
|
||||||
}
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
|
@ -976,7 +976,7 @@ export default {
|
||||||
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
|
var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
|
||||||
|
|
||||||
picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
|
picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
|
||||||
|
}
|
||||||
var answers = []
|
var answers = []
|
||||||
var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
|
var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
|
||||||
for (const k in this.questionForm) {
|
for (const k in this.questionForm) {
|
||||||
|
@ -1030,7 +1030,6 @@ export default {
|
||||||
DicomEvent.$emit('getReportInfo', true)
|
DicomEvent.$emit('getReportInfo', true)
|
||||||
DicomEvent.$emit('setMeasuredToolsPassive')
|
DicomEvent.$emit('setMeasuredToolsPassive')
|
||||||
}).catch(() => { loading.close() })
|
}).catch(() => { loading.close() })
|
||||||
}
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue