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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2022-05-24 09:59:17 +08:00
parent f7919d7cb1 dde807ed2e
commit 45a5780138
6 changed files with 588 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java
+2 -1
View File
@@ -133,7 +133,8 @@ public class ShiroRealm extends AuthorizingRealm {
try { try {
loginUser = commonAPI.getUserByName(username); loginUser = commonAPI.getUserByName(username);
}catch (SerializationException e){ }catch (SerializationException e){
throw e; LoginException.loginException(401,"用户不存在!");
return null;
} }
if (loginUser == null) { if (loginUser == null) {
LoginException.loginException(401,"用户不存在!"); LoginException.loginException(401,"用户不存在!");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
+463 -430
View File
File diff suppressed because it is too large Load Diff
jero-web/src/components/libraryPush/index.vue
+2 -2
View File
@@ -110,14 +110,14 @@
this.confirmLoading = false this.confirmLoading = false
this.submitLoading = false this.submitLoading = false
if (res.success) { if (res.success) {
this.$message.success(res.message) this.$message.success(this.$t('OperationSuccessful'))
this.userIds = [] this.userIds = []
this.visible = false this.visible = false
this.visibleTree = false this.visibleTree = false
this.$emit('clearSelected') this.$emit('clearSelected')
eventBUs.$emit('searchReset') eventBUs.$emit('searchReset')
} else { } else {
this.$message.warning(res.message) this.$message.warning(this.$t('operationFailed'))
} }
}) })
}, },
jero-web/src/views/projectManagement/components/nonConformance.vue
+8 -1
View File
@@ -213,7 +213,8 @@
serialNumber: val.serialNumber, serialNumber: val.serialNumber,
actiProcInstId: val.prcId, actiProcInstId: val.prcId,
primaryKeyId: val.projectTaskInventoryDetailId, primaryKeyId: val.projectTaskInventoryDetailId,
TaskKey: val.status == 'NotDone' ? val.taskDefinitionKey : 'hhhhh' TaskKey: val.taskDefinitionKey,
isDisplay: val.status == 'NotDone' ? true : false
} }
switch (num) { switch (num) {
case '2': case '2':
@@ -222,6 +223,8 @@
query.personLiable = 'designDutyName' query.personLiable = 'designDutyName'
query.typeOfDeliverables = 'designDeliverableType_dictText' query.typeOfDeliverables = 'designDeliverableType_dictText'
query.deliverableTemplate = 'designDeliverableTemplate' query.deliverableTemplate = 'designDeliverableTemplate'
query.DueDate = 'designDueDate'
query.remarks = 'designRemark'
break break
case '3': case '3':
query.flowType = 3 query.flowType = 3
@@ -229,6 +232,8 @@
query.personLiable = 'prehomoDutyName' query.personLiable = 'prehomoDutyName'
query.typeOfDeliverables = 'prehomoDeliverableType_dictText' query.typeOfDeliverables = 'prehomoDeliverableType_dictText'
query.deliverableTemplate = 'prehomoDeliverableTemplate' query.deliverableTemplate = 'prehomoDeliverableTemplate'
query.DueDate = 'prehomoDueDate'
query.remarks = 'prehomoRemark'
break break
case '4': case '4':
query.flowType = 4 query.flowType = 4
@@ -236,6 +241,8 @@
query.personLiable = 'verifyDutyName' query.personLiable = 'verifyDutyName'
query.typeOfDeliverables = 'verifyDeliverableType_dictText' query.typeOfDeliverables = 'verifyDeliverableType_dictText'
query.deliverableTemplate = 'verifyDeliverableTemplate' query.deliverableTemplate = 'verifyDeliverableTemplate'
query.DueDate = 'verifyDueDate'
query.remarks = 'verifyRemark'
break break
} }
let newUrl = this.$router.resolve({ let newUrl = this.$router.resolve({
jero-web/src/views/projectManagement/projectNonConformance/index.vue
+111 -104
View File
@@ -2,133 +2,133 @@
<a-card :bordered="false"> <a-card :bordered="false">
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('standard')">
<span>{{$t('standard')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
v-model="queryParam.serialNumber"></j-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
<span>{{$t('title')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
v-model="queryParam.title"></j-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('areaOfResponsibility')">
<span>{{$t('areaOfResponsibility')}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
</div>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text" :title="$t('ProcessType')"> <div class="title-text" :title="$t('standard')">
<span>{{$t('ProcessType')}}</span> <span>{{$t('standard')}}</span>
</div> </div>
<a-select allowClear <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
class="box-input" v-model="queryParam.serialNumber"></j-input>
v-model="queryParam.flowType" </div>
:placeholder="$t('PleaseSelect')+$t('ProcessType')"> </a-col>
<a-select-option :value="this.$t('designComplianceReview')"> <a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
<span>{{$t('title')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
v-model="queryParam.title"></j-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('areaOfResponsibility')">
<span>{{$t('areaOfResponsibility')}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
:placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
:type="'select'"
:triggerChange="false" :dictCode="'duty_territory'"/>
</div>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('ProcessType')">
<span>{{$t('ProcessType')}}</span>
</div>
<a-select allowClear
class="box-input"
v-model="queryParam.flowType"
:placeholder="$t('PleaseSelect')+$t('ProcessType')">
<a-select-option :value="this.$t('designComplianceReview')">
<span class="itemOption"> <span class="itemOption">
{{ $t('designComplianceReview') }} {{ $t('designComplianceReview') }}
</span> </span>
</a-select-option> </a-select-option>
<a-select-option :value="this.$t('preHomeConfirmation')"> <a-select-option :value="this.$t('preHomeConfirmation')">
<span class="itemOption"> <span class="itemOption">
{{ $t('preHomeConfirmation') }} {{ $t('preHomeConfirmation') }}
</span> </span>
</a-select-option> </a-select-option>
<a-select-option :value="this.$t('verificationComplianceReview')"> <a-select-option :value="this.$t('verificationComplianceReview')">
<span class="itemOption"> <span class="itemOption">
{{ $t('verificationComplianceReview') }} {{ $t('verificationComplianceReview') }}
</span> </span>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('RelatedItems')">
<span>{{$t('RelatedItems')}}</span>
</div> </div>
<a-select allowClear </a-col>
class="box-input" <a-col :md="6" :sm="8">
v-model="queryParam.projectName" <div class="box-title-text">
:placeholder="$t('PleaseSelect')+$t('RelatedItems')"> <div class="title-text" :title="$t('RelatedItems')">
<a-select-option v-for="(item, key) in projectNameList" <span>{{$t('RelatedItems')}}</span>
:key="key" </div>
:value="item.projectName"> <a-select allowClear
class="box-input"
v-model="queryParam.projectName"
:placeholder="$t('PleaseSelect')+$t('RelatedItems')">
<a-select-option v-for="(item, key) in projectNameList"
:key="key"
:value="item.projectName">
<span style="display: inline-block;width: 100%" :title=" item.projectName "> <span style="display: inline-block;width: 100%" :title=" item.projectName ">
{{ item.projectName}} {{ item.projectName}}
</span> </span>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('problemType')">
<span>{{$t('problemType')}}</span>
</div> </div>
<a-select allowClear </a-col>
class="box-input" <a-col :md="6" :sm="8">
v-model="queryParam.problemType" <div class="box-title-text">
:placeholder="$t('PleaseSelect')+$t('problemType')"> <div class="title-text" :title="$t('problemType')">
<a-select-option :value="$t('inconformity')"> <span>{{$t('problemType')}}</span>
</div>
<a-select allowClear
class="box-input"
v-model="queryParam.problemType"
:placeholder="$t('PleaseSelect')+$t('problemType')">
<a-select-option :value="$t('inconformity')">
<span class="itemOption"> <span class="itemOption">
{{ $t('nonConformity') }} {{ $t('nonConformity') }}
</span> </span>
</a-select-option> </a-select-option>
<a-select-option :value="$t('toTrack')"> <a-select-option :value="$t('toTrack')">
<span class="itemOption"> <span class="itemOption">
{{ $t('Tracked') }} {{ $t('Tracked') }}
</span> </span>
</a-select-option> </a-select-option>
</a-select> </a-select>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('Sponsor')">
<span>{{$t('Sponsor')}}</span>
</div> </div>
<PersonnelSelection :query="{db_field_name:'initiator',db_field_txt:$t('Sponsor')}" </a-col>
:isInput="true" <a-col :md="6" :sm="8">
class="box-input" <div class="box-title-text">
:personneQuery="queryParam" <div class="title-text" :title="$t('Sponsor')">
@change="PersonnelSelectionChange" <span>{{$t('Sponsor')}}</span>
v-model="queryParam.initiatorName"/> </div>
</div> <PersonnelSelection :query="{db_field_name:'initiator',db_field_txt:$t('Sponsor')}"
</a-col> :isInput="true"
<a-col :md="6" :sm="8"> class="box-input"
<div class="box-title-text"> :personneQuery="queryParam"
<div class="title-text" :title="$t('personLiable')"> @change="PersonnelSelectionChange"
<span>{{$t('personLiable')}}</span> v-model="queryParam.initiatorName"/>
</div> </div>
<PersonnelSelection :query="{db_field_name:'duty',db_field_txt:$t('personLiable')}" </a-col>
:isInput="true" <a-col :md="6" :sm="8">
class="box-input" <div class="box-title-text">
:personneQuery="queryParam" <div class="title-text" :title="$t('personLiable')">
@change="PersonnelSelectionChange" <span>{{$t('personLiable')}}</span>
v-model="queryParam.dutyName"/> </div>
</div> <PersonnelSelection :query="{db_field_name:'duty',db_field_txt:$t('personLiable')}"
</a-col> :isInput="true"
</template> class="box-input"
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons"> :personneQuery="queryParam"
@change="PersonnelSelectionChange"
v-model="queryParam.dutyName"/>
</div>
</a-col>
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button> <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button> <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
@@ -138,7 +138,7 @@
</a> </a>
</a-col> </a-col>
</span> </span>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
<div class="table-operator"> <div class="table-operator">
@@ -349,7 +349,8 @@
serialNumber: val.serialNumber, serialNumber: val.serialNumber,
actiProcInstId: val.prcId, actiProcInstId: val.prcId,
primaryKeyId: val.projectTaskInventoryDetailId, primaryKeyId: val.projectTaskInventoryDetailId,
TaskKey: val.status == 'NotDone' ? val.taskDefinitionKey : 'hhhhh' TaskKey: val.taskDefinitionKey,
isDisplay: val.status == 'NotDone' ? true : false
} }
switch (num) { switch (num) {
case '2': case '2':
@@ -358,6 +359,8 @@
query.personLiable = 'designDutyName' query.personLiable = 'designDutyName'
query.typeOfDeliverables = 'designDeliverableType_dictText' query.typeOfDeliverables = 'designDeliverableType_dictText'
query.deliverableTemplate = 'designDeliverableTemplate' query.deliverableTemplate = 'designDeliverableTemplate'
query.DueDate = 'designDueDate'
query.remarks = 'designRemark'
break break
case '3': case '3':
query.flowType = 3 query.flowType = 3
@@ -365,6 +368,8 @@
query.personLiable = 'prehomoDutyName' query.personLiable = 'prehomoDutyName'
query.typeOfDeliverables = 'prehomoDeliverableType_dictText' query.typeOfDeliverables = 'prehomoDeliverableType_dictText'
query.deliverableTemplate = 'prehomoDeliverableTemplate' query.deliverableTemplate = 'prehomoDeliverableTemplate'
query.DueDate = 'prehomoDueDate'
query.remarks = 'prehomoRemark'
break break
case '4': case '4':
query.flowType = 4 query.flowType = 4
@@ -372,6 +377,8 @@
query.personLiable = 'verifyDutyName' query.personLiable = 'verifyDutyName'
query.typeOfDeliverables = 'verifyDeliverableType_dictText' query.typeOfDeliverables = 'verifyDeliverableType_dictText'
query.deliverableTemplate = 'verifyDeliverableTemplate' query.deliverableTemplate = 'verifyDeliverableTemplate'
query.DueDate = 'verifyDueDate'
query.remarks = 'verifyRemark'
break break
} }
let newUrl = this.$router.resolve({ let newUrl = this.$router.resolve({
jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+2 -2
View File
@@ -285,7 +285,7 @@
left: 'right' left: 'right'
}, },
tooltip: { tooltip: {
position: 'top', position: 'left',
formatter: function(params) { formatter: function(params) {
return ( return (
timeDataList[params.value[3]].name + '<br/>' + timeDataList[params.value[3]].name + '<br/>' +
@@ -294,7 +294,7 @@
} }
}, },
grid: { grid: {
top: 0, top: 10,
left: 40, left: 40,
right: 40, right: 40,
containLabel: true containLabel: true