dev_review
yujialong 9 months ago
parent 539f1f95cc
commit 1449f2073d
  1. 2
      public/index.html
  2. 7
      src/components/img-upload/Cropper.vue
  3. 1
      src/setting.js
  4. 28
      src/views/match/manage/matchRank.vue
  5. 4
      src/views/serve/projectAdd.vue

@ -6,7 +6,6 @@
<meta name="keywords" content="深圳或然科技中台" /> <meta name="keywords" content="深圳或然科技中台" />
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" /> <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
<meta name="viewport" content="width=device-width, user-scalable=yes, shrink-to-fit=no" /> <meta name="viewport" content="width=device-width, user-scalable=yes, shrink-to-fit=no" />
<script src="/styles/tinymce/tinymce.min.js"></script>
<title>深圳或然科技中台</title> <title>深圳或然科技中台</title>
</head> </head>
<body> <body>
@ -15,5 +14,6 @@
</noscript> </noscript>
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
<script src="/dev/styles/tinymce/tinymce.min.js"></script>
</body> </body>
</html> </html>

@ -147,10 +147,9 @@ export default {
const that = this const that = this
if (type === 'blob') { if (type === 'blob') {
this.$refs.cropper.getCropBlob(data => { this.$refs.cropper.getCropBlob(data => {
compress(data, 1).then(res => { // compress(data, 1).then(res => {
debugger that.$emit('upload', data)
that.$emit('upload', res) // })
})
}) })
} else { } else {
this.$refs.cropper.getCropData(data => { this.$refs.cropper.getCropData(data => {

@ -10,6 +10,7 @@ let sandPath = `https://izhixinyun.com/sandbox` // 沙盘地址
let host = `${location.origin}/` let host = `${location.origin}/`
if (isDev) { if (isDev) {
jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统 jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统
jumpPath = 'https://judgment.huorantech.cn/'
sandPath = `http://${location.hostname}:9520` sandPath = `http://${location.hostname}:9520`
host = 'http://121.37.12.51/' host = 'http://121.37.12.51/'
// host = 'https://huorantech.cn/' // host = 'https://huorantech.cn/'

@ -35,7 +35,12 @@
class="ml20" class="ml20"
@click="batchImport">上传文件</el-button> @click="batchImport">上传文件</el-button>
</div> </div>
<div> <div style="display: inline-flex;align-items: center">
<el-input style="margin-right: 15px"
placeholder="请输入团队名称/队长/学校"
prefix-icon="el-icon-search"
v-model="keyword"
clearable></el-input>
<el-button v-if="!published" <el-button v-if="!published"
type="primary" type="primary"
@click="cancelPublish(1)">发布排名</el-button> @click="cancelPublish(1)">发布排名</el-button>
@ -269,6 +274,8 @@ export default {
method: this.$route.query.method, method: this.$route.query.method,
competitionType: +this.$route.query.competitionType, competitionType: +this.$route.query.competitionType,
rule: +this.$route.query.rule, rule: +this.$route.query.rule,
searchTimer: null,
keyword: '',
teamCalculationMethods: [ teamCalculationMethods: [
{ {
id: 0, id: 0,
@ -330,6 +337,14 @@ export default {
isPointWeight: false isPointWeight: false
}; };
}, },
watch: {
keyword: function (val) {
clearTimeout(this.searchTimer);
this.searchTimer = setTimeout(() => {
this.getRank();
}, 500);
}
},
mounted () { mounted () {
this.getStage() this.getStage()
}, },
@ -351,7 +366,8 @@ export default {
pageSize: this.pageSize, pageSize: this.pageSize,
competitionId: this.id, competitionId: this.id,
isOverallRanking: this.active ? 0 : 1, isOverallRanking: this.active ? 0 : 1,
stageId: this.active || this.stageId stageId: this.active || this.stageId,
keyword: this.keyword
}).then(({ message, publishStatus }) => { }).then(({ message, publishStatus }) => {
// isRelease 01 // isRelease 01
this.published = publishStatus this.published = publishStatus
@ -370,15 +386,17 @@ export default {
competitionId: this.id, competitionId: this.id,
publicationType: this.type, publicationType: this.type,
locationStageId: this.stageId, locationStageId: this.stageId,
stageIds: ids.splice(0, ids.length - 1) stageIds: ids.splice(0, ids.length - 1),
keyword: this.keyword
}).then(({ page, publishStatus, total }) => { }).then(({ page, publishStatus, total }) => {
this.published = publishStatus this.published = publishStatus
this.list = page this.list = page
this.total = total this.total = total
this.getPublishTime() this.getPublishTime()
}).catch(res => { }) }).catch(res => { })
} else { // } 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 }) => { //
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.published = publishStatus
this.list = page this.list = page
this.total = total this.total = total

@ -385,7 +385,7 @@ export default {
//100 //100
let score = 0; let score = 0;
this.projectJudgmentData.forEach(e => { this.projectJudgmentData.forEach(e => {
score += parseInt(e.score); score += parseFloat(e.score);
}); });
if (isNaN(score)) { if (isNaN(score)) {
return 0; return 0;
@ -634,7 +634,7 @@ export default {
this.projectJudgmentData.splice(x - 1, 1, ...this.projectJudgmentData.splice(y - 1, 1, this.projectJudgmentData[x - 1])); this.projectJudgmentData.splice(x - 1, 1, ...this.projectJudgmentData.splice(y - 1, 1, this.projectJudgmentData[x - 1]));
}, },
scoreChange (row, i) { scoreChange (row, i) {
row.score = row.score.replace(/[^\d]/g, '') row.score = row.score.replace(/[^\d\.]/g, '')
this.projectJudgmentData.splice(i, 1, row); this.projectJudgmentData.splice(i, 1, row);
}, },
delJudgePoint (index) { // delJudgePoint (index) { //

Loading…
Cancel
Save