diff --git a/src/api/home/home.js b/src/api/home/home.js
index 7ea4aa7..c8c18ae 100644
--- a/src/api/home/home.js
+++ b/src/api/home/home.js
@@ -52,3 +52,31 @@ export const getProjectAndDeviceById = (data) => {
params: data
})
}
+
+// 施工记录数量
+export const getTeamDataAmount = (data) => {
+ return request.get(`/base/screen/homeTwo/getTeamDataAmount`, {
+ params: data
+ })
+}
+
+// 岗位工种-下拉
+export const getProDepartDataList = (data) => {
+ return request.get(`/base/tbProDepart/getDataList`, {
+ params: data
+ })
+}
+
+// 施工班组-列表
+export const getTeamDetails = (data) => {
+ return request.get(`/base/screen/homeTwo/getTeamDetails`, {
+ params: data
+ })
+}
+
+// 施工人员-列表
+export const getTeamPeopleDetails = (data) => {
+ return request.get(`/base/screen/homeTwo/getTeamPeopleDetails`, {
+ params: data
+ })
+}
\ No newline at end of file
diff --git a/src/components/home/leftEight.vue b/src/components/home/leftEight.vue
new file mode 100644
index 0000000..debb3b2
--- /dev/null
+++ b/src/components/home/leftEight.vue
@@ -0,0 +1,271 @@
+
+
+
+

+ 班组人员
+
位置
+
+
+
+
+

+
+
+
施工班组数
+ {{ teamDataAmount.teamNum || 0 }}
+
+
+
+
+

+
+
+
施工人员数
+ {{ teamDataAmount.peopleNum || 0 }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/home/locationDialog.vue b/src/components/home/locationDialog.vue
new file mode 100644
index 0000000..beb7312
--- /dev/null
+++ b/src/components/home/locationDialog.vue
@@ -0,0 +1,410 @@
+
+
+
+
+
+
+
+
+
班组人员
+
+
+
+
+ {{ group.teamName }}
+
+
+ {{ person.peopleName }}
+ {{ person.peoplePhone }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/home/pieDialog.vue b/src/components/home/pieDialog.vue
new file mode 100644
index 0000000..6c574ab
--- /dev/null
+++ b/src/components/home/pieDialog.vue
@@ -0,0 +1,177 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/home/teamDialog.vue b/src/components/home/teamDialog.vue
new file mode 100644
index 0000000..98077f6
--- /dev/null
+++ b/src/components/home/teamDialog.vue
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/Workbench/components/workbenchEdit.vue b/src/views/Workbench/components/workbenchEdit.vue
index 76245ba..2c99497 100644
--- a/src/views/Workbench/components/workbenchEdit.vue
+++ b/src/views/Workbench/components/workbenchEdit.vue
@@ -111,6 +111,7 @@ import LeftThree from '@/components/home/leftThree.vue'
import LeftFive from '@/components/home/leftFive.vue'
import LeftSix from '@/components/home/leftSix.vue'
import LeftSeven from '@/components/home/leftSeven.vue'
+import leftEight from '@/components/home/leftEight.vue'
import RightOne from '@/components/home/rightOne.vue'
import RightTwo from '@/components/home/rightTwo.vue'
import CountryMap from '@/components/home/countryMap.vue'
@@ -130,7 +131,8 @@ export default {
CountryMap,
LeftFive,
LeftSix,
- LeftSeven
+ LeftSeven,
+ leftEight
},
computed: {
searchComp() {
@@ -462,7 +464,16 @@ export default {
h: 1,
isAccord: '1*1',
rigCont: '1*3'
- }
+ },
+ {
+ id: 10,
+ name: '班组人员',
+ componentName: 'leftEight',
+ w: 1,
+ h: 1,
+ isAccord: '1*1',
+ rigCont: '1*1'
+ },
],
rowHeight: 0,
previewLayout: [],
diff --git a/src/views/Workbench/components/workbenchTemp.vue b/src/views/Workbench/components/workbenchTemp.vue
index 493932c..8028cca 100644
--- a/src/views/Workbench/components/workbenchTemp.vue
+++ b/src/views/Workbench/components/workbenchTemp.vue
@@ -22,7 +22,7 @@
>
-
+
@@ -31,7 +31,9 @@
ref="dialogRef"
>
-
+
+
+
@@ -49,10 +51,14 @@ import LeftThree from '@/components/home/leftThree.vue'
import LeftFive from '@/components/home/leftFive.vue'
import LeftSix from '@/components/home/leftSix.vue'
import LeftSeven from '@/components/home/leftSeven.vue'
+import leftEight from '@/components/home/leftEight.vue'
import RightOne from '@/components/home/rightOne.vue'
import RightTwo from '@/components/home/rightTwo.vue'
import CountryMap from '@/components/home/countryMap.vue'
import CommonDialog from '@/components/home/commonDialog.vue'
+import PieDialog from '@/components/home/pieDialog.vue'
+import TeamDialog from '@/components/home/teamDialog.vue'
+import LocationDialog from '@/components/home/locationDialog.vue'
import {
queryTableApi
} from '@/api/home/home'
@@ -84,7 +90,11 @@ export default {
CommonDialog,
LeftFive,
LeftSix,
- LeftSeven
+ LeftSeven,
+ leftEight,
+ PieDialog,
+ TeamDialog,
+ LocationDialog
},
data() {
return {
@@ -255,6 +265,15 @@ export default {
}
})
},
+ handlePieDialog(val) {
+ if (val == 1) {
+ this.$refs.pieDialog.openDialog(this.proId)
+ } else if (val == 2) {
+ this.$refs.teamDialog.openDialog(this.proId)
+ } else {
+ this.$refs.locationDialog.openDialog(this.proId)
+ }
+ }
}
}