fix: 修复日程新增台站时,来回分配台站时的问题;修改从DB加载谱列表的rowKey

This commit is contained in:
Xu Zhimeng 2024-07-09 15:09:14 +08:00
parent dda6b9fb8e
commit b7c86bc0e5
2 changed files with 43 additions and 35 deletions

View File

@ -8,7 +8,7 @@
</search-form> </search-form>
<custom-table <custom-table
size="middle" size="middle"
rowKey="analysitId" rowKey="_index"
:columns="columns" :columns="columns"
:list="dataSource" :list="dataSource"
:pagination="ipagination" :pagination="ipagination"
@ -195,12 +195,13 @@ export default {
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
const result = res.result.records || res.result const result = res.result.records || res.result
result.forEach((item) => { result.forEach((item, index) => {
const fileName = item.inputFileName const fileName = item.inputFileName
if (fileName) { if (fileName) {
const arr = fileName.split('/') const arr = fileName.split('/')
item.inputFileName = arr[arr.length - 1] item.inputFileName = arr[arr.length - 1]
} }
item._index = index
}) })
this.dataSource = result this.dataSource = result

View File

@ -140,7 +140,7 @@
<a-transfer <a-transfer
:target-keys="targetKeys" :target-keys="targetKeys"
:render="(item) => item.title" :render="(item) => item.title"
:operations="['Remove', 'Assign']" :operations="['Assign', 'Remove']"
:titles="['Particulate Station', 'Roster personnel']" :titles="['Particulate Station', 'Roster personnel']"
:show-select-all="false" :show-select-all="false"
@change="onChange" @change="onChange"
@ -153,22 +153,6 @@
<a-tree <a-tree
v-if="direction === 'left'" v-if="direction === 'left'"
blockNode blockNode
checkStrictly
:treeData="accountTreeData"
:selectedKeys.sync="rightAccountChildSelectedKeys"
:expandedKeys.sync="rightAccountChildExpandedKeys"
@select="
(_, props) => {
onSelectAccount(_, props, itemSelect, itemSelectAll)
}
"
>
<a-icon slot="switcherIcon" type="down" />
</a-tree>
<!-- 右侧穿梭框中的树 -->
<a-tree
v-if="direction === 'right'"
blockNode
checkable checkable
checkStrictly checkStrictly
defaultExpandAll defaultExpandAll
@ -188,6 +172,22 @@
> >
<a-icon slot="switcherIcon" type="down" /> <a-icon slot="switcherIcon" type="down" />
</a-tree> </a-tree>
<!-- 右侧穿梭框中的树 -->
<a-tree
v-if="direction === 'right'"
blockNode
checkStrictly
:treeData="accountTreeData"
:selectedKeys.sync="rightAccountChildSelectedKeys"
:expandedKeys.sync="rightAccountChildExpandedKeys"
@select="
(_, props) => {
onSelectAccount(_, props, itemSelect, itemSelectAll)
}
"
>
<a-icon slot="switcherIcon" type="down" />
</a-tree>
</template> </template>
</a-transfer> </a-transfer>
<!-- 穿梭框结束 --> <!-- 穿梭框结束 -->
@ -631,9 +631,7 @@ export default {
// 穿 // 穿
onChange(targetKeys, direction, moveKeys) { onChange(targetKeys, direction, moveKeys) {
console.log(targetKeys, direction, moveKeys) if (direction == 'right') {
debugger
if (direction == 'left') {
if (!this.checkedAccount) { if (!this.checkedAccount) {
this.$message.warning('Please Select A Person To Assign') this.$message.warning('Please Select A Person To Assign')
return return
@ -959,6 +957,7 @@ export default {
.ant-transfer { .ant-transfer {
margin-top: 15px; margin-top: 15px;
margin-bottom: 10px; margin-bottom: 10px;
flex-direction: row-reverse;
::v-deep { ::v-deep {
.ant-transfer-list { .ant-transfer-list {
@ -990,6 +989,10 @@ export default {
width: 92px; width: 92px;
height: 26px; height: 26px;
padding: 0; padding: 0;
display: flex;
justify-content: center;
align-items: center;
.anticon { .anticon {
display: none; display: none;
} }
@ -998,25 +1001,29 @@ export default {
} }
&:first-child { &:first-child {
margin-bottom: 52px; margin-bottom: 52px;
&::after { gap: 13px;
display: inline-block;
margin-left: 13px;
content: '';
width: 18px;
height: 10px;
background: url(~@/assets/images/system/transfer-right.png) no-repeat;
background-size: contain;
}
}
&:nth-child(2) {
&::before { &::before {
display: inline-block; position: static;
margin-right: 6px; display: block;
content: ''; content: '';
width: 18px; width: 18px;
height: 10px; height: 10px;
background: url(~@/assets/images/system/transfer-left.png) no-repeat; background: url(~@/assets/images/system/transfer-left.png) no-repeat;
background-size: contain; background-size: contain;
opacity: 1;
}
}
&:nth-child(2) {
gap: 6px;
&::after {
display: inline-block;
content: '';
width: 18px;
height: 10px;
background: url(~@/assets/images/system/transfer-right.png) no-repeat;
background-size: contain;
position: static; position: static;
opacity: initial; opacity: initial;
} }