-
@@ -72,14 +81,7 @@ import * as taskApi from '@/api/task'
export default {
- watch:{
- comp:{
- handler(nv,ov){
- console.log(nv)
- },
- deep:true
- }
- },
+
components: {
'survey': Survey,
'group': Group ,
@@ -98,10 +100,14 @@ export default {
news: {
content: '',
img: '',
+ title: '',
+ plainText: ''
},
schoolNews: {
content: '',
- img: ''
+ img: '',
+ title: '',
+ plainText: ''
},
comp: {
survey: {
@@ -112,6 +118,7 @@ export default {
teamMinCount: 2,
teamMaxCount: 5,
supporter: '',
+ supporter2: '',
stageList: [],
bannerList: [],
thumbnail: '',
@@ -148,7 +155,7 @@ export default {
id: 4
},
{
- name: '交易规则',
+ name: '竞赛方式',
id: 5
},
{
@@ -189,6 +196,14 @@ export default {
}
},
methods: {
+
+ deleteNews(index,type){
+ if(type==1){
+ this.comp.survey.news.splice(index,1)
+ }else{
+ this.comp.survey.schoolNews.splice(index,1)
+ }
+ },
changeTab(val) {
this.tabId = val
if(this.tabId == 2){
@@ -271,6 +286,9 @@ export default {
}
})
} else if(this.tabId == 2){
+ competition.add(this.comp.survey).then(res => {
+
+ })
taskApi.add({list: this.comp.task}).then(res=>{
if(res.code == 200) {
@@ -299,20 +317,52 @@ export default {
chgGroup(val){
this.comp.group = val
},
+ sortNews(){
+ this.comp.survey.news.sort((a,b)=>{
+ return b.createTime - a.createTime
+ })
+ this.comp.survey.schoolNews.sort((a,b)=>{
+ return b.createTime - a.createTime
+ })
+ },
+ editNews(index,type){
+ if(type == 1){
+ let news = this.comp.survey.news[index]
+ this.news.title = news.title
+ this.news.plainText = news.plainText
+ this.news.content = news.content
+ this.news.img = news.img
+ this.comp.survey.news.splice(index,1)
+ }else{
+ let news = this.comp.survey.schoolNews[index]
+ this.schoolNews.title = news.title
+ this.schoolNews.plainText = news.plainText
+ this.schoolNews.content = news.content
+ this.schoolNews.img = news.img
+ this.comp.survey.schoolNews.splice(index,1)
+ }
+ },
addNews(type){
if(type == 1){
- console.log(this.news)
if(!this.comp.survey.news){
this.comp.survey.news = []
}
- this.comp.survey.news.push(this.news)
+ this.news.createTime = new Date().getTime()
+ this.comp.survey.news.push(Object.assign({}, this.news))
+
}else{
- console.log(this.schoolNews)
+
+ this.schoolNews.createTime = new Date().getTime()
if(!this.comp.survey.schoolNews){
this.comp.survey.schoolNews = []
}
- this.comp.survey.schoolNews.push(this.schoolNews)
+
+ this.comp.survey.schoolNews.push(Object.assign({},this.schoolNews))
+ this.comp.survey.schoolNews = this.comp.survey.schoolNews.sort((a,b)=>{
+ return new Date(a.createTime) - new Date(b.createTime)
+ })
}
+ this.sortNews()
}
}
diff --git a/backend/src/views/competition/memberlog.vue b/backend/src/views/competition/memberlog.vue
new file mode 100644
index 0000000..b1173f6
--- /dev/null
+++ b/backend/src/views/competition/memberlog.vue
@@ -0,0 +1,139 @@
+
+
+
+
+ 查询
+ 导出
+
+
+
+
+ {{ scope.row.studentNo }}
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+ {{ scope.row.ip }}
+
+
+
+
+ {{ scope.row.school }}
+
+
+
+
+ {{ new Date(scope.row.updateTime).Format('yyyy-MM-dd hh:mm:ss') }}
+
+
+
+
+
+
+
+
+
diff --git a/backend/src/views/login/index.vue b/backend/src/views/login/index.vue
index 36df62e..66e5cd6 100644
--- a/backend/src/views/login/index.vue
+++ b/backend/src/views/login/index.vue
@@ -110,7 +110,6 @@ export default {
this.$refs.loginForm.validate(valid => {
if (valid) {
this.loading = true
- console.log("login1")
this.$store.dispatch('user/login', this.loginForm).then(() => {
this.$router.push({ path: this.redirect || '/' })
this.loading = false
@@ -118,7 +117,6 @@ export default {
this.loading = false
})
} else {
- console.log("login3")
return false
}
})
diff --git a/backend/src/views/resource/anli/add/anli.vue b/backend/src/views/resource/anli/add/anli.vue
index d37c1bb..dadaa4f 100644
--- a/backend/src/views/resource/anli/add/anli.vue
+++ b/backend/src/views/resource/anli/add/anli.vue
@@ -43,6 +43,7 @@
toolbar:
' undo redo | formatselect | bold italic | \
alignleft aligncenter alignright | \
+ forecolor backcolor |\
bullist numlist outdent indent | image | help'
}"
>
diff --git a/backend/src/views/resource/anli/add/edit.vue b/backend/src/views/resource/anli/add/edit.vue
index 52caeb1..559f9b8 100644
--- a/backend/src/views/resource/anli/add/edit.vue
+++ b/backend/src/views/resource/anli/add/edit.vue
@@ -34,6 +34,8 @@
menubar: false,
language:'zh_CN',
images_upload_url: '/api/upload/image/upload',
+ font_formats: '微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif',
+ fontsize_formats: '11px 12px 14px 16px 18px 24px 36px 48px',
plugins: [
'advlist autolink lists link image charmap',
'searchreplace visualblocks code fullscreen',
@@ -43,6 +45,9 @@
toolbar:
' undo redo | formatselect | bold italic | \
alignleft aligncenter alignright | \
+ forecolor backcolor |\
+ fontsizeselect |\
+ fontselect |\
bullist numlist outdent indent | image | help'
}"
>
diff --git a/backend/src/views/resource/anli/anliList.vue b/backend/src/views/resource/anli/anliList.vue
index 4b2e812..4fab6dc 100644
--- a/backend/src/views/resource/anli/anliList.vue
+++ b/backend/src/views/resource/anli/anliList.vue
@@ -53,6 +53,11 @@
{{ courseToName(scope.row.courseId) }}
+
+
+ {{ scope.row.status==1?'上架':'上架' }}
+
+
diff --git a/backend/src/views/resource/exam/list.vue b/backend/src/views/resource/exam/list.vue
index f5005d3..8007fc1 100644
--- a/backend/src/views/resource/exam/list.vue
+++ b/backend/src/views/resource/exam/list.vue
@@ -59,6 +59,11 @@
{{ courseToName(scope.row.courseId) }}
+
+
+ {{ scope.row.status == 1?'上架':'下架' }}
+
+
@@ -214,7 +219,9 @@ export default {
duration: 2000
})
}
+ this.fetchData()
}
+
})
},
typeToName(type){
diff --git a/backend/src/views/table/create.vue b/backend/src/views/table/create.vue
index 0288ce7..180850d 100644
--- a/backend/src/views/table/create.vue
+++ b/backend/src/views/table/create.vue
@@ -23,7 +23,7 @@
-
+
diff --git a/front/src/views/member/index.vue b/front/src/views/member/index.vue
index edd4d6f..5ed4795 100644
--- a/front/src/views/member/index.vue
+++ b/front/src/views/member/index.vue
@@ -208,13 +208,12 @@ export default {
},
loginout(){
auth.loginout()
-
- memberApi.loginout().then(res=>{
-
+ this.$router.push({
+ path: '/'
})
-
- this.$router.push({
- path: '/'
+ this.$nextTick(()=>{
+ memberApi.loginout().then(res=>{
+ })
})
},
convertLevel(id){
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamBiz.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamBiz.java
index 0772175..a3cadbf 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamBiz.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamBiz.java
@@ -77,7 +77,11 @@ public class TeamBiz {
public Result deleteMember(TeamMemberVO vo){
CompetitionMember member = memberDao.getById(vo.getId());
+
if(member!=null){
+ if(StringUtils.hasText(member.getAccountId())){
+ return Result.error("此账号已创建资金账号无法删除");
+ }
memberDao.deleteById(vo.getId());
updatePeopleCount(member.getCompetitionId());
}else {
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/juejin/JueJinApi.java b/tz/competition/competition-service/src/main/java/com/tz/platform/juejin/JueJinApi.java
index f49a3e1..4266dbd 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/juejin/JueJinApi.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/juejin/JueJinApi.java
@@ -232,7 +232,7 @@ public class JueJinApi {
// api.createReport(accountId,"report"+ System.currentTimeMillis());
// api.getTenPosition("9d7f4856-cc11-11ec-9cd0-00163e0e6ad0");
// api.getCashInfo("cbee8129-cae7-11ec-a4f7-00163e0e6ad0");
- String content = api.getReport("57239410");
+ String content = api.getReport("57240003");
System.out.println(content);
// String reportDetail = api.reportDetail("55910953");
// System.out.println(content);