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 
# Conflicts:
#	jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
This commit is contained in:
zyx.net
2023-03-27 15:14:47 +08:00
parent 4d950e242e 8cee573d99
commit 3d8b43c44d
8 changed files with 226 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/zh-cn.js
+9 -7
View File
@@ -76,6 +76,8 @@ module.exports = {
numericalValue: '数值',
yes: '是',
not: '否',
have:'有',
notOnlyRz: '否',
EnterValue: '请输入值',
SavedQuery: '保存的查询',
@@ -1595,11 +1597,11 @@ module.exports = {
electroniccontrollertype:'电子控制器型号',
hardwareversioninformation:'硬件版本信息',
initialsoftwareversionnumber:'初始软件版本号',
inflammatorydata:'初始软件包的完整性验证数据',
environmentalprotection:'升级是否影响整车安全啊、节能、环保、防盗等性能',
inflammatorydata:'初始软件包的完整性验证数据（需统一哈希算法并说明，例如SM3：d192e819d6990624f40e3585106ee134）',
environmentalprotection:'升级是否影响整车安全、节能、环保、防盗等性能',
operatingsystemtype:'操作系统类型',
operatingsystemmanufacturer:'操作系统生产企业',
operatingsystemversion:'操作系统版本号',
operatingsystemversion:'软件版本号',
addcontroller:'添加控制器',
addsystem:'添加系统',
functionname:'功能名称',
@@ -1635,7 +1637,7 @@ module.exports = {
Taskconfirmationresult:'任务确认结果',
Compliancetaskhandling:'符合性任务办理',
resultofhandling:'处理结果',
networksecurityrequirements:'网络安全要求',
networksecurityrequirements:'激光雷达',
upgradefunctionrequirements:'升级功能要求',
usernotificationrequirement:'用户告知要求',
ineffectiveupgrades:'应保护升级包的真实性和完整性，以合理地防止其受到损害，并合理地防止无效升级',
@@ -1666,7 +1668,7 @@ module.exports = {
'(a)告知车辆用户车辆升级的结果(成功或失败)；\n' +
'\n' +
'(b)若升级成功，告知车辆用户已实施的变更，用户手册(如果适用)的任何相关更新。',
upgradepacketprotectionmeasures:'升级包保护措施',
upgradepacketprotectionmeasures:'软件版本（集）识别与存储',
otaupgradedsecuritymeasuresforvehicles:'车辆OTA升级安全措施',
authenticityandintegrityprotectionmechanism:'真实性、完整性保护机制(可多选)',
failsafmechanism:'防失效保护机制(可多选)',
@@ -1696,7 +1698,7 @@ module.exports = {
vehiclecommunicationsystem:'车载通信系统',
driversurveillancecamera:'驾驶员监控摄像头',
drivermonitoringinfraredsensor:'驾驶员监控红外传感器',
vehiclesatellitepositioningequipment:'车载卫星定位设备',
vehiclesatellitepositioningequipment:'车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）',
inertialnavigationsystem:'惯性导航系统',
wheelspeedmeter:'轮速计',
highprecisionmap:'高精度地图',
@@ -1743,7 +1745,7 @@ module.exports = {
afterthesoftwareversionupgraded:'软件版本号升级后',
beforetheOSversionupgraded:'操作系统版本号升级前',
aftertheoperatingsystemversionupgraded:'操作系统版本号升级后',
initialpackageforintegrityinflammatorydata:'初始软件包的完整性验证数据',
initialpackageforintegrityinflammatorydata:'初始软件包的完整性验证数据（需统一哈希算法并说明，例如SM3：d192e819d6990624f40e3585106ee134）',
upgradepackageintegrityverificationdata:'升级包完整性验证数据',
upgradepackagesize:'升级包大小',
differentialupgradeornot:'是否差分升级',
jero-web/src/components/uploadFileChange/file.vue
+172 -163
View File
@@ -9,7 +9,7 @@
name="file"
:file-list="myfileList"
:multiple="true"
:action="uploadAction+'?state='+2+'&cut='+cut"
:action="actionUrl"
:headers="headers"
@preview="preview"
:before-upload="beforeUpload"
@@ -26,127 +26,118 @@
</template>
<script>
import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
import { getAction, postAction, downFile, downloadFile } from '@/api/manage'
import { Base64 } from 'js-base64'
import { mapGetters } from 'vuex'
import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
import { getAction, postAction, downFile, downloadFile } from '@/api/manage'
import { Base64 } from 'js-base64'
import { mapGetters } from 'vuex'
export default {
name: 'file',
props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile','detailDate','accept'],
data() {
return {
visible: false,
title: this.$t('clickUpload'),
uploadAction: window._CONFIG['domianURL'] + '/sys/common/upload',
state: undefined,
myuploadAction: window._CONFIG['domianURL'] + this.thisFileUploadUrl,
upDataList: [],
downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
fileList: [],
myfileList: [],
isLoding: false,
cut: ''
}
},
created() {
const token = Vue.ls.get(ACCESS_TOKEN)
this.headers = { 'X-Access-Token': token }
this.containerId = 'container-ty-' + new Date().getTime()
},
mounted() {
// console.log(this.detailDate,'lldetailDate')
let long = localStorage.getItem('language')
this.cut = ''
if (long && long == 'zh-cn') {
this.cut = 'cn'
} else if (long && long == 'en-us') {
this.cut = 'en'
}
// console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl);
},
methods: {
...mapGetters(['userInfo']),
perentHandleFunc(data) {
this.myfileList = data
if (data && data.length > 0) {
this.myfileList.forEach((res) => {
res.name = res.fileName
res.uid = res.id
})
} else {
this.myfileList = []
export default {
name: 'file',
props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'detailDate', 'accept', 'isParameter'],
data() {
return {
visible: false,
title: this.$t('clickUpload'),
uploadAction: window._CONFIG['domianURL'] + '/sys/common/upload',
state: undefined,
myuploadAction: window._CONFIG['domianURL'] + this.thisFileUploadUrl,
upDataList: [],
downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
fileList: [],
myfileList: [],
isLoding: false,
cut: ''
}
},
beforeUpload(file) {
console.log(file)
// let thisFileType = this.thisFileType.replace(/\s+/g, "");
this.fileTypeSatus = true
//TODO 客户要求不拦截文件
// if(file.type){
// if (thisFileType.indexOf(file.type) != -1) {
// this.fileTypeSatus = true;
// }else{
// this.fileTypeSatus = false;
// }
// }else{
// if(file.name.slice(file.name.length - 3 , file.name.length) == 'rar'){
// this.fileTypeSatus = true
// }else if(file.type == 'application/x-zip-compressed'){
// this.fileTypeSatus = true
// }else{
// this.fileTypeSatus = false;
// }
// }
this.$message.destroy()
},
remove() {
this.fileTypeSatus = true
},
mypreview(item) {
let url = window._CONFIG['domianPreviewURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1)
window.open(url, '_blank')
},
handleChange(info) {
if(info.fileList.length > 1) {
this.$message.warning(this.$t('onlyOnefileUploaded'))
return
}
let { file } = info
const status = info.file.status
info.fileList.forEach((val, index) => {
if (val.response && !val.response.result) {
this.$message.error(val.response.message)
info.fileList.splice(index, 1)
computed: {
actionUrl() {
if (this.isParameter) {
return this.uploadAction + '?state=' + 3 + '&cut=' + this.cut
} else {
return this.uploadAction + '?state=' + 2 + '&cut=' + this.cut
}
})
if (status === 'error') {
this.$emit('uploadSuccess', this.fileList)
}
},
created() {
const token = Vue.ls.get(ACCESS_TOKEN)
this.headers = { 'X-Access-Token': token }
this.containerId = 'container-ty-' + new Date().getTime()
},
mounted() {
// console.log(this.detailDate,'lldetailDate')
let long = localStorage.getItem('language')
this.cut = ''
if (long && long == 'zh-cn') {
this.cut = 'cn'
} else if (long && long == 'en-us') {
this.cut = 'en'
}
// console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl);
},
methods: {
...mapGetters(['userInfo']),
perentHandleFunc(data) {
this.myfileList = data
if (data && data.length > 0) {
this.myfileList.forEach((res) => {
res.name = res.fileName
res.uid = res.id
})
} else {
this.myfileList = []
}
},
beforeUpload(file) {
console.log(file)
// let thisFileType = this.thisFileType.replace(/\s+/g, "");
this.fileTypeSatus = true
//TODO 客户要求不拦截文件
// if(file.type){
// if (thisFileType.indexOf(file.type) != -1) {
// this.fileTypeSatus = true;
// }else{
// this.fileTypeSatus = false;
// }
// }else{
// if(file.name.slice(file.name.length - 3 , file.name.length) == 'rar'){
// this.fileTypeSatus = true
// }else if(file.type == 'application/x-zip-compressed'){
// this.fileTypeSatus = true
// }else{
// this.fileTypeSatus = false;
// }
// }
this.$message.destroy()
this.$message.error(`${info.file.name}` + this.$t('FileUploadFailed'))
} else if (status === 'removed') {
this.myfileList = info.fileList
this.fileList = []
this.myfileList.forEach((res) => {
if (res.response) {
this.fileList.push(res.response.result)
} else {
this.fileList.push(res)
},
remove() {
this.fileTypeSatus = true
},
mypreview(item) {
let url = window._CONFIG['domianPreviewURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1)
window.open(url, '_blank')
},
handleChange(info) {
if (info.fileList.length > 1) {
this.$message.warning(this.$t('onlyOnefileUploaded'))
return
}
let { file } = info
const status = info.file.status
info.fileList.forEach((val, index) => {
if (val.response && !val.response.result) {
this.$message.error(val.response.message)
info.fileList.splice(index, 1)
}
})
this.$emit('uploadSuccess', this.fileList)
if (this.myfileList.length > 0) {
if (status === 'error') {
this.$emit('uploadSuccess', this.fileList)
this.$message.destroy()
this.$message.success(`${info.file.name}` + this.$t('DeletedSuccessfully'))
}
} else if (status === 'done') {
this.fileList = []
this.myfileList = info.fileList
if (info.fileList.length > 20) {
info.fileList.splice(20)
this.$message.error(`${info.file.name}` + this.$t('FileUploadFailed'))
} else if (status === 'removed') {
this.myfileList = info.fileList
this.fileList = []
this.myfileList.forEach((res) => {
if (res.response) {
this.fileList.push(res.response.result)
@@ -155,66 +146,84 @@ export default {
}
})
this.$emit('uploadSuccess', this.fileList)
this.$message.destroy()
this.$message.error(this.$t('UploadMost'))
return
}
this.myfileList.forEach((res) => {
if (res.response) {
this.fileList.push(res.response.result)
} else {
this.fileList.push(res)
if (this.myfileList.length > 0) {
this.$message.destroy()
this.$message.success(`${info.file.name}` + this.$t('DeletedSuccessfully'))
}
})
this.$emit('uploadSuccess', this.fileList)
if (this.myfileList.length > 0) {
this.$message.destroy()
if (file.response.success) {
this.$message.success(`${info.file.name}` + this.$t('FileUploadedSuccessfully'))
} else if (status === 'done') {
this.fileList = []
this.myfileList = info.fileList
if (info.fileList.length > 20) {
info.fileList.splice(20)
this.myfileList = info.fileList
this.myfileList.forEach((res) => {
if (res.response) {
this.fileList.push(res.response.result)
} else {
this.fileList.push(res)
}
})
this.$emit('uploadSuccess', this.fileList)
this.$message.destroy()
this.$message.error(this.$t('UploadMost'))
return
}
this.myfileList.forEach((res) => {
if (res.response) {
this.fileList.push(res.response.result)
} else {
this.fileList.push(res)
}
})
this.$emit('uploadSuccess', this.fileList)
if (this.myfileList.length > 0) {
this.$message.destroy()
if (file.response.success) {
this.$message.success(`${info.file.name}` + this.$t('FileUploadedSuccessfully'))
}
}
} else if (status === 'uploading') {
this.myfileList = info.fileList
// this.$message.success(`${info.file.name} 文件上传成功。`);
}
} else if (status === 'uploading') {
this.myfileList = info.fileList
// this.$message.success(`${info.file.name} 文件上传成功。`);
}
},
resetFileList() {
this.myfileList = []
this.fileList = []
},
preview(file) {
let fileQuery = file.response ? file.response.result : file
let fileName = fileQuery.fileName
let index1 = fileName.lastIndexOf('.')
let index2 = fileName.length
let fileSuffix = fileName.substring(index1, index2)
// if (fileSuffix === '.pdf') {
// window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username))
// } else if (fileSuffix === '.docx') {
// let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
// window.open(url, '_blank')
// } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
// let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
// window.open(url, '_blank')
// } else {
},
resetFileList() {
this.myfileList = []
this.fileList = []
},
preview(file) {
let fileQuery = file.response ? file.response.result : file
let fileName = fileQuery.fileName
let index1 = fileName.lastIndexOf('.')
let index2 = fileName.length
let fileSuffix = fileName.substring(index1, index2)
// if (fileSuffix === '.pdf') {
// window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username))
// } else if (fileSuffix === '.docx') {
// let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
// window.open(url, '_blank')
// } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
// let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
// window.open(url, '_blank')
// } else {
downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
// }
// }
}
}
}
}
</script>
<style>
.ant-upload-list-item-name {
color: rgba(0, 0, 0, 0.65) !important;
}
.ant-upload-list-item-name {
color: rgba(0, 0, 0, 0.65) !important;
}
.action-upload {
font-size: 67px;
color: #c0c4cc;
}
.action-upload {
font-size: 67px;
color: #c0c4cc;
}
.uploadFile {
.uploadFile {
}
}
</style>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+9 -4
View File
@@ -10,6 +10,7 @@
{{$t('templateDownload')}}
</div>
</div>
<a-spin :spinning="confirmLoading">
<a-form-model class="formAdd" ref="ruleForm">
<a-row :gutter="24">
@@ -58,7 +59,7 @@
<a-col :span="24">
<div class="box-title-text-add">
<div class="title-text-add">
<div class="title-text-add plus">
<span class="title-text-text" :title="$t('Modelandfunctionrecord')">{{$t('Modelandfunctionrecord')}}</span>
</div>
<a-form-model-item class="itemModel" prop="dutyTerritory">
@@ -288,9 +289,9 @@ import ImportFile from '@/components/ImportFileData/index'
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
height: 42px;
line-height: 42px;
margin-top: 3px;
@@ -336,4 +337,8 @@ import ImportFile from '@/components/ImportFileData/index'
.bootom-button{
text-align: center!important;
}
.plus{
margin-top: 5px;
line-height: 1.4 !important;
}
</style>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+6
View File
@@ -228,10 +228,16 @@ export default {
}
})
},
save(){
},
next(){
this.save()
this.$emit('recordparametersdown')
},
last(){
this.save()
this.$emit('recordparametersup')
},
dateChange(item) {
jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+1 -1
View File
@@ -103,7 +103,7 @@
<a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
<a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
</div>
<uploadFile ref="uploadFile" :acceptcode="'doc,docx,pdf'" @uploadSuccess="uploadSuccess"></uploadFile>
<uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
</div>
</template>
jero-web/src/views/otamanagement/vehicleinformation/components/other.vue
+7 -7
View File
@@ -113,15 +113,15 @@ export default {
}
.title-text-add {
width: 114px;
width: 200px;
text-align: right;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
height: 42px;
line-height: 42px;
margin-top: 3px;
@@ -133,9 +133,9 @@ export default {
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
height: 42px;
line-height: 42px;
margin-top: 3px;
jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+21 -14
View File
@@ -95,7 +95,7 @@
<div style='width: 300px'>
<span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('fillincontent')}}</span>
<span class='radio-text'>
<a-radio-group style='margin-left: 40px;' v-model="query.jgld">
<a-radio-group style='margin-left: 40px;' v-model="query.jgldPz">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
</a-radio-group>
@@ -239,8 +239,8 @@
<!-- 可升级-->
<span slot="systemclass" slot-scope="text,record" >
<a-radio-group v-model="record.pzqk">
<a-radio :value="1"> {{ $t('yes') }} </a-radio>
<a-radio :value="2"> {{ $t('not') }} </a-radio>
<a-radio :value="1"> {{ $t('have') }} </a-radio>
<a-radio :value="2"> {{ $t('nothing') }} </a-radio>
</a-radio-group>
</span>
<span slot="controllername" slot-scope="text,record">
@@ -263,7 +263,7 @@
</span>
<!-- 操作列-->
<span slot="operation" slot-scope="text,record">
<a class="text-operation" @click="addlineAtBot" style='width: 73px;margin-right: 50px'>{{$t('addcontroller')}}</a>
<a class="text-operation" style='width: 73px;margin-right: 50px' @click="addlineAtBot">{{$t('addcontroller')}}</a>
<a class="text-operation" v-if="dataSourceList.length >1" @click="deleteData(record)" >{{$t('delete')}}</a>
</span>
</a-table>
@@ -977,11 +977,14 @@ export default {
return obj;
},
addlineAtBot(){
let obj={bjmc:'车端OTA升级功能模块'}
let obj={}
obj.bjmc='车端OTA升级功能模块'
this.dataSourceList.push(obj)
this.$forceUpdate()
},
deleteData(record){
this.dataSourceList.splice(this.dataSourceList.indexOf(record),1)
this.$forceUpdate()
},
}
}
@@ -1142,7 +1145,7 @@ button{
line-height: 50px;
}
.text-box-three{
isplay: inline-block;
display: inline-block;
float: left;
border: #e8e8e8 solid 1px;
width: 100%;
@@ -1150,7 +1153,7 @@ button{
line-height: 250px;
}
.text-box-four{
isplay: inline-block;
display: inline-block;
float: left;
border: #e8e8e8 solid 1px;
width: 100%;
@@ -1158,15 +1161,18 @@ button{
line-height: 600px;
}
.four-text-text{
isplay: inline-block;
display: inline-block;
float: left;
border: #e8e8e8 solid 1px;
width: 50%;
height: 600px;
line-height: 600px;
line-height: 20px;
display: flex;
justify-content: center;
align-items: center;
}
.four-text{
isplay: inline-block;
display: inline-block;
float: left;
border: #e8e8e8 solid 1px;
width: 50%;
@@ -1174,7 +1180,7 @@ button{
line-height: 150px;
}
.text-box-five{
isplay: inline-block;
display: inline-block;
float: left;
border: #e8e8e8 solid 1px;
width: 100%;
@@ -1182,9 +1188,10 @@ button{
line-height: 100px;
}
span{
overflow: hidden; /*超出部分隐藏*/
text-overflow: ellipsis; /*超出部分省略号表示*/
white-space: nowrap;
/* overflow: hidden; /*超出部分隐藏*/
/* text-overflow: ellipsis; 超出部分省略号表示 */
white-space: wrap;
/* word-wrap: normal; */
}
.item-input{
margin-top: 9px;
jero-web/src/views/parameter/parameterlist/components/addModel.vue
+1 -1
View File
@@ -317,7 +317,7 @@
<a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
</div>
</a-drawer>
<uploadFileChange ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFileChange>
<uploadFileChange :isParameter="true" ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFileChange>
</div>
</template>