WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
liyawei
2022-08-18 15:06:48 +08:00
parent a748a14e2a d479f580dd
commit 5b837b73c2
8 changed files with 117 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
+2 -1
View File
@@ -196,7 +196,8 @@ public class LawsMonthlyReportWriteEO implements Serializable {
//新添字段 //新添字段
private String relatedAreasCn;//相关领域中文 private String relatedAreasCn;//相关领域中文
private String relatedAreasEn;//相关领域英文 private String relatedAreasEn;//相关领域英文
private String source;//来源 private String sourceCn;//来源中文
private String sourceEn;//来源英文
private String time;//日期 private String time;//日期
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/mapper/xml/LawsMonthlyReportWriteEOMapper.xml
+2 -1
View File
@@ -31,7 +31,8 @@
<result column="export_state" property="exportState" /> <result column="export_state" property="exportState" />
<result column="related_areas_cn" property="relatedAreasCn" /> <result column="related_areas_cn" property="relatedAreasCn" />
<result column="related_areas_en" property="relatedAreasEn" /> <result column="related_areas_en" property="relatedAreasEn" />
<result column="source" property="source" /> <result column="source_cn" property="sourceCn" />
<result column="source_en" property="sourceEn" />
<result column="time" property="time" /> <result column="time" property="time" />
</resultMap> </resultMap>
</mapper> </mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
+4 -3
View File
@@ -519,7 +519,8 @@ public class WordUtil {
String cut) { String cut) {
String relatedAreasCn = lawsMonthlyReportWriteEO.getRelatedAreasCn();//相关领域中文 String relatedAreasCn = lawsMonthlyReportWriteEO.getRelatedAreasCn();//相关领域中文
String relatedAreasEn = lawsMonthlyReportWriteEO.getRelatedAreasEn();//相关领域英文 String relatedAreasEn = lawsMonthlyReportWriteEO.getRelatedAreasEn();//相关领域英文
String source = lawsMonthlyReportWriteEO.getSource();//来源 String sourceCn = lawsMonthlyReportWriteEO.getSourceCn();//来源
String sourceEn = lawsMonthlyReportWriteEO.getSourceEn();
String time = lawsMonthlyReportWriteEO.getTime();//日期 String time = lawsMonthlyReportWriteEO.getTime();//日期
String contentCn = lawsMonthlyReportWriteEO.getContentCn();//主要内容中文 String contentCn = lawsMonthlyReportWriteEO.getContentCn();//主要内容中文
String contentEn = lawsMonthlyReportWriteEO.getContentEn();//主要内容英文 String contentEn = lawsMonthlyReportWriteEO.getContentEn();//主要内容英文
@@ -545,7 +546,7 @@ public class WordUtil {
//第1行 //第1行
setCell(table, 0, "相关领域",relatedAreasCn); setCell(table, 0, "相关领域",relatedAreasCn);
//第2行 //第2行
setCell(table,1, "来源",source); setCell(table,1, "来源",sourceCn);
//第3行 //第3行
setCell(table,2, "日期",time); setCell(table,2, "日期",time);
//第4行 //第4行
@@ -556,7 +557,7 @@ public class WordUtil {
//第1行 //第1行
setCell(table,0, "Related Areas",relatedAreasEn); setCell(table,0, "Related Areas",relatedAreasEn);
//第2行 //第2行
setCell(table,1,"source",source); setCell(table,1,"Source",sourceEn);
//第3行 //第3行
setCell(table,2,"Date",time); setCell(table,2,"Date",time);
//第4行 //第4行
jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+25 -10
View File
@@ -133,33 +133,34 @@
@click="checkedClick(item)" @click="checkedClick(item)"
:class="{ 'null-input':item.checked }"> :class="{ 'null-input':item.checked }">
<div class="text-header"> <div class="text-header">
<a-tooltip placement="topLeft" :mouseEnterDelay="0.5"> <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
<template slot="title"> <template slot="title">
<span v-html="item.module_type"></span> <span v-html="item.module_type"></span>
</template> </template>
<span v-html="item.module_type"></span> <span v-html="item.module_type"></span>
</a-tooltip> </a-tooltip>
<a-tooltip placement="topLeft" :mouseEnterDelay="0.5"> <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
<template slot="title"> <template slot="title">
<span v-html="item.serial_number"></span> <span v-html="item.serial_number"></span>
</template> </template>
<span style="cursor: pointer" <span style="cursor: pointer"
@click="titleClick(item)" v-html="item.serial_number"></span> @click="titleClick(item)" v-html="item.serial_number"></span>
</a-tooltip> </a-tooltip>
<a-tooltip placement="topLeft" :mouseEnterDelay="0.5"> <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
<template slot="title"> <template slot="title">
<span v-html="item.title"></span> <span v-html="item.title"></span>
</template> </template>
<span style="cursor: pointer" v-html="item.title" @click="titleClick(item)"></span> <span style="cursor: pointer" v-html="item.title" @click="titleClick(item)"></span>
</a-tooltip> </a-tooltip>
<a-tooltip placement="topLeft" :mouseEnterDelay="0.5"> <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
<template slot="title"> <template slot="title">
<span v-html="item.file_name"></span> <span v-html="item.file_name"></span>
</template> </template>
<span style="cursor: pointer" v-html="item.file_name" @click="titleClick(item)"></span> <span style="cursor: pointer" v-html="item.file_name" @click="titleClick(item)"></span>
</a-tooltip> </a-tooltip>
</div> </div>
<a-tooltip placement="topLeft" :mouseEnterDelay="0.5" v-if="selectModel == ''"> <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
v-if="selectModel == ''">
<template slot="title"> <template slot="title">
<span v-html="item.content"></span> <span v-html="item.content"></span>
</template> </template>
@@ -167,21 +168,21 @@
> >
</div> </div>
</a-tooltip> </a-tooltip>
<a-tooltip placement="topLeft" :mouseEnterDelay="0.5" <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
v-else-if="(item.file_text instanceof Array) && selectModel != ''"> v-else-if="(item.file_text instanceof Array) && selectModel != ''">
<template slot="title"> <template slot="title">
<span v-html="item.content"></span> <span v-html="item.content"></span>
</template> </template>
<div class="text-content" @click="checkedClick(item)" v-html="item.content"></div> <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
</a-tooltip> </a-tooltip>
<a-tooltip placement="topLeft" :mouseEnterDelay="0.5" <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
v-else-if="!item.file_text && selectModel != ''"> v-else-if="!item.file_text && selectModel != ''">
<template slot="title"> <template slot="title">
<span v-html="item.content"></span> <span v-html="item.content"></span>
</template> </template>
<div class="text-content" @click="checkedClick(item)" v-html="item.content"></div> <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
</a-tooltip> </a-tooltip>
<a-tooltip placement="topLeft" :mouseEnterDelay="0.5" v-else> <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5" v-else>
<template slot="title"> <template slot="title">
<span v-html="item.file_text"></span> <span v-html="item.file_text"></span>
</template> </template>
@@ -684,7 +685,7 @@
let index2 = fileName.length let index2 = fileName.length
let fileSuffix = fileName.substring(index1, index2) let fileSuffix = fileName.substring(index1, index2)
if (fileSuffix == '.pdf') { if (fileSuffix == '.pdf') {
window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username)) window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username))
} else if (fileSuffix == '.docx') { } else if (fileSuffix == '.docx') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
window.open(url, '_blank') window.open(url, '_blank')
@@ -720,6 +721,10 @@
height: 18px !important; height: 18px !important;
line-height: 18px !important; line-height: 18px !important;
} }
.tooltip-index {
max-width: calc(100% - 300px) !important;
}
</style> </style>
<style lang="less" scoped> <style lang="less" scoped>
@@ -879,6 +884,15 @@
font-weight: 400; font-weight: 400;
color: #040B29; color: #040B29;
opacity: 0.7; opacity: 0.7;
overflow: hidden;
display: -webkit-box;
text-overflow: ellipsis;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
-webkit-line-clamp: 4;
/*! autoprefixer: on;*/
text-justify: inter-ideograph;
word-break: break-all
} }
.box-content { .box-content {
@@ -919,7 +933,8 @@
text-justify: inter-ideograph; text-justify: inter-ideograph;
word-break: break-all word-break: break-all
} }
::v-deep .ant-select{
::v-deep .ant-select {
max-width: calc(100% - 126px) !important; max-width: calc(100% - 126px) !important;
} }
</style> </style>
jero-web/src/views/documentTools/searchCenter/components/monthlyReportRegulations.vue
+38 -10
View File
@@ -10,7 +10,7 @@
<a-checkbox :value="item.id" class="checkbox-left"></a-checkbox> <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>
<div class="text-text-right" <div class="text-text-right"
:class="{ 'null-input':item.checked }"> :class="{ 'null-input':item.checked }">
<div class="text-header" @click="titleClick(item)"> <div class="text-header" @click="checkedClick(item)">
<a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"> <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
<template slot="title"> <template slot="title">
<span v-html="item.title"></span> <span v-html="item.title"></span>
@@ -18,7 +18,8 @@
<span class="text-header-text" style="cursor: pointer" v-html="item.title"></span> <span class="text-header-text" style="cursor: pointer" v-html="item.title"></span>
</a-tooltip> </a-tooltip>
</div> </div>
<a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"> <a-tooltip placement="topLeft" overlayClassName="tooltip-index" v-if="!queryParam.selectValue"
:mouseEnterDelay="0.5">
<template slot="title"> <template slot="title">
<span v-html="item.content"></span> <span v-html="item.content"></span>
</template> </template>
@@ -26,6 +27,27 @@
> >
</div> </div>
</a-tooltip> </a-tooltip>
<a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
v-else-if="(item.file_text instanceof Array) && queryParam.selectValue">
<template slot="title">
<span v-html="item.content"></span>
</template>
<div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
</a-tooltip>
<a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
v-else-if="!item.file_text && queryParam.selectValue">
<template slot="title">
<span v-html="item.content"></span>
</template>
<div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
</a-tooltip>
<a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5" v-else>
<template slot="title">
<span v-html="item.file_text"></span>
</template>
<div class="text-content" @click="checkedClick(item)" v-html="item.file_text">
</div>
</a-tooltip>
</div> </div>
</div> </div>
</li> </li>
@@ -60,7 +82,7 @@
return { return {
checkboxText: [], checkboxText: [],
url: { url: {
getInfoList: 'search/document/getFullTextInfoList' getInfoList: '/search/lawsMonthlyReport/page'
}, },
loading: false, loading: false,
conList: [], conList: [],
@@ -95,12 +117,18 @@
methods: { methods: {
...mapGetters(['userInfo']), ...mapGetters(['userInfo']),
checkedClick(item) { checkedClick(item) {
if (item.checked) { let fileName = item.file_name
this.checkboxText = this.checkboxText.filter(res => { let index1 = fileName.lastIndexOf('.')
return res !== item.id let index2 = fileName.length
}) let fileSuffix = fileName.substring(index1, index2)
} else { if (fileSuffix == '.pdf') {
this.checkboxText.push(item.id) window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.file_id + '&userName=' + this.userInfo().username))
} else if (fileSuffix == '.docx') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix)
window.open(url, '_blank')
} else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix)
window.open(url, '_blank')
} }
}, },
ResetSearch() { ResetSearch() {
@@ -190,7 +218,7 @@
} }
.tooltip-index { .tooltip-index {
max-width: 600px !important; max-width: calc(100% - 300px) !important;
} }
</style> </style>
<style scoped lang="less"> <style scoped lang="less">
jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue
+1 -1
View File
@@ -335,7 +335,7 @@
} }
.tooltip-index { .tooltip-index {
max-width: 600px !important; max-width: calc(100% - 300px) !important;
} }
</style> </style>
<style lang="less" scoped> <style lang="less" scoped>
jero-web/src/views/documentTools/searchCenter/components/whole.vue
+39 -7
View File
@@ -11,7 +11,7 @@
<div class="text-text-right" <div class="text-text-right"
:class="{ 'null-input':item.checked }"> :class="{ 'null-input':item.checked }">
<div class="text-header" @click="titleClick(item)"> <div class="text-header" @click="titleClick(item)">
<a-tooltip placement="topLeft" :mouseEnterDelay="0.5"> <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
<template slot="title"> <template slot="title">
<span v-html="item.module_type"></span> <span v-html="item.module_type"></span>
</template> </template>
@@ -21,15 +21,17 @@
</template> </template>
<span style="cursor: pointer" <span style="cursor: pointer"
class="text-header-text" class="text-header-text"
v-if="item.serial_number"
v-html="item.serial_number"></span> v-html="item.serial_number"></span>
<template slot="title"> <template slot="title">
<span v-html="item.title"></span> <span v-html="item.title"></span>
</template> </template>
<span class="text-header-text" style="cursor: pointer" v-html="item.title"></span> <span class="text-header-text" v-if="item.title" style="cursor: pointer" v-html="item.title"></span>
<template slot="title"> <template slot="title">
<span v-html="item.file_name"></span> <span v-html="item.file_name"></span>
</template> </template>
<span class="text-header-text" style="cursor: pointer" v-html="item.file_name"></span> <span class="text-header-text" v-if="item.file_name" style="cursor: pointer"
v-html="item.file_name"></span>
</a-tooltip> </a-tooltip>
<!-- <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">--> <!-- <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">-->
@@ -41,7 +43,8 @@
</a-tooltip> </a-tooltip>
</div> </div>
<a-tooltip placement="topLeft" v-if="!queryParam.selectValue" :mouseEnterDelay="0.5"> <a-tooltip placement="topLeft" overlayClassName="tooltip-index" v-if="!queryParam.selectValue"
:mouseEnterDelay="0.5">
<template slot="title"> <template slot="title">
<span v-html="item.content"></span> <span v-html="item.content"></span>
</template> </template>
@@ -49,20 +52,21 @@
> >
</div> </div>
</a-tooltip> </a-tooltip>
<a-tooltip placement="topLeft" :mouseEnterDelay="0.5" <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
v-else-if="(item.file_text instanceof Array) && queryParam.selectValue"> v-else-if="(item.file_text instanceof Array) && queryParam.selectValue">
<template slot="title"> <template slot="title">
<span v-html="item.content"></span> <span v-html="item.content"></span>
</template> </template>
<div class="text-content" @click="checkedClick(item)" v-html="item.content"></div> <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
</a-tooltip> </a-tooltip>
<a-tooltip placement="topLeft" :mouseEnterDelay="0.5" v-else-if="!item.file_text && queryParam.selectValue"> <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5"
v-else-if="!item.file_text && queryParam.selectValue">
<template slot="title"> <template slot="title">
<span v-html="item.content"></span> <span v-html="item.content"></span>
</template> </template>
<div class="text-content" @click="checkedClick(item)" v-html="item.content"></div> <div class="text-content" @click="checkedClick(item)" v-html="item.content"></div>
</a-tooltip> </a-tooltip>
<a-tooltip placement="topLeft" :mouseEnterDelay="0.5" v-else> <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5" v-else>
<template slot="title"> <template slot="title">
<span v-html="item.file_text"></span> <span v-html="item.file_text"></span>
</template> </template>
@@ -211,6 +215,21 @@
} }
}) })
}, },
monthlyReportClick(item) {
let fileName = item.file_name
let index1 = fileName.lastIndexOf('.')
let index2 = fileName.length
let fileSuffix = fileName.substring(index1, index2)
if (fileSuffix == '.pdf') {
window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.file_id + '&userName=' + this.userInfo().username))
} else if (fileSuffix == '.docx') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix)
window.open(url, '_blank')
} else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.file_id + fileSuffix)
window.open(url, '_blank')
}
},
titleClick(item) { titleClick(item) {
let newUrl = this.$router.resolve({ let newUrl = this.$router.resolve({
path: '/docManage/library/detail', path: '/docManage/library/detail',
@@ -229,6 +248,10 @@
.highlight-class { .highlight-class {
color: #21c9cc; color: #21c9cc;
} }
.tooltip-index {
max-width: calc(100% - 300px) !important;
}
</style> </style>
<style scoped lang="less"> <style scoped lang="less">
.box { .box {
@@ -291,6 +314,15 @@
font-weight: 400; font-weight: 400;
color: #040B29; color: #040B29;
opacity: 0.7; opacity: 0.7;
overflow: hidden;
display: -webkit-box;
text-overflow: ellipsis;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
-webkit-line-clamp: 4;
/*! autoprefixer: on;*/
text-justify: inter-ideograph;
word-break: break-all
} }
.page { .page {
jero-web/src/views/documentTools/searchCenter/index.vue
+6
View File
@@ -146,6 +146,8 @@
this.$refs.wholeRef.ResetSearch() this.$refs.wholeRef.ResetSearch()
} else if (this.$refs.DocumentLibraryRef) { } else if (this.$refs.DocumentLibraryRef) {
this.$refs.DocumentLibraryRef.ResetSearch() this.$refs.DocumentLibraryRef.ResetSearch()
}else if (this.$refs.monthlyReportRegulationsRef) {
this.$refs.monthlyReportRegulationsRef.ResetSearch()
} }
}, },
onSearch(event) { onSearch(event) {
@@ -164,6 +166,8 @@
wholeOnSearch(event) { wholeOnSearch(event) {
if (this.$refs.wholeRef) { if (this.$refs.wholeRef) {
this.$refs.wholeRef.searchData(event) this.$refs.wholeRef.searchData(event)
}else if(this.$refs.monthlyReportRegulationsRef){
this.$refs.monthlyReportRegulationsRef.searchData(event)
} }
}, },
wholeTextSearch(event) { wholeTextSearch(event) {
@@ -177,6 +181,8 @@
this.queryParam[this.selectModel] = event this.queryParam[this.selectModel] = event
this.$refs.DocumentLibraryRef.searchDataTwo(this.queryParam, this.selectModel, this.selectModelName) this.$refs.DocumentLibraryRef.searchDataTwo(this.queryParam, this.selectModel, this.selectModelName)
} }
}else if(this.$refs.monthlyReportRegulationsRef){
this.$refs.monthlyReportRegulationsRef.searchDataTwo(event)
} }
}, },
getCondition() { getCondition() {