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

Merge branch 'dev_2nd_LCYH' of http://git.hzwlsoft.com/laws-nio/laws-weilai into dev_2nd_LCYH

Browse Source
This commit is contained in:
yuekuo
2023-03-25 19:03:56 +08:00
parent b74602af6a 47dad28c06
commit f153d45b6f
8 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+3 -3
View File
@@ -236,8 +236,8 @@
projectNameList:[], projectNameList:[],
formRules:[], formRules:[],
url: { url: {
exportData: '/ota/otaBaCxList/exportData', exportData: '/ota/otaBaCxJbxx/exportData',
importZipUrl: '/ota/otaBaCxList/importData',//导入 importZipUrl: '/ota/otaBaCxJbxx/importData',//导入
}, },
form:{}, form:{},
projectNameList1:['传统动力汽车','节能汽车','新能源汽车','其他'], projectNameList1:['传统动力汽车','节能汽车','新能源汽车','其他'],
@@ -254,7 +254,7 @@
methods: { methods: {
// 模板下载 // 模板下载
handleModule() { handleModule() {
downloadFile('ota/otaBaCxList/exportTemplate', '车型及功能备案' + '.zip', {}) downloadFile('ota/otaBaCxJbxx/exportTemplate', '车型及功能备案' + '.zip', {})
}, },
getSelect(){ getSelect(){
getAction('/ota/otaBaCxList/list').then(res=>{ getAction('/ota/otaBaCxList/list').then(res=>{
jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+3 -3
View File
@@ -115,8 +115,8 @@ import ImportFile from '@/components/ImportFileData/index'
data() { data() {
return { return {
url: { url: {
exportData: '/ota/otaBaCxList/exportData', exportData: '/ota/otaBaCxKsjjsmccs/exportData',
importZipUrl: '/ota/otaBaCxList/importData',//导入 importZipUrl: '/ota/otaBaCxKsjjsmccs/importData',//导入
}, },
dataSource: [ dataSource: [
{ {
@@ -288,7 +288,7 @@ import ImportFile from '@/components/ImportFileData/index'
methods: { methods: {
// 模板下载 // 模板下载
handleModule() { handleModule() {
downloadFile('ota/otaBaCxList/exportTemplate', '车型及功能备案' + '.zip', {}) downloadFile('ota/otaBaCxKsjjsmccs/exportTemplate', '车型及功能备案' + '.zip', {})
}, },
getList() { getList() {
let queryParam = JSON.parse(JSON.stringify(this.queryParam)) let queryParam = JSON.parse(JSON.stringify(this.queryParam))
jero-web/src/views/otamanagement/vehicleinformation/components/other.vue
+4 -4
View File
@@ -20,7 +20,7 @@
</a-spin> </a-spin>
<div class="bootom-button"> <div class="bootom-button">
<a-button style="margin-right:50px" @click="save">{{$t('preservation')}}</a-button> <a-button style="margin-right:50px" @click="save">{{$t('preservation')}}</a-button>
<a-button type="primary" @click='last' style="margin-right:50px">{{$t('last')}}</a-button> <a-button type="primary" style='margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
<a-button type="primary" @click='submit'>{{$t('submit')}}</a-button> <a-button type="primary" @click='submit'>{{$t('submit')}}</a-button>
</div> </div>
</div> </div>
@@ -54,8 +54,6 @@ export default {
getAction('/ota/otaBaCxQt/queryByOtaId',{otaIdT:localStorage.getItem('otaIdT'),otaId:localStorage.getItem('otaId')}).then(res=>{ getAction('/ota/otaBaCxQt/queryByOtaId',{otaIdT:localStorage.getItem('otaIdT'),otaId:localStorage.getItem('otaId')}).then(res=>{
console.log(res); console.log(res);
}) })
}
}, },
save(){ save(){
this.$refs.ruleForm.validate( valid =>{ this.$refs.ruleForm.validate( valid =>{
@@ -73,8 +71,10 @@ export default {
this.$emit('otherup') this.$emit('otherup')
}, },
submit(){ submit(){
this.save() this.save()
}, },
},
} }
</script> </script>
jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+2 -4
View File
@@ -294,8 +294,8 @@ export default {
return { return {
radioList:9, radioList:9,
url: { url: {
exportData: '/ota/otaBaCxList/exportData', exportData: '/ota/otaBaCxJsfzbacs/exportData',
importZipUrl: '/ota/otaBaCxList/importData',//导入 importZipUrl: '/ota/otaBaCxJsfzbacs/importData',//导入
}, },
dataSource: [ dataSource: [
{ {
@@ -763,8 +763,6 @@ export default {
fillincontent:this.$t('yesisselected'), fillincontent:this.$t('yesisselected'),
}, },
], ],
url: {
},
queryParam: {}, queryParam: {},
dataSourceList: [ dataSourceList: [
{ {
jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
+3 -6
View File
@@ -57,8 +57,8 @@ import ImportFile from '@/components/ImportFileData/index'
data() { data() {
return { return {
url: { url: {
exportData: '/ota/otaBaCxList/exportData', exportData: '/ota/otaBaCxAqcs/exportData',
importZipUrl: '/ota/otaBaCxList/importData',//导入 importZipUrl: '/ota/otaBaCxAqcs/importData',//导入
}, },
dataSource: [ dataSource: [
{ {
@@ -160,9 +160,6 @@ import ImportFile from '@/components/ImportFileData/index'
pageSize: 10, pageSize: 10,
pageNo: 1, pageNo: 1,
total: 0, total: 0,
url: {
list: '/todoCenter/projectProcess/issuedProcess'
},
queryParam: {} queryParam: {}
} }
}, },
@@ -173,7 +170,7 @@ import ImportFile from '@/components/ImportFileData/index'
methods: { methods: {
// 模板下载 // 模板下载
handleModule() { handleModule() {
downloadFile('ota/otaBaCxList/exportTemplate', '车型及功能备案' + '.zip', {}) downloadFile('ota/otaBaCxAqcs/exportTemplate', '车型及功能备案' + '.zip', {})
}, },
getData(){ getData(){
getAction('/ota/otaBaCxAqcs/queryByOtaId',{otaIdT:localStorage.getItem('otaIdT'),otaId:localStorage.getItem('otaId')}).then(res=>{ getAction('/ota/otaBaCxAqcs/queryByOtaId',{otaIdT:localStorage.getItem('otaIdT'),otaId:localStorage.getItem('otaId')}).then(res=>{
jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
+3 -3
View File
@@ -45,8 +45,8 @@ export default {
data() { data() {
return { return {
url: { url: {
exportData: '/ota/otaBaCxList/exportData', exportData: '/ota/otaBaCxZxsjyq/exportData',
importZipUrl: '/ota/otaBaCxList/importData',//导入 importZipUrl: '/ota/otaBaCxZxsjyq/importData',//导入
}, },
dataSource: [ dataSource: [
{ {
@@ -202,7 +202,7 @@ export default {
methods: { methods: {
// 模板下载 // 模板下载
handleModule() { handleModule() {
downloadFile('ota/otaBaCxList/exportTemplate', '车型及功能备案' + '.zip', {}) downloadFile('ota/otaBaCxZxsjyq/exportTemplate', '车型及功能备案' + '.zip', {})
}, },
getData(){ getData(){
console.log(localStorage.getItem('otaId')); console.log(localStorage.getItem('otaId'));
jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+17 -7
View File
@@ -111,32 +111,38 @@ import ImportFile from '@/components/ImportFileData/index'
data() { data() {
return { return {
url: { url: {
exportData: '/ota/otaBaCxList/exportData', exportData: '/ota/otaBaCxKsjxtmccs/exportData',
importZipUrl: '/ota/otaBaCxList/importData',//导入 importZipUrl: '/ota/otaBaCxKsjxtmccs/importData',//导入
}, },
dataSource: [ dataSource: [
{ {
xtlb:'动力系统', xtlb:'动力系统',
tpt:'',
key:'1' key:'1'
}, },
{ {
xtlb:'传动系统', xtlb:'传动系统',
tpt:'',
key:'2' key:'2'
}, },
{ {
xtlb:'转向系统', xtlb:'转向系统',
tpt:'',
key:'3' key:'3'
}, },
{ {
xtlb:'制动系统', xtlb:'制动系统',
tpt:'',
key:'4' key:'4'
}, },
{ {
xtlb:'车身系统', xtlb:'车身系统',
tpt:'',
key:'5' key:'5'
}, },
{ {
xtlb:'车载能源系统', xtlb:'车载能源系统',
tpt:'',
key:'6' key:'6'
}, },
], ],
@@ -289,7 +295,7 @@ import ImportFile from '@/components/ImportFileData/index'
methods: { methods: {
// 模板下载 // 模板下载
handleModule() { handleModule() {
downloadFile('ota/otaBaCxList/exportTemplate', '车型及功能备案' + '.zip', {}) downloadFile('ota/otaBaCxKsjxtmccs/exportTemplate', '车型及功能备案' + '.zip', {})
}, },
getData(){ getData(){
getAction('/ota/otaBaCxKsjxtmccs/queryByOtaId',{otaIdT:localStorage.getItem('otaIdT'),otaId:localStorage.getItem('otaId')}).then(res=>{ getAction('/ota/otaBaCxKsjxtmccs/queryByOtaId',{otaIdT:localStorage.getItem('otaIdT'),otaId:localStorage.getItem('otaId')}).then(res=>{
@@ -367,21 +373,25 @@ import ImportFile from '@/components/ImportFileData/index'
this.$emit('upgradedonlinedown') this.$emit('upgradedonlinedown')
}, },
uploadSuccess(data) { uploadSuccess(data) {
console.log(data)
let attIdList = [] let attIdList = []
if (data && data.length > 0) { if (data && data.length > 0) {
data.map(item => { data.map(item => {
attIdList.push(item.id || data.name) attIdList.push(item.id || data.name)
}) })
} }
this.dataSource.forEach((item) => {
if(item.key == this.type){
item.tpt = attIdList.join(',')
}
})
this.$forceUpdate()
// /** 赋值给当前对应的表单文件 */ // /** 赋值给当前对应的表单文件 */
// this.fileList.uploadName = attIdList.join(',') // this.fileList.uploadName = attIdList.join(',')
// this.fileList.certifyingmaterials = this.$t('viewFile') // this.fileList.certifyingmaterials = this.$t('viewFile')
}, },
clickButtonToUpload(current,index) { clickButtonToUpload(current,index) {
console.log(current)
this.type = index this.type = index
console.log(this.type) console.log(current)
this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.perentHandleFunc()
this.$refs.uploadFile.visible = true this.$refs.uploadFile.visible = true
this.uploadName = current this.uploadName = current
@@ -397,7 +407,7 @@ import ImportFile from '@/components/ImportFileData/index'
addlineAtMid(record){ addlineAtMid(record){
let randomNum=Math.floor(Math.random()*99999999999+1) let randomNum=Math.floor(Math.random()*99999999999+1)
let obj = {xtlb:record.xtlb,key:randomNum} let obj = {xtlb:record.xtlb,key:randomNum}
this.dataSource.splice(this.dataSource.indexOf(record)+1,0,obj) this.dataSource.splice(this.dataSource.indexOf(record)+1,0,obj)
}, },
//最后一行加 //最后一行加
jero-web/src/views/otamanagement/vehicleinformation/index.vue
+5 -8
View File
@@ -132,7 +132,7 @@ export default {
columnshistory: [ columnshistory: [
{ {
title: this.$t('fillincontent'), title: this.$t('fillincontent'),
dataIndex: 'logContent', dataIndex: 'content',
align: 'left', align: 'left',
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'content' }, scopedSlots: { customRender: 'content' },
@@ -140,7 +140,7 @@ export default {
}, },
{ {
title: this.$t('module'), title: this.$t('module'),
dataIndex: 'remarks', dataIndex: 'module',
align: 'left', align: 'left',
ellipsis: true, ellipsis: true,
width: 100, width: 100,
@@ -148,7 +148,7 @@ export default {
}, },
{ {
title: this.$t('completedBy'), title: this.$t('completedBy'),
dataIndex: 'createTime', dataIndex: 'createBy',
align: 'left', align: 'left',
ellipsis: true, ellipsis: true,
width: 130 width: 130
@@ -175,17 +175,14 @@ export default {
}, },
fillintherecordClick(){ fillintherecordClick(){
this.visible = true this.visible = true
return
this.bussLogList() this.bussLogList()
}, },
bussLogList(val) { bussLogList(val) {
let query = { let query = {
pageNo: this.pageNohistory, otaId:localStorage.getItem('otaId')
pageSize: this.pageSizehistory,
paramsReportDetailId: this.paramsReportDetailId
} }
this.loading = true this.loading = true
getAction('report/detailLog/page', query).then((res) => { getAction('ota/otaBaCxTxjl/page', query).then((res) => {
if (res.success) { if (res.success) {
this.dataSourcehistory = res.result.records this.dataSourcehistory = res.result.records
this.total = res.result.total this.total = res.result.total