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

合并master数据

Browse Source
This commit is contained in:
zer0Black
2022-06-21 22:21:07 +08:00
parent b86fa3a064 c530d98f47
commit 4182b4df14
36 changed files with 559 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/dashboard/components/customContent.vue
+15 -8
View File
@@ -1,18 +1,19 @@
<template>
<div class="customContent-box">
<div style="display: inline-block">
<div class="box-content-top">
<div class="box-content" v-for="(item,index) in dataSourceContentList" :key="index" @click="urlClick(item)">
<img :src="item.iconPath" class="img" alt="">
<div class="text" :title="item.iconName">{{item.iconName}}</div>
</div>
<div class="box-content-top">
<div class="box-content" v-for="(item,index) in dataSourceContentList" :key="index"
@click="urlClick(item)">
<img :src="item.iconPath" class="img" alt="">
<div class="text" :title="item.iconName">{{item.iconName}}</div>
</div>
<div class="box-content" @click="customClick()" style=";margin-top: 0;float: right">
<div class="box-content" @click="customClick()" style=";margin-top: 0;">
<img src="../../../assets/zdy.png" class="img" alt="">
<div class="text">{{$t('custom')}}</div>
</div>
</div>
<div class="box-content-right">
</div>
<a-modal
:title="$t('custom')"
:width="1180"
@@ -174,11 +175,12 @@
.customContent-box {
width: 100%;
text-align: center;
overflow: hidden;
.box-content-top {
max-width: calc(100% - 130px);
display: inline-block;
overflow: hidden;
overflow: auto;
white-space: nowrap;
}
@@ -249,4 +251,9 @@
margin-top: 10px;
margin-bottom: 30px;
}
.box-content-right {
display: inline-block;
overflow: hidden;
}
</style>
jero-web/src/views/dashboard/customContentList.vue
+1 -1
View File
@@ -39,7 +39,7 @@
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
:dataSource="dataSource"
:scroll="{x: 1600}"
:scroll="{x: '100%'}"
:pagination="ipagination"
:loading="loading"
@change="handleTableChange">
jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+9 -1
View File
@@ -185,7 +185,7 @@
:confirm-loading="confirmLoading"
@ok="modalOk"
@cancel="batSetCancel"
style="width: 1000px"
style="width: 1000px;height: auto"
>
<split-bat-form
ref="fileForm"
@@ -1306,6 +1306,14 @@
min-width: 700px;
}
.ant-select-dropdown--multiple {
max-height: 39vh !important;
}
.ant-modal-body {
overflow-y: visible !important;
}
.ant-modal-footer {
text-align: center;
}
jero-web/src/views/documentTools/searchCenter/components/whole.vue
+4 -1
View File
@@ -124,7 +124,10 @@
}
},
mounted() {
this.getList()
this.conList = []
// if (!this.queryParam.selectValue) {
// this.getList()
// }
},
methods: {
checkedClick(item) {
jero-web/src/views/documentTools/searchCenter/index.vue
+13
View File
@@ -105,12 +105,25 @@
this.$refs.wholeRef.searchData(this.selectValueTwo)
}
})
} else {
this.$nextTick(() => {
if (this.$refs.wholeRef) {
this.$refs.wholeRef.searchData()
}
})
}
},
methods: {
callback(key) {
this.active = key
this.selectValueTwo = ''
if (this.active == this.$t('whole')) {
this.$nextTick(() => {
if (this.$refs.wholeRef) {
this.$refs.wholeRef.searchData()
}
})
}
},
ResetSearch() {
this.selectValueTwo = ''
jero-web/src/views/documentTools/virtualList/components/addModel.vue
+53 -47
View File
@@ -11,37 +11,37 @@
<div style="margin-bottom: 60px">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('standard')">
<span>{{$t('standard')}}</span>
<a-row :gutter="24">
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('standard')">
<span>{{$t('standard')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
v-model="queryParam.serial_number"></a-input>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
v-model="queryParam.serial_number"></a-input>
</div>
</a-col>
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
<span>{{$t('title')}}</span>
</a-col>
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
<span>{{$t('title')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
v-model="queryParam.title"></a-input>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
v-model="queryParam.title"></a-input>
</div>
</a-col>
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('status')">
<span>{{$t('status')}}</span>
</a-col>
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('status')">
<span>{{$t('status')}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.state"
:placeholder="$t('PleaseSelect')+$t('status')"
:type="'select'"
:triggerChange="false" :dictCode="'state'"/>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.state"
:placeholder="$t('PleaseSelect')+$t('status')"
:type="'select'"
:triggerChange="false" :dictCode="'state'"/>
</div>
</a-col>
<span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
</a-col>
<span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
@@ -50,7 +50,7 @@
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
</a-col>
</span>
</a-row>
</a-row>
</a-form>
</div>
<div style="width: 100%">
@@ -121,17 +121,23 @@
ellipsis: true
},
{
title: this.$t('status'),
dataIndex: 'state',
align: 'center',
ellipsis: true
},
{
title: this.$t('technicalField'),
dataIndex: 'technology_territory',
title: this.$t('zoneOfApplication'),
dataIndex: 'region',
align: 'center',
ellipsis: true
},
// {
// title: this.$t('status'),
// dataIndex: 'state',
// align: 'center',
// ellipsis: true
// },
// {
// title: this.$t('technicalField'),
// dataIndex: 'technology_territory',
// align: 'center',
// ellipsis: true
// },
{
title: this.$t('ImplementationDate'),
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
@@ -143,13 +149,13 @@
dataIndex: 'implement_time',
align: 'center',
ellipsis: true
},
{
title: this.$t('correspondingStandard'),
dataIndex: 'corresponding_standard',
align: 'center',
ellipsis: true
}
// {
// title: this.$t('correspondingStandard'),
// dataIndex: 'corresponding_standard',
// align: 'center',
// ellipsis: true
// }
],
dataList: [],
content: [],
@@ -159,7 +165,7 @@
total: 0,
fieldList: [],
queryParamQuery: {},
queryConditionVOList: [],
queryConditionVOList: []
}
},
mounted() {
@@ -201,7 +207,7 @@
pageNo: this.pageNo,
pageSize: this.pageSize,
...this.queryParam,
queryConditionVOList: JSON.stringify(queryConditionVOList),
queryConditionVOList: JSON.stringify(queryConditionVOList)
}
this.loading = true
postAction(this.url.addModelList, query).then((res) => {
@@ -266,8 +272,8 @@
} else {
this.$refs.globalAdvancedQueryRef.superQueryFlag = true
this.queryConditionVOList = params
this.queryConditionVOList.forEach(res=>{
res.type = matchType
this.queryConditionVOList.forEach(res => {
res.type = matchType
})
}
this.replacePage()
jero-web/src/views/documentTools/virtualList/components/editModel.vue
+48
View File
@@ -373,6 +373,22 @@
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
</div>
<a-form-model-item class="itemModel-text" :prop="'designRemark'">
<a-textarea
style="width: 100%"
:placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
v-model="formInline.designRemark" :rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<div class="header-text">
&nbsp;{{$t('PrehomoConfirmation')}}
</div>
@@ -456,6 +472,22 @@
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
</div>
<a-form-model-item class="itemModel-text" :prop="'prehomoRemark'">
<a-textarea
style="width: 100%"
:placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
v-model="formInline.prehomoRemark" :rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<div class="header-text">
&nbsp;{{$t('verificationAndConformityconfirmation')}}
</div>
@@ -538,6 +570,22 @@
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
</div>
<a-form-model-item class="itemModel-text" :prop="'verifyRemark'">
<a-textarea
style="width: 100%"
:placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
v-model="formInline.verifyRemark" :rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
</a-spin>
<div class="drawer-bootom-button">
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+21 -3
View File
@@ -424,7 +424,6 @@
{
title: this.$t('confirmationOfDesignConformity'),
width: 540,
children: [
{
// TODO 未按要求实现，该列分为上下行，上行显示交付物类型，下行显示交付物模板名称，且交付物模板名称点击可下载。其他2个流程同理
@@ -448,12 +447,18 @@
width: 180,
ellipsis: true,
align: 'center'
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'designRemark',
align: 'center',
width: 220,
ellipsis: true
}
]
},
{
title: this.$t('PrehomoConfirmation'),
width: 540,
children: [
{
title: this.$t('Deliverables'),
@@ -476,12 +481,18 @@
width: 180,
ellipsis: true,
align: 'center'
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'prehomoRemark',
align: 'center',
width: 220,
ellipsis: true
}
]
},
{
title: this.$t('verificationAndConformityconfirmation'),
width: 540,
children: [
{
title: this.$t('Deliverables'),
@@ -504,6 +515,13 @@
width: 180,
align: 'center',
ellipsis: true
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'verifyRemark',
align: 'center',
width: 220,
ellipsis: true
}
]
},
jero-web/src/views/projectManagement/components/TaskList.vue
+2 -2
View File
@@ -543,8 +543,8 @@
text-align: center;
line-height: 32px;
border-radius: 4px;
background: #dbf6e2;
color: #26BD4B;
background: #f1f3f5;
color: #919399;
}
.accordColor {
jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
+4 -4
View File
@@ -102,7 +102,7 @@
name: this.$t('notInvolved'),
status: res.certificationProgress
})
color.push('#9DB9D4')
color.push('#707486')
this.dataSource[0].notInvolved = res.certificationProgressCount
} else if (res.certificationProgress == 'Not start') {
data.push({
@@ -110,7 +110,7 @@
name: this.$t('toBeStarted'),
status: res.certificationProgress
})
color.push('#FDB033')
color.push('#00B3BE')
this.dataSource[0].toBeStarted = res.certificationProgressCount
} else if (res.certificationProgress == 'In progress') {
data.push({
@@ -118,7 +118,7 @@
name: this.$t('inProgress'),
status: res.certificationProgress
})
color.push('#FF8543')
color.push('#FDA71C')
this.dataSource[0].inProgress = res.certificationProgressCount
} else if (res.certificationProgress == 'Test failed') {
data.push({
@@ -134,7 +134,7 @@
name: this.$t('experimentPassed'),
status: res.certificationProgress
})
color.push('#2F8DF3')
color.push('#26BD4B')
this.dataSource[0].experimentPassed = res.certificationProgressCount
}
})
jero-web/src/views/projectManagement/components/commentList.vue
+31 -14
View File
@@ -9,10 +9,14 @@
@close="handleCancel"
:visible="visible">
<div class="button-box">
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('comment')"
v-model="commentContent"></j-input>
<a-input-search class="box-input box-input-search" allowClear
@search="allowClearChange"
:placeholder="$t('PleaseEnter')+$t('comment')"
v-model="commentContent"></a-input-search>
<a-button @click="submitQuery" style="margin-right: 8px;" type="primary">{{$t('query')}}</a-button>
<a-button @click="handleSubmit" class="button-text" :title="$t('publishComment')" type="primary">{{$t('publishComment')}}</a-button>
<a-button @click="handleSubmit" class="button-text" :title="$t('publishComment')" type="primary">
{{$t('publishComment')}}
</a-button>
</div>
<div class="comment-box" v-if="dataList && dataList.length > 0">
<div class="comment-box-top-box" v-for="(item,index) in dataList" :key="index">
@@ -102,7 +106,7 @@
visible: false,
dataList: [],
formInline: {},
commentContent:'',
commentContent: '',
loading: false,
title: this.$t('comment'),
confirmLoading: false,
@@ -148,12 +152,18 @@
this.$refs.ruleForm.clearValidate()
})
},
submitQuery(){
allowClearChange() {
this.getList()
},
submitQuery() {
this.getList()
},
getList() {
this.loading = true
getAction(this.url.list, { projectLibraryId: this.$route.query.id,commentContent:this.commentContent }).then((res) => {
getAction(this.url.list, {
projectLibraryId: this.$route.query.id,
commentContent: this.commentContent
}).then((res) => {
if (res.success) {
this.loading = false
this.dataList = res.result || []
@@ -315,7 +325,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
z-index: 100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
@@ -363,14 +373,21 @@
text-align: center;
margin-top: 40px;
}
.box-input{
width: calc(100% - 168px);
margin-right: 8px;
.box-input {
width: calc(100% - 168px);
margin-right: 8px;
}
.button-text{
width: 80px;
.button-text {
width: 73px;
overflow: hidden;
padding:0 10px;
padding: 0 8px;
box-sizing: border-box;
}
</style>
<style>
.box-input-search .ant-input-suffix .ant-input-search-icon{
display: none;
}
</style>
jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue
+10 -10
View File
@@ -54,7 +54,7 @@
getData() {
getAction(this.url.getProjectDetailsStatistics, { id: this.$route.query.id }).then((res) => {
if (res.success) {
if (res.result){
if (res.result) {
let listingToConfirmMap = res.result.listingToConfirmMap ? res.result.listingToConfirmMap.listingToConfirmMapList : []
let taskToConfirmMap = res.result.taskToConfirmMap ? res.result.taskToConfirmMap.taskToConfirmMapList : []
@@ -82,28 +82,28 @@
name: this.$t('notLaunch'),
status: res.inventoryAffirmStatus || res.taskAffirmStatus
})
color.push('#00BEBE')
color.push('#707486')
} else if (res.inventoryAffirmStatus == 'List to confirm' || res.taskAffirmStatus == 'List to confirm') {
data.push({
value: res.inventoryAffirmStatusCount || res.taskAffirmStatusCount,
name: this.$t('toBeConfirmed'),
status: res.inventoryAffirmStatus || res.taskAffirmStatus
})
color.push('#FDB033')
color.push('#00B3BE')
} else if (res.inventoryAffirmStatus == 'Accepted' || res.taskAffirmStatus == 'Accepted') {
data.push({
value: res.inventoryAffirmStatusCount || res.taskAffirmStatusCount,
name: this.$t('accept'),
status: res.inventoryAffirmStatus || res.taskAffirmStatus
})
color.push('#2F8DF3')
color.push('#26BD4B')
} else if (res.inventoryAffirmStatus == 'Rejected' || res.taskAffirmStatus == 'Rejected') {
data.push({
value: res.inventoryAffirmStatusCount || res.taskAffirmStatusCount,
name: this.$t('refuse'),
status: res.inventoryAffirmStatus || res.taskAffirmStatus
})
color.push('#9DB9D4')
color.push('#E83030')
}
})
}
@@ -124,35 +124,35 @@
name: this.$t('toBeConfirmed'),
status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
})
color.push('#37CED1')
color.push('#00B3BE')
} else if (res.designFlowTaskStatus == 'Compliance' || res.prehomoFlowTaskStatus == 'Compliance' || res.verifyFlowTaskStatus == 'Compliance') {
data.push({
value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
name: this.$t('accord'),
status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
})
color.push('#2F8DF3')
color.push('#26BD4B')
} else if (res.designFlowTaskStatus == 'Non-Compliance' || res.prehomoFlowTaskStatus == 'Non-Compliance' || res.verifyFlowTaskStatus == 'Non-Compliance') {
data.push({
value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
name: this.$t('nonConformity'),
status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
})
color.push('#FF8543')
color.push('#E83030')
} else if (res.designFlowTaskStatus == 'To be tracked' || res.prehomoFlowTaskStatus == 'To be tracked' || res.verifyFlowTaskStatus == 'To be tracked') {
data.push({
value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
name: this.$t('Tracked'),
status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
})
color.push('#FDB033')
color.push('#FDA71C')
} else if (res.designFlowTaskStatus == 'NA' || res.prehomoFlowTaskStatus == 'NA' || res.verifyFlowTaskStatus == 'NA') {
data.push({
value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
name: this.$t('notInvolved'),
status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
})
color.push('#9DB9D4')
color.push('#707486')
} else if (res.designFlowTaskStatus == 'Termination of task' || res.prehomoFlowTaskStatus == 'Termination of task' || res.verifyFlowTaskStatus == 'Termination of task') {
data.push({
value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
jero-web/src/views/projectManagement/components/listAddModel.vue
+20 -14
View File
@@ -113,17 +113,23 @@
ellipsis: true
},
{
title: this.$t('status'),
dataIndex: 'state',
align: 'center',
ellipsis: true
},
{
title: this.$t('technicalField'),
dataIndex: 'technology_territory',
title: this.$t('zoneOfApplication'),
dataIndex: 'region',
align: 'center',
ellipsis: true
},
// {
// title: this.$t('status'),
// dataIndex: 'state',
// align: 'center',
// ellipsis: true
// },
// {
// title: this.$t('technicalField'),
// dataIndex: 'technology_territory',
// align: 'center',
// ellipsis: true
// },
{
title: this.$t('ImplementationDate'),
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
@@ -136,12 +142,12 @@
align: 'center',
ellipsis: true
},
{
title: this.$t('correspondingStandard'),
dataIndex: 'corresponding_standard',
align: 'center',
ellipsis: true
}
// {
// title: this.$t('correspondingStandard'),
// dataIndex: 'corresponding_standard',
// align: 'center',
// ellipsis: true
// }
],
dataList: [],
content: [],
jero-web/src/views/system/UserAnnouncementList.vue
+1 -1
View File
@@ -61,7 +61,7 @@
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
:dataSource="dataSource"
:scroll="{x: 1600}"
:scroll="{x: '100%'}"
:pagination="ipagination"
:loading="loading"
@change="handleTableChange">