huoran
/
FE_bankTeaching
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix

Browse Source
20240205
yujialong 1 year ago
parent a823365509
commit 457a039bd4
10 changed files with 108 additions and 116 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/App.vue
  2. 1
      src/api/api.js
  3. 42
      src/components/backButton/index.vue
  4. 86
      src/components/breadcrumb/index.vue
  5. 37
      src/components/case/index.vue
  6. 3
      src/components/selectBusiness/index.vue
  7. 5
      src/layouts/header/index.vue
  8. 10
      src/pages/index/list/index.vue
  9. 28
      src/pages/report/index.vue
  10. 2
      src/store/modules/system.js

8
src/App.vue
Unescape View File

@ -15,6 +15,7 @@ import util from '@/libs/util';
import selectBusiness from '@/components/selectBusiness'
import TipDialog from '@/components/tipDialog'
import { mapState, mapMutations } from 'vuex'
import Bus from '@/libs/bus'
export default {
name: 'App',
components: {
@ -62,7 +63,6 @@ export default {
if (!newVal) {
// 如果未选择业务，则关闭后继续弹出弹框
if (!this.businessKey && !sessionStorage.getItem('submited')) {
console.log("🚀 ~ file: App.vue:65 ~ handler ~ submited:", sessionStorage.getItem('submited'))
this.$nextTick(() => { this.setShowBusiness(true) })
} else {
// this.setTipsOperate('您正在进行' + this.businessKey + ',加油！');
@ -75,11 +75,15 @@ export default {
immediate: true
}
},
mounted () {
Bus.$on('setShowIt', data => {
this.showIt = data
})
},
computed: {
...mapState({
businessKey: state => state.system.businessKey,
showBusiness: state => state.system.showBusiness,
businessKey: state => state.system.businessKey
})
},
}

1
src/api/api.js
Unescape View File

@ -7,6 +7,7 @@ let host = `${location.origin}/`
if (dev) {
// 本地
host = 'http://121.37.12.51/' // 中台测试服
// host = 'https://www.occupationlab.com/' // 正式服
// host = 'http://192.168.31.151:9000/' // 榕
// host = 'http://192.168.31.116:9000/' // 赓
}

42
src/components/backButton/index.vue
Unescape View File

@ -1,33 +1,35 @@
<template>
<div class="sth guide" @click="toPart" alt="">
返回
</div>
<div class="sth guide"
@click="toPart"
alt="">
返回
</div>
</template>
<script>
export default {
methods: {
toPart() {
this.$router.push('/index')
}
methods: {
toPart () {
this.$router.push('/index')
}
}
}
</script>
<style lang="scss" scoped>
.sth {
position: absolute;
&.cp {
cursor: pointer;
}
}
.guide {
top: 90px;
left: 0;
width: 222px;
.sth {
position: absolute;
&.cp {
cursor: pointer;
&:hover {
opacity: 0.9;
}
}
}
.guide {
top: 90px;
left: 0;
width: 222px;
cursor: pointer;
&:hover {
opacity: 0.9;
}
}
</style>

86
src/components/breadcrumb/index.vue
Unescape View File

@ -3,15 +3,12 @@
<div class="breadcrumb">
<el-breadcrumb separator=">">
<template v-for="(item, index) in pages">
<el-breadcrumb-item
v-if="index != pages.length - 1"
:key="index"
>
<el-breadcrumb-item v-if="index != pages.length - 1"
:key="index">
<span @click="toPath">{{item}}</span>
</el-breadcrumb-item>
<el-breadcrumb-item
v-else
:key="index">
<el-breadcrumb-item v-else
:key="index">
{{item}}
</el-breadcrumb-item>
</template>
@ -21,51 +18,50 @@
<script>
export default {
props: {
data: {
type: String,
required: true
},
route: {
type: String,
default: '/'
},
query: {
type: Object
}
props: {
data: {
type: String,
required: true
},
data() {
return {
pages: this.data.split('/')
};
route: {
type: String,
default: '/'
},
methods: {
update(data){
this.pages = data.split('/')
},
toPath() {
console.log(33)
this.$router.back()
}
query: {
type: Object
}
},
data () {
return {
pages: this.data.split('/')
};
},
methods: {
update (data) {
this.pages = data.split('/')
},
toPath () {
this.$router.push('/index')
}
}
};
</script>
<style lang="scss" scoped>
.breadcrumb {
margin: 4px 0 16px;
/deep/.el-breadcrumb__item {
&:first-child {
span {
font-weight: 400;
color: #007eff;
cursor: pointer;
}
margin: 4px 0 16px;
/deep/.el-breadcrumb__item {
&:first-child {
span {
font-weight: 400;
color: #007eff;
cursor: pointer;
}
}
&:last-child {
.is-link {
color: #0b1d30;
}
}
}
&:last-child {
.is-link {
color: #0B1D30;
}
}
}
}
</style>

37
src/components/case/index.vue
Unescape View File

@ -200,6 +200,7 @@ import Setting from '@/setting'
import { getProjectBySystemId, getProjectDetail, submit, getQueryCache, deleteCache, checkTest, checkTest2 } from "@/api/http.js";
import { mapMutations } from 'vuex'
import { async } from 'q';
import Bus from '@/libs/bus'
export default {
props: {
sendSync: {
@ -214,10 +215,6 @@ export default {
type: Number,
default: null
},
codeId: {
type: Number,
default: 0
},
showIt: {
type: Boolean,
required: true
@ -235,7 +232,6 @@ export default {
grade: "00",
exampleData: "",
codeid: "",
codeIds: [],
judgmentPointsIds: [],
text: "",
isStart: false,
@ -318,6 +314,9 @@ export default {
})
}, 4000)
}
Bus.$on('setSubmited', data => {
this.popContainer = data
})
},
watch: {
countVal: {
@ -365,11 +364,9 @@ export default {
let token = sessionStorage.getItem('token') || this.getQueryVariable('token')
let cid = sessionStorage.getItem('cid') || this.getQueryVariable('cid')
let systemId = sessionStorage.getItem('systemId') || this.getQueryVariable('systemId')
let projectId
let projectId = this.getQueryVariable('projectId')
if (sessionStorage.getItem('projectId')) {
projectId = sessionStorage.getItem('projectId')
} else {
projectId = this.getQueryVariable('projectId')
}
console.log('mounted', projectId)
let assessmentId = sessionStorage.getItem('assessmentId') || this.getQueryVariable('assessmentId')
@ -378,6 +375,7 @@ export default {
let teamId = sessionStorage.getItem('teamId') || this.getQueryVariable('teamId')
let classId = sessionStorage.getItem('classId') || this.getQueryVariable('classId')
let stopTime = sessionStorage.getItem('stopTime') || this.getQueryVariable('stopTime')
let mallId = sessionStorage.getItem('mallId') || this.getQueryVariable('mallId')
let timestamp = +stopTime;
if (timestamp != null) {
} else {
@ -399,6 +397,7 @@ export default {
this.stageId = stageId
this.teamId = teamId
this.classId = classId
this.mallId = mallId
}
let tokens = sessionStorage.getItem('token')
if (tokens || token) {
@ -408,7 +407,6 @@ export default {
2 :
0
this.assessmentId && this.projectId && this.checkVer()
this.codeId && this.codeIds.push(this.codeId)
if (JSON.parse(assessmentId != null && assessmentId != '' && assessmentId != 'null' || this.competitionId)) {
this.selectProjects({
projectId
@ -417,9 +415,11 @@ export default {
this.getData()
}
}
console.log(2222, this.showIt)
},
methods: {
...mapMutations({
setBusinessKey: 'system/setBusinessKey',
initState: 'system/initState',
setShowBusiness: 'system/setShowBusiness',
}),
@ -440,6 +440,7 @@ export default {
sessionStorage.setItem('cid', cid)
sessionStorage.setItem('systemId', systemId)
sessionStorage.setItem('projectId', projectId)
sessionStorage.setItem('firstLoad2', true)
if (assessmentId) {
sessionStorage.setItem('assessmentId', assessmentId)
}
@ -499,6 +500,7 @@ export default {
"systemId": sessionStorage.getItem('systemId'),
"cId": sessionStorage.getItem('cid'),
"permissions": 0,
mallId: this.mallId
}
getProjectBySystemId(params).then((data) => {
if (data.status == 200) {
@ -657,6 +659,7 @@ export default {
sessionStorage.setItem('accountPasswordAll', '')
sessionStorage.setItem('projectId', this.projectId)
sessionStorage.setItem('submited', 0)
sessionStorage.setItem('firstLoad2', true)
getProjectDetail(params).then((data) => {
if (data.status == 200) {
const { systemId, projectId } = data.data.projectManage
@ -751,12 +754,14 @@ export default {
competitionId: this.competitionId,
stageId: this.stageId,
teamId: this.teamId,
mallId: this.mallId
}
this.loading = true;
submit(params).then((data) => {
console.log(4, data)
if (data.status == 200) {
this.clearStore()
sessionStorage.setItem('firstLoad2', true)
// this.clearStore()
const { retMap } = data.data
this.reportId = retMap.reportId
let firstLoad = null
@ -906,7 +911,7 @@ export default {
sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
sessionStorage.setItem('accountVoucher', JSON.stringify(formList))
sessionStorage.setItem('accountPasswordAll', '')
sessionStorage.setItem('submited', 0)
this.setBusinessKey('')
let params = {
"projectId": projectId,
}
@ -947,11 +952,11 @@ export default {
},
toggleCase () {
if (this.submitType) return
if (!this.lockIt) {
this.$emit('update:showIt', !this.showIt)
} else {
this.closePaneJudge = true
}
// if (!this.lockIt) {
this.$emit('update:showIt', !this.showIt)
// } else {
// this.closePaneJudge = true
// }
// this.caseVisible = !this.caseVisible
},

3
src/components/selectBusiness/index.vue
Unescape View File

@ -50,6 +50,7 @@ export default {
// default: '本业务需要授权'
},
mounted () {
console.log('business', this.getBusinessSelectList)
if (this.businessKey) {
// 如果上次保存有 那么直接赋值
this.takeCheck = this.businessKey
@ -164,7 +165,7 @@ export default {
// sessionStorage.setItem('systemData', systemData)
sessionStorage.setItem('businessKey', this.$store.state.system.businessKey)
sessionStorage.setItem('businessKey', this.takeCheck)
},
},

5
src/layouts/header/index.vue
Unescape View File

@ -30,7 +30,7 @@ export default {
};
},
mounted () {
this.$route.query.manager && Cookie.set('manager', 1)
this.$route.query.manager ? Cookie.set('manager', 1) : Cookie.remove('manager')
},
methods: {
toIndex () {
@ -53,8 +53,9 @@ export default {
href += `ass/list`
} else {
const cid = sessionStorage.getItem('cid')
href += `station/preview?courseId=${cid}&curriculumName=银行项目`
href += `station/preview?courseId=${cid}&curriculumName=银行项目&mallId=${this.$route.query.mallId}`
}
sessionStorage.clear()
location.href = href
},
},

10
src/pages/index/list/index.vue
Unescape View File

@ -65,6 +65,7 @@
<script>
import { mapMutations, mapState } from 'vuex';
import saveSystemModule from '@/mixins/saveSystemModule'
import Bus from '@/libs/bus'
export default {
name: 'index',
mixins: [saveSystemModule],
@ -84,6 +85,9 @@ export default {
},
created () {
if (!sessionStorage.getItem('firstLoad2')) {
sessionStorage.removeItem('submited')
sessionStorage.removeItem('businessKey')
this.setBusinessKey('')
const loading = this.$loading({
lock: true,
// text: 'Loading',
@ -100,6 +104,11 @@ export default {
if (!this.businessKey) {
this.setShowBusiness(true)
}
// 已经提交，则显示面板
if (sessionStorage.getItem('submited')) {
Bus.$emit('setShowIt', true)
Bus.$emit('setSubmited', true)
}
},
mounted () {
let token = this.getQueryVariable('token')
@ -122,6 +131,7 @@ export default {
},
methods: {
...mapMutations({
setBusinessKey: 'system/setBusinessKey',
setShowBusiness: 'system/setShowBusiness'
}),
getQueryVariable (name) {

28
src/pages/report/index.vue
Unescape View File

@ -156,34 +156,6 @@
v-html="scope.row.referenceAnswer"></div>
</template>
</el-table-column>
<el-table-column prop="userAnswer"
width="280"
label="学生答案">
<template slot-scope="scope">
<div v-if='scope.row.lcRuleRecords'>
<div v-for="(item, index) in scope.row.lcRuleRecords"
:key="index">
<span v-if='item.userAnswer'>
<span>{{index+1}}. </span>{{item.userAnswer}}
</span>
<span v-else>
<span>{{index+1}}. </span>未填写
</span>
</div>
</div>
<div v-else
v-html='scope.row.answer'
style='white-space: pre-wrap'></div>
<template v-if="scope.row.runThePictureList">
<img v-for="(img, i) in scope.row.runThePictureList"
:key="i"
width="200"
class="result-pic"
:src="img"
alt="">
</template>
</template>
</el-table-column>
<el-table-column prop="quesScore"
label="分值"
width="80"

2
src/store/modules/system.js
Unescape View File

@ -2610,7 +2610,7 @@ export default {
initState(state) {
state.businessSelect = JSON.parse(JSON.stringify(myInitState))
state.allDataFlow = { ...allDataFlow }
state.businessKey = ''
// state.businessKey = ''
},
// 控制选择业务列表的展示状态
setShowBusiness(state, isShow) {

Write Preview
Loading…
Cancel
Save