Browse Source

技能优化,提示优化

master
陈裕财 5 years ago
parent
commit
3a93955f57
  1. 2
      src/utils/request.js
  2. 4
      src/views/xm/core/skill/skillMng.vue
  3. 6
      src/views/xm/core/xmTask/XmTaskMng.vue

2
src/utils/request.js

@ -48,6 +48,7 @@ service.interceptors.request.use(config => {
service.interceptors.response.use( service.interceptors.response.use(
response => { response => {
if(response.data && response.data.tips && response.data.tips.msg == 'Full authentication is required to access this resource'){ if(response.data && response.data.tips && response.data.tips.msg == 'Full authentication is required to access this resource'){
Message.closeAll()
Message.error('会话过期,请重新登陆') Message.error('会话过期,请重新登陆')
//response.data.tips.msg="会话过期,请重新登陆"; //response.data.tips.msg="会话过期,请重新登陆";
store.dispatch('FedLogOut').then(() => { store.dispatch('FedLogOut').then(() => {
@ -62,6 +63,7 @@ service.interceptors.response.use(
switch (error.response.status) { switch (error.response.status) {
case 401: case 401:
// 返回 401 清除token信息并跳转到登录页面 // 返回 401 清除token信息并跳转到登录页面
Message.closeAll()
Message.error('会话过期,请重新登陆') Message.error('会话过期,请重新登陆')
store.dispatch('FedLogOut').then(() => { store.dispatch('FedLogOut').then(() => {
router.replace({path: '/login'}) router.replace({path: '/login'})

4
src/views/xm/core/skill/skillMng.vue

@ -4,7 +4,7 @@
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-button type="primary" v-if="jump==true" @click="selectConfirm" icon="el-icon-finished">确认选择</el-button> <el-button type="primary" v-if="jump==true" @click="selectConfirm" icon="el-icon-finished">确认选择</el-button>
<el-button type="primary" @click="getAllHrSkill" v-loading="sectionLoading" icon="el-icon-search">查询</el-button>
<el-button @click="getAllHrSkill" v-loading="sectionLoading" icon="el-icon-search">刷新标签</el-button>
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<el-checkbox <el-checkbox
@ -18,7 +18,7 @@
placeholder="回车直接快速添加技能分类" placeholder="回车直接快速添加技能分类"
@keyup.enter.native="addTagCategorySubmitMethod" @keyup.enter.native="addTagCategorySubmitMethod"
></el-input> ></el-input>
<el-button type="primary" @click="addTagCategorySubmitMethod" icon="el-icon-finished"></el-button>
<el-button type="primary" @click="addTagCategorySubmitMethod" icon="el-icon-finished">存分类</el-button>
<el-tooltip content="黄色表示已经有的技能"> <el-tooltip content="黄色表示已经有的技能">
<span class="addTagSquare"></span> <span class="addTagSquare"></span>
</el-tooltip> </el-tooltip>

6
src/views/xm/core/xmTask/XmTaskMng.vue

@ -316,14 +316,14 @@
<xm-skill-mng :visible="skillVisible" :task-id="currTaskId" :task-name="currTaskName"></xm-skill-mng> <xm-skill-mng :visible="skillVisible" :task-id="currTaskId" :task-name="currTaskName"></xm-skill-mng>
</el-dialog> --> </el-dialog> -->
<el-dialog :title="'任务'+currTaskName+'的技能要求'" :visible.sync="skillVisible" width="600" append-to-body :close-on-click-modal="false">
<el-dialog :title="'任务'+currTaskName+'的技能要求'" :visible.sync="skillVisible" width="80%" append-to-body :close-on-click-modal="false">
<skill-mng :task-skills="taskSkills" :jump="true" @select-confirm="onTaskSkillsSelected"></skill-mng> <skill-mng :task-skills="taskSkills" :jump="true" @select-confirm="onTaskSkillsSelected"></skill-mng>
</el-dialog> </el-dialog>
<el-dialog :title="'技能条件'" :visible.sync="showSkillSearchVisible" width="600" append-to-body :close-on-click-modal="false">
<el-dialog :title="'技能条件'" :visible.sync="showSkillSearchVisible" width="70%" append-to-body :close-on-click-modal="false">
<skill-mng :task-skills="filters.skillTags" :jump="true" @select-confirm="onTaskSkillsSearchSelected"></skill-mng> <skill-mng :task-skills="filters.skillTags" :jump="true" @select-confirm="onTaskSkillsSearchSelected"></skill-mng>
</el-dialog> </el-dialog>
<el-dialog title="任务模板" :visible.sync="taskTemplateVisible" width="80%" append-to-body :close-on-click-modal="false">
<el-dialog title="任务模板" :visible.sync="taskTemplateVisible" width="70%" append-to-body :close-on-click-modal="false">
<xm-task-template-mng :is-select="true" @select-confirm="onTaskTemplatesSelected"></xm-task-template-mng> <xm-task-template-mng :is-select="true" @select-confirm="onTaskTemplatesSelected"></xm-task-template-mng>
</el-dialog> </el-dialog>

Loading…
Cancel
Save