diff --git a/back/src/views/modules/ability/components/combine-ability.vue b/back/src/views/modules/ability/components/combine-ability.vue
index 0fc21e0e..dc6faeca 100644
--- a/back/src/views/modules/ability/components/combine-ability.vue
+++ b/back/src/views/modules/ability/components/combine-ability.vue
@@ -293,7 +293,7 @@ export default {
})
this.allData = JSON.parse(JSON.stringify(this.transferData))
}).catch(err => {
- this.$message.error(err)
+ this.$message.error('未搜索到相关数据资源')
})
}
},
@@ -316,6 +316,7 @@ export default {
title: this.type,
list: this.selectedArray
})
+ console.log(this.selectedArray, this.displayList, 'this.displayList')
},
getDisplay (displayList) {
this.displayList = []
diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
index 3467060c..d1478efa 100644
--- a/back/src/views/modules/putOnTheShelf/index.vue
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -36,8 +36,10 @@
tip="支持文件类型,大小不超过100M">
-
+
@@ -267,7 +269,7 @@ export default {
}
.item {
position: relative;
- .box{
+ .box {
display: flex;
align-items: center;
margin: 25px 0;
@@ -276,17 +278,17 @@ export default {
display: flex;
align-items: center;
}
- .required{
+ .required {
color: #f56c6c;
margin-right: 3px;
}
}
- .requiredTips{
+ .requiredTips {
font-size: 14px;
color: #f56c6c;
position: absolute;
- bottom:-20px;
- left:110px;
+ bottom: -20px;
+ left: 110px;
}
}
diff --git a/front/src/views/capacityOnTheShelf/Algorithm.vue b/front/src/views/capacityOnTheShelf/Algorithm.vue
index 8949a90c..78cf6caa 100644
--- a/front/src/views/capacityOnTheShelf/Algorithm.vue
+++ b/front/src/views/capacityOnTheShelf/Algorithm.vue
@@ -69,6 +69,7 @@
:dataFrom="dataFrom"
:fileList="fileList"
:packageList="packageList"
+ :accessoryList="accessoryList"
:imgList="imgList"
:externalField="['接口服务', '接口请求方式']"
:configure="bs"
@@ -370,6 +371,7 @@
const navList2 = ref([])
const fileList = ref({})
const packageList = ref({})
+ const accessoryList = ref({})
const imgList = ref({})
const videoList = ref({})
const data = ref({})
@@ -787,6 +789,9 @@
mybus.on('chagePackageList', (obj) => {
packageList.value = obj
})
+ mybus.on('chageAccessory', (obj) => {
+ accessoryList.value = obj
+ })
mybus.on('chageImgList', (obj) => {
imgList.value = obj
})
@@ -836,6 +841,7 @@
mybus.off('chageDataFromDwon')
mybus.off('chageVideoList')
mybus.off('chagePackageList')
+ mybus.off('chageAccessory')
})