@@ -30,7 +30,7 @@
打卡有效范围
- {{ distance[chooseIndex] }}
+ {{ distance[chooseIndex] }}米
@@ -75,7 +75,7 @@
lib: null,
map: null,
latLng: null,
- distance: ['100米', '200米', '300米', '400米', '500米'],
+ distance: ['100', '200', '300', '400', '500'],
addressList: [],
page: 1,
marker: null,
@@ -124,12 +124,26 @@
})
},
+ confirm () {
+ const address = this.addressList[this.currIndex]
+ uni.$emit('address', {
+ address: address.address,
+ title: address.title,
+ lat: address.location.lat,
+ lng: address.location.lng,
+ distance: this.distance[this.chooseIndex]
+ })
+ uni.navigateBack({
+ delta: 1
+ })
+ },
+
chooseAddress (index) {
this.addMarker(this.addressList[index].location)
this.currIndex = index
},
- addMarker (position) {
+ addMarker (position) {
if (this.marker) {
this.marker.setMap(null)
this.marker = null
@@ -181,7 +195,7 @@
}
})
}, 500)
- },
+ },
getAddress () {
this.currIndex = 0
@@ -257,7 +271,7 @@
line-height: 1;
font-style: normal;
}
-
+
.wrapper {
height: 100%;
overflow: hidden;
@@ -383,4 +397,4 @@
height: 100%;
}
}
-
\ No newline at end of file
+
diff --git a/src/saas/AppCountryAlbum/ReportImg.vue b/src/saas/AppCountryAlbum/ReportImg.vue
new file mode 100644
index 00000000..88370e3b
--- /dev/null
+++ b/src/saas/AppCountryAlbum/ReportImg.vue
@@ -0,0 +1,212 @@
+
+
+
+
+
+ 保存至：{{ albumName || '默认相册' }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/saas/AppCountryAlbum/components/Organize.vue b/src/saas/AppCountryAlbum/components/Organize.vue
index 35d04b7a..b2a0aadd 100644
--- a/src/saas/AppCountryAlbum/components/Organize.vue
+++ b/src/saas/AppCountryAlbum/components/Organize.vue
@@ -3,16 +3,18 @@
-
09
+
{{ DD }}
-
2022年2月
+
{{ yyyyMM }}
日·数据统计
-
-
- 切换日期
-
+
+
+
+ 切换日期
+
+
@@ -24,21 +26,21 @@
未拍照
-
0
+ {{ photoTotal.noPhtoto }}
人
已拍照
-
10
+ {{ photoTotal.userPhoto }}
人
拍照数
-
30
+ {{ photoTotal.allPhoto }}
人
@@ -95,15 +97,64 @@
data () {
return {
+ photoTotal: {},
+ date: '',
+ list: []
+ }
+ },
+ computed: {
+ yyyyMM () {
+ if (this.date) {
+ return this.date.substr(0, 8)
+ }
+
+ return ''
+ },
+
+ DD () {
+ if (this.date) {
+ return this.date.substr(8)
+ }
+
+ return ''
}
},
onLoad () {
-
+ this.date = this.$dayjs(new Date).format('YYYY年MM月DD')
+ this.getPhotoTotal()
},
methods: {
+ getPhotoTotal () {
+ this.$http.post(`/api/appattendancerecord/punchclocksum?queryTime=${this.date}`).then(res => {
+ if (res.code === 0) {
+ this.photoTotal = res.data
+ }
+ })
+
+ this.$http.post(`/api/appattendancerecord/alldetail?queryTime=${this.date}`).then(res => {
+ if (res.code === 0) {
+ }
+ })
+
+ this.$http.post(`/api/appattendancerecord/userphotosort?queryTime=${this.date}`).then(res => {
+ if (res.code === 0) {
+ this.list = res.data
+ }
+ })
+ },
+
+ onDateChange (e) {
+ const values = e.detail.value.split('-')
+ this.date = `${values[0]}年${values[1]}月${values[2]}`
+
+ this.$nextTick(() => {
+ this.getPhotoTotal()
+ })
+ },
+
linkTo (url) {
uni.navigateTo({
url
@@ -365,4 +416,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/src/saas/AppCountryAlbum/components/report/InspectLog.vue b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
index 1b9aba57..0631f33d 100644
--- a/src/saas/AppCountryAlbum/components/report/InspectLog.vue
+++ b/src/saas/AppCountryAlbum/components/report/InspectLog.vue
@@ -146,7 +146,7 @@
}
.imgs {
- margin-top: 2px;
+ margin-top: 20px;
image {
display: block;
width: 100%;
diff --git a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
index 76437256..951f341d 100644
--- a/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
+++ b/src/saas/AppCountryAlbum/components/report/MeetingMminutes.vue
@@ -1,36 +1,36 @@
-
- | 会议纪要 |
+
+ | {{ title }} |
-
- | 会议日期 |
- 2022-01-21 周五 |
- 天气 |
- 24℃ 晴 |
+
+ | 会议日期 |
+ {{ date }} |
+
-
+
| 会议主题 |
- 会议主题会议主题会议主题会议主题会议主题 |
+ {{ theme }} |
-
- | 主持人 |
- 鄢然 |
- 记录人 |
- 刘烨 |
+
+ | 主持人 |
+ {{ hoster }} |
+ 记录人 |
+ {{ recorder }} |
-
+
| 参与人 |
- 2022-01-21 周五 |
+ {{ attendee }} |
-
+
| 会议地点 |
- 2022-01-21 周五 |
+ {{ address }} |
-
+
| 会议内容 |
- 2022-01-21 周五 |
+ {{ remark }} |
@@ -58,18 +58,23 @@
data () {
return {
title: '巡查日志',
- subTitle: '',
- reporter: '',
date: '',
+ hoster: '',
remark: '',
address: '',
+ recorder: '',
+ attendee: '',
weather: '',
+ theme: '',
+ isShowRecorder: true,
+ isShowAttendee: true,
isShowTitle: true,
isShowWeather: true,
isShowDate: true,
- isShowReporter: false,
- isShowAddress: false,
- isShowRemark: false,
+ isShowTheme: true,
+ isShowAddress: true,
+ isShowRemark: true,
+ isShowHoster: true,
imgs: [],
configList: []
}
@@ -80,23 +85,32 @@
handler: function (v) {
if (v.length) {
const title = v.filter(v => v.type === '17')[0]
- const reporter = v.filter(v => v.type === '24')[0]
- const date = v.filter(v => v.type === '1')[0]
- const address = v.filter(v => v.type === '23')[0]
- const remark = v.filter(v => v.type === '25')[0]
- const weather = v.filter(v => v.type === '2')[0]
+ const hoster = v.filter(v => v.type === '26')[0]
+ const date = v.filter(v => v.type === '0')[0]
+ const address = v.filter(v => v.type === '29')[0]
+ const remark = v.filter(v => v.type === '31')[0]
+ const theme = v.filter(v => v.type === '30')[0]
+ const attendee = v.filter(v => v.type === '28')[0]
+ const recorder = v.filter(v => v.type === '27')[0]
+
+ console.log(date)
+
this.isShowTitle = title.status === '1'
this.isShowRemark = remark.status === '1'
- this.isShowReporter = reporter.status === '1'
- this.isShowWeather = weather.status === '1'
+ this.isShowRecorder = recorder.status === '1'
+ this.isShowAttendee = attendee.status === '1'
+ this.isShowTheme = theme.status === '1'
this.isShowDate = date.status === '1'
this.isShowAddress = address.status === '1'
+
this.title = title.defaultValue || '巡查日志'
- this.weather = weather.defaultValue || '晴转多云'
- this.address = date.defaultValue || '武汉天地'
- this.reporter = reporter.defaultValue || ''
+ this.address = address.defaultValue || '武汉天地'
+ this.hoster = hoster.defaultValue || ''
this.date = date.defaultValue || this.$dayjs(new Date).format('YYYY-MM-DD')
this.remark = remark.defaultValue || ''
+ this.theme = theme.defaultValue || ''
+ this.attendee = attendee.defaultValue || ''
+ this.recorder = recorder.defaultValue || ''
}
},
deep: true
@@ -154,7 +168,7 @@
background: #fff;
.imgs {
- margin-top: 2px;
+ margin-top: 20px;
image {
display: block;
width: 100%;