diff --git a/package.json b/package.json index 792775f9..c03f7850 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "core-js": "^3.11.0", "dayjs": "^1.10.6", "echarts": "^4.9.0", + "html2canvas": "^1.4.1", "recorder-core": "^1.1.21080800", "regenerator-runtime": "^0.12.1", "vue": "^2.6.11", diff --git a/src/saas/AppCountryAlbum/Watermark.vue b/src/saas/AppCountryAlbum/Watermark.vue index 337db65a..f6c59653 100644 --- a/src/saas/AppCountryAlbum/Watermark.vue +++ b/src/saas/AppCountryAlbum/Watermark.vue @@ -1,29 +1,106 @@ diff --git a/src/saas/AppCountryAlbum/components/Home.vue b/src/saas/AppCountryAlbum/components/Home.vue index 9a49c607..7cfdae7a 100644 --- a/src/saas/AppCountryAlbum/components/Home.vue +++ b/src/saas/AppCountryAlbum/components/Home.vue @@ -1,5 +1,5 @@ @@ -78,7 +79,7 @@ data () { return { - + src: '' } }, diff --git a/src/saas/AppCountryAlbum/components/MeetingMminutes.vue b/src/saas/AppCountryAlbum/components/MeetingMminutes.vue index a670a5cd..7d44cb99 100644 --- a/src/saas/AppCountryAlbum/components/MeetingMminutes.vue +++ b/src/saas/AppCountryAlbum/components/MeetingMminutes.vue @@ -1,6 +1,6 @@ diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark1.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark1.vue new file mode 100644 index 00000000..1d51c39e --- /dev/null +++ b/src/saas/AppCountryAlbum/components/watermark/Watermark1.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark2.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark2.vue new file mode 100644 index 00000000..45b76813 --- /dev/null +++ b/src/saas/AppCountryAlbum/components/watermark/Watermark2.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark3.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark3.vue new file mode 100644 index 00000000..101589c7 --- /dev/null +++ b/src/saas/AppCountryAlbum/components/watermark/Watermark3.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark4.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark4.vue new file mode 100644 index 00000000..e851020d --- /dev/null +++ b/src/saas/AppCountryAlbum/components/watermark/Watermark4.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark5.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark5.vue new file mode 100644 index 00000000..4f0f39c8 --- /dev/null +++ b/src/saas/AppCountryAlbum/components/watermark/Watermark5.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark6.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark6.vue new file mode 100644 index 00000000..76a2e3d5 --- /dev/null +++ b/src/saas/AppCountryAlbum/components/watermark/Watermark6.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark7.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark7.vue new file mode 100644 index 00000000..caa81dbd --- /dev/null +++ b/src/saas/AppCountryAlbum/components/watermark/Watermark7.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/saas/AppCountryAlbum/components/watermark/Watermark8.vue b/src/saas/AppCountryAlbum/components/watermark/Watermark8.vue new file mode 100644 index 00000000..eb46d2d4 --- /dev/null +++ b/src/saas/AppCountryAlbum/components/watermark/Watermark8.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/saas/AppCountryAlbum/config/index.js b/src/saas/AppCountryAlbum/config/index.js new file mode 100644 index 00000000..643f2875 --- /dev/null +++ b/src/saas/AppCountryAlbum/config/index.js @@ -0,0 +1,47 @@ +export const config = [ + { + name: '打卡水印', + type: '1', + thum: 'https://cdn.cunwuyun.cn/dvcp/h5/watermark/1.png' + }, + { + name: '时间地点水印', + type: '2', + thum: 'https://cdn.cunwuyun.cn/dvcp/h5/watermark/2.png' + }, + { + name: '巡查水印', + type: '3', + thum: 'https://cdn.cunwuyun.cn/dvcp/h5/watermark/3.png' + }, + { + name: '防疫水印', + type: '4', + thum: 'https://cdn.cunwuyun.cn/dvcp/h5/watermark/4.png' + }, + { + name: '网格化水印', + type: '5', + thum: 'https://cdn.cunwuyun.cn/dvcp/h5/watermark/5.png' + }, + { + name: '标题水印', + type: '6', + thum: 'https://cdn.cunwuyun.cn/dvcp/h5/watermark/6.png' + }, + { + name: '环境卫生水印', + type: '7', + thum: 'https://cdn.cunwuyun.cn/dvcp/h5/watermark/7.png' + }, + { + name: '日历水印', + type: '8', + thum: 'https://cdn.cunwuyun.cn/dvcp/h5/watermark/8.png' + }, + // { + // name: '自定义水印', + // type: '9', + // thum: 'https://cdn.cunwuyun.cn/dvcp/h5/watermark/1.png' + // } +] diff --git a/src/saas/AppCountryAlbum/images/sy/1.png b/src/saas/AppCountryAlbum/images/sy/1.png new file mode 100644 index 00000000..6ab2c9e2 Binary files /dev/null and b/src/saas/AppCountryAlbum/images/sy/1.png differ diff --git a/src/saas/AppCountryAlbum/images/sy/2.png b/src/saas/AppCountryAlbum/images/sy/2.png new file mode 100644 index 00000000..1f97c299 Binary files /dev/null and b/src/saas/AppCountryAlbum/images/sy/2.png differ diff --git a/src/saas/AppCountryAlbum/images/sy/3.png b/src/saas/AppCountryAlbum/images/sy/3.png new file mode 100644 index 00000000..701e2928 Binary files /dev/null and b/src/saas/AppCountryAlbum/images/sy/3.png differ diff --git a/src/saas/AppCountryAlbum/images/sy/4.png b/src/saas/AppCountryAlbum/images/sy/4.png new file mode 100644 index 00000000..d8cf56ed Binary files /dev/null and b/src/saas/AppCountryAlbum/images/sy/4.png differ diff --git a/src/saas/AppCountryAlbum/images/sy/5.png b/src/saas/AppCountryAlbum/images/sy/5.png new file mode 100644 index 00000000..78297857 Binary files /dev/null and b/src/saas/AppCountryAlbum/images/sy/5.png differ diff --git a/src/saas/AppCountryAlbum/images/sy/6.png b/src/saas/AppCountryAlbum/images/sy/6.png new file mode 100644 index 00000000..00d5816b Binary files /dev/null and b/src/saas/AppCountryAlbum/images/sy/6.png differ diff --git a/src/saas/AppCountryAlbum/images/sy/7.png b/src/saas/AppCountryAlbum/images/sy/7.png new file mode 100644 index 00000000..1c476dcc Binary files /dev/null and b/src/saas/AppCountryAlbum/images/sy/7.png differ diff --git a/src/saas/AppCountryAlbum/images/sy/8.png b/src/saas/AppCountryAlbum/images/sy/8.png new file mode 100644 index 00000000..c2ea3a92 Binary files /dev/null and b/src/saas/AppCountryAlbum/images/sy/8.png differ diff --git a/src/saas/AppCountryAlbum/images/sy/9.png b/src/saas/AppCountryAlbum/images/sy/9.png new file mode 100644 index 00000000..c9e7cf66 Binary files /dev/null and b/src/saas/AppCountryAlbum/images/sy/9.png differ