diff --git a/src/api/xm/core/xmTask.js b/src/api/xm/core/xmTask.js
index 61788325..79f5de2d 100644
--- a/src/api/xm/core/xmTask.js
+++ b/src/api/xm/core/xmTask.js
@@ -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); };
diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss
index 0a43cfcf..de8f29ff 100644
--- a/src/styles/mdp.scss
+++ b/src/styles/mdp.scss
@@ -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;
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 45fc7ddc..8871b4a3 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -334,6 +334,17 @@
>
+
+
+ 刷新全部计划进度数据
+
+
更多
@@ -405,17 +416,11 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -466,13 +471,28 @@
-
{{ (scope.row.rate != null ? scope.row.rate : 0) + "%" }}
-
+
+
+
+ {{ (scope.row.rate != null ? scope.row.rate : 0) + "%" }}
+
+
+
+
+
+
+
+
@@ -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();