Skip to content

D
DA-Platform

文档服务地址：http://47.92.0.57:3000/ 周报索引地址：http://47.92.0.57:3000/s/NruNXRYmV

Commit c0a7b66a by 李景熙
Options

Merge branch 'develop' of https://gitlab.redhtc.com/Berlincen/DA-Platform into develop

parents 7d061cfa 9bd1043f
Showing with 50 additions and 29 deletions
DAPlatform-front/src/components/PiecesTable.vue
......@@ -5,7 +5,7 @@
:data="tableData"
style="width: 100%"
:row-class-name="tableRowClassName"
@selection-change="handleSelectionChange"
@selection-change="selectionChange"
@expand-change="expandChange"
>
<el-table-column v-if="showSelection" type="selection" width="55"></el-table-column>
......@@ -67,7 +67,7 @@ export default {
})
},
methods: {
handleSelectionChange (val) {
selectionChange (val) {
this.multipleSelection = val
},
complete () {
......@@ -78,7 +78,18 @@ export default {
type: 'warning'
})
} else {
this.$router.push('/ongoing')
var selected = this.multipleSelection.map((item) => {
return item.id
})
var userId = this.$store.state.userInfo.userId
this.axios.post('/slice/selectPieces', {
userId,
selected
}).then((res) => {
// this.$router.push('/ongoing')
console.log(res)
})
}
},
tableRowClassName ({row}) {
......
DAPlatform-front/src/components/ReleaseTask.vue
......@@ -39,9 +39,9 @@
</el-upload>
</el-col>
<el-col span="6">
<el-select v-model="domain.pvalue" placeholder="模板选择" >
<el-select v-model="domain.piecesOptions" placeholder="模板选择" >
<el-option
v-for="i in domain.piecesOptions"
v-for="i in pOptions"
:key="i.pvalue"
:label="i.plabel"
:value="i.pvalue">
......@@ -323,21 +323,22 @@
desc: ''
},
formLabelWidth: '120px',
pOptions: [{
pvalue: '1',
plabel: '模板1'
}, {
pvalue: '2',
plabel: '模板2'
}, {
pvalue: '3',
plabel: '模板3'
}],
dynamicValidateForm: {
//domains--文本信息
domains: [{
fileList:new Array(),
piecesOptions: [{
pvalue: '1',
plabel: '模板1'
}, {
pvalue: '2',
plabel: '模板2'
}, {
pvalue: '3',
plabel: '模板3'
}],
pvalue:'',
piecesOptions:'',//模板ID
pname:'',
createMode:false
}],
pictureDomains:[{
......@@ -380,12 +381,14 @@
alert('无法修改任务');
}
else{
alert(res.data.taskId);
// alert(res.data.taskId);
this.dynamicValidateForm.domains = res.data.domains;
// this.dynamicValidateForm.domains[0].pvalue = '1';
this.dynamicValidateForm.pictureDomains = res.data.pictureDomains;
this.dynamicValidateForm.layerDomains = res.data.layerDomains;
this.taskName = res.data.taskName;
this.taskId = res.data.taskId;
console.log(res.data.domains[0].piecesOptions);
}
})
}
......@@ -511,8 +514,11 @@
handleRemoveP(file,fileList){
var flag = 0;
for(var i = 0 ; i < this.dynamicValidateForm.pictureDomains.length && flag ==0;i++){
// alert("Inin");
for(var j = 0 ; j < this.dynamicValidateForm.pictureDomains[i].fileList.length ; j++){
if(file.name == this.dynamicValidateForm.pictureDomains[i].fileFile[j].name){
// alert(file.name);
// alert(this.dynamicValidateForm.pictureDomains[i].fileList[j].name);
if(file.name == this.dynamicValidateForm.pictureDomains[i].fileList[j].name){
this.url = this.dynamicValidateForm.pictureDomains[i].fileList[j].url;
this.dynamicValidateForm.pictureDomains[i].fileList.splice(j,1);
flag = 1;
......@@ -520,6 +526,7 @@
}
}
}
alert(this.url);
this.axios({
method:'post',
params:{
......@@ -557,7 +564,7 @@
})
},
submitForm(formName) {
//console.log(this.dynamicValidateForm);
alert(this.dynamicValidateForm.domains[0].piecesOptions);
this.axios({
method:'post',
url:"/task/createTask",
......@@ -604,17 +611,8 @@
if(ptype == 1){
this.dynamicValidateForm.domains.push({
fileList:new Array(),
piecesOptions: [{
pvalue: '1',
plabel: '模板1'
}, {
pvalue: '2',
plabel: '模板2'
}, {
pvalue: '3',
plabel: '模板3'
}],
pvalue:'1',
pname:'',
createMode:false,
key: Date.now()
});
......
DAPlatform/upload/1593611534 0 → 100644
参加过一次软院心理讲座，但是未录入
有博雅记录的一共4次
总共5次博雅
\ No newline at end of file
DAPlatform/upload/1593612267 0 → 100644
参加过一次软院心理讲座，但是未录入
有博雅记录的一共4次
总共5次博雅
\ No newline at end of file
DAPlatform/upload/1593613317 0 → 100644
参加过一次软院心理讲座，但是未录入
有博雅记录的一共4次
总共5次博雅
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment