diff --git a/package.json b/package.json index 69dbf07..f73530f 100644 --- a/package.json +++ b/package.json @@ -33,12 +33,15 @@ "file-saver": "2.0.5", "fuse.js": "6.4.3", "highlight.js": "9.18.5", + "html2canvas": "^1.4.1", "js-beautify": "1.13.0", "js-cookie": "3.0.1", "jsencrypt": "3.0.0-rc.1", + "jspdf": "^4.0.0", "lodash": "^4.17.21", "moment": "^2.30.1", "nprogress": "0.2.0", + "pdf-lib": "^1.17.1", "quill": "2.0.2", "screenfull": "5.0.2", "sortablejs": "1.10.2", diff --git a/src/api/business/study/studyMethod.js b/src/api/business/study/studyMethod.js index becd1fb..20a9892 100644 --- a/src/api/business/study/studyMethod.js +++ b/src/api/business/study/studyMethod.js @@ -26,4 +26,24 @@ export function studyMethod_read(data) { method: 'post', data: data }) -} \ No newline at end of file +} + +// 方法阅读汇总列表 +export function studyMethod_readList(query) { + return request({ + url: '/system/business/studyMethod/read/list', + method: 'get', + params: query + }) +} + + + +// 方法阅读导出 +export function studyMethod_export(query) { + return request({ + url: '/system/business/studyMethod/test', + method: 'get', + params: query + }) +} diff --git a/src/lang/en/business/study/studyMethod.js b/src/lang/en/business/study/studyMethod.js index e267930..2bfa44d 100644 --- a/src/lang/en/business/study/studyMethod.js +++ b/src/lang/en/business/study/studyMethod.js @@ -13,4 +13,8 @@ export default { qmhz: '签名汇总', yidu: '已读', weidu: '未读', + qmr: '签名人', + qmsj: '签名时间', + qmyy: '签名意义', + remark: '备注', } \ No newline at end of file diff --git a/src/lang/zh/business/study/studyMethod.js b/src/lang/zh/business/study/studyMethod.js index e267930..2bfa44d 100644 --- a/src/lang/zh/business/study/studyMethod.js +++ b/src/lang/zh/business/study/studyMethod.js @@ -13,4 +13,8 @@ export default { qmhz: '签名汇总', yidu: '已读', weidu: '未读', + qmr: '签名人', + qmsj: '签名时间', + qmyy: '签名意义', + remark: '备注', } \ No newline at end of file diff --git a/src/views/business/study/comp/syff/Xq.vue b/src/views/business/study/comp/syff/Xq.vue index 52dc4b3..7c311b2 100644 --- a/src/views/business/study/comp/syff/Xq.vue +++ b/src/views/business/study/comp/syff/Xq.vue @@ -10,7 +10,9 @@
{{ $t('form.cancel') }} - {{ + {{ + $t('page.business.study.studyMethod.daochu') }} + {{ $t('page.business.study.studyMethod.yuedu') }}
@@ -29,14 +31,31 @@ class="el-icon-arrow-right el-icon--right"> +
+
+
+
{{ $t('page.business.study.studyMethod.qmhz') }}
+
+ + + + + + +
+ + - + diff --git a/src/views/business/study/comp/syffList.vue b/src/views/business/study/comp/syffList.vue index 13cdebe..9fc80eb 100644 --- a/src/views/business/study/comp/syffList.vue +++ b/src/views/business/study/comp/syffList.vue @@ -63,7 +63,7 @@ {{ $t('page.business.study.studyMethod.yuedu') }} - {{ + {{ $t('page.business.study.studyMethod.daochu') }} @@ -174,6 +174,11 @@ export default { this.$emit('showDetail', this.showDetail) this.$refs.Xq.show(row) }, + showExport(row) { + this.showDetail = true + this.$emit('showDetail', this.showDetail) + this.$refs.Xq.showExport(row) + }, xqClose() { this.showDetail = false this.$emit('showDetail', this.showDetail) diff --git a/vue.config.js b/vue.config.js index f82b590..56dd747 100644 --- a/vue.config.js +++ b/vue.config.js @@ -34,8 +34,8 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - //target: `http://localhost:8080`, - target: `http://39.99.251.173:8080`, + target: `http://localhost:8080`, + // target: `http://39.99.251.173:8080`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''