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/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>