Compare commits
No commits in common. "acdd26424af6e73a9cdce34131e79477eefdfbd6" and "bb983557f08f35680d4a105f80a5222b771258e6" have entirely different histories.
acdd26424a
...
bb983557f0
|
@ -208,7 +208,7 @@ const columns = [
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'ServerAddress',
|
title: 'E-MAIL',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
dataIndex: 'emailServerAddress',
|
dataIndex: 'emailServerAddress',
|
||||||
},
|
},
|
||||||
|
|
|
@ -435,29 +435,4 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 二级操作栏开始
|
|
||||||
.spectrum-analysis-sub-operators {
|
|
||||||
flex-shrink: 0;
|
|
||||||
margin-bottom: 19px;
|
|
||||||
display: flex;
|
|
||||||
gap: 11px;
|
|
||||||
flex-wrap: nowrap;
|
|
||||||
overflow: auto;
|
|
||||||
height: 46px;
|
|
||||||
align-items: center;
|
|
||||||
|
|
||||||
.pop-over-with-icon {
|
|
||||||
height: 32px;
|
|
||||||
flex-shrink: 0;
|
|
||||||
|
|
||||||
&:nth-child(1) {
|
|
||||||
width: 224px;
|
|
||||||
}
|
|
||||||
|
|
||||||
&:nth-child(3) {
|
|
||||||
width: 125px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 二级操作栏结束
|
|
||||||
</style>
|
</style>
|
|
@ -726,8 +726,6 @@ export default {
|
||||||
})
|
})
|
||||||
} else if (el.fileType == 'C') {
|
} else if (el.fileType == 'C') {
|
||||||
obj.sampleSystemType = el.fileType
|
obj.sampleSystemType = el.fileType
|
||||||
obj.gasFileName = ''
|
|
||||||
obj.qcFileName = ''
|
|
||||||
el.files.forEach((item) => {
|
el.files.forEach((item) => {
|
||||||
if (item.includes('_S_')) {
|
if (item.includes('_S_')) {
|
||||||
obj.sampleFileName = item
|
obj.sampleFileName = item
|
||||||
|
|
|
@ -602,8 +602,7 @@ export default {
|
||||||
callInitValue(willAddList) {
|
callInitValue(willAddList) {
|
||||||
willAddList
|
willAddList
|
||||||
.filter(
|
.filter(
|
||||||
({ sampleType, inputFileName }) =>
|
({ sampleType, inputFileName }) => sampleType !== 'B' && inputFileName !== this.sampleData.inputFileName
|
||||||
sampleType !== 'B' && sampleType !== 'C' && inputFileName !== this.sampleData.inputFileName
|
|
||||||
)
|
)
|
||||||
.forEach(({ inputFileName: fileName, dbName, sampleId, analyst }) => {
|
.forEach(({ inputFileName: fileName, dbName, sampleId, analyst }) => {
|
||||||
const params = {
|
const params = {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user