diff --git a/src/setting.js b/src/setting.js index ab9dacd..2278fe9 100644 --- a/src/setting.js +++ b/src/setting.js @@ -14,7 +14,7 @@ if (isDev) { sandPath = `http://${location.hostname}:9520` host = 'http://121.37.12.51/' // host = 'https://huorantech.cn/' - const ips = ['http://192.168.31.217:9000/', 'http://192.168.31.51:9000/', 'http://121.37.12.51/'] + const ips = ['http://192.168.31.217:9000/', 'http://192.168.31.51:9000/', 'https://dev.huorantech.cn/'] host = ips[+localStorage.getItem('ip')] } else if (isPro) { sandPath = `https://izhixinyun.com/sandbox` diff --git a/src/views/match/manage/matchArchList.vue b/src/views/match/manage/matchArchList.vue index 782b7b7..b2dd692 100644 --- a/src/views/match/manage/matchArchList.vue +++ b/src/views/match/manage/matchArchList.vue @@ -150,9 +150,11 @@ file.attachmentName }} - 查看答题文件 + 查看答题文件 - 下载答题文件 + 下载答题文件 查看成绩报告 删除 diff --git a/src/views/match/manage/trialReport.vue b/src/views/match/manage/trialReport.vue index c18d0b0..fc7a189 100644 --- a/src/views/match/manage/trialReport.vue +++ b/src/views/match/manage/trialReport.vue @@ -206,7 +206,7 @@ export default { e.assessmentPoint = '' e.referenceAnswer = '' e.answer = '' - e.lcRuleRecords.map((n, i) => { + e.lcRuleRecords && e.lcRuleRecords.map((n, i) => { e.assessmentPoint += `${i + 1}.${n.name}` e.referenceAnswer += `${i + 1}.${n.ruleAnswer}` e.answer += `${i + 1}.${n.userAnswer}` diff --git a/src/views/setting/info.vue b/src/views/setting/info.vue index d422481..75847d2 100644 --- a/src/views/setting/info.vue +++ b/src/views/setting/info.vue @@ -1,833 +1,859 @@ @@ -835,128 +861,157 @@ export default { .flex { display: flex; } + .m-r-10 { margin-right: 10px; } -.l-title{ + +.l-title { display: flex; align-items: center; margin-bottom: 12px; font-size: 14px; color: #333; - img{ + + img { margin-right: 5px; } } -.scroll{ - max-height: calc(100vh - 218px); - overflow: auto; + +.scroll { + max-height: calc(100vh - 218px); + overflow: auto; } -.page{ - margin-bottom: 12px; - /deep/.el-input__inner{ - border-color: #CACFDB; - } - .list{ - .line{ - display: flex; - margin-bottom: 24px; - &.info li:not(.selects){ - .el-input{ - flex: 1; - } - } - &.imp li{ - &:nth-child(odd) { - width: 360px; - margin-right: 64px; - } - } - } - .el-input, .el-select{ - width: 220px; - .el-input__inner{ - border-color: #CACFDB; - } + +.page { + margin-bottom: 12px; + + /deep/.el-input__inner { + border-color: #CACFDB; + } + + .list { + .line { + display: flex; + margin-bottom: 24px; + + &.info li:not(.selects) { + .el-input { + flex: 1; } - li{ - display: inline-flex; - align-items: center; - &>label{ - width: 100px; - margin-right: 5px; - text-align: right; - font-size: 14px; - color: #4c4c4c; - } - .el-select { - flex: 1; - } - .el-select .el-input.is-disabled .el-input__inner{ - border-color: #ddd; - } - .val{ - margin-right: 15px; - color: #606266; - font-size: 14px; - } - .mul{ - display: inline-flex; - .child{ - display: inline-flex; - width: 132px; - margin-right: 10px; - &>span{ - margin-bottom: 5px; - font-size: 14px; - color: #575757; - } - } - } - &:nth-child(odd) { - width: 325px; - margin-right: 100px; - } + } + + &.imp li { + &:nth-child(odd) { + width: 360px; + margin-right: 64px; } + } } - .archives{ - position: relative; - width: 862px; - padding: 16px 0; - margin-bottom: 6px; - border-radius: 4px; - background-color: #FAFAFA; - .del{ - position: absolute; - top: 80px; - right: 19px; - cursor: pointer; - } + + .el-input, + .el-select { + width: 220px; + + .el-input__inner { + border-color: #CACFDB; + } } - .fold{ - margin-top: 20px; - text-align: center; - font-size: 12px; - color: #006EFF; - span{ - cursor: pointer; - i{ - transition: .5s; - } - &.active i{ - transform: rotate(180deg); - } + + li { + display: inline-flex; + align-items: center; + + &>label { + width: 100px; + margin-right: 5px; + text-align: right; + font-size: 14px; + color: #4c4c4c; + } + + .el-select { + flex: 1; + } + + .el-select .el-input.is-disabled .el-input__inner { + border-color: #ddd; + } + + .val { + margin-right: 15px; + color: #606266; + font-size: 14px; + } + + .mul { + display: inline-flex; + + .child { + display: inline-flex; + width: 132px; + margin-right: 10px; + + &>span { + margin-bottom: 5px; + font-size: 14px; + color: #575757; + } } + } + + &:nth-child(odd) { + width: 325px; + margin-right: 100px; + } } -} -.btns{ - width: 100%; - padding: 12px 0; + } + + .archives { + position: relative; + width: 862px; + padding: 16px 0; + margin-bottom: 6px; + border-radius: 4px; + background-color: #FAFAFA; + + .del { + position: absolute; + top: 80px; + right: 19px; + cursor: pointer; + } + } + + .fold { + margin-top: 20px; text-align: center; - background-color: #fff; - box-shadow: 0px 0px 10px 0px rgba(188, 201, 218, 0.4); - .el-button{ - width: 80px; + font-size: 12px; + color: #006EFF; + + span { + cursor: pointer; + + i { + transition: .5s; + } + + &.active i { + transform: rotate(180deg); + } } + } +} + +.btns { + width: 100%; + padding: 12px 0; + text-align: center; + background-color: #fff; + box-shadow: 0px 0px 10px 0px rgba(188, 201, 218, 0.4); + + .el-button { + width: 80px; + } } \ No newline at end of file