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

项目库跳转vdr

Browse Source
This commit is contained in:
zyx.net
2023-08-21 09:40:57 +08:00
parent d451cfdfe0
commit 9ac600e7de
4 changed files with 72 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
+23 -8
View File
@@ -145,11 +145,11 @@
{{ $t('submit') }} {{ $t('submit') }}
</div> </div>
<!-- manger导出--> <!-- manger导出-->
<div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="handleExportManage('manger')" <!-- <div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="handleExportManage('manger')"-->
v-has="'otaman:export'"> <!-- v-has="'otaman:export'">-->
<a-icon type="export" :rotate="-90"/> <!-- <a-icon type="export" :rotate="-90"/>-->
{{ $t('export') }} <!-- {{ $t('export') }}-->
</div> <!-- </div>-->
<!-- manger确认--> <!-- manger确认-->
<div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="confirm" <div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="confirm"
v-has="'otaman:confirm'"> v-has="'otaman:confirm'">
@@ -194,9 +194,15 @@
</div> </div>
</a-popconfirm> </a-popconfirm>
</div> </div>
<a-table ref="table" size="middle" :components="drag(columnsAll, 'columnsAll')" :loading="loading" :pagination="false" <a-table ref="table" size="middle"
:scroll="{ x: '100%', y: 'calc(100vh - 140px)' }" rowKey="id" :data-source="dataSource" :components="drag(columnsAll, 'columnsAll')"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columnsAll"> :loading="loading" :pagination="false"
:scroll="{ x: '100%', y: 'calc(100vh - 140px)' }"
rowKey="id"
@change="tableOnChange"
:data-source="dataSource"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columnsAll">
<!-- 历史记录--> <!-- 历史记录-->
<template slot="operation" slot-scope="text, record"> <template slot="operation" slot-scope="text, record">
<a-button class="action-dict" @click="UpdateLog(record)">{{$t('historicalrecord')}}</a-button> <a-button class="action-dict" @click="UpdateLog(record)">{{$t('historicalrecord')}}</a-button>
@@ -883,6 +889,8 @@ export default {
}, },
], ],
userInfoQuery: {}, userInfoQuery: {},
orderBy: '1',
orderByField: '',
administrators: false administrators: false
} }
}, },
@@ -937,6 +945,11 @@ export default {
handleToggleSearch() { handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus this.toggleSearchStatus = !this.toggleSearchStatus
}, },
tableOnChange(pagination, filters, sorter) {
this.orderBy = sorter.order == 'ascend' ? '1' : '2'
this.orderByField = sorter.columnKey
this.getList()
},
searchQuery() { searchQuery() {
this.pageNo = 1 this.pageNo = 1
this.getList() this.getList()
@@ -969,6 +982,8 @@ export default {
let query = { let query = {
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize,
orderBy: this.orderBy,
orderByField: this.orderByField,
...queryParam ...queryParam
} }
this.loading = true this.loading = true
jero-web/src/views/projectManagement/components/addModel.vue
+13 -13
View File
@@ -474,7 +474,7 @@
this.$message.success(this.$t('OperationSuccessful')) this.$message.success(this.$t('OperationSuccessful'))
this.visible = false this.visible = false
this.$emit('addModelList') this.$emit('addModelList')
this.vdrClick() // this.vdrClick()
} else { } else {
this.$message.warning(res.message) this.$message.warning(res.message)
this.confirmLoading = false this.confirmLoading = false
@@ -484,18 +484,18 @@
}) })
}, },
// 跳转vdr // 跳转vdr
vdrClick(){ // vdrClick(){
let _this = this // let _this = this
this.$confirm({ // this.$confirm({
content: _this.$t('Rematchornot') + 'VDR', // content: _this.$t('Rematchornot') + 'VDR',
onOk() { // onOk() {
let newUrl = _this.$router.resolve({ // let newUrl = _this.$router.resolve({
path:'otaAuthentication', // path:'otaAuthentication',
}) // })
window.open(newUrl.href, '_blank') // window.open(newUrl.href, '_blank')
} // }
}) // })
}, // },
handleInput(value) { handleInput(value) {
this.$nextTick(() => { this.$nextTick(() => {
this.formInline = { ...this.formInline } this.formInline = { ...this.formInline }
jero-web/src/views/projectManagement/components/otastatus.vue
+20 -22
View File
@@ -47,11 +47,11 @@
<td width="150px" height="50px" align="center">{{$t('notInvolved')}}</td> <td width="150px" height="50px" align="center">{{$t('notInvolved')}}</td>
</tr> </tr>
<tr> <tr>
<td height="80px" align="center"><span style='color: #5087EC'>111</span></td> <td height="80px" align="center"><span style='color: #5087EC'>{{matchForm.a}}</span></td>
<td height="80px" align="center"><span style='color: #68BBC4'>111</span></td> <td height="80px" align="center"><span style='color: #68BBC4'>{{matchForm.a}}</span></td>
<td height="80px" align="center"><span style='color: #58A55C'>111</span></td> <td height="80px" align="center"><span style='color: #58A55C'>{{matchForm.a}}</span></td>
<td height="80px" align="center"><span style='color: #F2BD42'>111</span></td> <td height="80px" align="center"><span style='color: #F2BD42'>{{matchForm.a}}</span></td>
<td height="80px" align="center"><span style='color: #BBBBBB'>111</span></td> <td height="80px" align="center"><span style='color: #BBBBBB'>{{matchForm.a}}</span></td>
</tr> </tr>
</table> </table>
</div> </div>
@@ -72,13 +72,13 @@
<td width="190px" height="50px" align="center">{{$t('componentReportHasBeenStored')}}</td> <td width="190px" height="50px" align="center">{{$t('componentReportHasBeenStored')}}</td>
</tr> </tr>
<tr> <tr>
<td height="80px" align="center"><span style='color: #BBBBBB'>111</span></td> <td height="80px" align="center"><span style='color: #BBBBBB'>{{authenticationForm.a}}</span></td>
<td height="80px" align="center"><span style='color: #68BBC4'>111</span></td> <td height="80px" align="center"><span style='color: #68BBC4'>{{authenticationForm.a}}</span></td>
<td height="80px" align="center"><span style='color: #68BBC4'>111</span></td> <td height="80px" align="center"><span style='color: #68BBC4'>{{authenticationForm.a}}</span></td>
<td height="80px" align="center"><span style='color: #D95040'>111</span></td> <td height="80px" align="center"><span style='color: #D95040'>{{authenticationForm.a}}</span></td>
<td height="80px" align="center"><span style='color: #BBBBBB'>111</span></td> <td height="80px" align="center"><span style='color: #BBBBBB'>{{authenticationForm.a}}</span></td>
<td height="80px" align="center"><span style='color: #68BBC4'>111</span></td> <td height="80px" align="center"><span style='color: #68BBC4'>{{authenticationForm.a}}</span></td>
<td height="80px" align="center"><span style='color: #58A55C'>111</span></td> <td height="80px" align="center"><span style='color: #58A55C'>{{authenticationForm.a}}</span></td>
</tr> </tr>
</table> </table>
</div> </div>
@@ -133,6 +133,8 @@
vehicleTypeCode:'', vehicleTypeCode:'',
softwareversion:'', softwareversion:'',
releaseName:'', releaseName:'',
matchForm:{},
authenticationForm:{},
url: { url: {
getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatistics' getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatistics'
}, },
@@ -158,10 +160,11 @@
if (res.success) { if (res.success) {
if (res.result) { if (res.result) {
let mainTopDataSource = res.result.taskToConfirmMap ? res.result.taskToConfirmMap.taskToConfirmMapList : [] let mainTopDataSource = res.result.taskToConfirmMap ? res.result.taskToConfirmMap.taskToConfirmMapList : []
let mainLeftDataSource = res.result.designComplianceMap ? res.result.designComplianceMap.designComplianceMapList : [] let mainEndDataSource = res.result.designComplianceMap ? res.result.designComplianceMap.designComplianceMapList : []
// let mainRightDataSource = res.result.verifyComplianceMap ? res.result.verifyComplianceMap.verifyComplianceMapList : [] this.matchForm = res.result.matchForm
this.authenticationForm = res.result.authenticationForm
this.mainTopEcharts(mainTopDataSource) this.mainTopEcharts(mainTopDataSource)
this.mainEndEcharts(mainLeftDataSource) this.mainEndEcharts(mainEndDataSource)
// this.mainRightEcharts(mainRightDataSource) // this.mainRightEcharts(mainRightDataSource)
} }
} }
@@ -170,13 +173,8 @@
getoptions() { getoptions() {
let id = '' let id = ''
if (this.idList && this.idList.length > 0) { id = this.$route.query.id
id = this.idList.join(',') getAction('ota/otaManageApplyEO/getVdrListByProject', { projectId: id }).then((res) => {
} else {
id = this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id
// id = this.$route.query.id
}
getAction('project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestLabel', { id: id }).then((res) => {
if (res.success) { if (res.success) {
this.options = res.result this.options = res.result
this.queryParam.ctype = this.options[0].value this.queryParam.ctype = this.options[0].value
jero-web/src/views/projectManagement/components/settingList.vue
+16
View File
@@ -515,6 +515,9 @@
this.visible = false this.visible = false
this.confirmLoading = false this.confirmLoading = false
this.$emit('settingListForm') this.$emit('settingListForm')
if(res.result.matchVdr == true){
this.vdrClick()
}
} else { } else {
this.$message.warning(this.$t('operationFailed')) this.$message.warning(this.$t('operationFailed'))
this.confirmLoading = false this.confirmLoading = false
@@ -523,6 +526,19 @@
} }
}) })
}, },
// 跳转vdr
vdrClick(){
let _this = this
this.$confirm({
content: _this.$t('Rematchornot') + 'VDR',
onOk() {
let newUrl = _this.$router.resolve({
path:'otaAuthentication',
})
window.open(newUrl.href, '_blank')
}
})
},
handleCancel() { handleCancel() {
this.formInline = {} this.formInline = {}
this.visible = false this.visible = false