diff --git a/src/pages/components/JobWorkerDialog.vue b/src/pages/components/JobWorkerDialog.vue
index 4547dd9..ec72198 100644
--- a/src/pages/components/JobWorkerDialog.vue
+++ b/src/pages/components/JobWorkerDialog.vue
@@ -9,6 +9,9 @@
+
+ {{row.total }}
+
@@ -93,7 +96,7 @@ export default {
this.index = 1;
this.loadData();
},
- showDialog(data) {debugger
+ showDialog(data) {
const getData = id => {
var tmps = data.datas.filter(d => d.text == id);
return tmps.length > 0 ? tmps[0].cnt : 0;
@@ -146,7 +149,8 @@ export default {
dptName: it.dptName,
data101: 0,
data102: 0,
- data103: 0
+ data103: 0,
+ total:0,
};
obj[k] = o;
} else {
@@ -157,7 +161,9 @@ export default {
});
this.tableData = [];
for (let k in obj) {
- this.tableData.push(obj[k]);
+ let o=obj[k];
+ o.total=o.data101+o.data102+o.data103;
+ this.tableData.push(o);
}
this.total = sum;
})
diff --git a/src/pages/index.vue b/src/pages/index.vue
index a7b8e90..fcbd39a 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -219,8 +219,7 @@
-
-
+
@@ -235,7 +234,6 @@ import MonitAndWarning from './components/MonitAndWarning.vue'
import journalismDlg from './dlg/journalismDlg.vue'
import debounce from 'lodash.debounce'
import AttendanceDetailDialog from './components/AttendanceDetailDialog.vue'
-import AttendanceWorkerDialog from './components/AttendanceWorkerDialog.vue'
import mapIndex from './index/mapIndex.vue'
import JobWorkerDialog from './components/JobWorkerDialog.vue'
export default {
@@ -246,7 +244,7 @@ export default {
indexDlg3,
MonitAndWarning,
journalismDlg,
- AttendanceDetailDialog,mapIndex,JobWorkerDialog,AttendanceWorkerDialog
+ AttendanceDetailDialog,mapIndex,JobWorkerDialog
},
data() {
return {