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-27 15:32:58 +08:00
parent 2c87e4a12b fb45ce36c6
commit 4ed528db12
8 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+6 -8
View File
@@ -50,13 +50,13 @@
</span>
<!-- 技术参数-->
<span slot="technicalparameters" slot-scope="text,record">
<a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjggcs" :max-length="500"></a-input>
<a-input :placeholder="$t('ifNot')" :title="record.sjggcs ? record.sjggcs : $t('ifNot')" v-model="record.sjggcs" :max-length="500"></a-input>
</span>
<span slot="functiondescription" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.gnms" :max-length="500"></a-input>
<a-input :placeholder="$t('ifNot')" :title="record.gnms ? record.gnms:$t('ifNot')" v-model="record.gnms" :max-length="500"></a-input>
</span>
<span slot="applicationconditions" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sytj" :max-length="500"></a-input>
<a-input :placeholder="$t('ifNot')" :title="record.sytj ? record.sytj:$t('ifNot')" v-model="record.sytj" :max-length="500"></a-input>
</span>
<span slot="functiondeelectronicscription" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :max-length="500"></a-input>
@@ -87,14 +87,12 @@
<a v-if="dataSource.length >1" class="text-operation" @click="deleteData(record)">{{$t('delete')}}</a>
</span>
</a-table>
<div style="display: inline-block;">
<span style="margin-right: 10px;">证明材料:</span>
<div>
<a-button @click="clickButtonToUpload(fileList)" type="primary"> {{ (fileList === 'null' || fileList === '' ||
fileList == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}</a-button>
<div style='margin: 20px 0px 0px 70px'>
<div style='margin-top: 20px'>
<p>{{ $t('note') }}</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;{{ $t('format') }}</p>
</div>
@@ -137,7 +135,7 @@ import ImportFile from '@/components/ImportFileData/index'
gnmc:'车道偏离预警(LDW)',
},
{
gnmc:'盲区监测(BSD)',
gnmc:'百区监测(BSD)',
},
{
gnmc:'驾驶员疲劳监测(DFM)',
jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
+1 -1
View File
@@ -47,7 +47,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" @uploadSuccess="uploadSuccess"></uploadFile>
<uploadFile ref="uploadFile" :acceptcode="'doc,docx,pdf'" @uploadSuccess="uploadSuccess"></uploadFile>
</div>
</template>
jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+2 -2
View File
@@ -32,7 +32,7 @@
</span>
<!-- 技术参数-->
<span slot="technicalparameters" slot-scope="text,record">
<a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjbgcs" :max-length="500"></a-input>
<a-input :placeholder="$t('ifNot')" :title="record.sjbgcs ? record.sjbgcs : $t('ifNot')" v-model="record.sjbgcs" :max-length="500"></a-input>
</span>
<!-- 上传附件-->
<span slot="architecturetopologydiagram" slot-scope="text,record">
@@ -99,7 +99,7 @@
<a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
</div>
<uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
<uploadFileOta ref="uploadFileOta" @uploadSuccess="uploadSuccessOta"></uploadFileOta>
<uploadFileOta ref="uploadFileOta" :acceptcode="'doc,docx,pdf'" @uploadSuccess="uploadSuccessOta"></uploadFileOta>
</div>
</template>
jero-web/src/views/otamanagement/vehicleregistration/index.vue
+1 -1
View File
@@ -104,7 +104,7 @@
{{ $t('datamaintenance') }}
</div>
<div v-has="'regulatoryAndTechnicalAssessment:batchDelete'" class="operator-text">
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getList"/>
</div>
<div @click="handleModule" v-has="'regulatoryAndTechnicalAssessment:batchDelete'" class="operator-text">
<a-icon type="download" />
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+4 -2
View File
@@ -1528,7 +1528,7 @@
_this.selectedRowKeys = []
_this.getList()
if (detailedWarningList && detailedWarningList.length > 0) {
this.promptInformation(detailedWarningList)
_this.promptInformation(detailedWarningList)
}
} else {
_this.$message.warning(_this.$t('operationFailed'))
@@ -2389,9 +2389,11 @@
_this.detailedWarningList.push(
< div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
}
}
if (this.requestsNum == 0) {
_this.promptInformation(_this.detailedWarningList)
this.$message.warning(_this.$t('theDataYouInitiate'))
// _this.promptInformation(_this.detailedWarningList)
this.JTextLoading = false
}
},