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:
hanshaozhuang
2022-06-21 17:52:17 +08:00
parent 478ad68193 8c6741dee1
commit 2dd8491cc8
2 changed files with 115 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/static/pdf/web/viewer.html
+3 -3
View File
@@ -345,9 +345,9 @@ See https://github.com/adobe-type-tools/cmap-resources
<div id="toolbarContainer">
<div id="toolbarViewer">
<div id="toolbarViewerLeft">
<button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="11" data-l10n-id="toggle_sidebar">
<span data-l10n-id="toggle_sidebar_label">Toggle Sidebar</span>
</button>
<!-- <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="11" data-l10n-id="toggle_sidebar">-->
<!-- <span data-l10n-id="toggle_sidebar_label">Toggle Sidebar</span>-->
<!-- </button>-->
<div class="toolbarButtonSpacer"></div>
<button id="viewFind" class="toolbarButton" title="Find in Document" tabindex="12" data-l10n-id="findbar">
<span data-l10n-id="findbar_label">Find</span>
src/pages/phone/domesticDetails.vue
+112 -223
View File
@@ -398,10 +398,10 @@
}}</a>
</template>
</p>
</div>
</div>
</template>
</div>
</el-collapse-item>
@@ -433,8 +433,8 @@
>
</el-popover>
</el-form-item>
<el-form-item class="search-item">
<el-input v-model="standItemSearch.itemsName" size="small" placeholder="根据条款名称查找" clearable
maxlength="100"></el-input>
@@ -631,8 +631,8 @@
:total="total7"
@pageChange="pageChange7"
@pageSizeChange="pageSizeChange7"></pagination>
<!-- <el-pagination-->
<!-- @size-change="pageSizeChange"-->
<!-- @current-change="pageChange"-->
@@ -642,7 +642,7 @@
<!-- layout="sizes, prev, pager, next, jumper"-->
<!-- :total="standitemTotal">-->
<!-- </el-pagination>-->
<!-- <pagination :total="standitemTotal" @pageChange="pageChange"-->
<!-- @pageSizeChange="pageSizeChange"></pagination>-->
@@ -754,7 +754,7 @@
v-model="resolveListForm.applyArctic"
></custom-select-array>
</template>
<!-- 责任工程师-->
<template>
<el-form-item
@@ -1018,7 +1018,7 @@
standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
}}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="新车型实施日期">新车型实施日期</label>
<span class="see-drawer-val" style="font-size: 12px"
@@ -1055,15 +1055,15 @@
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.comparedWithPrevious">
{{ standShowItemEO.comparedWithPrevious }}</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="符合性状态">符合性状态</label>
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceRequire">
{{ standShowItemEO.complianceRequire ? (standShowItemEO.complianceRequire === '1' ? '是' : '否') : '-' }}
</span>
</div>
<div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="合规性分析">合规性分析</label>
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceState">
@@ -1083,7 +1083,7 @@
<!-- <label class="see-drawer-name" title="svpps">svpps</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
<!-- </div>-->
<!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="要求类型">要求类型</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
@@ -1409,6 +1409,7 @@
import RelatedTermsSelect from "@/pages/details/otherStandardDetails/components/RelatedTermsSelect";
import {getBusStandFileByAttId} from 'api/process'
import {dicTypeData} from "api/unqualProcess";
import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
export default {
@@ -2639,138 +2640,26 @@
if (fileSuffix !== undefined && fileSuffix !== null) {
fileSuffix = fileSuffix.toUpperCase()
}
// 判断上传文件格式
if (fileSuffix === '.PNG' || fileSuffix === '.JPG' || fileSuffix === '.JPEG') {
this.downloadFile(attId)
return true
}
// 缺少文件
if (this.$route.query.pageType === 'INLAND_STAND') {
if (this.$hasPermission('2d6ab9d465ab73d415194e1ca4313793')) {
if (fileSuffix === '.PDG' || fileSuffix === '.pdg') {
this.getBusStandFileByAttId(attId)
.then(res => {
if (res) {
const editFileInfo = res
if (editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG') {
window.open('book://ssreader/e0?url=' + editFileInfo.downLoadUrl)
} else {
if(fileSuffix !== 'pdg' && fileSuffix !== 'PDG'){
this.getBusStandFileByAttId(attId)
.then(res => {
if (res) {
const editFileInfo = res
const nowTime = new Date().getTime()
window.open(onlyOfficeUrl + '/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime + '&filePath=' + editFileInfo.filePath + '&fileName=' + editFileInfo.fileName)
}
}
}).catch(e => {
console.log(e)
this.$message.warning('文件不存在,预览失败')
})
} else {
this.$http.get('lawss/sarStandFile/queryConvertAtt', {
attId: attId
}, {
_this: this
}, res => {
if (res.data) {
let fileObj = {}
fileObj.fileId = res.data.attId
fileObj.fileName = oldFileName
let fileList = []
let repeatData = 0
if (sessionStorage.getItem('fileInfo')) {
fileList = JSON.parse(sessionStorage.getItem('fileInfo'))
if (fileList != null && fileList.length > 0) {
for (let i = 0; i < fileList.length; i++) {
if (fileList[i].fileId === res.data.attId) {
repeatData = 1
break
}
}
if (repeatData === 0) {
fileList.push(fileObj)
fileList = JSON.stringify(fileList)
sessionStorage.setItem('fileInfo', fileList)
}
}
} else {
fileList.push(fileObj)
fileList = JSON.stringify(fileList)
sessionStorage.setItem('fileInfo', fileList)
}
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId))
} else {
this.$message.error('文档未转换成功或本地读取不到该文档')
}
}, e => {
this.$message.error('文档未转换成功或本地读取不到该文档')
})
}
} else {
this.$message.error('没有在线预览文档权限！')
}
} else {
// 国外在线预览权限
if (this.$hasPermission('ee684b4a9975f5d8a6dfe898c0332f98')) {
// if (this.$hasPermission('02fd6eff0537c283dd071683de10689f')) {
if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
}else {
const nowTime = new Date().getTime()
// window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
window.open(kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
this.$http.get('lawss/sarStandFile/queryConvertAtt', {
attId: attId
}, {
_this: this
}, res => {
if (res.data) {
let fileObj = {}
fileObj.fileId = res.data.attId
fileObj.fileName = oldFileName
let fileList = []
let repeatData = 0
if (sessionStorage.getItem('fileInfo')) {
fileList = JSON.parse(sessionStorage.getItem('fileInfo'))
if (fileList != null && fileList.length > 0) {
for (let i = 0; i < fileList.length; i++) {
if (fileList[i].fileId === res.data.attId) {
repeatData = 1
break
}
}
if (repeatData === 0) {
fileList.push(fileObj)
fileList = JSON.stringify(fileList)
sessionStorage.setItem('fileInfo', fileList)
}
}
} else {
fileList.push(fileObj)
fileList = JSON.stringify(fileList)
sessionStorage.setItem('fileInfo', fileList)
}
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId))
} else {
this.$message.error('文档未转换成功或本地读取不到该文档')
}
}, e => {
this.$message.error('文档未转换成功或本地读取不到该文档')
})
} else {
this.$message.error('没有在线预览文档权限！')
}
}
if(this.$route.query.pageType === 'INLAND_STAND'){
let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
this.$http.get('sarStandardsInfo/sar-standards-info/logInvalid',{
standNumber: standNumber,
standName: this.sarStandardsInfoEO.standName
}, {
_this: this
}, res => {
})
}else{
let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
this.$http.get('sarStandardsInfo/sar-standards-info/logForeign',{
standNumber: standNumber,
standName: this.sarStandardsInfoEO.standEnName
}, {
_this: this
}, res => {
}).catch(e => {
this.$message.warning('文件不存在,预览失败')
})
}else {
this.$message.warning('PDG文件,不支持手机端预览')
}
},
showItemsModel(attField) {
@@ -3584,28 +3473,28 @@
/deep/ .el-icon-circle-close:before {
margin-left: 250px;
}
/deep/ .el-tag.el-tag--info {
margin-left: 30px;
}
/deep/ .el-radio {
margin-left: 30px;
}
/deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner {
width: 600px;
margin-left: 20px;
}
/deep/ .label-input-form .add-form-item .el-form-item__label {
width: 150px;
}
/deep/ .el-collapse-item__header {
border-bottom: none !important;
}
/deep/ .decomposition-btn {
position: absolute;
top: 6px;
@@ -3617,7 +3506,7 @@
color: #07C160;
border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1);
/deep/ .icon-separate {
display: inline-block;
margin-right: 3px;
@@ -3630,22 +3519,22 @@
background-image: url("~assets/images/shangqi/standardDetails/separate.png");
}
}
/deep/ .el-collapse {
border: none;
}
/deep/ .el-collapse-item__wrap {
border: none;
}
/deep/ .el-collapse-item__content {
padding-bottom: 0px;
font-size: 16px;
color: #303133;
line-height: 1.769230769230769;
}
/deep/ .btn1 #question {
padding: 0 10px;
margin-left: 10px;
@@ -3655,7 +3544,7 @@
color: #409EFF;;
border: 1px solid #409EFF;
background: rgba(64, 158, 255, 0.1);
.icon-separate {
display: inline-block;
margin-right: 3px;
@@ -3668,7 +3557,7 @@
background-image: url("~assets/images/shangqi/standardDetails/separate.png");
}
}
.other-standard-details {
padding: 15px 30px 0;
width: 100%;
@@ -3677,24 +3566,24 @@
height: 100%;
background: #FFFFFF;
overflow: auto;
.itemsTextBox {
min-height: 300px;
max-height: 500px;
overflow: auto;
line-height: 20px;
/deep/ td {
border: 1px solid #606266;
text-align: center;
}
}
/deep/ .el-radio-group {
display: block;
margin-bottom: 10px;
}
/deep/ .icon-download {
display: inline-block;
margin-left: 3px;
@@ -3707,7 +3596,7 @@
cursor: pointer;
background-image: url("~assets/images/shangqi/img/download.png");
}
/deep/ .icon-download2 {
display: inline-block;
margin-left: 3px;
@@ -3720,54 +3609,54 @@
cursor: pointer;
background-image: url("~assets/images/shangqi/img/download2.png");
}
.action-bar {
border-top: 0px;
}
.fileCss {
margin-right: 10px;
cursor: pointer;
}
.fileCss:hover {
color: #0c91e5;
}
.myDialog1 {
/deep/ .el-dialog__body {
padding: 0px 20px 10px;
}
.myRadio {
min-height: 200px;
max-height: 400px;
overflow: auto;
}
}
.myDialog {
min-width: 700px;
.el-dialog {
min-width: 700px;
width: 70%;
}
/deep/ .el-dialog__body {
padding: 0px 20px 56px;
.basic-information-content {
color: #333333;
font-size: 16px;
/*font-weight: 400;*/
.standard-text {
height: 50px;
line-height: 50px;
border-bottom: 1px solid #E5E5E5;
}
& > p {
min-height: 55px;
line-height: 55px;
@@ -3775,27 +3664,27 @@
}
}
}
.knowContent {
height: 500px;
}
}
.details-header {
padding: 34px 0;
font-size: 0.3rem;
font-weight: bold;
color: #555555;
text-align: center;
& > span {
width: 100%;
}
}
/deep/ .details-content {
/*padding: 0 67px;*/
.details-content-modular {
.modular-header {
display: flex;
@@ -3804,12 +3693,12 @@
width: 100%;
height: 50px;
border-bottom: 1px solid #E5E5E5;
.modular-header-title {
font-size: 0.25rem;
font-weight: bold;
color: #3B424C;
& > .icon-modular-title {
display: inline-block;
margin-left: -28px;
@@ -3821,12 +3710,12 @@
position: relative;
top: 2px;;
}
& > span {
padding-left: 10px;
}
}
.modular-header-btn {
& > button {
height: 30px;
@@ -3834,7 +3723,7 @@
font-size: 14px;
padding: 0 10px;
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
& > i {
display: inline-block;
margin-right: 3px;
@@ -3846,53 +3735,53 @@
vertical-align: text-bottom;
}
}
.collection-btn {
padding: 0;
border: none;
i {
color: #F2CB51;
font-size: 18px;
width: 18px;
height: 18px;
}
/*background: rgba(244, 162, 39, 0.1);*/
.icon-collection {
background-image: url("~assets/images/shangqi/standardDetails/collection.png");
}
&:hover {
background: transparent;
}
}
.relation-btn {
color: #409EFF;
border: 1px solid #409EFF;
background: rgba(64, 158, 255, 0.1);
.icon-relation {
background-image: url("~assets/images/shangqi/standardDetails/relation.png");
}
}
}
}
.basic-information-content {
color: #333333;
font-size: 0.2rem;
/*font-weight: 400;*/
.standard-text {
height: 50px;
line-height: 50px;
border-bottom: 1px solid #E5E5E5;
}
}
.modular-content {
.modular-item-more {
padding: 5px 0;
@@ -3903,33 +3792,33 @@
display: flex;
justify-content: center;
align-items: center;
.wrap {
cursor: pointer;
span {
color: #409EFF;
}
img {
height: 10px;
margin-left: 5px;
transition: all .2s linear;
&.is-show-all {
transform: rotate(180deg);
}
}
}
}
& > div:not(.modular-item-more) {
position: relative;
//英文名称变粗
border-bottom: 1px solid #E5E5E5;
min-height: 43px;
line-height: 43px;
.modular-content-p-name {
display: inline-block;
width: 213px;
@@ -3942,7 +3831,7 @@
white-space: nowrap;
text-overflow: ellipsis;
}
.modular-content-p-val {
line-height: 32px;
display: inline-block;
@@ -3957,14 +3846,14 @@
//white-space: nowrap;
//text-overflow: ellipsis;
}
.modular-content-p-flies {
font-size: 0.2rem;
line-height: 32px;
//position: relative;
display: inline-block;
width: calc(~'100% - 225px');
& > .files-title {
width: calc(~'100% - 120px');
//报批稿撑开
@@ -3972,11 +3861,11 @@
//line-height: 50px;
//font-size: 16px;
color: #409EFF;
& > a {
cursor: pointer;
}
& > i {
display: inline-block;
margin-left: 3px;
@@ -3988,16 +3877,16 @@
vertical-align: sub;
cursor: pointer;
}
.icon-download {
background-image: url("~assets/images/shangqi/img/download.png");
}
.icon-download2 {
background-image: url("~assets/images/shangqi/img/download2.png");
}
}
.decomposition-btn {
position: absolute;
//报批稿撑开
@@ -4011,7 +3900,7 @@
color: #07C160;
border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1);
.icon-separate {
display: inline-block;
margin-right: 3px;
@@ -4028,15 +3917,15 @@
}
}
}
.basic-information {
border-top: 2px dashed #D1D1D1;
.modular-header {
height: 60px;
border-bottom: none;
}
.basic-information-content {
& > p {
min-height: 43px;
@@ -4046,7 +3935,7 @@
}
}
}
.more, .put-away {
position: fixed;
bottom: 0;
@@ -4061,74 +3950,74 @@
background-image: linear-gradient(-180deg, rgba(255, 255, 255, 0) 0%, #fff 70%);
padding-bottom: 34px;
padding-top: 34px;
& > img {
margin-left: 5px;
width: 14px;
height: 14px;
}
}
.put-away {
& > img {
transform: rotate(180deg);
}
}
.not-footer-drawer {
.search-area {
margin-bottom: 0;
border-bottom: 5px solid #f6f6f6;
}
.content {
padding: 0 10px;
flex: auto;
//height: calc(~'100% - 105px - 56px');
}
.pagination {
position: static;
}
}
}
.half {
width: 100%;
float: left;
}
.hidden {
overflow: hidden;
}
.clearfix {
&:after {
clear: both;
}
&:after, &:before {
display: table;
content: "";
}
}
.details-container .el-divider {
height: 1px;
background-color: #d5d8da;
}
.span-line:hover {
text-decoration: underline;
}
.relateClass {
.el-dialog__body {
max-height: 460px;
overflow-y: auto;
}
}
.over {
word-break: break-all;
overflow: hidden;
@@ -4137,13 +4026,13 @@
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
::v-deep .el-drawer__header {
& > span:first-child {
outline: none !important;
}
}
::v-deep .el-drawer {
outline: none !important;
}