diff --git a/public/static/pdf/web/viewer.js b/public/static/pdf/web/viewer.js index ff47ee580..1994141c8 100644 --- a/public/static/pdf/web/viewer.js +++ b/public/static/pdf/web/viewer.js @@ -6664,9 +6664,13 @@ var PDFPageView = function () { // //判断分辨率 // if (screen.width+"*"+screen.height === '800*600' ){ // } - - - + var screenHeight = window.screen.height; + var screenWidth = window.screen.width; + if((screenHeight>screenWidth) && (screenWidth>480 && screenWidth <= 1440)){ + defaultSettings.watermark_fontsize = '20px'; + defaultSettings.watermark_width = 60; + defaultSettings.watermark_height = 40; + } var oTemp = document.createDocumentFragment(); //获取页面最大宽度 diff --git a/src/pages/details/otherLawsDetails/index.vue b/src/pages/details/otherLawsDetails/index.vue index 01b31fab0..abafee181 100644 --- a/src/pages/details/otherLawsDetails/index.vue +++ b/src/pages/details/otherLawsDetails/index.vue @@ -337,7 +337,6 @@ type="primary" class="common-button-primary" @click="openRelatedTermsDrawer" - v-btn-permission="'8PXLAB2CMQG5QNAGKKNB'" >关联条款 diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 9b1f3d015..deddf29b2 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -789,7 +789,7 @@ type="primary" class="common-button-primary" @click="openRelatedTermsDrawer" - v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" + v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'" >关联条款 关联条款 关联条款
diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 989497922..34e2c6c0c 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -191,12 +191,14 @@ height="100%" border :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" - @selection-change="selectStandChange" + @selection-change="standSelectChangeByStandTab" > - + + 模板下载 批量复制 合并条款 - 提交 + 审核
diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue index f722b06e7..3c91b2cd2 100644 --- a/src/pages/phone/domesticDetails.vue +++ b/src/pages/phone/domesticDetails.vue @@ -533,7 +533,7 @@ type="primary" class="common-button-primary" @click="openRelatedTermsDrawer" - v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" + v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? 'bd291146ac1e42c48968c5142ae55375' : '960a97045a6e47b0b8e33ebc347e5fd9'" >关联条款 - - + + +