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 11:57:54 +08:00
parent bb0caa01a8 77d6830e58
commit 53cf8b1ab8
5 changed files with 111 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/PDFUtils.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class PDFUtils {
brush.getGraphics().save();
brush.getGraphics().translateTransform((float) brush.getSize().getWidth() / 1.5, (float) brush.getSize().getHeight() / 3);
brush.getGraphics().rotateTransform(-45);
brush.getGraphics().drawString(watermark, new PdfFont(PdfFontFamily.Helvetica, 10),
brush.getGraphics().drawString(watermark, new PdfFont(PdfFontFamily.Times_Roman, 10),
PdfBrushes.getViolet(), 0 , 0 , new PdfStringFormat(PdfTextAlignment.Center));
brush.getGraphics().restore();
brush.getGraphics().setTransparency(1);
jero-web/src/components/tableCollection/index1.vue
+1 -1
View File
@@ -222,7 +222,7 @@
dataSource: [],
pageNo: 1,
pageSize: 10,
pageSizeOptions: ['10', '20','30', '50'],
pageSizeOptions: ['100', '200'],
total: 0,
searchParmes: {},
loading: false,
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+68 -48
View File
@@ -12,43 +12,6 @@
<div style="padding-top: 68px;background: #fff">
<div class="detail-content" style="padding: 24px">
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-row :gutter="24">
<a-col :span="8">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('displayPermission')">{{$t('displayPermission')}}</span>
</div>
<a-form-model-item class="itemModel" prop="showPermissions">
<a-select :placeholder="$t('PleaseSelect')+$t('displayPermission')"
@change="showPermissionsChange"
v-model="formInline.showPermissions">
<a-select-option v-for="(item, key) in projectNameList"
:key="key"
:value="item.value">
<span class="selectText" :title=" item.name ">
{{ item.name}}
</span>
</a-select-option>
</a-select>
</a-form-model-item>
</div>
</a-col>
<a-col :span="8" v-if="isDisplay">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('authorizedUser')">{{$t('authorizedUser')}}</span>
</div>
<a-form-model-item class="itemModel" prop="studioEngineerName">
<PersonnelSelection :query="{db_field_name:'studioEngineer',db_field_txt:$t('authorizedUser')}"
:personneQuery="formInline"
@change="PersonnelSelectionChange"
v-model="formInline.studioEngineerName"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="8">
<div class="box-title-text">
@@ -106,25 +69,55 @@
<a-col :span="8">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text" :title="$t('standardNo')">{{$t('standardNo')}}</span>
<span class="Required">*</span>
<span class="title-text-text" :title="$t('displayPermission')">{{$t('displayPermission')}}</span>
</div>
<a-form-model-item class="itemModel" prop="standNumber">
<a-input class="box-input"
:title="formInline.standNumber"
:disabled="true"
v-model="formInline.standNumber"
:placeholder="$t('PleaseEnter')+$t('standardNo')"/>
<a-form-model-item class="itemModel" prop="showPermissions">
<a-select :placeholder="$t('PleaseSelect')+$t('displayPermission')"
@change="showPermissionsChange"
v-model="formInline.showPermissions">
<a-select-option v-for="(item, key) in projectNameList"
:key="key"
:value="item.value">
<span class="selectText" :title=" item.name ">
{{ item.name}}
</span>
</a-select-option>
</a-select>
</a-form-model-item>
</div>
</a-col>
<a-col :span="8" v-if="isDisplay">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('authorizedUser')">{{$t('authorizedUser')}}</span>
</div>
<a-form-model-item class="itemModel" prop="studioEngineerName">
<PersonnelSelection :query="{db_field_name:'studioEngineer',db_field_txt:$t('authorizedUser')}"
:personneQuery="formInline"
@change="PersonnelSelectionChange"
v-model="formInline.studioEngineerName"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="8">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"></span>
<span class="title-text-text" :title="$t('standardNo')">{{$t('standardNo')}}</span>
</div>
<a-button class="box-button" type="primary" @click="bringInDocumentInformationClick">
{{$t('bringInDocumentInformation')}}
</a-button>
<a-form-model-item class="itemModel" prop="standNumber">
<a-input class="box-input-index"
:title="formInline.standNumber"
:disabled="true"
v-model="formInline.standNumber"
:placeholder="$t('PleaseEnter')+$t('standardNo')"/>
<a-button class="box-button-index"
:title="$t('bringInDocumentInformation')"
type="primary" @click="bringInDocumentInformationClick">
{{$t('bringInDocumentInformation')}}
</a-button>
</a-form-model-item>
</div>
</a-col>
</a-row>
@@ -584,6 +577,26 @@
margin-top: 4px;
}
.box-button-index {
height: 38px;
margin-top: 2px;
width: 120px;
overflow: hidden;
padding: 0 0;
float: right;
text-align: center;
}
::v-deep .box-button-index span {
display: inline-block;
width: 100px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
margin-top: 4px;
text-align: center;
}
.submit-button {
width: 100%;
margin-top: 20px;
@@ -612,4 +625,11 @@
overflow: hidden;
word-break: break-word;
}
.box-input-index {
width: calc(100% - 130px);
display: inline-block;
height: 38px;
margin-right: 10px;
}
</style>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+28 -19
View File
@@ -18,6 +18,7 @@
<template v-for="tag in tagList">
<a-checkable-tag
:key="tag.id"
:title="tag.problemLabel"
:checked="selectedTags.indexOf(tag.id) > -1"
@change="checked => handleChange(tag.id, checked)"
>
@@ -45,7 +46,7 @@
<div style="margin-bottom: 10px;position: relative">
<!-- <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>-->
<div class="text-text-right"
:class="{ 'null-input':item.checked }">
:class="{ 'null-input':index % 2 == 0 ? true : false}">
<div class="text-header" @click="titleClick(item)">
<a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
<template slot="title">
@@ -306,7 +307,7 @@
}
.text-text-right {
padding: 19px 0;
padding: 19px 20px;
box-sizing: border-box;
/*margin-left: 38px;*/
}
@@ -352,8 +353,15 @@
font-weight: 400;
color: #040B29;
opacity: 0.7;
white-space: pre-wrap;
word-wrap: break-word;
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 {
@@ -367,18 +375,9 @@
line-height: 10;
}
::v-deep .ant-tag {
padding: 2px 4px;
background: #9B9DA9;
color: #fff !important;
}
::v-deep .ant-tag-checkable:not(.ant-tag-checkable-checked):hover {
color: #fff !important;
}
::v-deep .ant-tag-checkable-checked {
background: #21c9cc;
border: 1px #21c9cc solid;
color: #21c9cc;
}
::v-deep p {
@@ -394,11 +393,21 @@
}
.box-content-left .ant-tag-checkable {
padding: 3px 8px;
padding: 4px 10px;
display: inline-block;
box-sizing: border-box;
margin-bottom: 10px;
background: #fff;
border: 1px #d9d9d9 solid;
color: rgba(0, 0, 0, 0.65);
max-width: 150px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-all;
}
.box-content-left .ant-tag-checkable-checked {
color: #fff;
.box-content-left .ant-tag-checkable-checked{
border: 1px #21c9cc solid;
color: #21c9cc;
}
</style>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+13 -4
View File
@@ -26,10 +26,10 @@
</div>
<div v-if="conList.length > 0" style="height: calc(100vh - 240px);overflow:auto;">
<div v-for="(item,index) in conList" :key="item.id">
<div style="margin-bottom: 10px;position: relative;overflow: hidden">
<div style="margin-bottom: 10px;position: relative;overflow: hidden"
:class="{ 'null-input':index % 2 == 0 ? true : false }">
<!-- <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>-->
<div class="text-text-right"
:class="{ 'null-input':item.checked }">
<div class="text-text-right">
<div class="text-header" @click="titleClick(item)">
<a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
<template slot="title">
@@ -270,7 +270,7 @@
}
.text-text-right {
padding: 19px 0;
padding: 19px 19px;
width: calc(100% - 180px);
box-sizing: border-box;
/*margin-left: 38px;*/
@@ -327,6 +327,15 @@
font-weight: 400;
color: #040B29;
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 {