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

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
高嵩
2023-03-25 19:26:14 +08:00
parent d8715bf0ec 381552069b
commit 1603e61893
14 changed files with 528 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue
+11 -12
View File
@@ -36,10 +36,10 @@
<a-form-model-item class="itemModel" prop="filingtime">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('filingtime')"
@change="dateChange({db_field_name:'batjs'})"
@change="dateChange({db_field_name:'batjsj'})"
format="YYYY-MM-DD"
:getCalendarContainer="(trigger) => trigger.parentNode"
v-model="formInline.batjs"
v-model="formInline.batjsj"
:disabled="false"
style="width: 100%"/>
</a-form-model-item>
@@ -76,7 +76,7 @@ export default {
visible: false,
confirmLoading: false,
formInline: {
batjs:'',
batjsj:'',
},
rules: {
// listConfirmation: [
@@ -129,7 +129,7 @@ export default {
// }
// ]
},
ids: []
ids: ''
}
},
mounted() {
@@ -137,11 +137,12 @@ export default {
methods: {
edit(row) {
if(row instanceof Array){
this.ids = row
this.ids = row.join(',')
}else{
this.formInline.bazt = row.bazt
this.formInline.batjs = row.batjs
this.formInline.batjsj = row.batjsj
this.formInline.bz = row.bz
this.ids = row.id
}
this.visible = true
this.$nextTick(() => {
@@ -153,12 +154,10 @@ export default {
if (valid) {
let query = {
...this.formInline,
id:this.ids.join(',')
ids:this.ids.join(',')
}
this.confirmLoading = true
postAction('ota/otaBaSjList/batchRecord', {
recordList :query
}).then((res) => {
postAction('ota/otaBaSjList/batchRecord', query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
@@ -174,9 +173,9 @@ export default {
},
handleCancel() {
this.formInline = {
batjs:''
batjsj:''
}
this.ids = []
this.ids = ''
this.visible = false
},
dateChange(item) {
jero-web/src/views/otamanagement/upgradeactivity/index.vue
+1 -1
View File
@@ -281,7 +281,7 @@ export default {
align: 'left',
ellipsis: true,
width: 140,
dataIndex: 'batjs'
dataIndex: 'batjsj'
},
{
title: this.$t('createTime'),
jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+56 -15
View File
@@ -2,10 +2,9 @@
<div class="box">
<div class="table-operator">
<div class="operator-text">
<a-icon type="import" :rotate="270"/>
{{$t('dataimport')}}
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
</div>
<div class="operator-text">
<div @click='handleModule' class="operator-text">
<a-icon type="download"/>
{{$t('templateDownload')}}
</div>
@@ -22,7 +21,8 @@
<a-form-model-item class="itemModel" prop="dutyTerritory">
<a-select :disabled="disabled" class="box-input" v-model="form.cxmb" allowClear :triggerChange="false" :placeholder="$t('PleaseSelect')">
<a-select-option v-for="(item , key ) in selectList" :key="key" >
<a-select-option v-for="(item , key ) in selectList" :key="key" :value="item.id">
{{ item.ggpc }}
</a-select-option>
</a-select>
</a-form-model-item>
@@ -219,12 +219,15 @@
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
import ImportFile from '@/components/ImportFileData/index'
export default {
name: 'basicInformation',
components:{
ImportFile
},
// props:['otaId'],
data() {
return {
confirmLoading: false,
@@ -232,6 +235,10 @@
formInline:{},
projectNameList:[],
formRules:[],
url: {
exportData: '/ota/otaBaCxJbxx/exportData',
importZipUrl: '/ota/otaBaCxJbxx/importData',//导入
},
form:{},
projectNameList1:['传统动力汽车','节能汽车','新能源汽车','其他'],
projectNameList2:[],
@@ -240,15 +247,21 @@
}
},
mounted() {
this.$forceUpdate()
this.getSelect()
this.getData()
},
methods: {
// 模板下载
handleModule() {
downloadFile('ota/otaBaCxJbxx/exportTemplate', '车型及功能备案' + '.zip', {})
},
getSelect(){
getAction('/ota/otaBaCxList/list').then(res=>{
if(res.code==200){
this.selectList=[]
let obj={}
res.result.map(item=>{
res.result.forEach(item=>{
let obj={}
obj.id=item.id
obj.ggpc=item.ggpc
this.selectList.push(obj)
@@ -256,18 +269,46 @@
}
})
},
next(){
this.save()
this.$emit('basicInformationForm')
},
save(){
getData(){
let otaIdT=localStorage.getItem('otaIdT')
if(otaIdT==null){
otaIdT=''
}
if(localStorage.getItem('otaId') == null){
return
}else{
getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{
if(res.code == 200){
this.form=res.result
if(res.result.dllx1 == null ){
res.result.dllx1 = undefined
}
if(res.result.dllx2 == null){
res.result.dllx2 = undefined
}
this.changeSelect()
}
})
}
postAction('/ota/otaBaCxJbxx/add',{otaId:this.otaId,...this.form}).then( res => {
console.log(res);
},
next(){
this.save()
setTimeout(()=>{
this.$emit('basicInformationForm')
},300)
},
async save(){
postAction('/ota/otaBaCxJbxx/add',{ otaId:localStorage.getItem('otaId'),...this.form}).then( res => {
if(res.code == 200){
localStorage.setItem('otaId', res.result.otaId)
}
})
},
changeSelect(target){
this.form.Vehicledynamictype2=undefined
this.form.dllx2=undefined
if(target =='传统动力汽车'){
this. projectNameList2=['汽油','柴油']
}else if (target =='节能汽车'){
jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+65 -6
View File
@@ -2,10 +2,9 @@
<div class="box">
<div class="table-operator">
<div class="operator-text">
<a-icon type="import" :rotate="270"/>
{{$t('dataimport')}}
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
</div>
<div class="operator-text">
<div @click='handleModule' class="operator-text">
<a-icon type="download"/>
{{$t('templateDownload')}}
</div>
@@ -103,16 +102,22 @@
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
import ImportFile from '@/components/ImportFileData/index'
import uploadFile from '@/components/uploadFile/file'
export default {
name: 'beupgradedonline',
components:{
uploadFile
uploadFile,
ImportFile
},
data() {
return {
url: {
exportData: '/ota/otaBaCxKsjjsmccs/exportData',
importZipUrl: '/ota/otaBaCxKsjjsmccs/importData',//导入
},
dataSource: [
{
gnmc:'前向碰撞预警(FCW)'
@@ -278,8 +283,13 @@
},
mounted() {
// this.getList()
this.getData()
},
methods: {
// 模板下载
handleModule() {
downloadFile('ota/otaBaCxKsjjsmccs/exportTemplate', '车型及功能备案' + '.zip', {})
},
getList() {
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
Object.keys(queryParam).forEach(val => {
@@ -308,8 +318,57 @@
}
})
},
getData(){
let otaIdT=localStorage.getItem('otaIdT')
if(otaIdT==null){
otaIdT=''
}
getAction('/ota/otaBaCxKsjjsmccs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{
if(res.code==200){
if(res.result.length==0){
this.dataSource=[
{
gnmc:'前向碰撞预警(FCW)'
},
{
gnmc:'车道偏离预警(LDW)'
},
{
gnmc:'百区监测(BSD)'
},
{
gnmc:'驻员疲劳篮澳CDFM)'
},
{
gnmc:'自动紧急制动(AEB)'
},
{
gnmc:'自适应巡航控制(ACC)'
},
{
gnmc:'自适应巡航控制(ACC)'
},
{
gnmc:'智能泊车辅助(IPA)'
},
{
gnmc:'交通拥堵辅助(TJA)'
},
]
}else{
res.result.forEach(item =>{
item.pzqk =Number(item.pzqk)
})
res.result.forEach(item =>{
item.sfksj =Number(item.sfksj)
})
this.dataSource=res.result
}
}
})
},
save(){
postAction('',{otaId:this.otaId,list:this.dataSource}).then(res =>{
postAction('/ota/otaBaCxKsjjsmccs/add',{otaId:localStorage.getItem('otaId'),list:this.dataSource}).then(res =>{
console.log(res);
})
},
jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue
+7 -284
View File
@@ -2,29 +2,14 @@
<div class="box">
<a-row :gutter="24" style='margin-top: 30px'>
<a-col :span="24">
<div class="box-title-text">
<div class="box-title-text" v-for='(item,index) in dataSource'>
<div class="title-text">
<span class="dot"></span>
<span class="title-text-text"
:title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span>
:title="item.sjzt">{{item.sjzt_dictText}}</span>
<div class='titlebox'>
<span class='titlebox-text'>提交审批</span>
<span class='titlebox-text-text'>2023-02-02 14:13:21</span>
</div>
</div>
</div>
</a-col>
</a-row>
<a-row :gutter="24" style='margin-top: 30px'>
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="dot"></span>
<span class="title-text-text"
:title="$t('parameterTemplate')">{{$t('parameterTemplate')}}</span>
<div class='titlebox'>
<span class='titlebox-text'>提交审批</span>
<span class='titlebox-text-text'>2023-02-02 14:13:21</span>
<span class='titlebox-text'>{{item.sjzt_dictText}}</span>
<span class='titlebox-text-text'>{{item.updateTime}}</span>
</div>
</div>
</div>
@@ -47,70 +32,7 @@
return {
dataSource: [],
loading: false,
url: {
list: '/todoCenter/projectProcess/doneProcess'
},
queryParam: {},
columns: [
{
title: this.$t('RelatedItems'),
align: 'left',
dataIndex: 'projectName',
ellipsis: true,
scopedSlots: { customRender: 'RelatedItems' },
width: 170
},
{
title: this.$t('standardInformation'),
align: 'left',
dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 170
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
},
{
title: this.$t('Sponsor'),
align: 'left',
dataIndex: 'createBy',
ellipsis: true,
width: 170
},
{
title: this.$t('CurrentProcessor'),
align: 'left',
dataIndex: 'assigneeName',
ellipsis: true,
width: 170
},
{
title: this.$t('TaskCutOffTime'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 170
},
{
title: this.$t('taskStatus'),
align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
},
{
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 120,
scopedSlots: { customRender: 'operation' }
}
],
selectedRowKeys: [],
pageSize: 10,
pageNo: 1,
@@ -124,213 +46,14 @@
back(){
this.$emit('historicalrecordup')
},
monitoringProcessClick(row){
let newUrl = this.$router.resolve({
path: '/processDetails',
query: {
prcNum: row.prcNum,
prcType:row.flowType,
prcId:row.actiProcInstId,
}
})
window.open(newUrl.href, '_blank')
},
RelatedItemsClick(item) {
let newUrl = this.$router.resolve({
path: '/ProjectDetails',
query: {
id: item.projectLibraryId,
projectName: item.projectName,
projectNameId: item.projectNameId,
targetMarket: item.targetMarket,
studioEngineer:item.studioEngineer,
}
})
window.open(newUrl.href, '_blank')
},
standardInformationClick(item){
let newUrl = this.$router.resolve({
path: '/docManage/library/detail',
query: {
id: item.bussDocumentLibraryId,
}
})
window.open(newUrl.href, '_blank')
},
viewClick(row) {
let query = {}
row.router = this.$route.path
if (row.flowType == '1') {
query = {
taskDefinitionKey:row.taskDefinitionKey,
taskIds:row.taskId,
prcType:row.flowType,
prcNum:row.prcNum,
isTrue:false,
}
let newUrl = this.$router.resolve({
path: '/handshakeProcess',
query: query
})
window.open(newUrl.href, '_blank')
}else if(row.flowType == '10'){
let newUrl = this.$router.resolve({
path: '/ProjectDetails',
query: {
id: row.projectLibraryId,
projectName: row.projectName,
projectNameId: row.projectNameId,
targetMarket: row.targetMarket,
studioEngineer:row.studioEngineer,
type:'102',
}
})
window.open(newUrl.href, '_blank')
}else if(row.flowType == '2'){
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
row.taskId = ''
}
query = {
router: row.router,
taskIds:row.taskId,
actiProcInstId: row.actiProcInstId,
projectTaskInventoryId: row.projectLawsInventoryId,
projectLibraryId:row.projectLibraryId,
id: row.projectLibraryId,
studioEngineer: row.studioEngineer,
serialNumber: row.serialNumber,
TaskKey: row.taskDefinitionKey,
isDisplay: false,
flowType: 2,
Sponsor: 'designInitiatorName',
personLiable: 'designDutyName',
typeOfDeliverables: 'designDeliverableTypeName',
deliverableTemplate: 'designDeliverableTemplate',
DueDate: 'designDueDate',
remarks: 'designRemark',
projectName: row.projectName,
targetMarket: row.targetMarket,
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
}else if(row.flowType == '3'){
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
row.taskId = ''
}
query = {
router: row.router,
taskIds:row.taskId,
actiProcInstId: row.actiProcInstId,
projectTaskInventoryId: row.projectLawsInventoryId,
studioEngineer: row.studioEngineer,
projectLibraryId:row.projectLibraryId,
serialNumber: row.serialNumber,
TaskKey: row.taskDefinitionKey,
flowType: 3,
isDisplay: false,
id: row.projectLibraryId,
Sponsor: 'prehomoInitiatorName',
personLiable: 'prehomoDutyName',
typeOfDeliverables: 'prehomoDeliverableTypeName',
deliverableTemplate: 'prehomoDeliverableTemplate',
DueDate: 'prehomoDueDate',
remarks: 'prehomoRemark',
projectName: row.projectName,
targetMarket: row.targetMarket,
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
}else if(row.flowType == '4'){
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
row.taskId = ''
}
query = {
router: row.router,
taskIds: row.taskId,
actiProcInstId: row.actiProcInstId,
id: row.projectLibraryId,
projectLibraryId: row.projectLibraryId,
studioEngineer: row.studioEngineer,
serialNumber: row.serialNumber,
projectTaskInventoryId: row.projectLawsInventoryId,
TaskKey: row.taskDefinitionKey,
flowType: 4,
isDisplay: false,
Sponsor: 'verifyInitiatorName',
personLiable: 'verifyDutyName',
typeOfDeliverables: 'verifyDeliverableTypeName',
deliverableTemplate: 'verifyDeliverableTemplate',
DueDate: 'verifyDueDate',
remarks: 'verifyRemark',
projectName: row.projectName,
targetMarket: row.targetMarket,
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
let newUrl = this.$router.resolve({
path: '/taskListProcess',
query: query
})
window.open(newUrl.href, '_blank')
}
},
searchQuery(value) {
this.queryParam = value
this.pageNo = 1
this.getList()
},
searchReset() {
this.queryParam = {}
this.pageNo = 1
this.getList()
},
pageOnChange(page) {
this.pageNo = page
this.getList()
},
SizeChange(page, pageSize) {
this.pageNo = 1
this.pageSize = pageSize
this.getList()
},
getList() {
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
Object.keys(queryParam).forEach(val => {
if (queryParam[val] instanceof Array) {
queryParam[val] = queryParam[val].join(',')
}
})
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...queryParam
otaId:localStorage.getItem('otaId')
}
this.loading = true
getAction(this.url.list, query).then((res) => {
getAction('ota/otaBaCxLsjl/list', query).then((res) => {
if (res.success) {
if (res.result.current > 1 && res.result.records.length == 0) {
this.pageNo = 1
this.getList()
return
}
this.dataSource = res.result.records || []
this.total = res.result.total
this.dataSource = res.result || []
this.loading = false
} else {
this.loading = false
jero-web/src/views/otamanagement/vehicleinformation/components/other.vue
+17 -5
View File
@@ -20,7 +20,7 @@
</a-spin>
<div class="bootom-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>
</div>
</div>
@@ -33,6 +33,7 @@ export default {
name: 'basicInformation',
components:{
},
props:['otaId'],
data() {
return {
confirmLoading: false,
@@ -46,13 +47,22 @@ export default {
}
},
mounted() {
this.getData()
},
methods: {
getData(){
let otaIdT=localStorage.getItem('otaIdT')
if(otaIdT==null){
otaIdT=''
}
getAction('/ota/otaBaCxQt/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{
console.log(res);
})
},
save(){
this.$refs.ruleForm.validate( valid =>{
if (valid) {
postAction('/ota/otaBaCxQt/add',this.queryParam).then(res=>{
postAction('/ota/otaBaCxQt/add',{otaId:localStorage.getItem('otaId'),...this.queryParam}).then(res=>{
console.log(res);
})
} else {
@@ -65,10 +75,12 @@ export default {
this.$emit('otherup')
},
submit(){
this.save()
this.save()
},
},
}
}
</script>
<style lang="less" scoped>
jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+115 -66
View File
@@ -2,10 +2,9 @@
<div class="box">
<div class="table-operator">
<div class="operator-text">
<a-icon type="import" :rotate="270"/>
{{$t('dataimport')}}
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
</div>
<div class="operator-text">
<div @click='handleModule' class="operator-text">
<a-icon type="download"/>
{{$t('templateDownload')}}
</div>
@@ -279,20 +278,28 @@
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
import ImportFile from '@/components/ImportFileData/index'
import uploadFile from '@/components/uploadFile/file'
import { result } from 'lodash'
export default {
name: 'upgradeRequirements',
components:{
uploadFile
uploadFile,
ImportFile
},
props:['otaId'],
data() {
return {
radioList:9,
url: {
exportData: '/ota/otaBaCxJsfzbacs/exportData',
importZipUrl: '/ota/otaBaCxJsfzbacs/importData',//导入
},
dataSource: [
{
key: 'wlaqyq_sl',
key: 'wlaqyqSl',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -300,7 +307,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'wlaqyq_bzwz',
key: 'wlaqyqBzwz',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -308,7 +315,7 @@ export default {
fillincontent:this.$t('forwardXquantity'),
},
{
key: 'wlaqyq_ggxh',
key: 'wlaqyqGgxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -316,7 +323,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'wlaqyq_scqy',
key: 'wlaqyqScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('productionenterprise'),
@@ -324,7 +331,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'hmbld_sl',
key: 'hmbldSl',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -332,7 +339,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'hmbld_bzwz',
key: 'hmbldBzwz',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -340,7 +347,7 @@ export default {
fillincontent:this.$t('forwardXquantity'),
},
{
key: 'hmbld_ggxh',
key: 'hmbldGgxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -348,7 +355,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'hmbld_scqy',
key: 'hmbldScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('productionenterprise'),
@@ -356,7 +363,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'csbld_sl',
key: 'csbldSl',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -364,7 +371,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'csbld_bzwz',
key: 'csbldBzwz',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -372,7 +379,7 @@ export default {
fillincontent:this.$t('forwardXquantity'),
},
{
key: '1csbld_ggxh',
key: 'csbldGgxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -380,7 +387,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'csbld_scqy',
key: 'csbldScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('productionenterprise'),
@@ -388,7 +395,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'sxths_sl',
key: 'sxthsSl',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -396,7 +403,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'sxths_bzwz',
key: 'sxthsBzwz',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -404,7 +411,7 @@ export default {
fillincontent:this.$t('forwardXquantity'),
},
{
key: 'sxths_ggxh',
key: 'sxthsGgxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -412,7 +419,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'sxths_scqy',
key: 'sxthsScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('productionenterprise'),
@@ -420,7 +427,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'sxtdsd_sl',
key: 'sxtdsdSl',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -428,7 +435,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'sxtdsd_bzwz',
key: 'sxtdsdBzwz',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -436,7 +443,7 @@ export default {
fillincontent:this.$t('forwardXquantity'),
},
{
key: 'sxtdsd_ggxh',
key: 'sxtdsdGgxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -444,7 +451,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'sxtdsd_scqy',
key: 'sxtdsdScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('productionenterprise'),
@@ -452,7 +459,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'jsyjk_sl',
key: 'jsyjkSl',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -460,7 +467,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'jsyjk_bzwz',
key: 'jsyjkBzwz',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -468,7 +475,7 @@ export default {
fillincontent:this.$t('forwardXquantity'),
},
{
key: 'jsyjk_ggxh',
key: 'jsyjkGgxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -476,7 +483,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'jsyjk_scqy',
key: 'jsyjkScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('productionenterprise'),
@@ -484,7 +491,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'jsyhw_sl',
key: 'jsyhwSl',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -492,7 +499,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'jsyhw_bzwz',
key: 'jsyhwBzwz',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -500,7 +507,7 @@ export default {
fillincontent:this.$t('forwardXquantity'),
},
{
key: 'jsyhw_ggxh',
key: 'jsyhwGgxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -508,7 +515,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'jsyhw_scqy',
key: 'jsyhwScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('productionenterprise'),
@@ -516,7 +523,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'czwxdw_ggxh',
key: 'czwxdwGgxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -524,7 +531,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'czwxdw_scqy',
key: 'czwxdwScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -532,7 +539,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'gxdh_ggxh',
key: 'gxdhGgxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -540,7 +547,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'gxdh_scqy',
key: 'gxdhScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -548,7 +555,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'lsj_ggxh',
key: 'lsjGgxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -556,7 +563,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'lsj_scqy',
key: 'lsjScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -564,7 +571,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'gjddt_ggxh',
key: 'gjddtGgxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -572,7 +579,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'gjddt_scqy',
key: 'gjddtScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -580,7 +587,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'dzwl_dxxgcs',
key: 'dzwlDxxgcs',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -588,7 +595,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'cztx_xtmc',
key: 'cztxXtmc',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -596,7 +603,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'cztx_ggxh',
key: 'cztxGgxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -604,7 +611,7 @@ export default {
fillincontent:this.$t('forwardXquantity'),
},
{
key: 'cztx_scqy',
key: 'cztxScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -612,7 +619,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'cztx_bbh',
key: 'cztxBbh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -620,7 +627,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'cztx_kfqy',
key: 'cztxKfqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -628,7 +635,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'jsfzczj_mc',
key: 'jsfzczjMc',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -636,7 +643,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'jsfzczj_yjxh',
key: 'jsfzczjYjxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -644,7 +651,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'jsfzczj_scqy',
key: 'jsfzczjScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -652,7 +659,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'jsfzzsq_mc',
key: 'jsfzzsqMc',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -660,7 +667,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'jsfzzsq_yjxh',
key: 'jsfzzsqYjxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -668,7 +675,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'jsfzzsq_scqy',
key: 'jsfzzsqScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -676,7 +683,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'fxptsts_mc',
key: 'fxptstsMc',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -684,7 +691,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'fxptsts_yjxh',
key: 'fxptstsYjxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -692,7 +699,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'fxptsts_scqy',
key: 'fxptstsScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -700,7 +707,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'jsyzylts_mc',
key: 'jsyzyltsMc',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -708,7 +715,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'jsyzylts_yjxh',
key: 'jsyzyltsYjxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -716,7 +723,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'jsyzylts_scqy',
key: 'jsyzyltsScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -724,7 +731,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'DSSAD_ggxh',
key: 'dssadGgxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -732,7 +739,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'DSSAD_scqy',
key: 'dssadScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -740,7 +747,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'EDR_ggxh',
key: 'edrGgxh',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -748,7 +755,7 @@ export default {
fillincontent:this.$t('yesisselected'),
},
{
key: 'EDR_scqy',
key: 'edrScqy',
val:'',
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
@@ -756,8 +763,6 @@ export default {
fillincontent:this.$t('yesisselected'),
},
],
url: {
},
queryParam: {},
dataSourceList: [
{
@@ -853,8 +858,52 @@ export default {
},
mounted() {
// this.getList()
this.getData()
},
methods: {
// 模板下载
handleModule() {
downloadFile('ota/otaBaCxList/exportTemplate', '车型及功能备案' + '.zip', {})
},
getData(){
let otaIdT=localStorage.getItem('otaIdT')
if(otaIdT==null){
otaIdT=''
}
getAction('/ota/otaBaCxJsfzbacs/queryByOtaId',{otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{
if(res == 200 ) {
if(res.code==200){
if(res.result.kzq.length == 0){
this.dataSourceList=[
{
bjmc:'车端OTA升级功能模块'
}
]
}else{
res.result.kzq.forEach(item=>{
item.pzqk=Number(item.pzqk)
})
this.dataSourceList=res.result.kzq
}
this.dataSource.forEach(item=>{
for(let key in res.result.bj){
if(item.val==key){
item.val=res.result.bj[key]
}
}
})
}
res.result.bj.forEach(item=>{
item=Number(item)
})
this.query=res.result.bj
}
})
},
click(value){
this.fileList = value
console.log(this.fileList)
@@ -907,7 +956,7 @@ export default {
arr.push(kval)
})
postAction('/ota/otaBaCxJsfzbacs/add',{
otaId:this.otaId,
otaId:localStorage.getItem('otaId'),
bj:this.query,
cs:arr,
kzq:this.dataSourceList
jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
+38 -9
View File
@@ -2,10 +2,9 @@
<div class="box">
<div class="table-operator">
<div class="operator-text">
<a-icon type="import" :rotate="270"/>
{{$t('dataimport')}}
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
</div>
<div class="operator-text">
<div @click='handleModule' class="operator-text">
<a-icon type="download"/>
{{$t('templateDownload')}}
</div>
@@ -44,16 +43,23 @@
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
import ImportFile from '@/components/ImportFileData/index'
import uploadFile from '@/components/uploadFile/file'
export default {
name: 'safetyPrecautions',
components:{
uploadFile
uploadFile,
ImportFile
},
props:['otaId'],
data() {
return {
url: {
exportData: '/ota/otaBaCxAqcs/exportData',
importZipUrl: '/ota/otaBaCxAqcs/importData',//导入
},
dataSource: [
{
key: '1',
@@ -154,16 +160,33 @@
pageSize: 10,
pageNo: 1,
total: 0,
url: {
list: '/todoCenter/projectProcess/issuedProcess'
},
queryParam: {}
}
},
mounted() {
this.getList()
this.getData()
},
methods: {
// 模板下载
handleModule() {
downloadFile('ota/otaBaCxAqcs/exportTemplate', '车型及功能备案' + '.zip', {})
},
getData(){
let otaIdT=localStorage.getItem('otaIdT')
if(otaIdT==null){
otaIdT=''
}
getAction('/ota/otaBaCxAqcs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{
if(res.code == 200){
this.dataSource[0].info = Number(res.result.bhjz)
this.dataSource[1].info =Number(res.result.fsxjz)
this.dataSource[2].info= Number(res.result.sjsbcs)
this.dataSource[3].info=Number(res.result.xxaqjz)
}
})
},
click(value){
this.fileList = value
console.log(this.fileList)
@@ -215,7 +238,7 @@
},
save(){
let obj={}
obj.otaId=this.otaId,
obj.otaId=localStorage.getItem('otaId'),
obj.bhjz = this.dataSource[0].info
obj.fsxjz= this.dataSource[1].info
obj.sjsbcs = this.dataSource[2].info
@@ -225,9 +248,11 @@
})
},
last(){
this.save()
this.$emit('safetyPrecautionsup')
},
next(){
this.save()
this.$emit('safetyPrecautionsdown')
},
}
@@ -295,4 +320,8 @@
color: #00B3BE;
border-color: #00B3BE;
}
::v-deep .ant-table-row:first-child {
background: #fff !important;
opacity: 3.9 !important;
}
</style>
jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
+40 -10
View File
@@ -2,12 +2,11 @@
<div class="box">
<div class="table-operator">
<div class="operator-text">
<a-icon type="import" :rotate="270" />
{{ $t('dataimport') }}
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
</div>
<div class="operator-text">
<a-icon type="download" />
{{ $t('templateDownload') }}
<div @click='handleModule' class="operator-text">
<a-icon type="download"/>
{{$t('templateDownload')}}
</div>
</div>
<a-table ref="table" size="middle" :pagination="false" :scroll="{ x: '100%', y: 'calc(100vh - 140px)' }" rowKey="key"
@@ -33,16 +32,22 @@
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
import ImportFile from '@/components/ImportFileData/index'
import uploadFile from '@/components/uploadFile/file'
export default {
name: 'upgradeRequirements',
components: {
uploadFile
uploadFile,
ImportFile
},
data() {
return {
url: {
exportData: '/ota/otaBaCxZxsjyq/exportData',
importZipUrl: '/ota/otaBaCxZxsjyq/importData',//导入
},
dataSource: [
{
key: '1',
@@ -115,8 +120,6 @@ export default {
certifyingmaterials: '',
},
],
url: {
},
queryParam: {},
columns: [
{
@@ -193,8 +196,35 @@ export default {
},
mounted() {
// this.getList()
this.$forceUpdate()
this.getData()
},
methods: {
// 模板下载
handleModule() {
downloadFile('ota/otaBaCxZxsjyq/exportTemplate', '车型及功能备案' + '.zip', {})
},
getData(){
console.log(localStorage.getItem('otaId'));
let otaIdT=localStorage.getItem('otaIdT')
if(otaIdT==null){
otaIdT=''
}
getAction('/ota/otaBaCxZxsjyq/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{
this.dataSource[0].relevantverification =Number(res.result.bhsjb)
this.dataSource[1].relevantverification=Number(res.result.bhclbb)
this.dataSource[2].relevantverification=Number(res.result.clgxnl)
this.dataSource[3].relevantverification=Number(res.result.clsjtj)
this.dataSource[4].relevantverification=Number(res.result.clsjdl)
this.dataSource[5].relevantverification=Number(res.result.sjbhaq)
this.dataSource[6].relevantverification=Number(res.result.sjantj)
this.dataSource[7].relevantverification=Number(res.result.sjsbaq)
this.dataSource[8].relevantverification=Number(res.result.sjgg)
this.dataSource[9].relevantverification=Number(res.result.sjzt)
this.$forceUpdate()
})
},
click(value) {
this.fileList = value
console.log(this.fileList)
@@ -240,7 +270,7 @@ export default {
},
save() {
let obj = {}
obj.otaId=this.otaId
obj.otaId=localStorage.getItem('otaId')
obj.bhsjb = this.dataSource[0].relevantverification
obj.bhclbb = this.dataSource[1].relevantverification
obj.clgxnl = this.dataSource[2].relevantverification
jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+113 -26
View File
@@ -2,10 +2,9 @@
<div class="box">
<div class="table-operator">
<div class="operator-text">
<a-icon type="import" :rotate="270"/>
{{$t('dataimport')}}
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
</div>
<div class="operator-text">
<div @click='handleModule' class="operator-text">
<a-icon type="download"/>
{{$t('templateDownload')}}
</div>
@@ -37,7 +36,11 @@
</span>
<!-- 上传附件-->
<span slot="architecturetopologydiagram" slot-scope="text,record">
<a-button @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
<a-button @click="clickButtonToUpload(record.tpt,record.key)" type="primary">
{{ (record.tpt === 'null' || record.tpt === '' ||
record.tpt == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
}}
</a-button>
</span>
<span slot="electronicController" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :max-length="500"></a-input>
@@ -82,7 +85,7 @@
<div>
<a-button @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
<p>注:附件包括测试项目清单、测试报告．测试标准或技术规范</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;支持doc/docx/pdf格式,大小50M以内1</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;支持doc/docx/pdf格式,大小50M以内</p>
</div>
<div class="bootom-button">
@@ -95,34 +98,52 @@
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
import ImportFile from '@/components/ImportFileData/index'
import uploadFile from '@/components/uploadFile/file'
export default {
name: 'upgradedonline',
components:{
uploadFile,
ImportFile
},
data() {
return {
url: {
exportData: '/ota/otaBaCxKsjxtmccs/exportData',
importZipUrl: '/ota/otaBaCxKsjxtmccs/importData',//导入
},
dataSource: [
{
xtlb:'动力系统'
xtlb:'动力系统',
tpt:'',
key:'1'
},
{
xtlb:'传动系统'
xtlb:'传动系统',
tpt:'',
key:'2'
},
{
xtlb:'转向系统'
xtlb:'转向系统',
tpt:'',
key:'3'
},
{
xtlb:'制动系统'
xtlb:'制动系统',
tpt:'',
key:'4'
},
{
xtlb:'车身系统'
xtlb:'车身系统',
tpt:'',
key:'5'
},
{
xtlb:'车载能源系统'
xtlb:'车载能源系统',
tpt:'',
key:'6'
},
],
columns: [
@@ -263,12 +284,62 @@
scopedSlots: { customRender: 'operation' }
}
],
form:[{}],
type:'',
}
},
mounted() {
// this.getList()
this.getData()
},
methods: {
// 模板下载
handleModule() {
downloadFile('ota/otaBaCxKsjxtmccs/exportTemplate', '车型及功能备案' + '.zip', {})
},
getData(){
let otaIdT=localStorage.getItem('otaIdT')
if(otaIdT==null){
otaIdT=''
}
getAction('/ota/otaBaCxKsjxtmccs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{
if(res.code==200){
if(res.result.length==0){
this.dataSource= [
{
xtlb:'动力系统',
key:'1'
},
{
xtlb:'传动系统',
key:'2'
},
{
xtlb:'转向系统',
key:'3'
},
{
xtlb:'制动系统',
key:'4'
},
{
xtlb:'车身系统',
key:'5'
},
{
xtlb:'车载能源系统',
key:'6'
},
]
}else{
res.result.forEach(item =>{
item.sfksj =Number(item.sfksj)
})
this.dataSource=res.result
}
}
})
},
getList() {
// let queryParam = JSON.parse(JSON.stringify(this.queryParam))
// Object.keys(queryParam).forEach(val => {
@@ -306,38 +377,54 @@
this.$emit('upgradedonlinedown')
},
uploadSuccess(data) {
// let attIdList = []
// if (data && data.length > 0) {
// data.map(item => {
// attIdList.push({
// id:item.id,
// fileName:item.fileName
// })
// })
// }
let attIdList = []
if (data && data.length > 0) {
data.map(item => {
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
// this.fileList.uploadName = attIdList.join(',')
// this.fileList.certifyingmaterials = this.$t('viewFile')
},
clickButtonToUpload() {
clickButtonToUpload(current,index) {
this.type = index
console.log(current)
this.$refs.uploadFile.perentHandleFunc()
this.$refs.uploadFile.visible = true
this.uploadName = current
getAction('sys/common/getFileInfos', { id: current }).then((res) => {
if (res.success) {
this.$refs.uploadFile.perentHandleFunc(res.result)
} else {
this.$refs.uploadFile.perentHandleFunc()
}
})
},
//中间加
addlineAtMid(record){
let obj = {xtlb:record.xtlb}
let randomNum=Math.floor(Math.random()*99999999999+1)
let obj = {xtlb:record.xtlb,key:randomNum}
this.dataSource.splice(this.dataSource.indexOf(record)+1,0,obj)
},
//最后一行加
addlineAtBot(){
let obj={}
let randomNum=Math.floor(Math.random()*99999999999+1)
let obj={key:randomNum}
this.dataSource.push(obj)
},
deleteData(record){
this.dataSource.splice(this.dataSource.indexOf(record),1)
},
save(){
postAction('/ota/otaBaCxKsjxtmccs/add',{otaId:this.otaId,list:this.dataSource}).then(res => {
postAction('/ota/otaBaCxKsjxtmccs/add',{otaId:localStorage.getItem('otaId'),list:this.dataSource}).then(res => {
console.log(res);
})
}
jero-web/src/views/otamanagement/vehicleinformation/index.vue
+22 -16
View File
@@ -15,25 +15,25 @@
</div>
<a-tabs class="tabs" v-model="tabActive" @change="callback">
<a-tab-pane disabled :key="$t('basicinformationofvehicletype')" :tab="$t('basicinformationofvehicletype')">
<basicInformation v-if="tabActive == $t('basicinformationofvehicletype')" @basicInformationForm='basicInformationForm' ref="dealtWithRef"/>
<basicInformation v-if="tabActive == $t('basicinformationofvehicletype')" @basicInformationForm='basicInformationForm' ref="dealtWithRef" />
</a-tab-pane>
<a-tab-pane disabled :key="$t('onlineupgraderequirements')" :tab="$t('onlineupgraderequirements')">
<upgradeRequirements v-if="tabActive == $t('onlineupgraderequirements')" @upgradeRequirementsup='upgradeRequirementsup' @upgradeRequirementsdown='upgradeRequirementsdown' ref="doneListRef"/>
<upgradeRequirements v-if="tabActive == $t('onlineupgraderequirements')" @upgradeRequirementsup='upgradeRequirementsup' @upgradeRequirementsdown='upgradeRequirementsdown' ref="doneListRef" />
</a-tab-pane>
<a-tab-pane disabled :key="$t('safetymeasure')" :tab="$t('safetymeasure')">
<safetyPrecautions v-if="tabActive == $t('safetymeasure')" @safetyPrecautionsup='safetyPrecautionsup' @safetyPrecautionsdown='safetyPrecautionsdown' ref="SentListRef"/>
<safetyPrecautions v-if="tabActive == $t('safetymeasure')" @safetyPrecautionsup='safetyPrecautionsup' @safetyPrecautionsdown='safetyPrecautionsdown' ref="SentListRef" />
</a-tab-pane>
<a-tab-pane disabled :key="$t('upgradedonline')" :tab="$t('upgradedonline')">
<upgradedonline v-if="tabActive == $t('upgradedonline')" @upgradedonlineup='upgradedonlineup' @upgradedonlinedown='upgradedonlinedown' ref="upgradedonlineRef"/>
<upgradedonline v-if="tabActive == $t('upgradedonline')" @upgradedonlineup='upgradedonlineup' @upgradedonlinedown='upgradedonlinedown' ref="upgradedonlineRef" />
</a-tab-pane>
<a-tab-pane disabled :key="$t('beupgradedonline')" :tab="$t('beupgradedonline')">
<beupgradedonline v-if="tabActive == $t('beupgradedonline')" @beupgradedonlineup='beupgradedonlineup' @beupgradedonlinedown='beupgradedonlinedown' ref="beupgradedonlineRef"/>
<beupgradedonline v-if="tabActive == $t('beupgradedonline')" @beupgradedonlineup='beupgradedonlineup' @beupgradedonlinedown='beupgradedonlinedown' ref="beupgradedonlineRef" />
</a-tab-pane>
<a-tab-pane disabled :key="$t('recordparameters')" :tab="$t('recordparameters')">
<recordparameters v-if="tabActive == $t('recordparameters')" @recordparametersup='recordparametersup' @recordparametersdown='recordparametersdown' ref="recordparametersRef"/>
<recordparameters v-if="tabActive == $t('recordparameters')" @recordparametersup='recordparametersup' @recordparametersdown='recordparametersdown' ref="recordparametersRef" />
</a-tab-pane>
<a-tab-pane disabled :key="$t('other')" :tab="$t('other')">
<other v-if="tabActive == $t('other')" @otherup='otherup' ref="otherRef"/>
<other v-if="tabActive == $t('other')" @otherup='otherup' ref="otherRef" />
</a-tab-pane>
<a-tab-pane disabled :key="$t('historicalrecord')" :tab="$t('historicalrecord')">
<historicalrecord v-if="tabActive == $t('historicalrecord')" ref="historicalrecordRef" @historicalrecordup='historicalrecordup'/>
@@ -132,7 +132,7 @@ export default {
columnshistory: [
{
title: this.$t('fillincontent'),
dataIndex: 'logContent',
dataIndex: 'content',
align: 'left',
ellipsis: true,
scopedSlots: { customRender: 'content' },
@@ -140,7 +140,7 @@ export default {
},
{
title: this.$t('module'),
dataIndex: 'remarks',
dataIndex: 'module',
align: 'left',
ellipsis: true,
width: 100,
@@ -148,7 +148,7 @@ export default {
},
{
title: this.$t('completedBy'),
dataIndex: 'createTime',
dataIndex: 'createBy',
align: 'left',
ellipsis: true,
width: 130
@@ -162,7 +162,8 @@ export default {
},
],
toggleSearchStatus: false,
tabActive: this.$t('basicinformationofvehicletype')
tabActive: this.$t('basicinformationofvehicletype'),
otaId:''
}
},
methods: {
@@ -174,17 +175,14 @@ export default {
},
fillintherecordClick(){
this.visible = true
return
this.bussLogList()
},
bussLogList(val) {
let query = {
pageNo: this.pageNohistory,
pageSize: this.pageSizehistory,
paramsReportDetailId: this.paramsReportDetailId
otaId:localStorage.getItem('otaId')
}
this.loading = true
getAction('report/detailLog/page', query).then((res) => {
getAction('ota/otaBaCxTxjl/page', query).then((res) => {
if (res.success) {
this.dataSourcehistory = res.result.records
this.total = res.result.total
@@ -216,36 +214,44 @@ export default {
},
basicInformationForm(){
this.tabActive = this.$t('onlineupgraderequirements')
},
upgradeRequirementsup(){
this.tabActive = this.$t('basicinformationofvehicletype')
},
upgradeRequirementsdown(){
this.tabActive = this.$t('safetymeasure')
},
safetyPrecautionsup(){
this.tabActive = this.$t('onlineupgraderequirements')
},
safetyPrecautionsdown(){
this.tabActive = this.$t('upgradedonline')
},
upgradedonlineup(){
this.tabActive = this.$t('safetymeasure')
},
upgradedonlinedown(){
this.tabActive = this.$t('beupgradedonline')
},
beupgradedonlineup(){
this.tabActive = this.$t('upgradedonline')
},
beupgradedonlinedown(){
this.tabActive = this.$t('recordparameters')
},
recordparametersup(){
this.tabActive = this.$t('beupgradedonline')
},
recordparametersdown(){
this.tabActive = this.$t('other')
},
otherup(){
this.tabActive = this.$t('recordparameters')
jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
+15 -13
View File
@@ -36,10 +36,10 @@
<a-form-model-item class="itemModel" prop="filingtime">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('filingtime')"
@change="dateChange({db_field_name:'batjs'})"
@change="dateChange({db_field_name:'batjsj'})"
format="YYYY-MM-DD"
:getCalendarContainer="(trigger) => trigger.parentNode"
v-model="formInline.batjs"
v-model="formInline.batjsj"
style="width: 100%"/>
</a-form-model-item>
</div>
@@ -75,7 +75,9 @@ export default {
visible: false,
confirmLoading: false,
formInline: {
batjs:'',
bazt:'',
batjsj:'',
bz:'',
},
rules: {
// listConfirmation: [
@@ -128,7 +130,7 @@ export default {
// }
// ]
},
ids: []
ids: ''
}
},
mounted() {
@@ -136,11 +138,12 @@ export default {
methods: {
edit(row) {
if(row instanceof Array){
this.ids = row
this.ids = row.join(',')
}else{
this.formInline.bazt = row.bazt
this.formInline.batjs = row.batjs
this.formInline.batjsj = row.batjsj
this.formInline.bz = row.bz
this.ids = row.id
}
this.visible = true
this.$nextTick(() => {
@@ -152,12 +155,10 @@ export default {
if (valid) {
let query = {
...this.formInline,
id:this.ids.join(',')
ids:this.ids
}
this.confirmLoading = true
postAction('ota/otaBaCxList/batchRecord', {
recordList: query
}).then((res) => {
postAction('ota/otaBaCxList/batchRecord', query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
@@ -173,9 +174,10 @@ export default {
},
handleCancel() {
this.formInline = {
batjs:''
}
this.ids = []
bazt:'',
batjsj:'',
bz:'',}
this.ids = ''
this.visible = false
},
dateChange(item) {
jero-web/src/views/otamanagement/vehicleregistration/index.vue
+27 -24
View File
@@ -137,7 +137,7 @@
</template>
<script>
import { getAction, postAction, deleteAction } from '@/api/manage'
import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
import maintenance from './components/maintenance'
import { mapGetters } from 'vuex'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
@@ -156,7 +156,8 @@ export default {
url: {
list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page',
deleteBatch: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/deleteBatch',
exportData: ''
exportData: '/ota/otaBaCxList/exportData',
importZipUrl: '/ota/otaBaCxList/importData',//导入
},
visible: false,
loading: false,
@@ -241,14 +242,14 @@ export default {
align: 'left',
width: 140,
ellipsis: true,
dataIndex: 'bazt'
dataIndex: 'bazt_dictText'
},
{
title: this.$t('filingtime'),
align: 'left',
ellipsis: true,
width: 140,
dataIndex: 'batjs'
dataIndex: 'batjsj'
},
{
title: this.$t('createTime'),
@@ -343,7 +344,7 @@ export default {
this.$confirm({
content: _this.$t('ConfirmDelete'),
onOk() {
deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
deleteAction('ota/otaBaCxList/delete', { id: val.id }).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.getList()
@@ -356,10 +357,26 @@ export default {
},
// 引用备案
citeforrecord() {
if( this.selectedRowKeys.length == 0 ){
this.$message.warning(this.$t('selectLeastOne'))
}else{
if ( this.selectedRowKeys.length > 1){
this.$message.warning(this.$t('OnlyOneSelected'))
}else{
localStorage.removeItem('otaIdt')
localStorage.removeItem('otaId')
localStorage.setItem('otaIdt',this.selectedRowKeys[0])
this.$router.push({
path: '/vehicleinformation',
query: {}
})
}
}
},
// 创建车型
createvehicleandfunctionrecords() {
localStorage.removeItem('otaId')
this.$router.push({
path: '/vehicleinformation',
query: {}
@@ -370,26 +387,12 @@ export default {
},
// 导出
handleExport(row) {
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
let text = ''
let text = '车型及功能备案' + row.ggpc
let flag
if (this.activeTab == this.$t('ImplementationDate')) {
flag = 0
text = this.$t('ImplementationDate')
} else {
text = this.$t('vehicleInProductionDate')
flag = 1
}
let query = {
id: selectedRowKeys.join(','),
...this.searchParmes,
flag: flag
otaId: row.id
}
downloadFile(this.url.exportData, text + '.xls', query, this.Deselect)
},
// 结束升级
endUpgrade() {
this.$refs.upgradecompletionRef.addModel()
downloadFile(this.url.exportData, text + '.zip', query, this.Deselect)
},
// 查看
detailclick() {
@@ -409,7 +412,7 @@ export default {
},
// 模板下载
handleModule() {
downloadFile('params/paramsInfo/exportTemplate', this.$t('parameterTemplateExportName') + '.xlsx', {})
downloadFile('ota/otaBaCxList/exportTemplate', '车型及功能备案' + '.zip', {})
},
}
}
jero-web/vue.config.js
+1 -1
View File
@@ -93,7 +93,7 @@ module.exports = {
}
}, */
'/jero-boot': {
target: 'http://localhost:8080', //请求本地 jero-boot后台项目
target: 'http://10.0.3.22:8080', //请求本地 jero-boot后台项目
// target: 'http://10.10.10.46:8101', //请求本地 jero-boot后台项目
// target: 'http://10.0.1.25:8080',
// target: 'http://10.0.1.5:8080',