diff --git a/src/assets/icons/svg/all-project.svg b/src/assets/icons/svg/all-project.svg new file mode 100644 index 0000000..e8e9aac --- /dev/null +++ b/src/assets/icons/svg/all-project.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/clock-in.svg b/src/assets/icons/svg/clock-in.svg new file mode 100644 index 0000000..8310988 --- /dev/null +++ b/src/assets/icons/svg/clock-in.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/finish-project.svg b/src/assets/icons/svg/finish-project.svg new file mode 100644 index 0000000..fc66a87 --- /dev/null +++ b/src/assets/icons/svg/finish-project.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/fixed-person.svg b/src/assets/icons/svg/fixed-person.svg new file mode 100644 index 0000000..2aef2d6 --- /dev/null +++ b/src/assets/icons/svg/fixed-person.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/home-use.svg b/src/assets/icons/svg/home-use.svg new file mode 100644 index 0000000..cea639a --- /dev/null +++ b/src/assets/icons/svg/home-use.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/line-project.svg b/src/assets/icons/svg/line-project.svg new file mode 100644 index 0000000..573e9ad --- /dev/null +++ b/src/assets/icons/svg/line-project.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/lot-project.svg b/src/assets/icons/svg/lot-project.svg new file mode 100644 index 0000000..365cb2e --- /dev/null +++ b/src/assets/icons/svg/lot-project.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/on-site-person.svg b/src/assets/icons/svg/on-site-person.svg new file mode 100644 index 0000000..e97748a --- /dev/null +++ b/src/assets/icons/svg/on-site-person.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/prepare-project.svg b/src/assets/icons/svg/prepare-project.svg new file mode 100644 index 0000000..4b7d8e1 --- /dev/null +++ b/src/assets/icons/svg/prepare-project.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/remain-project.svg b/src/assets/icons/svg/remain-project.svg new file mode 100644 index 0000000..f5b5475 --- /dev/null +++ b/src/assets/icons/svg/remain-project.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/stop-project.svg b/src/assets/icons/svg/stop-project.svg new file mode 100644 index 0000000..bb6c09c --- /dev/null +++ b/src/assets/icons/svg/stop-project.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/sub-unit.svg b/src/assets/icons/svg/sub-unit.svg new file mode 100644 index 0000000..bdd5b99 --- /dev/null +++ b/src/assets/icons/svg/sub-unit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/temp-person.svg b/src/assets/icons/svg/temp-person.svg new file mode 100644 index 0000000..537ceff --- /dev/null +++ b/src/assets/icons/svg/temp-person.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/use-teams.svg b/src/assets/icons/svg/use-teams.svg new file mode 100644 index 0000000..2e1753e --- /dev/null +++ b/src/assets/icons/svg/use-teams.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/home-index/components/dataOverviewCompany/index.vue b/src/views/home-index/components/dataOverviewCompany/index.vue index 6b6d846..969e897 100644 --- a/src/views/home-index/components/dataOverviewCompany/index.vue +++ b/src/views/home-index/components/dataOverviewCompany/index.vue @@ -27,7 +27,12 @@
- + + + 常用功能
diff --git a/src/views/home-index/components/dataOverviewProject/components/item-one.vue b/src/views/home-index/components/dataOverviewProject/components/item-one.vue index 2f20bf2..657184c 100644 --- a/src/views/home-index/components/dataOverviewProject/components/item-one.vue +++ b/src/views/home-index/components/dataOverviewProject/components/item-one.vue @@ -28,7 +28,7 @@ - + diff --git a/src/views/home-index/components/dataOverviewProject/index.vue b/src/views/home-index/components/dataOverviewProject/index.vue index e5e9d1d..650c95d 100644 --- a/src/views/home-index/components/dataOverviewProject/index.vue +++ b/src/views/home-index/components/dataOverviewProject/index.vue @@ -15,7 +15,15 @@ v-for="item in projectList" @click="onHandleCheckItem(item)" > - + +
{{ item.count }} {{ item.name }} @@ -31,6 +39,7 @@ :key="item.name" class="right-content-item" v-for="item in dataWarningList" + @click="onHandleCheckDataWarning(item)" > {{ item.name }} @@ -79,37 +88,37 @@ export default { name: '总工程', count: 1, component: 'ItemOne', - icon: require('@/assets/images/home-index/dataOverviewProject/icon_1.png'), + icon: 'all-project', }, { name: '标段工程', count: 20, component: 'ItemTwo', - icon: require('@/assets/images/home-index/dataOverviewProject/icon_1.png'), + icon: 'lot-project', }, { name: '在用分包单位', count: 1, component: 'ItemThree', - icon: require('@/assets/images/home-index/dataOverviewProject/icon_1.png'), + icon: 'sub-unit', }, { name: '在用班组', count: 50, component: 'ItemFour', - icon: require('@/assets/images/home-index/dataOverviewProject/icon_1.png'), + icon: 'use-teams', }, { name: '在场人员', count: 1, component: 'ItemFive', - icon: require('@/assets/images/home-index/dataOverviewProject/icon_1.png'), + icon: 'on-site-person', }, { name: '今日打卡', count: 80, component: 'ItemSix', - icon: require('@/assets/images/home-index/dataOverviewProject/icon_1.png'), + icon: 'clock-in', }, ], // 数据预警列表 @@ -147,13 +156,18 @@ export default { // 点击工程 onHandleCheckItem(item) { this.dialogConfig.outerTitle = item.name - this.currentComponent = item.component + // this.currentComponent = item.component this.dialogConfig.outerVisible = true }, // 关闭弹框 handleCloseDialogOuter(value) { this.dialogConfig.outerVisible = value }, + // 点击数据预警 + onHandleCheckDataWarning(item) { + this.dialogConfig.outerVisible = true + console.log(item) + }, }, } diff --git a/src/views/home-index/components/oftenUse/index.vue b/src/views/home-index/components/oftenUse/index.vue index 146b506..1bbb915 100644 --- a/src/views/home-index/components/oftenUse/index.vue +++ b/src/views/home-index/components/oftenUse/index.vue @@ -170,8 +170,8 @@ export default { this.dialogConfig.outerVisible = true }, // 关闭配置页面 - handleCloseDialogOuter(value) { - this.dialogConfig.outerVisible = value + handleCloseDialogOuter() { + this.dialogConfig.outerVisible = false }, // 关闭标签 handleCloseTag(item) { @@ -188,6 +188,7 @@ export default { // 确定按钮 handleConfirm() { console.log(this.selectList) + this.dialogConfig.outerVisible = false }, }, diff --git a/src/views/home-index/components/personAttendance/components/circlePie.vue b/src/views/home-index/components/personAttendance/components/circlePie.vue index 24a690d..a59a79a 100644 --- a/src/views/home-index/components/personAttendance/components/circlePie.vue +++ b/src/views/home-index/components/personAttendance/components/circlePie.vue @@ -1,22 +1,31 @@ diff --git a/src/views/home-index/components/personPresence/components/item-pie.vue b/src/views/home-index/components/personPresence/components/item-pie.vue index 3ded1a3..17b178c 100644 --- a/src/views/home-index/components/personPresence/components/item-pie.vue +++ b/src/views/home-index/components/personPresence/components/item-pie.vue @@ -6,9 +6,19 @@ diff --git a/src/views/home-index/components/personPresence/components/person-ratio.vue b/src/views/home-index/components/personPresence/components/person-ratio.vue index ea3a935..8c6cdca 100644 --- a/src/views/home-index/components/personPresence/components/person-ratio.vue +++ b/src/views/home-index/components/personPresence/components/person-ratio.vue @@ -3,12 +3,12 @@
- - 197 + + 197
- - 197 + + 197
@@ -28,8 +28,10 @@ style=" font-size: 18px; font-weight: bold; + cursor: pointer; font-family: 'DINAlternate-Bold'; " + @click="onHandleOpenDialog('fixed')" > 98.6%
@@ -37,8 +39,10 @@ style=" font-size: 18px; font-weight: bold; + cursor: pointer; font-family: 'DINAlternate-Bold'; " + @click="onHandleOpenDialog('temp')" > 96.3%
@@ -56,9 +60,12 @@ export default { } }, methods: { - format(percentage) { + format() { return `` }, + onHandleOpenDialog(type) { + console.log(type, '打开弹框---') + }, }, } @@ -75,6 +82,16 @@ export default { display: flex; justify-content: space-between; + div { + display: flex; + align-items: center; + gap: 4px; + + span { + cursor: pointer; + } + } + & div:first-child { color: #52c1f5; } diff --git a/src/views/home-index/components/personPresence/components/sex-ratio.vue b/src/views/home-index/components/personPresence/components/sex-ratio.vue index f664c4a..3053bda 100644 --- a/src/views/home-index/components/personPresence/components/sex-ratio.vue +++ b/src/views/home-index/components/personPresence/components/sex-ratio.vue @@ -6,8 +6,10 @@ diff --git a/src/views/home-index/components/projectInfo/components/item-three.vue b/src/views/home-index/components/projectInfo/components/item-three.vue index d170eb5..eea4d31 100644 --- a/src/views/home-index/components/projectInfo/components/item-three.vue +++ b/src/views/home-index/components/projectInfo/components/item-three.vue @@ -6,9 +6,10 @@