diff --git a/public/index.html b/public/index.html index c8655e8..736f48f 100644 --- a/public/index.html +++ b/public/index.html @@ -6,7 +6,6 @@ - 深圳或然科技中台 @@ -15,5 +14,6 @@
+ diff --git a/src/components/img-upload/Cropper.vue b/src/components/img-upload/Cropper.vue index b494dd6..073c712 100644 --- a/src/components/img-upload/Cropper.vue +++ b/src/components/img-upload/Cropper.vue @@ -147,10 +147,9 @@ export default { const that = this if (type === 'blob') { this.$refs.cropper.getCropBlob(data => { - compress(data, 1).then(res => { - debugger - that.$emit('upload', res) - }) + // compress(data, 1).then(res => { + that.$emit('upload', data) + // }) }) } else { this.$refs.cropper.getCropData(data => { diff --git a/src/setting.js b/src/setting.js index 687f57c..c26c768 100644 --- a/src/setting.js +++ b/src/setting.js @@ -10,6 +10,7 @@ let sandPath = `https://izhixinyun.com/sandbox` // 沙盘地址 let host = `${location.origin}/` if (isDev) { jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统 + jumpPath = 'https://judgment.huorantech.cn/' sandPath = `http://${location.hostname}:9520` host = 'http://121.37.12.51/' // host = 'https://huorantech.cn/' diff --git a/src/views/match/manage/matchRank.vue b/src/views/match/manage/matchRank.vue index 3154ffe..c2aefa9 100644 --- a/src/views/match/manage/matchRank.vue +++ b/src/views/match/manage/matchRank.vue @@ -35,7 +35,12 @@ class="ml20" @click="batchImport">上传文件 -
+
+ 发布排名 @@ -269,6 +274,8 @@ export default { method: this.$route.query.method, competitionType: +this.$route.query.competitionType, rule: +this.$route.query.rule, + searchTimer: null, + keyword: '', teamCalculationMethods: [ { id: 0, @@ -330,6 +337,14 @@ export default { isPointWeight: false }; }, + watch: { + keyword: function (val) { + clearTimeout(this.searchTimer); + this.searchTimer = setTimeout(() => { + this.getRank(); + }, 500); + } + }, mounted () { this.getStage() }, @@ -351,7 +366,8 @@ export default { pageSize: this.pageSize, competitionId: this.id, isOverallRanking: this.active ? 0 : 1, - stageId: this.active || this.stageId + stageId: this.active || this.stageId, + keyword: this.keyword }).then(({ message, publishStatus }) => { // isRelease 0未发布，1已发布 this.published = publishStatus @@ -370,15 +386,17 @@ export default { competitionId: this.id, publicationType: this.type, locationStageId: this.stageId, - stageIds: ids.splice(0, ids.length - 1) + stageIds: ids.splice(0, ids.length - 1), + keyword: this.keyword }).then(({ page, publishStatus, total }) => { this.published = publishStatus this.list = page this.total = total this.getPublishTime() }).catch(res => { }) - } else { // 阶段排名 - this.$post(`${this.api.stageRaceRanking}?competitionId=${this.id}&stageId=${this.active}&pageNum=${this.page}&pageSize=${this.pageSize}&publicationType=${this.type}`).then(({ page, total, publishStatus }) => { + } else { + // 阶段排名 + this.$post(`${this.api.stageRaceRanking}?competitionId=${this.id}&stageId=${this.active}&pageNum=${this.page}&pageSize=${this.pageSize}&publicationType=${this.type}&keyword=${this.keyword}`).then(({ page, total, publishStatus }) => { this.published = publishStatus this.list = page this.total = total diff --git a/src/views/serve/projectAdd.vue b/src/views/serve/projectAdd.vue index a372687..326ecb9 100644 --- a/src/views/serve/projectAdd.vue +++ b/src/views/serve/projectAdd.vue @@ -385,7 +385,7 @@ export default { //计算判分点分值，超出100提示， let score = 0; this.projectJudgmentData.forEach(e => { - score += parseInt(e.score); + score += parseFloat(e.score); }); if (isNaN(score)) { return 0; @@ -634,7 +634,7 @@ export default { this.projectJudgmentData.splice(x - 1, 1, ...this.projectJudgmentData.splice(y - 1, 1, this.projectJudgmentData[x - 1])); }, scoreChange (row, i) { - row.score = row.score.replace(/[^\d]/g, '') + row.score = row.score.replace(/[^\d\.]/g, '') this.projectJudgmentData.splice(i, 1, row); }, delJudgePoint (index) { // 删除判分点