提交 dbfc6d34 authored 作者: pengxiaohui's avatar pengxiaohui

update: 优化一些交互

上级 3534d9a2
......@@ -42,3 +42,8 @@ export function getSelectRole() {
export function getWorkStatus() {
return httpRequest.get('/api/xtraining/api/v1/show/analysis-status')
}
// 选中案例
export function selectCase(id) {
return httpRequest.post(`/api/xtraining/api/v1/${id}/select-case`, {})
}
......@@ -40,12 +40,14 @@ export default {
},
methods: {
handleClose() {
this.type = ''
this.$emit('input', false)
},
handleProdSelect(val) {
this.type = val
},
handleCaseSelect() {
this.type = ''
this.$emit('input', false)
}
}
......
......@@ -21,7 +21,8 @@
</div>
</template>
<script>
import { getCategories, getCasesList, selectCase } from './api'
import { getCategories, getCasesList } from './api'
import { selectCase } from '@/api/base'
export default {
data() {
return {
......@@ -54,13 +55,14 @@ export default {
if (Array.isArray(this.$store.state.case)) {
this.selectConfirm()
} else {
this.$confirm('切换案例,当前填写的内容不会保存', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.selectCase()
})
// this.$confirm('切换案例,当前填写的内容不会保存', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
// this.selectCase()
// })
this.selectCase()
}
},
selectConfirm() {
......@@ -76,8 +78,11 @@ export default {
},
selectCase() {
const data = this.caseList.find(item => { return item.id === this.caseSelect })
this.$store.commit('setCase', data)
selectCase(data.id).then(res => {
let msg = '选择'
if (this.$store.state.case.id) msg = '切换'
this.$message.success(msg + '案例成功!')
this.$store.commit('setCase', data)
this.$emit('select', data)
})
}
......
......@@ -3,11 +3,11 @@
<div class="header-bar">
<app-menu />
<div>
<el-button @click="visible = true" style="height: fit-content;" type="primary" v-if="showCaseSelect">切换案例</el-button>
<!-- <el-button @click="visible = true" style="height: fit-content;" type="primary" v-if="showCaseSelect">切换案例</el-button> -->
<el-button @click="drawerVisible = true" style="height: fit-content;" type="primary" v-if="showCaseDetails">查看案例</el-button>
</div>
</div>
<case-select v-model="visible"></case-select>
<!-- <case-select v-model="visible"></case-select> -->
<el-drawer title="" size="640px" :visible.sync="drawerVisible">
<embed class="embed" width="100%" height="100%" :src="cases.pdf_uris[0]" />
</el-drawer>
......@@ -16,18 +16,18 @@
<script>
import AppMenu from '../base/AppMenu.vue'
import CaseSelect from '@/components/caseSelect/Index.vue'
// import CaseSelect from '@/components/caseSelect/Index.vue'
export default {
name: 'AppHeader',
components: { AppMenu, CaseSelect },
components: { AppMenu },
computed: {
path() {
return this.$route.path
},
showCaseSelect() {
if (this.path !== '/home' && !this.path.includes('/works-show')) return true
else return false
},
// showCaseSelect() {
// if (this.path !== '/home' && !this.path.includes('/works-show')) return true
// else return false
// },
showCaseDetails() {
if (this.path.includes('/user-study') || this.path.includes('/market-tools')) return true
else return false
......
......@@ -2,7 +2,8 @@
<div class="home">
<div class="top">
<el-button style="margin-left:10px;" type="primary" size="medium" plain round @click="handleLogout">退出系统</el-button>
<el-button type="primary" size="medium" plain round @click="roleVisible = true">切换角色</el-button>
<!-- <el-button type="primary" size="medium" plain round @click="roleVisible = true">切换角色</el-button> -->
<el-button type="primary" size="medium" plain round @click="visible = true">切换案例</el-button>
</div>
<div class="inner">
<div class="header">
......@@ -12,7 +13,7 @@
<btn v-for="(item, index) in btnList" :key="index" :attrs="{ title: item.label, left: item.left, top: item.top }" @click.native="handleClick(item)" :disabled="item.disabled.includes(role)"/>
</div>
<role-select :visible="roleVisible" @roleSelect="fetchSelectRole" />
<case-select v-model="visible" :show-close="false"></case-select>
<case-select v-model="visible" :show-close="!!_case.id"></case-select>
</div>
</template>
......@@ -42,7 +43,7 @@ export default {
path() {
return this.$route.path
},
case() {
_case() {
return this.$store.state.case
},
role() {
......@@ -50,7 +51,7 @@ export default {
}
},
created() {
if (this.case && !this.case.id) {
if (this._case && !this._case.id) {
this.visible = true
}
if (this.role !== 4) {
......
......@@ -170,7 +170,8 @@ export default {
const tableFilter = {}
this.questions.forEach(item => {
if (item.selection.length) {
tableFilter[item.tag] = item.selection[0].tag
const tagArr = item.selection.map(it => it.tag)
tableFilter[item.tag] = tagArr.join(',')
}
})
this.tableFilter = tableFilter
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论