\n ';
// previewTemplate += '
\n ';
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 6e308e973..41ca26a50 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -3681,8 +3681,10 @@ function initVueDataset() {
})
}
const items = []
+ const zipStatus = []
$('#dataset-range-value').find('.item').each(function(){
items.push($(this).data('private'))
+ zipStatus.push($(this).data('decompress-state'))
})
let num_stars = $('#dataset-range-value').data('num-stars')
let star_active = $('#dataset-range-value').data('star-active')
@@ -3739,6 +3741,7 @@ function initVueDataset() {
descfile:'',
datasetType:'',
privates:[],
+ zipStatus:[],
starItems:[],
starActives:[],
taskLists:[],
@@ -3763,6 +3766,7 @@ function initVueDataset() {
dataset_uuid:'',
dataset_name:'',
loadingDataIndex:true,
+ timer:null,
ruleForm:{
title:'',
description:'',
@@ -3835,6 +3839,7 @@ function initVueDataset() {
this.url = document.getElementById('postPath').value
}
this.privates = items
+ this.zipStatus = zipStatus
this.num_stars = num_stars
this.star_active = star_active
this.ruleForm1 = ruleForm
@@ -3847,7 +3852,7 @@ function initVueDataset() {
this.descfile = dataset_file_desc
this.repolink = repolink
this.cloudbrainType = cloudbrainType
- console.log(this.starItems,this.starActives)
+ console.log(this.starItems,this.starActives,this.zipStatus)
},
methods:{
handleCurrentChange(val) {
@@ -3904,18 +3909,21 @@ function initVueDataset() {
}
else{
console.log(attachment)
- location.href = '/'+attachment + '/datasets'
+ location.href = `${AppSubUrl}${attachment}/datasets`
}
},
- gotoUpload(datsetId){
- location.href = `${AppSubUrl}/attachments/upload?datasetId=${datsetId}`
+ gotoUpload(repolink,datsetId){
+ location.href = `${AppSubUrl}${repolink}/datasets/attachments/upload?datasetId=${datsetId}`
},
gotoDataset(datsetUrl){
console.log(datsetUrl)
location.href = datsetUrl
},
+ gotoAnnotate(repolink,uuid,type){
+ location.href = `${AppSubUrl}${repolink}/datasets/label/${uuid}?type=${type}`
+ },
uploadGpu(){
this.type=0
},
@@ -3993,7 +4001,7 @@ function initVueDataset() {
// document.getElementById("mask").style.display = "block"
this.$axios.post(url,this.qs.stringify(params)).then((res)=>{
if(res.data.Code===0){
- location.href = '/'+backurl + '/datasets'
+ location.href = `${AppSubUrl}${backurl}/datasets`
}else{
console.log(res.data.Message)
}
@@ -4082,8 +4090,8 @@ function initVueDataset() {
},
- gotoDatasetEidt(id){
- location.href = `/attachments/edit/${id}`
+ gotoDatasetEidt(repolink,id){
+ location.href = `${repolink}/datasets/attachments/edit/${id}`
},
handleClick(repoLink, tabName,type) {
@@ -4110,7 +4118,57 @@ function initVueDataset() {
this.getStarDataset(repoLink,type)
}
},
+ polling (checkStatuDataset,repoLink) {
+ console.log("===polling===checkStatuDataset===",checkStatuDataset,repoLink)
+ this.timer = window.setInterval(() => {
+ setTimeout(() => {
+ this.getDatasetStatus(checkStatuDataset,repoLink)
+ },0)
+ },15000)
+
+ },
+
+ getDatasetStatus(checkStatuDataset,repoLink){
+ const getmap = checkStatuDataset.map((item)=>{
+ let url = `${AppSubUrl}${repolink}/datasets/status/${item.UUID}`
+ console.log("map item",item,url)
+ return this.$axios.get(url)
+ })
+ console.log(getmap)
+ this.$axios.all(getmap)
+ .then((res)=>{
+ console.log(res,this.timer)
+ let flag = res.some((item)=>{
+ console.log(item.data)
+ return item.data.AttachmentStatus == 1
+ })
+ console.log(flag)
+ flag && clearInterval(this.timer)
+ flag && this.refreshStatusDataset()
+
+ }
+ )
+
+ },
+ refreshStatusDataset(){
+ console.log("refresh")
+ switch(this.activeName){
+ case 'first':
+ this.getCurrentRepoDataset(this.repolink,this.cloudbrainType)
+ break
+ case 'second':
+ this.getMyDataset(this.repolink,this.cloudbrainType)
+ break
+ case 'third':
+ this.getPublicDataset(this.repolink,this.cloudbrainType)
+ break
+ case 'fourth':
+ this.getStarDataset(this.repolink,this.cloudbrainType)
+ break
+ }
+ },
getCurrentRepoDataset(repoLink,type){
+ clearInterval(this.timer)
this.loadingDataIndex = true
let url = repoLink + '/datasets/current_repo'
this.$axios.get(url,{
@@ -4124,11 +4182,17 @@ function initVueDataset() {
console.log(JSON.parse(res.data.data))
console.log(res.data.count)
this.currentRepoDataset = JSON.parse(res.data.data)
+ const checkStatuDataset = this.currentRepoDataset.filter(item=>item.DecompressState===2)
+ console.log("=========checkStatuDataset",checkStatuDataset,repoLink)
+ if(checkStatuDataset.length>0){
+ this.polling(checkStatuDataset,repoLink)
+ }
this.totalnums = parseInt(res.data.count)
this.loadingDataIndex = false
})
},
getMyDataset(repoLink,type){
+ clearInterval(this.timer)
this.loadingDataIndex = true
let url = repoLink + '/datasets/my_datasets'
this.$axios.get(url,{
@@ -4141,12 +4205,18 @@ function initVueDataset() {
console.log(res)
console.log(JSON.parse(res.data.data))
this.myDataset = JSON.parse(res.data.data)
+ const checkStatuDataset = this.myDataset.filter(item=>item.DecompressState===2)
+ console.log("=========checkStatuDataset",checkStatuDataset,repoLink)
+ if(checkStatuDataset.length>0){
+ this.polling(checkStatuDataset,repoLink)
+ }
this.totalnums = parseInt(res.data.count)
this.loadingDataIndex = false
})
},
getPublicDataset(repoLink,type){
+ clearInterval(this.timer)
this.loadingDataIndex = true
let url = repoLink + '/datasets/public_datasets'
this.$axios.get(url,{
@@ -4159,12 +4229,18 @@ function initVueDataset() {
console.log(res)
console.log(JSON.parse(res.data.data))
this.publicDataset = JSON.parse(res.data.data)
+ const checkStatuDataset = this.publicDataset.filter(item=>item.DecompressState===2)
+ console.log("=========checkStatuDataset",checkStatuDataset,repoLink)
+ if(checkStatuDataset.length>0){
+ this.polling(checkStatuDataset,repoLink)
+ }
this.totalnums = parseInt(res.data.count)
this.loadingDataIndex = false
})
},
getStarDataset(repoLink,type){
+ clearInterval(this.timer)
this.loadingDataIndex = true
let url = repoLink + '/datasets/my_favorite'
this.$axios.get(url,{
@@ -4177,6 +4253,11 @@ function initVueDataset() {
console.log(res)
console.log(JSON.parse(res.data.data))
this.myFavoriteDataset = JSON.parse(res.data.data)
+ const checkStatuDataset = this.myFavoriteDataset.filter(item=>item.DecompressState===2)
+ console.log("=========checkStatuDataset",checkStatuDataset,repoLink)
+ if(checkStatuDataset.length>0){
+ this.polling(checkStatuDataset,repoLink)
+ }
this.totalnums= parseInt(res.data.count)
this.loadingDataIndex = false
})
@@ -4209,13 +4290,7 @@ function initVueDataset() {
break
}
}
-
-
-
-
},
-
-
});
}
diff --git a/web_src/less/_dataset.less b/web_src/less/_dataset.less
index 3bc19ef63..35a87f89f 100644
--- a/web_src/less/_dataset.less
+++ b/web_src/less/_dataset.less
@@ -222,3 +222,38 @@
}
}
}
+.panel_creator_reponam{
+ display: inline-block;
+ border-radius: 4px;
+ padding: 4px;
+ font-size: 12px;
+ text-align: center;
+ background-color: rgba(161, 220, 255, 0.2);
+ color: #101010;
+}
+.panel_dataset_name{
+ font-size: 15px;
+ color: #0366D6;
+ text-align: center;
+ margin-left: 1rem;
+}
+.panel_datset_desc{
+ white-space: nowrap;
+ display: inline-block;
+ overflow: hidden;
+ width: 90%;
+
+ text-overflow: ellipsis;
+}
+.el-dialog__body{
+ padding-top:0
+}
+#dataset-base{
+ .active{
+ color: #0087f5!important;
+ border: 1px solid #0087f5!important;
+ /* margin: -1px!important; */
+ background: #fff!important;
+
+ }
+}
\ No newline at end of file