end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

界面优化

master
陈裕财 4 years ago
parent
065a3207d0
commit
d33b93e214
3 changed files with 69 additions and 19 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. 7
      src/api/xm/core/xmTask.js
  2. 18
      src/styles/mdp.scss
  3. 61
      src/views/xm/core/xmTask/XmTaskMng.vue

7
src/api/xm/core/xmTask.js
View File

@ -52,6 +52,13 @@ export const setTaskCreateUser = params => { return axios.post(`${base}/xm/core/
export const editTime = params => { return axios.post(`${base}/xm/core/xmTask/editTime`, params); };
export const calcProgress = params => { return axios.post(`${base}/xm/core/xmTask/calcProgress`, params); };
export const calcProjectProgress = params => { return axios.post(`${base}/xm/core/xmTask/calcProjectProgress`, params); };
export const batchChangeParentTask = params => { return axios.post(`${base}/xm/core/xmTask/batchChangeParentTask`, params); };

18
src/styles/mdp.scss
View File

@ -225,7 +225,15 @@
float: right;
}
.el-table__body tr:hover{
table tr:hover{
.tool-bar{
visibility: visible;
.u-btn{
float: right;
}
}
}
table tr.hover-row{
.tool-bar{
visibility: visible;
.u-btn{
@ -233,7 +241,6 @@
}
}
}
.cell-bar{
display: none;
float: right;
@ -241,9 +248,10 @@
.el-table__row td:hover{
.cell-bar{
display: block;
float: right;
width: 90%;
display: inline;
.u-btn{
float: right;
}
}
.cell-text{
display:none;

61
src/views/xm/core/xmTask/XmTaskMng.vue
View File

@ -334,6 +334,17 @@
>
</el-col>
</el-row>
<el-row>
<el-col :span="24" style="padding-top: 5px">
<el-button title="一般情况下默认半个小时会统一更新一次，不需要手动更新，如需要立即汇总数据到上级计划，可以手动执行刷新操作"
v-if="queryScope=='planTask'||queryScope=='plan'"
@click="calcProjectProgress"
v-loading="load.edit"
icon="el-icon-edit"
>刷新全部计划进度数据</el-button
>
</el-col>
</el-row>
<el-button style="margin-top: 10px;" slot="reference">更多</el-button>
</el-popover>
@ -405,17 +416,11 @@
<div class="tool-bar">
<span class="u-btn">
<el-tooltip v-if="scope.row.ntype==='1'" :content=" '新建任务'">
<el-button @click="showSubAdd( scope.row,scope.$index,'0')" icon="el-icon-plus" title="新建任务" circle plain size="mini"> </el-button>
</el-tooltip>
<el-tooltip v-if="scope.row.ntype==='1'" :content=" '新建计划'">
<el-button :style="{backgroundColor: '#E6A23C'}" @click="showSubAdd( scope.row,scope.$index,'1')" icon="el-icon-plus" title="新建计划" circle plain size="mini"> </el-button>
</el-tooltip>
<el-tooltip v-if="scope.row.ntype==='0'" :content=" '编辑任务'">
<el-button @click="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑任务" circle plain size="mini"> </el-button>
</el-tooltip>
</span>
<el-button v-if="scope.row.ntype==='1'" @click="showSubAdd( scope.row,scope.$index,'0')" icon="el-icon-plus" title="新建任务" circle plain size="mini"> </el-button>
<el-button v-if="scope.row.ntype==='1'" :style="{backgroundColor: '#E6A23C'}" @click="showSubAdd( scope.row,scope.$index,'1')" icon="el-icon-plus" title="新建计划" circle plain size="mini"> </el-button>
<el-button v-if="scope.row.ntype==='0'" @click="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑任务" circle plain size="mini"> </el-button>
</span>
</div>
</template>
</el-table-column>
@ -466,13 +471,28 @@
</el-table-column>
<el-table-column sortable prop="rate" label="进度" width="100">
<template slot-scope="scope">
<el-link :disabled="scope.row.ntype=='1'"
<el-link v-if="scope.row.ntype=='0'"
style="border-radius: 30px"
:type="scope.row.rate >= 100 ? 'success' : 'warning'"
@click="showWorkload(scope.row)"
>
{{ (scope.row.rate != null ? scope.row.rate : 0) + "%" }}
</el-link>
<el-link v-else
style="border-radius: 30px"
:type="scope.row.rate >= 100 ? 'success' : 'warning'"
@click="calcProgress(scope.row)"
>
{{ (scope.row.rate != null ? scope.row.rate : 0) + "%" }}
</el-link>
<div class="cell-bar">
<span class="u-btn">
<el-button v-if="scope.row.ntype==='0'" @click="showWorkload(scope.row)" icon="el-icon-timer" title="登记工时进度" circle plain size="mini"> </el-button>
<el-button v-else :disabled="load.calcProgress" v-loading="load.calcProgress" @click="calcProgress(scope.row)" icon="el-icon-s-data" title="统计进度，逐级往上汇总" circle plain size="mini"> </el-button>
</span>
</div>
</template>
</el-table-column>
@ -913,6 +933,8 @@ import {
batchRelTasksWithMenu,
batchChangeParentTask,
editXmTaskSomeFields,
calcProgress,
calcProjectProgress,
} from "@/api/xm/core/xmTask";
import XmTaskAdd from "./XmTaskAdd"; //新增界面
import XmTaskEdit from "./XmTaskEdit"; //修改界面
@ -1042,7 +1064,7 @@ export default {
orderFields: ["create_time"], //排序列 如 ['sex','student_id']，必须为数据库字段
orderDirs: ["desc"], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
},
load: { list: false, edit: false, del: false, add: false }, //查询中...
load: { list: false, edit: false, del: false, add: false,calcProgress:false, }, //查询中...
sels: [], //列表选中数据
dicts: {
priority: [],
@ -1166,6 +1188,19 @@ export default {
};
}, //end data
methods: {
calcProjectProgress(){
calcProjectProgress().then(res=>{
this.searchXmTasks();
})
},
calcProgress(row){
this.load.calcProgress=true
calcProgress({id:row.id}).then(res=>{
this.load.calcProgress=false
this.searchXmTasks();
})
},
changeSelKey(index) {
this.selkey = index;
this.searchXmTasks();

Write Preview
Loading…
Cancel
Save