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

合并分支 'dev_third_stage' 到 'master'

Browse Source 
Dev third stage

查看合并请求 laws-nio/laws-weilai!146
This commit is contained in:
李雪涛
2022-08-16 11:10:01 +08:00
parent 85836680c7 159ab2843d
commit d1e8f66087
16 changed files with 218 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/search/index.vue
+1 -1
View File
@@ -299,7 +299,7 @@
.title-text {
width: 20%;
min-width: 110px;
min-width: 100px;
color: #000F16;
display: inline-block;
font-weight: 500;
jero-web/src/components/tableCollection/index.vue
+1
View File
@@ -871,6 +871,7 @@
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
word-break: break-word;
color: #040B29;
font-weight: 400;
}
jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue
+3 -1
View File
@@ -10,6 +10,8 @@
</div>
<a-select :placeholder="$t('PleaseSelect')+$t('applicableMarket')"
:disabled="false"
style="z-index: 100"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="queryParam.applyMarket">
<a-select-option v-for="(item, key) in applyMarketList"
:key="key"
@@ -86,7 +88,7 @@
},
methods: {
getApplyMarketList() {
getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: 'countryCard' }).then((res) => {
getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: '2' }).then((res) => {
if (res.success) {
this.applyMarketList = res.result || []
} else {
jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
+8 -3
View File
@@ -20,8 +20,9 @@
<span>{{$t('applicableMarket')}}</span>
</div>
<a-select class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
:placeholder="$t('PleaseSelect')+$t('applicableMarket')"
style="width: 100%"
style="width: 100%;"
v-model="queryParam.applyMarket">
<a-select-option v-for="(item, key) in applyMarketList"
:key="key"
@@ -39,8 +40,9 @@
<span>{{$t('releaseStatus')}}</span>
</div>
<a-select class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
:placeholder="$t('PleaseSelect')+$t('releaseStatus')"
style="width: 100%"
style="width: 100%;"
v-model="queryParam.releaseStatus">
<a-select-option v-for="(item, key) in releaseStatusList"
:key="key"
@@ -192,7 +194,7 @@
methods: {
...mapGetters(['userInfo']),
getApplyMarketList() {
getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: '1' }).then((res) => {
getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: '3' }).then((res) => {
if (res.success) {
this.applyMarketList = res.result || []
} else {
@@ -474,4 +476,7 @@
.text-operation {
margin-right: 8px;
}
::v-deep .ant-select-dropdown{
z-index: 100;
}
</style>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue
+1 -1
View File
@@ -181,7 +181,7 @@
this.editReplacePage(row)
},
getApplyMarketList() {
getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', {}).then((res) => {
getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: '1' }).then((res) => {
if (res.success) {
this.applyMarketList = res.result || []
} else {
jero-web/src/views/documentManage/library/docDetail/index.vue
+2
View File
@@ -590,6 +590,7 @@
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
word-break: break-word;
color: #040B29;
font-weight: 400;
}
@@ -618,6 +619,7 @@
font-size: 16px;
text-overflow: ellipsis;
white-space: pre-wrap;
word-break: break-word;
overflow: visible;
float: left;
color: #040B29;
jero-web/src/views/processCenter/components/projectInformation.vue
+1
View File
@@ -145,6 +145,7 @@
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
word-break: break-word;
color: #040B29;
font-weight: 400;
}
jero-web/src/views/processCenter/components/standardContent.vue
+2
View File
@@ -138,6 +138,7 @@
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
word-break: break-word;
color: #040B29;
font-weight: 400;
}
@@ -172,6 +173,7 @@
text-overflow: ellipsis;
white-space: pre-wrap;
overflow: visible;
word-break: break-word;
float: left;
color: #040B29;
font-weight: 400;
jero-web/src/views/projectManagement/components/ProjectDetails.vue
+1
View File
@@ -268,6 +268,7 @@
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
word-break: break-word;
color: #040B29;
font-weight: 400;
}
jero-web/src/views/regulatoryEarlyWarning/index.vue
+37 -2
View File
@@ -35,6 +35,39 @@
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
>
<span slot="vehicleInProductionDate" slot-scope="text,result">
<span v-if="result.xin1_che1_xing2_shi2_shi1_ri4_qi1 == 'yellow'">
{{text}}
</span>
<span v-else-if="result.xin1_che1_xing2_shi2_shi1_ri4_qi1 == 'red'">
{{text}}
</span>
<span v-else>
{{text}}
</span>
</span>
<span slot="ImplementationDate" slot-scope="text,result">
<span v-if="result.new_colour == 'yellow'" style="color: #fdd835">
{{text}}
</span>
<span v-else-if="result.new_colour == 'red'" style="color: red">
{{text}}
</span>
<span v-else>
{{text}}
</span>
</span>
<span slot="vehicleInProductionDate" slot-scope="text,result">
<span v-if="result.implement_colour == 'yellow'" style="color: #fdd835">
{{text}}
</span>
<span v-else-if="result.implement_colour == 'red'" style="color: red">
{{text}}
</span>
<span v-else>
{{text}}
</span>
</span>
</a-table>
<div class="page" v-if="dataSource && dataSource.length > 0">
<a-pagination
@@ -138,14 +171,16 @@
align: 'center',
ellipsis: true,
width: 210,
dataIndex: 'implement_time'
dataIndex: 'implement_time',
scopedSlots: { customRender: 'vehicleInProductionDate' }
},
{
title: this.$t('ImplementationDate'),
align: 'center',
ellipsis: true,
width: 210,
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1'
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
scopedSlots: { customRender: 'ImplementationDate' }
}
]
}