FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yanyizhou
2021-12-14 21:27:20 +08:00
parent 3ef6461c89 893824ca5e
commit c6ca2cf8aa
2 changed files with 19 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/static/pdf/web/viewer.js
+8 -24
View File
@@ -6648,11 +6648,11 @@ var PDFPageView = function () {
var defaultSettings = {
watermark_txt: msg,
watermark_x: 100,//水印起始位置x轴坐标
watermark_y: 0,//水印起始位置Y轴坐标
watermark_y: -130,//水印起始位置Y轴坐标
watermark_rows: 0,//水印行数
watermark_cols: 0,//水印列数
watermark_x_space: 18,//水印x轴间隔
watermark_y_space: 20,//水印y轴间隔
watermark_x_space: 40,//水印x轴间隔
watermark_y_space: 50,//水印y轴间隔
watermark_color: 'rgba(232,232,240)',//水印字体颜色
watermark_alpha: 0.3,//水印透明度
watermark_fontsize: '40px',//水印字体大小
@@ -6661,25 +6661,9 @@ var PDFPageView = function () {
watermark_height: 80,//水印长度
watermark_angle: 40//水印倾斜度数
};
//判断分辨率
if (screen.width+"*"+screen.height === '800*600' ){
defaultSettings = {
watermark_txt: msg,
watermark_x: 0,//水印起始位置x轴坐标
watermark_y: 0,//水印起始位置Y轴坐标
watermark_rows: 0,//水印行数
watermark_cols: 0,//水印列数
watermark_x_space: 2,//水印x轴间隔
watermark_y_space: 27,//水印y轴间隔
watermark_color: 'rgba(232,232,240)',//水印字体颜色
watermark_alpha: 0.3,//水印透明度
watermark_fontsize: '40px',//水印字体大小
watermark_font: '微软雅黑',//水印字体
watermark_width: 120,//水印宽度
watermark_height: 80,//水印长度
watermark_angle: 40//水印倾斜度数
};
}
// //判断分辨率
// if (screen.width+"*"+screen.height === '800*600' ){
// }
@@ -6688,7 +6672,6 @@ var PDFPageView = function () {
//获取页面最大宽度
// var getPage = Math.max(document.body.scrollWidth, document.body.clientWidth);
// var getPage =document.body.scrollWidth;
var page_width = parseInt(textLayerDiv.style.width) //获取pdf页面宽度
// var page_width = getPage - (0.35 * getPage);
//var page_width = canvasWrapper.style.width;
//获取页面最大长度
@@ -6699,7 +6682,6 @@ var PDFPageView = function () {
// //获取页面最大长度
// var page_height = parseInt(canvasWrapper.style.height);
var page_height = parseInt(textLayerDiv.style.height) //获取pdf页面长度
var pdf_page =document.getElementById("viewer");
//2021/12/5 分辨率不同的情况会出现问题
//如果将水印列数设置为0，或水印列数设置过大，超过页面最大宽度，则重新计算水印列数和水印x轴间隔
@@ -6720,6 +6702,8 @@ var PDFPageView = function () {
//
// }
var page_width = parseInt(textLayerDiv.style.width) //获取pdf页面宽度
var page_height = parseInt(textLayerDiv.style.height)+defaultSettings.watermark_y //获取pdf页面长度
//如果将水印列数设置为0，或水印列数设置过大，超过页面最大宽度，则重新计算水印列数和水印x轴间隔
if (defaultSettings.watermark_cols == 0 || (parseInt(defaultSettings.watermark_x + defaultSettings.watermark_width * defaultSettings.watermark_cols + defaultSettings.watermark_x_space * (defaultSettings.watermark_cols - 1)) > page_width)) {
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+11 -11
View File
@@ -484,7 +484,7 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>
<!-- <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>-->
<el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>
<el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
</el-dropdown-menu>
@@ -513,16 +513,16 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择其他起草人" prop="qcUserName" placement="top" :color="roleForm.qcUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="qcUserName" style="margin-bottom: 0">
<h4>其他起草人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.qcUserName" placeholder="其他起草人" @click.native="choiceZRRList('qcUserId', '选择其他起草人', roleForm.qcUserId)"></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<!-- <el-timeline-item timestamp="选择其他起草人" prop="qcUserName" placement="top" :color="roleForm.qcUserName ? '#66b1ff' : ''">-->
<!-- <el-card>-->
<!-- <el-form-item prop="qcUserName" style="margin-bottom: 0">-->
<!-- <h4>其他起草人</h4>-->
<!-- <div style="margin-top: 10px;width: 300px;">-->
<!-- <el-input v-model="roleForm.qcUserName" placeholder="其他起草人" @click.native="choiceZRRList('qcUserId', '选择其他起草人', roleForm.qcUserId)"></el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-card>-->
<!-- </el-timeline-item>-->
<el-timeline-item timestamp="主起草人汇总修订" placement="top" :color="roleForm.hzUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="hzUserName" style="margin-bottom: 0">