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:
wangzhijiang
2022-09-07 18:34:47 +08:00
parent 2c941e334b fe2c854acb
commit c6dabec4dc
20 changed files with 488 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+4 -4
View File
@@ -1434,8 +1434,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
String href = "<a href='/ParameterItemCollection" + urlParamsStr + "'" + " target='_blank'>the link</a>,";
String content = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter the link to handle it.";
String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " please enter " + href + " to handle it.";
String msgTitle = "You have a homo parameter task to complete";
String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter " + href + " and fill in the relevant information.";
String msgTitle = projectInfo.getProjectName() + ": You have a homo parameter task to complete";
// 发送系统消息
SysAnnouncement sysAnnouncement = new SysAnnouncement();
@@ -1563,7 +1563,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
String href = "<a href='/ParameterItemCollection" + urlParamsStr + "'" + " target='_blank'>the link</a>,";
String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length() - 1) + " and other parameter items, please enter " + href + " and fill in the relevant information.";
String msgTitle = "You have a homo parameter task to complete";
String msgTitle = projectInfo.getProjectName() + ": You have a homo parameter task to complete";
// 发送系统消息
SysAnnouncement sysAnnouncement = new SysAnnouncement();
@@ -1697,7 +1697,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
String href = "<a href='/ParameterItemCollection" + urlParamsStr + "'" + " target='_blank'>the link</a>,";
String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length() - 1) + " and other parameter items, please enter " + href + " and fill in the relevant information.";
String msgTitle = "You have a homo parameter task to complete";
String msgTitle = projectInfo.getProjectName() + ": You have a homo parameter task to complete";
// 发送系统消息
SysAnnouncement sysAnnouncement = new SysAnnouncement();
jero-boot/jero-boot-module-system/pom.xml
+5
View File
@@ -70,6 +70,11 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-openfeign-core</artifactId>
</dependency>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itext-asian</artifactId>
<version>5.2.0</version>
</dependency>
<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/PDFUtils.java
+116 -13
View File
@@ -1,26 +1,24 @@
package com.jero.modules.system.util;
import com.itextpdf.text.BaseColor;
import com.itextpdf.text.DocumentException;
import com.itextpdf.text.Element;
import com.itextpdf.text.pdf.*;
import com.spire.pdf.PdfDocument;
import com.spire.pdf.PdfPageBase;
import com.spire.pdf.graphics.PdfBrushes;
import com.spire.pdf.graphics.PdfFont;
import com.spire.pdf.graphics.PdfFontFamily;
import com.spire.pdf.graphics.PdfStringFormat;
import com.spire.pdf.graphics.PdfTextAlignment;
import com.spire.pdf.graphics.PdfTilingBrush;
import com.spire.pdf.graphics.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import javax.swing.*;
import java.awt.*;
import java.awt.geom.Dimension2D;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.*;
@Slf4j
public class PDFUtils {
public static void main(String[] args) throws IOException {
File file = new File("E:\\DeskTop\\动态资料\\加入IEEE会员 - 副本 - 副本.pdf");
@@ -84,7 +82,7 @@ public class PDFUtils {
page.getCanvas().drawRectangle(brush, loRect);
}
public static File PDFWatermark(InputStream in,String uploadpath, String fileName,String waterMark) throws FileNotFoundException {
public static File PDFWatermarkInvalid(InputStream in,String uploadpath, String fileName,String waterMark) throws FileNotFoundException {
//创建PdfDocument类的对象
PdfDocument pdf = new PdfDocument();
//加载测试文档
@@ -203,4 +201,109 @@ public class PDFUtils {
// }
// return buffer;
// }
public static File PDFWatermark(InputStream in,String uploadpath, String fileName,String waterMark) {
String newFilePath = "";
// 待加水印的文件
PdfReader reader = null;
PdfStamper stamper = null;
FileOutputStream os = null;
try {
byte[] byes = IOUtils.toByteArray(in);
//生成临时文件 , 读取完删除
String path = uploadpath + File.separator + fileName;
newFilePath = path.replace(fileName, "transformation" + fileName);
reader = new PdfReader(byes);
// 加完水印的文件
os = new FileOutputStream(newFilePath);
stamper = new PdfStamper(reader, os);
int total = reader.getNumberOfPages() + 1;
BaseFont basefont = BaseFont.createFont("/static/times.ttf", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
// 方法二：这里的字体设置比较关键，这个设置是支持中文的写法
// BaseFont basefont = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);// 使用系统字体
PdfContentByte under;
com.itextpdf.text.Rectangle pageRect = null;
//水印倾斜角度（0-360）
int angle = 45;
//数值越大每页竖向水印越少
int heightDensity = 10;
//数值越大每页横向水印越少
int widthDensity = 1;
int textH = 0;
int textW = 0;
JLabel label = new JLabel();
FontMetrics metrics;
label.setText(waterMark);
metrics = label.getFontMetrics(label.getFont());
//字符串的高, 只和字体有关
textH = metrics.getHeight();
//字符串的宽
textW = metrics.stringWidth(label.getText());
// 循环对每页插入水印
for (int i = 1; i < total; i++) {
pageRect = stamper.getReader().getPageSizeWithRotation(i);
// 获得PDF最顶层
under = stamper.getOverContent(i);
under.saveState();
// set Transparency
PdfGState gs = new PdfGState();
// 设置透明度
gs.setFillOpacity(0.5f);
under.setGState(gs);
under.restoreState();
under.beginText();
under.setFontAndSize(basefont, pageRect.getHeight() / 100);
under.setColorFill(BaseColor.PINK);
// 水印文字成45度角倾斜
for (int height = textH; height < pageRect.getHeight() * 3; height = height + textH * heightDensity) {
for (int width = textW; width < pageRect.getWidth() * 1.5 + textW; width = width + textW * widthDensity) {
// rotation:倾斜角度
under.showTextAligned(Element.ALIGN_CENTER, waterMark, width - textW, height - textH, angle);
}
}
// 添加水印文字
under.endText();
under.setLineWidth(1f);
under.stroke();
}
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage());
} catch (DocumentException e) {
e.printStackTrace();
log.error(e.getMessage());
} finally {
try {
stamper.close();
if (os != null) {
os.close();
}
if (reader != null) {
reader.close();
}
} catch (DocumentException e) {
e.printStackTrace();
log.error(e.getMessage());
} catch (IOException e) {
e.printStackTrace();
log.error(e.getMessage());
}
}
return new File(newFilePath);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenuVo.java
+6 -1
View File
@@ -1,5 +1,7 @@
package com.jero.modules.compare.entity;
import com.jero.modules.system.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
@@ -25,7 +27,10 @@ public class SarFileCompareMenuVo extends SarFileCompareMenu {
this.setLeftOrRight(menu.getLeftOrRight());
this.setItemName(menu.getItemName());
this.setKey(menu.getId());
this.setTitle(menu.getName() + menu.getItemName());
this.setTitle(menu.getName());
if(StringUtils.isNoneBlank(menu.getItemName())){
this.setTitle(menu.getName() + menu.getItemName());
}
this.setRemarks(menu.getRemarks());
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoDataServiceImpl.java
+1
View File
@@ -81,6 +81,7 @@ public class ExtRepoDataServiceImpl extends ServiceImpl<ExtRepoDataMapper, ExtRe
public void editById(ExtRepoData extRepoData) {
Date now = new Date();
extRepoData.setUpdateTime(now);
extRepoData.setCreateTime(null);
saveOrUpdate(extRepoData);
}
jero-boot/jero-boot-single-startup/src/main/resources/static/times.ttf
BIN
View File
Binary file not shown.
jero-web/src/components/searchalonesplit/index.vue
+3
View File
@@ -180,6 +180,7 @@ export default {
},
mounted() {
this.getSeach()
this.queryParam = {...this.queryParam}
},
methods: {
searchQuery() {
@@ -199,6 +200,7 @@ export default {
this.searchList.forEach((item, index) => {
if(item.db_field_name === 'serialNumber') {
this.queryParam[item.db_field_name] = this.searchalonesplit
this.queryParam = {...this.queryParam}
}
})
}
@@ -209,6 +211,7 @@ export default {
// },
dateChange(item) {
this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')
},
onChange(item) {
if (this.queryParam[item] && this.queryParam[item].length > 0) {
jero-web/src/components/tableCollection/index.vue
+30 -31
View File
@@ -856,7 +856,37 @@
.table .ant-table-column-title {
font-weight: bold;
}
</style>
<style scoped lang="less">
.box {
width: 100%;
height: calc(100% - 100px);
overflow: auto;
}
.text {
margin-right: 10px;
}
.page {
text-align: right;
margin-top: 20px;
}
/deep/ .ant-table-tbody .yellow {
background-color: #ffff001f !important;
height: 40px !important;
border: none !important;
padding: 0 !important;
}
::v-deep .ant-table-row:first-child {
background: #fff!important;
/*opacity: 0.9;*/
}
::v-deep .ant-table-body {
background: transparent!important;
}
.content-text {
width: 100%;
display: flex;
@@ -891,37 +921,6 @@
}
}
</style>
<style scoped>
.box {
width: 100%;
height: calc(100% - 100px);
overflow: auto;
}
.text {
margin-right: 10px;
}
.page {
text-align: right;
margin-top: 20px;
}
/deep/ .ant-table-tbody .yellow {
background-color: #ffff001f !important;
height: 40px !important;
border: none !important;
padding: 0 !important;
}
::v-deep .ant-table-row:first-child {
background: #fff!important;
/*opacity: 0.9;*/
}
::v-deep .ant-table-body {
background: transparent!important;
}
</style>
<style>
.resize-table-th {
position: relative;
jero-web/src/components/tableCollection/index1.vue
+30 -31
View File
@@ -672,7 +672,37 @@
.table .ant-table-column-title {
font-weight: bold;
}
</style>
<style scoped lang="less">
.box {
width: 100%;
height: calc(100% - 100px);
overflow: auto;
}
.text {
margin-right: 10px;
}
.page {
text-align: right;
margin-top: 20px;
}
/deep/ .ant-table-tbody .yellow {
background-color: #ffff001f !important;
height: 40px !important;
border: none !important;
padding: 0 !important;
}
::v-deep .ant-table-row:first-child {
background: #fff!important;
opacity: 0.9;
}
::v-deep .ant-table-body {
background: transparent!important;
}
.content-text {
width: 100%;
display: flex;
@@ -706,37 +736,6 @@
}
}
</style>
<style scoped>
.box {
width: 100%;
height: calc(100% - 100px);
overflow: auto;
}
.text {
margin-right: 10px;
}
.page {
text-align: right;
margin-top: 20px;
}
/deep/ .ant-table-tbody .yellow {
background-color: #ffff001f !important;
height: 40px !important;
border: none !important;
padding: 0 !important;
}
::v-deep .ant-table-row:first-child {
background: #fff!important;
opacity: 0.9;
}
::v-deep .ant-table-body {
background: transparent!important;
}
</style>
<style>
.resize-table-th {
position: relative;
jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue
+3 -3
View File
@@ -41,9 +41,9 @@
</div>
</div>
<div class="drawer-bootom-button">
<a-button @click="handleCancel" type="danger">{{$t('cancel')}}</a-button>
</div>
<!-- <div class="drawer-bootom-button">-->
<!-- <a-button @click="handleCancel" type="danger">{{$t('cancel')}}</a-button>-->
<!-- </div>-->
</a-drawer>
<classificationMaintenanceAdd ref="classificationMaintenanceAddRef"
@classificationMaintenanceAddForm="classificationMaintenanceAddForm"/>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseModel.vue
+3 -3
View File
@@ -46,9 +46,9 @@
</div>
</div>
<div class="drawer-bootom-button">
<a-button @click="handleCancel" type="danger">{{$t('cancel')}}</a-button>
</div>
<!-- <div class="drawer-bootom-button">-->
<!-- <a-button @click="handleCancel" type="danger">{{$t('cancel')}}</a-button>-->
<!-- </div>-->
</a-drawer>
<countryCardReleaseModelAdd ref="countryCardReleaseModelAddRef"
@countryCardReleaseModelAddForm="countryCardReleaseModelAddForm"/>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
+13 -9
View File
@@ -3,9 +3,9 @@
<div class="doc-detail-wrap">
<div class="doc-detail-header" style="position: fixed;top: 0">
<div class="doc-detail-title">
<!-- <span style="line-height: 66px;display: inline-block;float: left">-->
<!-- <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
<!-- </span>-->
<!-- <span style="line-height: 66px;display: inline-block;float: left">-->
<!-- <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
<!-- </span>-->
{{header_text}}
</div>
</div>
@@ -35,7 +35,7 @@
</div>
</div>
<div class="content-box-box" v-else>
<div class="content-box-box" :class="{'content-box-box-color':index % 2 == 1 ? true : false}" v-else>
<a v-if="index2 == 0 && item2.relevantUrl"
style="color: rgb(33, 201, 204)"
:class="{'content-box-box-text-admin':!item2.lableName || item2.lableName == 'null' || item2.lableName == 'undefined'? true : false}"
@@ -116,7 +116,7 @@
}
},
mounted() {
document.title = 'Country Card'+ '-' + this.$t('details')
document.title = 'Country Card' + '-' + this.$t('details')
this.queryCountry(() => {
this.replacePage()
})
@@ -385,8 +385,8 @@
.content-box-box {
width: 340px;
display: inline-block;
height: 80px;
line-height: 80px;
height: 60px;
line-height: 60px;
text-align: center;
background: #fff;
border-right: 1px #d9d9d9 solid;
@@ -421,7 +421,7 @@
}
.content-box-top {
height: 80px;
height: 60px;
}
.content-box-top:first-child {
@@ -442,6 +442,10 @@
}
.content-box-box-text-admin {
height: 80px !important;
height: 60px !important;
}
.content-box-box-color {
background: #f2f2f2;
}
</style>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/optionMaintenance.vue
+3 -3
View File
@@ -41,9 +41,9 @@
</div>
</div>
<div class="drawer-bootom-button">
<a-button @click="handleCancel" type="danger">{{$t('cancel')}}</a-button>
</div>
<!-- <div class="drawer-bootom-button">-->
<!-- <a-button @click="handleCancel" type="danger">{{$t('cancel')}}</a-button>-->
<!-- </div>-->
</a-drawer>
<optionMaintenanceAdd ref="optionMaintenanceAddRef"
@optionMaintenanceAddForm="optionMaintenanceAddForm"/>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue
+247 -61
View File
@@ -2,7 +2,7 @@
<div class="doc-detail">
<div class="doc-detail-wrap">
<div class="doc-detail-header" style="position: fixed;top: 0">
<div class="doc-detail-title">
<div class="doc-detail-title" :title="queryForm.title">
<!-- <span style="line-height: 66px;display: inline-block;float: left">-->
<!-- <a-icon type="arrow-left" @click="back" style="margin-right: 6px;"/>-->
<!-- </span>-->
@@ -15,76 +15,99 @@
</div>
</div>
</div>
<div style="padding-top: 68px;background: #fff">
<div class="detail-content" style="padding: 24px">
<div class="content-text-top">
<span style="margin-right: 10px">
{{$t('issuedBy')}}:{{this.queryForm.createBy}}
</span>
<span>
{{$t('releaseDate')}}:{{this.queryForm.createTime?this.queryForm.createTime.slice(0,11):''}}
</span>
</div>
<div class="content-text">
<div class="text-field" v-for="(item,index) in standardContentList" :key="index">
<span class="text-field-left" :title="item.title">{{item.title}}</span>
<span class="text-field-right text-field-right-url"
@click="clickButtonToUpload(queryForm[item.value])"
v-if="item.type == 2 && queryForm[item.value]"
>{{ $t('viewFile') }}</span>
<div class="doc-detail-box">
<div style="padding-top: 68px;" class="doc-detail-box-text">
<div class="detail-content" style="padding: 24px">
<!-- <div class="content-text-top">-->
<!-- <span style="margin-right: 10px">-->
<!-- {{$t('issuedBy')}}:{{this.queryForm.createBy}}-->
<!-- </span>-->
<!-- <span>-->
<!-- {{$t('releaseDate')}}:{{this.queryForm.createTime?this.queryForm.createTime.slice(0,11):''}}-->
<!-- </span>-->
<!-- </div>-->
<div class="content-text">
<div class="text-field" v-for="(item,index) in standardContentList" :key="index">
<span class="text-field-left" :title="item.title">{{item.title}}</span>
<span class="text-field-right text-field-right-url"
@click="clickButtonToUpload(queryForm[item.value])"
v-if="item.type == 2 && queryForm[item.value]"
>{{ $t('viewFile') }}</span>
<span class="text-field-right"
:title="queryForm[item.value]" v-else>
<span class="text-field-right"
:title="queryForm[item.value]" v-else>
{{queryForm[item.value]}}
</span>
</div>
</div>
</div>
<div class="content" v-html="queryForm.content"></div>
<div class="content-icon">
<div class="division"></div>
<div class="content ql-editor" v-html="queryForm.content"></div>
<div class="content-icon">
<span class="content-icon-text">
<a-icon class="icon" type="eye"/>
<span>{{this.queryForm.browsingHistoryCount}}</span>
</span>
<span class="content-icon-text" @click="likeClick()">
<span class="content-icon-text" @click="likeClick()">
<a-icon class="icon" :class="{'icon-active':this.isPraise}" type="like"/>
<span>{{this.queryForm.praiseCount}}</span>
</span>
<span class="content-icon-text" @click="starClick()">
<span class="content-icon-text" @click="starClick()">
<a-icon class="icon" :class="{'icon-active':this.isCollect}" type="star"/>
<span>{{this.queryForm.collectCount}}</span>
</span>
</div>
<div class="box-text">
<div class="header-text">
{{$t('comment')}}
</div>
</div>
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<a-form-model-item class="itemModel" prop="commentContent">
<a-textarea :placeholder="$t('pleaseEnter')+$t('comment')"
v-model.trim="formInline.commentContent"
:rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
<div class="content-button">
<a-button class="header-btn submit" :loading="loading" @click="release" type="primary">{{$t('release')}}
</a-button>
</div>
<div v-for="(item,index) in releaseList">
<div class="box-text">
<div class="division"></div>
<div class="box-text" style="margin-top: 24px">
<div class="header-text">
<span style="margin-right: 20px">{{item.createBy}}</span>
{{item.createTime}}
{{$t('comment')}}
</div>
</div>
<div class="content">
{{item.commentContent}}
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<a-form-model-item class="itemModel" prop="commentContent">
<a-textarea :placeholder="$t('pleaseEnter')+$t('comment')"
v-model.trim="formInline.commentContent"
:rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
<div class="content-button">
<a-button class="header-btn submit" :loading="loading" @click="release" type="primary">{{$t('release')}}
</a-button>
</div>
<div v-for="(item,index) in releaseList" style="margin-bottom: 30px">
<div class="box-text-index">
<div class="header-text-index">
<span style="margin-right: 20px" class="header-text-index-left">{{item.createBy}}</span>
<span class="header-text-index-text">{{item.createTime}}</span>
<span class="box-icon" @click="messageClick(item)">
<a-icon type="message"/>
</span>
</div>
</div>
<div class="content-index">
{{item.commentContent}}
</div>
<div class="box-comment"
v-for="(val,index1) in item.problemKnowledgeBaseCommentVOList"
v-if="item.problemKnowledgeBaseCommentVOList && item.problemKnowledgeBaseCommentVOList.length > 0">
<div class="box-text-index">
<div class="header-text-index">
<span style="margin-right: 20px" class="header-text-index-left">{{val.createBy}}</span>
<span class="header-text-index-text">{{val.createTime}}</span>
<span class="box-icon" @click="messageClick(item)">
<a-icon type="message"/>
</span>
</div>
</div>
<div class="content-index">
{{val.commentContent}}
</div>
</div>
</div>
</div>
</div>
@@ -92,6 +115,34 @@
</div>
<viewFileModel ref="viewFileModelRef"/>
<SelectedBy ref="SelectedByRef" :title="$t('forward')" @SelectedByForm="SelectedByForm"></SelectedBy>
<a-modal
:title="$t('replyToComments')"
:width="700"
:visible="visibleComment"
:confirm-loading="confirmLoading"
:maskClosable="false"
@ok="handleOkComment"
@cancel="handleCancelComment"
>
<a-form-model :model="formInlineComment" class="formAdd" :rules="rulesComment" ref="ruleFormComment">
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('replyToComments')">{{$t('replyToComments')}}</span>
</div>
<a-form-model-item class="itemModel" :prop="'replyContent'">
<a-textarea
:placeholder="$t('PleaseEnter')+$t('replyToComments')"
:disabled="false"
v-model="formInlineComment.replyContent" :rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
</a-modal>
</div>
</template>
@@ -100,6 +151,10 @@
import SelectedBy from '@/components/SelectedBy/index'
import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
import { mapGetters } from 'vuex'
import 'quill/dist/quill.core.css'
import 'quill/dist/quill.snow.css'
import 'quill/dist/quill.bubble.css'
import { quillEditor } from 'vue-quill-editor'
export default {
name: 'problemKnowledgeBaseView',
@@ -109,6 +164,10 @@
},
data() {
return {
visibleComment: false,
confirmLoading: false,
CommentQuery: {},
formInlineComment: {},
standardContentList: [
{
title: this.$t('problemClassification'),
@@ -122,9 +181,17 @@
title: this.$t('standardNo'),
value: 'standNumber'
},
// {
// title: this.$t('title'),
// value: 'title'
// },
{
title: this.$t('title'),
value: 'title'
title:this.$t('issuedBy'),
value: 'createBy'
},
{
title:this.$t('releaseDate'),
value: 'createTime'
},
{
title: this.$t('enclosure'),
@@ -134,6 +201,20 @@
],
queryForm: {},
formInline: {},
rulesComment: {
replyContent: [
{
required: true,
message: this.$t('replyToComments') + this.$t('cannotEmpty'),
trigger: 'blur'
},
{
max: 300,
message: this.$t('replyToComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
]
},
rules: {
commentContent: [
{
@@ -156,6 +237,39 @@
},
methods: {
...mapGetters(['userInfo']),
messageClick(val) {
this.CommentQuery = val
this.visibleComment = true
this.formInlineComment = {}
this.$nextTick(() => {
this.$refs.ruleFormComment.clearValidate()
})
},
handleOkComment() {
this.$refs.ruleFormComment.validate(valid => {
if (valid) {
let query = {
commentId: this.CommentQuery.id,
replyContent: this.formInlineComment.replyContent
}
this.confirmLoading = true
postAction('/project/problemKnowledgeBaseReplyEO/add', query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.visibleComment = false
this.confirmLoading = false
this.releaseData()
} else {
this.confirmLoading = false
this.$message.success(this.$t('operationFailed'))
}
})
}
})
},
handleCancelComment() {
this.visibleComment = false
},
SelectedByForm(userIds) {
let query = {
userIds: userIds,
@@ -311,7 +425,6 @@
.doc-detail {
background: #fff;
height: 100%;
.doc-detail-wrap {
.doc-detail-header {
width: 100%;
@@ -415,7 +528,7 @@
.text-field-right-url {
color: #00B3BE !important;
cursor: pointer;
margin-top: 10px;
/*margin-top: 10px;*/
}
}
}
@@ -425,6 +538,9 @@
color: #040B29;
font-weight: 400;
word-break: break-word;
padding: 24px 0;
box-sizing: border-box;
margin-top: 32px;
}
.content-icon {
@@ -449,12 +565,12 @@
}
.content-icon-text .icon {
font-size: 24px;
font-size: 20px;
color: #3b4249 !important;
}
.content-icon-text .icon-active {
font-size: 24px;
font-size: 20px;
color: #00B3BE !important;
}
@@ -532,10 +648,80 @@
.content-text-top {
width: 100%;
text-align: right;
color: #040B29;
color: #6F7385;
font-weight: 400;
font-size: 16px;
font-size: 14px;
margin-bottom: 20px;
}
.doc-detail-box {
width: 100%;
background: #f2f2f2;
}
.doc-detail-box-text {
width: 75%;
margin: 0 auto;
background: #fff;
/*position: absolute;*/
min-height: 100vh;
/*left: 50%;*/
/*transform: translateX(-50%);*/
}
.division {
height: 20px;
position: absolute;
left: 0;
width: 100%;
background: #f2f2f2;
margin-top: 20px;
}
.content-index {
font-size: 14px;
color: #000F16;
font-weight: 400;
word-break: break-word;
padding: 12px 0;
box-sizing: border-box;
}
.header-text-index {
font-size: 16px;
font-weight: 400;
margin-top: 10px;
height: 35px;
color: #000F16;
line-height: 40px;
}
.box-icon {
margin-right: 10px;
float: right;
cursor: pointer;
}
.box-comment {
width: calc(100% - 80px);
margin-left: 80px;
background: #f2f2f2;
padding: 6px 24px;
box-sizing: border-box;
}
.Required {
color: red;
margin-right: 4px;
}
.header-text-index-left {
font-size: 16px;
font-weight: 700;
}
.header-text-index-text {
font-size: 14px;
color: #848684;
}
</style>
jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+2 -1
View File
@@ -75,7 +75,8 @@
title: this.$t('clauseNo'),
dataIndex: 'itemNum',
align: 'center',
ellipsis: true
ellipsis: true,
width: 120
},
{
title: this.$t('clauseName'),
jero-web/src/views/dashboard/components/myList.vue
+14 -15
View File
@@ -11,7 +11,7 @@
<div class="myList-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="prcClick(item)">
<div class="top">
<span class="top-text" :title="item.prcName">{{item.prcName}}</span>
<span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>
<!-- <span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>-->
</div>
<div class="button">
{{item.creatTime}}
@@ -161,25 +161,24 @@
font-family: Blue Sky Noto;
font-weight: 400;
color: #040B29;
max-width: 50%;
max-width: calc(100% - 72px);
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.top-admin {
font-size: 16px;
font-family: Blue Sky Noto;
display: inline-block;
font-weight: 400;
color: #040B29;
margin-left: 4px;
max-width: calc(50% - 72px);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
/*.top-admin {*/
/* font-size: 16px;*/
/* font-family: Blue Sky Noto;*/
/* display: inline-block;*/
/* font-weight: 400;*/
/* color: #040B29;*/
/* margin-left: 4px;*/
/* max-width: calc(50% - 72px);*/
/* overflow: hidden;*/
/* text-overflow: ellipsis;*/
/* white-space: nowrap;*/
/*}*/
}
.button {
jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
+2 -2
View File
@@ -377,7 +377,7 @@
return
}
for (let i = 0; i < this.resultData.textLeft.length; i++) {
if (node.parentId && node.itemName == this.resultData.textLeft[i].itemsName) {
if (node.parentId && node.menuId == this.resultData.textLeft[i].menuId) {
detailContent[0].scrollTop = detailLeft[i].offsetTop - 150
return
}
@@ -392,7 +392,7 @@
return
}
for (let i = 0; i < this.resultData.textRight.length; i++) {
if (node.parentId && node.itemName == this.resultData.textRight[i].itemsName) {
if (node.parentId && node.menuId == this.resultData.textRight[i].menuId) {
detailContent[0].scrollTop = detailRight[i].offsetTop - 150
return
}
jero-web/src/views/externalReports/index.vue
+2 -2
View File
@@ -131,7 +131,7 @@
:columns="columns"
>
<span slot="projectName" slot-scope="text,record" :title="text">
{{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
{{ text && text.length > 20 ? text.slice(0, 18) + '...' : text }}
</span>
<span slot="fileName" slot-scope="text,record" :title="text">
{{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
@@ -366,7 +366,7 @@ export default {
align: 'center',
dataIndex: 'fileDescription',
scopedSlots: { customRender: 'projectName' },
width: 150
width: 300
},
{
title: this.$t('uploadedBy'),
jero-web/src/views/parameter/managementdetails/index.vue
+3 -1
View File
@@ -434,7 +434,9 @@ export default {
<style lang="less" scoped>
@import '~@assets/less/common.less';
/deep/.ant-card-body{
margin-top: -28px;
}
.doc-detail {
background: #fff;
height: 100%;
jero-web/src/views/parameter/parameterexport/index.vue
+1 -1
View File
@@ -44,7 +44,7 @@
:columns="columns"
>
<span slot="projectName" slot-scope="text,record" :title="text">
{{ text && text.length > 25 ? text.slice(0, 24) + '...' : text }}
{{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
</span>
<span slot="templateName" slot-scope="text,record" :title="text">
{{ text && text.length > 25 ? text.slice(0, 21) + '...' : text }}