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-05 18:49:28 +08:00
parent 6f31ef20a8 193a5dc341
commit da1f05a21a
11 changed files with 139 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/static/pdf/web/viewer.js
+41 -18
View File
@@ -6648,8 +6648,8 @@ var PDFPageView = function () {
var defaultSettings = { var defaultSettings = {
watermark_txt: msg, watermark_txt: msg,
watermark_x: 50,//水印起始位置x轴坐标 watermark_x: 50,//水印起始位置x轴坐标
watermark_y: 0,//水印起始位置Y轴坐标 watermark_y: -100,//水印起始位置Y轴坐标
watermark_rows: 15,//水印行数 watermark_rows: 13,//水印行数
watermark_cols: 7,//水印列数 watermark_cols: 7,//水印列数
watermark_x_space: 18,//水印x轴间隔 watermark_x_space: 18,//水印x轴间隔
watermark_y_space: 20,//水印y轴间隔 watermark_y_space: 20,//水印y轴间隔
@@ -6661,6 +6661,28 @@ var PDFPageView = function () {
watermark_height: 80,//水印长度 watermark_height: 80,//水印长度
watermark_angle: 40//水印倾斜度数 watermark_angle: 40//水印倾斜度数
}; };
//判断分辨率
if (screen.width+"*"+screen.height === '800*600' ){
defaultSettings = {
watermark_txt: msg,
watermark_x: 80,//水印起始位置x轴坐标
watermark_y: -100,//水印起始位置Y轴坐标
watermark_rows: 11,//水印行数
watermark_cols: 6,//水印列数
watermark_x_space: 2,//水印x轴间隔
watermark_y_space: 27,//水印y轴间隔
watermark_color: 'rgba(192, 192, 192)',//水印字体颜色
watermark_alpha: 0.3,//水印透明度
watermark_fontsize: '40px',//水印字体大小
watermark_font: '微软雅黑',//水印字体
watermark_width: 120,//水印宽度
watermark_height: 80,//水印长度
watermark_angle: 40//水印倾斜度数
};
}
var oTemp = document.createDocumentFragment(); var oTemp = document.createDocumentFragment();
//获取页面最大宽度 //获取页面最大宽度
@@ -6670,23 +6692,24 @@ var PDFPageView = function () {
//获取页面最大长度 //获取页面最大长度
var page_height = Math.max(document.body.scrollHeight, document.body.clientHeight+350); var page_height = Math.max(document.body.scrollHeight, document.body.clientHeight+350);
var pdf_page =document.getElementById("viewer"); var pdf_page =document.getElementById("viewer");
//2021/12/5 分辨率不同的情况会出现问题
//如果将水印列数设置为0，或水印列数设置过大，超过页面最大宽度，则重新计算水印列数和水印x轴间隔 //如果将水印列数设置为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)) { // 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)) {
defaultSettings.watermark_cols = parseInt((page_width - defaultSettings.watermark_x + defaultSettings.watermark_x_space) / (defaultSettings.watermark_width + defaultSettings.watermark_x_space))-1; // defaultSettings.watermark_cols = parseInt((page_width - defaultSettings.watermark_x + defaultSettings.watermark_x_space) / (defaultSettings.watermark_width + defaultSettings.watermark_x_space))-1;
console.log("------------------------------------") // console.log("------------------------------------")
console.log(defaultSettings.watermark_cols) // console.log(defaultSettings.watermark_cols)
defaultSettings.watermark_x_space = parseInt((page_width - defaultSettings.watermark_x - defaultSettings.watermark_width * defaultSettings.watermark_cols) / (defaultSettings.watermark_cols - 1)); // defaultSettings.watermark_x_space = parseInt((page_width - defaultSettings.watermark_x - defaultSettings.watermark_width * defaultSettings.watermark_cols) / (defaultSettings.watermark_cols - 1));
console.log(defaultSettings.watermark_x_space) // console.log(defaultSettings.watermark_x_space)
} // }
//如果将水印行数设置为0，或水印行数设置过大，超过页面最大长度，则重新计算水印行数和水印y轴间隔 // //如果将水印行数设置为0，或水印行数设置过大，超过页面最大长度，则重新计算水印行数和水印y轴间隔
if (defaultSettings.watermark_rows == 0 || (parseInt(defaultSettings.watermark_y + defaultSettings.watermark_height * defaultSettings.watermark_rows + defaultSettings.watermark_y_space * (defaultSettings.watermark_rows - 1)) > page_height)) { // if (defaultSettings.watermark_rows == 0 || (parseInt(defaultSettings.watermark_y + defaultSettings.watermark_height * defaultSettings.watermark_rows + defaultSettings.watermark_y_space * (defaultSettings.watermark_rows - 1)) > page_height)) {
defaultSettings.watermark_rows = parseInt((defaultSettings.watermark_y_space + page_height - defaultSettings.watermark_y) / (defaultSettings.watermark_height + defaultSettings.watermark_y_space))-3; // defaultSettings.watermark_rows = parseInt((defaultSettings.watermark_y_space + page_height - defaultSettings.watermark_y) / (defaultSettings.watermark_height + defaultSettings.watermark_y_space))-3;
defaultSettings.watermark_y_space = parseInt(((page_height - defaultSettings.watermark_y) - defaultSettings.watermark_height * defaultSettings.watermark_rows) / (defaultSettings.watermark_rows - 1)); // defaultSettings.watermark_y_space = parseInt(((page_height - defaultSettings.watermark_y) - defaultSettings.watermark_height * defaultSettings.watermark_rows) / (defaultSettings.watermark_rows - 1));
console.log("------------------------------------") // console.log("------------------------------------")
console.log(defaultSettings.watermark_rows+10) // console.log(defaultSettings.watermark_rows+10)
console.log(defaultSettings.watermark_y_space) // console.log(defaultSettings.watermark_y_space)
//
} // }
var x; var x;
var y; var y;
for (var i = 0; i < defaultSettings.watermark_rows; i++) { for (var i = 0; i < defaultSettings.watermark_rows; i++) {
src/components/CustomFormComponents/SelectArray.vue
+2
View File
@@ -16,6 +16,7 @@
multiple multiple
@change="handleChange" @change="handleChange"
> >
<!-- <el-option value="全选" label="全选" @click.native="clickOption"></el-option>-->
<el-option <el-option
v-for="opt in options" v-for="opt in options"
:key="opt.value" :key="opt.value"
@@ -73,6 +74,7 @@ export default {
handleChange (event) { handleChange (event) {
// const value = event.target.value // const value = event.target.value
this.$emit('input', event) this.$emit('input', event)
} }
}, },
watch: { watch: {
src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+3 -2
View File
@@ -67,7 +67,7 @@
<el-table <el-table
:data="dataList" :data="dataList"
border border
ref="selection" ref="standSelection"
height="65%" height="65%"
@selection-change="selectStandChange" @selection-change="selectStandChange"
style="width: 100%; border:1px solid #ccc" style="width: 100%; border:1px solid #ccc"
@@ -1009,12 +1009,13 @@ export default {
this.projectStand.map(item => { this.projectStand.map(item => {
let index; let index;
index = this.dataList.findIndex(items => { index = this.dataList.findIndex(items => {
return items.standId === item.standId; return items.id === item.id;
}); });
if (index > -1) { if (index > -1) {
this.dataList.splice(index, 1); this.dataList.splice(index, 1);
} }
}); });
this.$refs.standSelection.clearSelection()
}).catch(() => { }).catch(() => {
}); });
} }
src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+31 -2
View File
@@ -59,7 +59,7 @@
<el-table <el-table
:data="dataList" :data="dataList"
border border
ref="selection" ref="standSelection"
height="65%" height="65%"
@selection-change="selectStandChange" @selection-change="selectStandChange"
style="width: 100%; border:1px solid #ccc" style="width: 100%; border:1px solid #ccc"
@@ -138,6 +138,34 @@
width="180px" width="180px"
> >
</el-table-column> </el-table-column>
<el-table-column
prop="involve"
width="160px"
align="center"
label="标准是否涉及">
<template slot-scope="scope">
<el-select v-model="scope.row.involve"
placeholder="请选择涉不涉及"
max-length="30"
clearable>
<el-option value="involve" label="涉及"></el-option>
<el-option value="noInvolve" label="不涉及"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
prop="remarks"
align="center"
width="180"
label="备注">
<template slot-scope="scope">
<el-input
v-model.trim="dataList[scope.$index].remarks"
placeholder="请输入备注"
>
</el-input>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -1015,12 +1043,13 @@ export default {
this.projectStand.map(item => { this.projectStand.map(item => {
let index; let index;
index = this.dataList.findIndex(items => { index = this.dataList.findIndex(items => {
return items.standId === item.standId; return items.id === item.id;
}); });
if (index > -1) { if (index > -1) {
this.dataList.splice(index, 1); this.dataList.splice(index, 1);
} }
}); });
this.$refs.standSelection.clearSelection()
}).catch(() => { }).catch(() => {
}); });
} }
src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+15 -2
View File
@@ -59,7 +59,7 @@
<el-table <el-table
:data="dataList" :data="dataList"
border border
ref="selection" ref="standSelection"
height="65%" height="65%"
@selection-change="selectStandChange" @selection-change="selectStandChange"
style="width: 100%; border:1px solid #ccc" style="width: 100%; border:1px solid #ccc"
@@ -138,6 +138,18 @@
width="180px" width="180px"
> >
</el-table-column> </el-table-column>
<el-table-column
prop="involve"
width="160px"
align="center"
label="标准是否涉及">
</el-table-column>
<el-table-column
prop="remarks"
align="center"
width="180"
label="备注">
</el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -1016,12 +1028,13 @@ export default {
this.projectStand.map(item => { this.projectStand.map(item => {
let index; let index;
index = this.dataList.findIndex(items => { index = this.dataList.findIndex(items => {
return items.standId === item.standId; return items.id === item.id;
}); });
if (index > -1) { if (index > -1) {
this.dataList.splice(index, 1); this.dataList.splice(index, 1);
} }
}); });
this.$refs.standSelection.clearSelection()
}).catch(() => { }).catch(() => {
}); });
} }
src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
+12
View File
@@ -132,6 +132,18 @@
width="180px" width="180px"
> >
</el-table-column> </el-table-column>
<el-table-column
prop="involve"
width="160px"
align="center"
label="标准是否涉及">
</el-table-column>
<el-table-column
prop="remarks"
align="center"
width="180"
label="备注">
</el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1 -1
View File
@@ -403,6 +403,7 @@
:wrapperClosable="false" :wrapperClosable="false"
size="800px" size="800px"
@close="resetForm" @close="resetForm"
ref="standard"
append-to-body append-to-body
> >
<!-- 新增样式 --> <!-- 新增样式 -->
@@ -3320,7 +3321,6 @@ export default {
}) })
}) })
this.dynamicFormField = displayLocation this.dynamicFormField = displayLocation
console.log(this.dynamicFormField);
this.loading = false this.loading = false
}) })
}) })
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+1 -1
View File
@@ -382,7 +382,7 @@
}, },
addFormRules: { addFormRules: {
unit: [ unit: [
{required: true, message: '请输入单位', trigger: 'blur'}, {required: true, message: '请输入单位', trigger: 'change'},
], ],
esName: [ esName: [
{required: true, message: '请输入企标名称', trigger: 'blur'}, {required: true, message: '请输入企标名称', trigger: 'blur'},
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+17 -7
View File
@@ -87,9 +87,9 @@
ref="multipleTable" ref="multipleTable"
:data="localProTableList" :data="localProTableList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%;height: inherit" style="width: 100%"
border border
:max-height="400" max-height="600"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
fontWeight: 'normal', height: '48px'}" fontWeight: 'normal', height: '48px'}"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
@@ -97,18 +97,23 @@
show-overflow-tooltip show-overflow-tooltip
prop="projectPlatfor" prop="projectPlatfor"
align="center" align="center"
fixed="left"
min-width="100"
label="产品平台"> label="产品平台">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="projectNumber" prop="projectNumber"
align="center" align="center"
width="90" fixed="left"
min-width="150"
label="项目编号"> label="项目编号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="projectName" prop="projectName"
align="center" align="center"
fixed="left"
min-width="300"
label="项目名称"> label="项目名称">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.projectName }}</a> <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.projectName }}</a>
@@ -142,7 +147,7 @@
show-overflow-tooltip show-overflow-tooltip
prop="productLine" prop="productLine"
label="产品线" label="产品线"
min-width="120" min-width="160"
align="center" align="center"
> >
</el-table-column> </el-table-column>
@@ -184,7 +189,7 @@
align="center" align="center"
label="项目经理"> label="项目经理">
</el-table-column> </el-table-column>
<el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center"> <el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click.stop style="display: inline-block"> <div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
@@ -1638,9 +1643,14 @@ export default {
} }
} }
} }
///deep/ .el-table--scrollable-x .el-table__body-wrapper {
// overflow-x: scroll;
//}
///deep/.el-table__fixed {
// height: 48px !important;
//}
/deep/.el-table .el-table__body-wrapper { /deep/.el-table .el-table__body-wrapper {
height: 86%; height: 84%;
} }
::v-deep .el-drawer__header { ::v-deep .el-drawer__header {
& > span:first-child { & > span:first-child {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+3 -3
View File
@@ -37,10 +37,10 @@
</el-row> </el-row>
<el-row style="margin-top: 10px"> <el-row style="margin-top: 10px">
<el-col :span="5">产品线: <span class="valueColor">{{ localProEO.productLine }} </span></el-col> <el-col :span="5">产品线: <span class="valueColor">{{ localProEO.productLine }} </span></el-col>
<el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col> <el-col :span="5" :push="1">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
<el-col :span="5" :push="1"> 项目计划开始时间: <span <el-col :span="5" :push="2"> 项目计划开始时间: <span
class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col> class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
<el-col :span="5" :push="2">项目计划完成时间: <span <el-col :span="4" :push="3">项目计划完成时间: <span
class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col> class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
</el-row> </el-row>
</div> </div>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+13 -6
View File
@@ -91,6 +91,7 @@
tooltip-effect="dark" tooltip-effect="dark"
height="100%" height="100%"
border border
max-height="100%"
class="table" class="table"
v-loading="myLoading.loadData" v-loading="myLoading.loadData"
@selection-change="standSelectChange" @selection-change="standSelectChange"
@@ -106,7 +107,7 @@
<el-table-column <el-table-column
prop="standSerialNumber" prop="standSerialNumber"
fixed="left" fixed="left"
width="180" min-width="180"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
@@ -115,7 +116,7 @@
<el-table-column <el-table-column
prop="standName" prop="standName"
fixed="left" fixed="left"
width="200" min-width="300"
show-overflow-tooltip show-overflow-tooltip
label="标准名称"> label="标准名称">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -124,12 +125,12 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsNum" prop="itemsNum"
width="75" min-width="100"
label="条款号"> label="条款号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
width="180" min-width="300"
show-overflow-tooltip show-overflow-tooltip
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
@@ -145,7 +146,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productName" prop="productName"
width="180" min-width="300"
show-overflow-tooltip show-overflow-tooltip
label="项目名称"> label="项目名称">
</el-table-column> </el-table-column>
@@ -186,7 +187,7 @@
{{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }} {{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="50"> <el-table-column label="操作" align="center" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click.stop style="display: inline-block"> <div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
@@ -1187,6 +1188,12 @@ export default {
color: #606266 !important; color: #606266 !important;
} }
#rectification-dataBase { #rectification-dataBase {
/deep/ .el-table__fixed {
height: 100% !important; //设置高优先，以覆盖内联样式
}
/deep/ .el-table__fixed-right {
height: 100% !important; //设置高优先，以覆盖内联样式
}
/deep/ .table-wrap { /deep/ .table-wrap {
.el-table__fixed { .el-table__fixed {
height: calc(~'100% - 20px') !important; height: calc(~'100% - 20px') !important;