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:
wangzhijiang
2023-03-23 20:47:32 +08:00
parent e4585df8d7 67320ac029
commit b4703a5f48
8 changed files with 63 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/tableCollection/index.vue
+1 -1
View File
@@ -819,7 +819,7 @@
customRender: 'titleName'
}
if (res.db_field_name == 'nioNumber') {
this.columns[index].width = 100
this.columns[index].width = 120
}
if (res.click1) {
this.columns[index].scopedSlots = {
jero-web/src/components/tableCollection/index1.vue
+1 -1
View File
@@ -610,7 +610,7 @@
customRender: 'titleName'
}
if (res.db_field_name == 'nioNumber') {
this.columns[index].width = 100
this.columns[index].width = 120
}
if (res.click) {
// 工程接口人列表修改
jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+16 -1
View File
@@ -122,13 +122,26 @@
<div class="title-text-add">
<span class="title-text-text" :title="$t('Vehicledynamictype')">{{$t('Vehicledynamictype')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-form-model-item class="itemModel" style='width: 38%'>
<j-dict-select-tag class="box-input"
:disabled="disabled"
@change="projectNameChange"
:placeholder="$t('PleaseSelect')"
:type="'select'"
:triggerChange="false"/>
</a-form-model-item>
<a-form-model-item class="itemModel" style='width: 40%;margin-left: 20px'>
<a-select class="box-input" :placeholder="$t('PleaseSelect')"
v-model="formInline.projectNameId">
<a-select-option v-for="(item, key) in projectNameList"
:key="key"
:value="item.id">
<span style="display: inline-block;width: 100%" :title=" item.projectName ">
{{ item.projectName}}
</span>
</a-select-option>
</a-select>
</a-form-model-item>
</div>
</a-col>
<a-col :span="24">
@@ -178,6 +191,8 @@
return {
confirmLoading: false,
disabled: false,
formInline:{},
projectNameList:[],
}
},
mounted() {
jero-web/src/views/projectManagement/ProjectDetails/index.vue
+2 -1
View File
@@ -143,6 +143,7 @@
<projectStatus @TaskListChange="TaskListChange"
v-else-if="textTitle === $t('projectStatus')"/>
<certificationList ref="certificationListRef"
:isDisplayNum="isDisplayNum"
@getRoleSwitch="getRoleSwitch"
v-else-if="textTitle === $t('certificationList')"/>
</div>
@@ -206,7 +207,7 @@
'12': '系统管理员',
'13': 'Viewer',
'14': '品牌管理员',
'20': '接口人',
'20': '工程接口人',
'21': '责任人',
'30': '工程接口人',
'31': '责任人',
jero-web/src/views/projectManagement/components/certificationDirectory.vue
+5 -3
View File
@@ -11,7 +11,8 @@
style="height: 100%;overflow: auto;padding-bottom: 53px;">
<div style="margin-bottom: 60px">
<div class="table-operator">
<div class="operator-text" v-if="isDisplayNum == 2" @click="addData">
<div class="operator-text" v-if="isDisplayNum == 2 && roleSwitchingCode == 2"
@click="addData">
<a-icon type="plus"/>
{{$t('add')}}
</div>
@@ -76,7 +77,7 @@
certificationDirectoryAdd,
viewFileModel
},
props: ['isDisplayNum'],
props: ['isDisplayNum','roleSwitchingCode'],
mixins:[ResizeHeader, ResizeColumnProvide],
data() {
return {
@@ -158,7 +159,8 @@
computed: {
columns() {
let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
if (this.isDisplayNum != 2) {
if (this.roleSwitchingCode == 2 && this.isDisplayNum == 2){
}else{
for (var i = 0; i < columnResult.length; i++) {
if (columnResult[i].title === this.$t('operation')) {
columnResult.splice(i, 1)
jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue
+11 -5
View File
@@ -15,10 +15,10 @@
<a-row :gutter="24">
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('VirtualListName')">
<span>{{$t('VirtualListName')}}</span>
<div class="title-text" :title="$t('CertificationListName')">
<span>{{$t('CertificationListName')}}</span>
</div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('VirtualListName')"
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('CertificationListName')"
v-model="queryParam.name"></j-input>
</div>
</a-col>
@@ -87,7 +87,7 @@
selectedRowKeys: [],
columns: [
{
title: this.$t('VirtualListName'),
title: this.$t('CertificationListName'),
dataIndex: 'name',
align: 'left',
ellipsis: true,
@@ -155,11 +155,17 @@
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
...this.queryParam
...this.queryParam,
state:'1',
}
this.loading = true
getAction('/authDummy/authDummyInventoryBaseEO/page', query).then((res) => {
if (res.success) {
if (res.result.current > 1 && res.result.records.length == 0) {
this.pageNo = 1
this.replacePage()
return
}
this.dataList = res.result.records || []
this.total = res.result.total
this.loading = false
jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue
+18 -18
View File
@@ -32,9 +32,9 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
<!-- <globalAdvancedQuery ref="globalAdvancedQueryRef"-->
<!-- @handleSuperQuery="handleSuperQuery"-->
<!-- :fieldList="fieldList"/>-->
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
</a-col>
@@ -180,8 +180,8 @@ export default {
this.pageNo = 1
this.queryParam = {}
this.replacePage()
this.$refs.globalAdvancedQueryRef.resetLine()
this.$refs.globalAdvancedQueryRef.emitCallback()
// this.$refs.globalAdvancedQueryRef.resetLine()
// this.$refs.globalAdvancedQueryRef.emitCallback()
},
onChange(page, pageSize) {
this.pageNo = page
@@ -192,19 +192,19 @@ export default {
this.pageSize = pageSize
this.replacePage()
},
handleSuperQuery(params, matchType) {
let sqp = {}
if (!params || (params && params.length == 0)) {
sqp['superQueryParams'] = ''
this.$refs.globalAdvancedQueryRef.superQueryFlag = false
} else {
this.$refs.globalAdvancedQueryRef.superQueryFlag = true
sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
sqp['superQueryMatchType'] = matchType
}
this.queryParamQuery = sqp
this.replacePage()
},
// handleSuperQuery(params, matchType) {
// let sqp = {}
// if (!params || (params && params.length == 0)) {
// sqp['superQueryParams'] = ''
// this.$refs.globalAdvancedQueryRef.superQueryFlag = false
// } else {
// this.$refs.globalAdvancedQueryRef.superQueryFlag = true
// sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
// sqp['superQueryMatchType'] = matchType
// }
// this.queryParamQuery = sqp
// this.replacePage()
// },
replacePage() {
let query = {
// pageNo: this.pageNo,
jero-web/src/views/projectManagement/components/certificationList/index.vue
+9 -5
View File
@@ -96,7 +96,8 @@
</div>
<!-- 认证目录-->
<div @click="certificationClick" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 2" class="operator-text">
<div @click="certificationClick" v-if="roleSwitchingCode == 0 || roleSwitchingCode == 1 ||
roleSwitchingCode == 2" class="operator-text">
<a-icon type="profile"/>
{{ $t('CertificationDirectory') }}
</div>
@@ -377,7 +378,8 @@
</div>
</div>
<transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
<certificationDirectory :isDisplayNum="isDisplayNum" :url="url" ref="certificationDirectoryRef"/>
<certificationDirectory :isDisplayNum="isDisplayNum" :roleSwitchingCode="roleSwitchingCode"
:url="url" ref="certificationDirectoryRef"/>
<batSetting :url="url" ref="batSettingRef" :roleSwitchingCode="roleSwitchingCode" @batSettingForm="batSettingForm"/>
<addModel ref="addModelRef" @addModelForm="addModelForm"/>
<modifyHistory ref="modifyHistoryRef"/>
@@ -477,6 +479,7 @@
export default {
name: 'index',
props:['isDisplayNum'],
components: {
globalAdvancedQuery,
ImportFile,
@@ -601,14 +604,16 @@
align: 'left',
dataIndex: 'category',
width: 180,
ellipsis: true
ellipsis: true,
fixed: 'left',
},
{
title: this.$t('inspectionItems'),
align: 'left',
dataIndex: 'inspectionItem',
width: 180,
ellipsis: true
ellipsis: true,
fixed: 'left',
},
{
title: this.$t('configurationItem'),
@@ -723,7 +728,6 @@
],
selectedRowKeys: [],
selectedRowKeysList: [],
isDisplayNum: 2,
long: '',
toDoIds: [],
toDoNotConditions: [],