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:
zyx.net
2023-03-31 11:50:06 +08:00
parent 7d4edacf2a 18d561e176
commit fc90c0537d
41 changed files with 566 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+6 -6
View File
@@ -5940,14 +5940,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
Map<String, Object> resultMap = new HashMap<>();
// 校验必填
if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isEmpty(value)) {
/*if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isEmpty(value)) {
if (CutEnum.CN.getValue().equals(cut)) {
errorMsg += configName + "为必填项,不能为空；";
} else {
errorMsg += configName + " is mandatory and cannot be empty; ";
}
countError++;
}
}*/
String fileName = value;
if (StringUtils.isNotBlank(fileName)) {
@@ -5984,14 +5984,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
// StringBuilder newValue = new StringBuilder();
// 校验必填
if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isEmpty(value)) {
/*if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isEmpty(value)) {
if (CutEnum.CN.getValue().equals(cut)) {
errorMsg += configName + "为必填项,不能为空；";
} else {
errorMsg += configName + " is mandatory and cannot be empty; ";
}
countError++;
}
}*/
if (StringUtils.isNotEmpty(value)) {
//判断是否是单选
@@ -6047,14 +6047,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
Map<String, Object> resultMap = new HashMap<>();
// 校验必填
if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isEmpty(value)) {
/*if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isEmpty(value)) {
if (CutEnum.CN.getValue().equals(cut)) {
errorMsg += configName + "为必填项,不能为空；";
} else {
errorMsg += configName + " is mandatory and cannot be empty; ";
}
countError++;
}
}*/
// 校验长度
if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
jero-web/src/common/lang/zh-cn.js
+3 -2
View File
@@ -1602,7 +1602,7 @@ module.exports = {
environmentalprotection:'升级是否影响整车安全、节能、环保、防盗等性能',
operatingsystemtype:'操作系统类型',
operatingsystemmanufacturer:'操作系统生产企业',
operatingsystemversion:'软件版本号',
operatingsystemversion:'操作系统版本号',
addcontroller:'添加控制器',
addsystem:'添加系统',
functionname:'功能名称',
@@ -1792,7 +1792,8 @@ module.exports = {
designComplianceReviewAdmin:'设计符合性审查',
missionAccomplished:'任务完成',
yesisselected:'如选择“有”，请输入',
forwardXquantity:'如前向X数量，后向X数量，右向X数量等',
haveisselected:'如选择“是”，请输入',
forwardXquantity:'如前向x数量、后向x数量、后左x数量、后右x数量等',
upgraderecordnumber:'升级备案编号',
Modelandfunctionrecord:'车型及功能备案《公告》批次',
taskTypeMismatch:'任务类型不匹配',
jero-web/src/components/OcrTable/index.vue
+1 -1
View File
@@ -172,7 +172,7 @@
dataIndex: res.db_field_name,
align: 'left',
ellipsis: true,
width: 170,
width: 192,
sorter: res.sort
})
if (res.click) {
jero-web/src/components/SplitDetailTable/index.vue
+3 -1
View File
@@ -182,7 +182,9 @@
sorter: res.sort,
width: 100
})
if (res.db_field_name=='technology_territory'){
this.columns[index].width= 293
}
if (res.urlClick) {
this.columns[index].scopedSlots = {
customRender: 'urlClick'
jero-web/src/components/SplitTable/index.vue
+1 -1
View File
@@ -196,7 +196,7 @@
align: 'left',
ellipsis: true,
sorter: res.sort,
width: 170
width: 224,
})
if (res.db_field_name == '') {
// scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : ''
jero-web/src/components/tableDate/index.vue
+1 -1
View File
@@ -165,7 +165,7 @@
align: 'left',
ellipsis: true,
sorter: res.sort,
width: 170
width: 215,
})
if (res.click) {
this.columns[index].scopedSlots = {
jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+4 -4
View File
@@ -73,12 +73,12 @@
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<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 @click="handleToggleSearch" style="margin-left: 8px">
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue
+2 -2
View File
@@ -89,14 +89,14 @@
title: this.$t('problemLabel'),
dataIndex: 'problemLabel',
align: 'left',
width: 240,
width: 370,
ellipsis: true
},
{
title: this.$t('personCharge'),
dataIndex: 'chargePersonIdName',
align: 'left',
width: 240,
width: 323,
ellipsis: true
},
{
jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
+2 -2
View File
@@ -59,8 +59,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<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-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+2 -2
View File
@@ -41,9 +41,9 @@
</div>
</a-col>
<div style="text-align: right">
<a-button class="box-button" type="primary" @click="onSearch">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="ResetSearch">{{$t('reset')}}
<a-button class="box-button" @click="ResetSearch">{{$t('reset')}}
</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="onSearch">{{$t('query')}}</a-button>
</div>
</a-row>
</a-form>
jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
+5 -5
View File
@@ -36,8 +36,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<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-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
@@ -185,12 +185,12 @@
align: 'left',
dataIndex: 'titleCn',
ellipsis: true,
width: 170
width: 200
},
{
title: this.$t('englishTitle'),
align: 'left',
width: 170,
width: 205,
ellipsis: true,
dataIndex: 'titleEn'
},
@@ -212,7 +212,7 @@
title: this.$t('exportStatus'),
align: 'left',
ellipsis: true,
width: 170,
width: 250,
dataIndex: 'exportStateName'
},
{
jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
+6 -6
View File
@@ -14,8 +14,8 @@
</a-col>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<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-button class="box-button" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
@@ -121,7 +121,7 @@
title: this.$t('RegulationMonthlyName'),
align: 'left',
dataIndex: 'name',
width: 190,
width: 485,
ellipsis: true,
scopedSlots: { customRender: 'RegulationMonthlyName' }
},
@@ -129,21 +129,21 @@
title: this.$t('monthlyLanguage'),
align: 'left',
dataIndex: 'language',
width: 170,
width: 195,
ellipsis: true,
scopedSlots: { customRender: 'language' }
},
{
title: this.$t('releaseStatus'),
align: 'left',
width: 140,
width: 175,
ellipsis: true,
dataIndex: 'issueStatus_dictText'
},
{
title: this.$t('uploadTime'),
align: 'left',
width: 170,
width: 305,
ellipsis: true,
dataIndex: 'createTime'
},
jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
+2 -2
View File
@@ -88,12 +88,12 @@
align: 'left',
dataIndex: 'titleCn',
ellipsis: true,
width: 320
width: 330
},
{
title: this.$t('englishTitle'),
align: 'left',
width: 320,
width: 460,
ellipsis: true,
dataIndex: 'titleEn'
},
jero-web/src/views/businessSupport/technologyAssessment/index.vue
+4 -4
View File
@@ -74,12 +74,12 @@
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<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 @click="handleToggleSearch" style="margin-left: 8px">
<a @click="handleToggleSearch">
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</a>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
</a-col>
</span>
</a-row>
jero-web/src/views/documentManage/collection/index.vue
+4 -4
View File
@@ -131,20 +131,20 @@
align: 'left',
sorter: true,
ellipsis: true,
width: 180
width: 335
},
{
title: this.$t('title'),
align: 'left',
scopedSlots: { customRender: 'serialtitle' },
width: 180,
width: 510,
ellipsis: true,
dataIndex: 'title'
},
{
title: this.$t('status'),
align: 'left',
width: 180,
width: 254,
ellipsis: true,
sorter: true,
dataIndex: 'state'
@@ -152,7 +152,7 @@
{
title: this.$t('collectionTime'),
align: 'left',
width: 180,
width: 299,
ellipsis: true,
sorter: true,
dataIndex: 'createTime'
jero-web/src/views/documentManage/subscribtion/index.vue
+4 -4
View File
@@ -127,7 +127,7 @@
dataIndex: 'serialNumber',
key: 'serialNumber',
align: 'left',
width: 180,
width: 335,
scopedSlots: { customRender: 'serialNumber' },
sorter:true,
ellipsis: true
@@ -135,7 +135,7 @@
{
title: this.$t('title'),
align: 'left',
width: 180,
width: 510,
dataIndex: 'title',
scopedSlots: { customRender: 'serialtitle' },
ellipsis: true
@@ -143,7 +143,7 @@
{
title: this.$t('status'),
align: 'left',
width: 180,
width: 254,
dataIndex: 'state',
sorter:true,
ellipsis: true
@@ -151,7 +151,7 @@
{
title: this.$t('subscriptionTime'),
align: 'left',
width: 180,
width: 299,
dataIndex: 'createTime',
sorter:true,
ellipsis: true
jero-web/src/views/documentTools/virtualList/index.vue
+3 -3
View File
@@ -221,14 +221,14 @@
title: this.$t('VirtualListName'),
align: 'left',
dataIndex: 'name',
width: 260,
width: 484,
ellipsis: true,
scopedSlots: { customRender: 'VirtualListName' }
},
{
title: this.$t('listStatus'),
align: 'left',
width: 260,
width: 540,
ellipsis: true,
dataIndex: 'state_dictText'
},
@@ -243,7 +243,7 @@
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 400,
width: 280,
scopedSlots: { customRender: 'operation' }
}
],
jero-web/src/views/externalReports/index.vue
+8 -8
View File
@@ -99,12 +99,12 @@
<!-- <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 @click="handleToggleSearch" style="margin-left: 8px">
<a @click="handleToggleSearch">
<span class="icon-open">{{ !toggleSearchStatus ? $t('open') : $t('away') }}</span>
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
<a-button class="box-button" style="margin-left: 8px"
@click="searchReset">{{ $t('reset') }}</a-button>
<a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
</a>
</a-col>
</span>
@@ -385,7 +385,7 @@
ellipsis: true,
dataIndex: 'fileName',
scopedSlots: { customRender: 'fileName' },
width: 400
width: 200
},
{
title: this.$t('fileDeclaration'),
@@ -393,7 +393,7 @@
ellipsis: true,
dataIndex: 'fileDescription',
scopedSlots: { customRender: 'projectName' },
width: 400
width: 300
},
{
title: this.$t('uploadedBy'),
@@ -412,14 +412,14 @@
align: 'left',
ellipsis: true,
dataIndex: 'createTime',
width: 150
width: 250
},
{
title: this.$t('operation'),
align: 'left',
fixed: 'right',
ellipsis: true,
width: 150,
width: 250,
scopedSlots: { customRender: 'operation' }
}
],
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+323 -309
View File
@@ -3,11 +3,12 @@
<div class="box">
<div class="table-operator">
<div class="operator-text">
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getData"/>
<ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'"
@getList="getData" />
</div>
<div @click='handleModule' class="operator-text">
<a-icon type="download"/>
{{$t('templateDownload')}}
<a-icon type="download" />
{{ $t('templateDownload') }}
</div>
</div>
@@ -17,11 +18,13 @@
<a-col :span="24">
<div class="box-title-text-add">
<div class="title-text-add">
<span class="title-text-text" :title="$t('selectTheVehicleTemplate')">{{$t('selectTheVehicleTemplate')}}</span>
<span class="title-text-text"
:title="$t('selectTheVehicleTemplate')">{{ $t('selectTheVehicleTemplate') }}</span>
</div>
<a-form-model-item class="itemModel" prop="dutyTerritory">
<a-select :disabled="disabled" class="box-input" v-model="form.cxmb" allowClear :placeholder="$t('PleaseSelect')" @change="update">
<a-select-option v-for="(item , key ) in selectListMb" :key="key" :value="item.id" >
<a-select :disabled="disabled" class="box-input" v-model="form.cxmb" allowClear
:placeholder="$t('PleaseSelect')" @change="update">
<a-select-option v-for="(item, key ) in selectListMb" :key="key" :value="item.id">
{{ item.cpdjbh }}
</a-select-option>
</a-select>
@@ -37,38 +40,40 @@
<a-col :span="24">
<div class="box-title-text-add">
<div class="title-text-add">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('upgraderecordnumber')">{{$t('upgraderecordnumber')}}</span>
<span class="Required">*</span>
<span class="title-text-text" :title="$t('upgraderecordnumber')">{{ $t('upgraderecordnumber') }}</span>
</div>
<div style="width:78%">
<!-- <span class="title-text-text">中文</span> -->
<a-form-model-item prop="babh">
<a-input class="box-input" v-model="form.babh" :title='form.babh' :placeholder="$t('pleaseEnter')" style="width:93%" :max-length="50"></a-input>
<a-form-model-item class="itemModel" prop="babh">
<a-input class="box-input" v-model="form.babh" :title='form.babh' :placeholder="$t('pleaseEnter')"
style="width:100%" :max-length="50"></a-input>
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="24">
<div class="box-title-text-add">
<div class="title-text-add">
<span class="title-text-text" :title="$t('theNameOfFirm')">{{$t('theNameOfFirm')}}</span>
<span class="title-text-text" :title="$t('theNameOfFirm')">{{ $t('theNameOfFirm') }}</span>
</div>
<div class="title-text-add-input">
<!-- <span class="title-text-text">中文</span> -->
<a-input class="box-input" v-model="form.qymc" :title='form.qymc' :placeholder="$t('pleaseEnter')" disabled style="width:93%" :max-length="50"></a-input>
<a-form-model-item class="itemModel">
<a-input class="box-input" v-model="form.qymc" :title='form.qymc' :placeholder="$t('pleaseEnter')"
disabled style="width:100%" :max-length="50"></a-input>
</a-form-model-item>
</div>
</div>
</a-col>
<a-col :span="24">
<div class="box-title-text-add">
<div class="title-text-add plus">
<span class="Required">*</span>
<span class="title-text-text" :title="$t('Modelandfunctionrecord')">{{$t('Modelandfunctionrecord')}}</span>
<span class="title-text-text"
:title="$t('Modelandfunctionrecord')">{{ $t('Modelandfunctionrecord') }}</span>
</div>
<a-form-model-item class="itemModel" prop="bapc">
<a-select :disabled="disabled" class="box-input" v-model="form.bapc" :placeholder="$t('PleaseSelect')" @change="changeId">
<a-select-option v-for="(item , key ) in selectListPc" :key="key" :value="item.id" >
<a-select :disabled="disabled" class="box-input" v-model="form.bapc" :placeholder="$t('PleaseSelect')"
@change="changeId">
<a-select-option v-for="(item, key ) in selectListPc" :key="key" :value="item.id">
{{ item.ggpc }}
</a-select-option>
</a-select>
@@ -78,10 +83,11 @@
<a-col :span="24">
<div class="box-title-text-add">
<div class="title-text-add">
<span class="title-text-text" :title="$t('producttrademark')">{{$t('producttrademark')}}</span>
<span class="title-text-text" :title="$t('producttrademark')">{{ $t('producttrademark') }}</span>
</div>
<a-form-model-item class="itemModel">
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpsb' v-model="form.cpsb" :max-length="50"></a-input>
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpsb'
v-model="form.cpsb" :max-length="50"></a-input>
</a-form-model-item>
</div>
@@ -89,10 +95,11 @@
<a-col :span="24">
<div class="box-title-text-add">
<div class="title-text-add">
<span class="title-text-text" :title="$t('productname')">{{$t('productname')}}</span>
<span class="title-text-text" :title="$t('productname')">{{ $t('productname') }}</span>
</div>
<a-form-model-item class="itemModel">
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpmc' v-model="form.cpmc" :max-length="50"></a-input>
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpmc'
v-model="form.cpmc" :max-length="50"></a-input>
</a-form-model-item>
</div>
@@ -100,10 +107,11 @@
<a-col :span="24">
<div class="box-title-text-add">
<div class="title-text-add">
<span class="title-text-text" :title="$t('productModel')">{{$t('productModel')}}</span>
<span class="title-text-text" :title="$t('productModel')">{{ $t('productModel') }}</span>
</div>
<a-form-model-item class="itemModel">
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpxh' v-model="form.cpxh" :max-length="50"></a-input>
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpxh'
v-model="form.cpxh" :max-length="50"></a-input>
</a-form-model-item>
</div>
@@ -111,36 +119,35 @@
<a-col :span="24">
<div class="box-title-text-add">
<div class="title-text-add">
<span class="title-text-text plus2" :title="$t('Vehicledynamictype')">{{$t('Vehicledynamictype')}}</span>
<span class="title-text-text plus2" :title="$t('Vehicledynamictype')">{{ $t('Vehicledynamictype') }}</span>
</div>
<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"
v-model="form.Vehicledynamictype"/> -->
<a-select class="box-input" v-model="form.dllx1" :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="changeSelect($event,target)">
<a-select-option v-for="(item, key) in projectNameList1"
:key="key"
:value="item">
{{ item }}
</a-select-option>
</a-select>
</a-form-model-item>
<a-form-model-item class="itemModel" style="width: 40%;margin-left:-9px">
<a-select v-model="form.dllx2" class="box-input" :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="update2">
<a-select-option v-for="(item, key) in projectNameList2"
:key="key"
:value="item">
{{ item }}
<!-- <span style="display: inline-block;width: 100%" :title=" item.projectName ">
{{ item.projectName}}
</span> -->
<a-form-model-item class="itemModel " >
<div style="display:flex;flex-wrap: nowrap;width: 100%;">
<div style="width: 90%;margin-right: 20px;">
<a-select class="box-input" v-model="form.dllx1" :disabled="disabled" :placeholder="$t('PleaseSelect')"
@change="changeSelect($event, target)"
style="width: 100%;"
>
<a-select-option v-for="(item, key) in projectNameList1" :key="key" :value="item">
{{ item }}
</a-select-option>
</a-select>
</div>
<div style="width: 100%;">
<a-select v-model="form.dllx2" class="box-input" :disabled="disabled" :placeholder="$t('PleaseSelect')"
@change="update2"
style="width: 100%;"
>
<a-select-option v-for="(item, key) in projectNameList2" :key="key" :value="item">
{{ item }}
</a-select-option>
</a-select>
</div>
</div>
</a-form-model-item>
</div>
</a-col>
@@ -148,305 +155,312 @@
</a-form-model>
</a-spin>
<div class="bootom-button">
<a-button style="margin-right:50px" @click="save">{{$t('preservation')}}</a-button>
<a-button type="primary" @click='next'>{{$t('next')}}</a-button>
<a-button style="margin-right:50px" @click="save">{{ $t('preservation') }}</a-button>
<a-button type="primary" @click='next'>{{ $t('next') }}</a-button>
</div>
</div>
</template>
<script>
import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import ImportFile from '@/components/ImportFileData/index'
export default {
name: 'basicInformation',
components:{
ImportFile
},
data() {
return {
confirmLoading: false,
disabled: false,
form:{
qymc:'安徽江淮汽车集团股份有限公司',
bapc:undefined
},
url: {
exportData: '/ota/otaBaSjSjmbcx/exportData',
importZipUrl: '/ota/otaBaSjSjmbcx/importData?otaId=' + localStorage.getItem('otaId'),//导入
},
projectNameList1:['传统动力汽车','节能汽车','新能源汽车','其他'],
projectNameList2:[],
selectListPc:[],
selectListMb:[],
rules:{
babh:[
{ required:true,message:this.$t('upgraderecordnumber')+this.$t('cannotEmpty'),trigger:'blur'}
],
bapc:[
{ required:true,message:this.$t('Modelandfunctionrecord')+this.$t('cannotEmpty'),trigger:'change'}
]
}
}
},
mounted() {
this.getSelect()
this.getData()
},
methods: {
// 模板下载
handleModule() {
downloadFile('ota/otaBaSjSjmbcx/exportTemplate', '升级目标车型' + '.zip', {})
export default {
name: 'basicInformation',
components: {
ImportFile
},
data() {
return {
confirmLoading: false,
disabled: false,
form: {
qymc: '安徽江淮汽车集团股份有限公司',
bapc: undefined
},
getData(){
let otaIdT=localStorage.getItem('otaIdT')
if(otaIdT==null){
otaIdT=''
}
let otaId=localStorage.getItem('otaId')
if(otaId==null){
otaId=''
}
getAction('/ota/otaBaSjSjmbcx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
if(res.code == 200){
if(res.result==null){
this.form={}
this.form.cxmb=undefined
this.form.bapc=undefined
this.form.dllx1=undefined
this.form.dllx2=undefined
this.form.qymc='安徽江淮汽车集团股份有限公司'
url: {
exportData: '/ota/otaBaSjSjmbcx/exportData',
importZipUrl: '/ota/otaBaSjSjmbcx/importData?otaId=' + localStorage.getItem('otaId'),//导入
},
projectNameList1: ['传统动力汽车', '节能汽车', '新能源汽车', '其他'],
projectNameList2: [],
selectListPc: [],
selectListMb: [],
rules: {
babh: [
{ required: true, message: this.$t('upgraderecordnumber') + this.$t('cannotEmpty'), trigger: 'blur' }
],
bapc: [
{ required: true, message: this.$t('Modelandfunctionrecord') + this.$t('cannotEmpty'), trigger: 'change' }
]
}
}
},
mounted() {
this.getSelect()
this.getData()
},
methods: {
// 模板下载
handleModule() {
downloadFile('ota/otaBaSjSjmbcx/exportTemplate', '升级目标车型' + '.zip', {})
},
getData() {
let otaIdT = localStorage.getItem('otaIdT')
if (otaIdT == null) {
otaIdT = ''
}
let otaId = localStorage.getItem('otaId')
if (otaId == null) {
otaId = ''
}
getAction('/ota/otaBaSjSjmbcx/queryByOtaId', { otaIdT: otaIdT, otaId: otaId }).then(res => {
if (res.code == 200) {
if (res.result == null) {
this.form = {}
this.form.cxmb = undefined
this.form.bapc = undefined
this.form.dllx1 = undefined
this.form.dllx2 = undefined
this.form.qymc = '安徽江淮汽车集团股份有限公司'
// if(this.$route.query.type == 1 && res.result.cxmb == null){
// this.form.cxmb=this.form.ggpc+'-'+ this.form.cpmc+'-'+this.form.cpxh
// }
}else{
this.form=res.result
if(this.$route.query.type == 1 && res.result.cxmb == null){
this.form.cxmb = this.form.babh+'-'+ this.form.bapc+'-'+this.form.cpxh
}else {
if(this.$route.query.type == 2 && res.result.cxmb == null){
this.form.cxmb = this.form.babh+'-'+ this.form.bapc+'-'+this.form.cpxh
}else{
this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined
} else {
this.form = res.result
if (this.$route.query.type == 1 && res.result.cxmb == null) {
this.form.cxmb = this.form.babh + '-' + this.form.bapc + '-' + this.form.cpxh
} else {
if (this.$route.query.type == 2 && res.result.cxmb == null) {
this.form.cxmb = this.form.babh + '-' + this.form.bapc + '-' + this.form.cpxh
} else {
this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined
}
}
}
if(res.result.dllx1==null ||res.result.dllx1==""){
this.form.dllx1=undefined
if (res.result.dllx1 == null || res.result.dllx1 == "") {
this.form.dllx1 = undefined
}
if(res.result.dllx2==null ||res.result.dllx2==""){
this.form.dllx2=undefined
if (res.result.dllx2 == null || res.result.dllx2 == "") {
this.form.dllx2 = undefined
}
if(res.result.cxmb==null||res.result.cxmb==""){
this.form.cxmb=undefined
if (res.result.cxmb == null || res.result.cxmb == "") {
this.form.cxmb = undefined
}
if(res.result.bapc==null||res.result.bapc==""){
this.form.bapc=undefined
if (res.result.bapc == null || res.result.bapc == "") {
this.form.bapc = undefined
}
this.$forceUpdate()
}
}
})
}
})
},
save(){
let otaId=localStorage.getItem('otaId')
if(otaId==null){
otaId=''
}
// if(this.form.bapc!=null && this.form.bapc!=undefined && this.form.bapc!=''){
// this.$nextTick(()=>{
// this.$refs.ruleForm.clearValidate('bapc')
// })
// }
this.$refs.ruleForm.validate(valid=>{
if(valid){
this.selectListPc.map(item=>{
if(item.id==this.form.bapc){
this.form.bapc=item.ggpc
}
})
postAction('/ota/otaBaSjSjmbcx/add',{otaId:otaId,...this.form}).then(res=>{
if(res.code==200){
localStorage.setItem('otaId', res.result.otaId)
this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
}
})
}else{
this.form.bapc=undefined
}
})
},
next(){
this.save()
// if(this.form.bapc!=null && this.form.bapc!=undefined && this.form.bapc!=''){
// this.$nextTick(()=>{
// this.$refs.ruleForm.clearValidate('bapc')
// })
// }
this.$refs.ruleForm.validate(valid=>{
if(valid){
this.$emit('basicInformationForm')
}})
},
getSelect(){
getAction('/ota/otaBaCxList/list').then(res=>{
if(res.code==200){
this.selectListPc=[]
res.result.forEach(item=>{
if(item.ggpc !="" && item.ggpc !=null){
let obj={}
obj=item
this.selectListPc.push(obj)
}
})
}
})
getAction('/ota/otaBaSjList/list').then(res=>{
if(res.code==200){
this.selectListMb=[]
res.result.forEach(item=>{
let obj={}
obj.id=item.id
obj.cpdjbh=item.cpdjbh+'-'+item.ggpc+'-'+item.cpxh
this.selectListMb.push(obj)
})
}
})
},
changeSelect(target){
this.form.dllx2=undefined
if(target =='传统动力汽车'){
this. projectNameList2=['汽油','柴油']
}else if (target =='节能汽车'){
this. projectNameList2=['混合动力','天然气','甲醇','其他']
}else if (target =='新能源汽车'){
this. projectNameList2=['纯电动','插电式混合动力','燃料电池']
}else{
this. projectNameList2=['其他']
}
},
changeId(value,option){
this.$nextTick(()=>{
this.form={...this.form}
this.$refs.ruleForm.validateField('bapc')
save() {
let otaId = localStorage.getItem('otaId')
if (otaId == null) {
otaId = ''
}
// if(this.form.bapc!=null && this.form.bapc!=undefined && this.form.bapc!=''){
// this.$nextTick(()=>{
// this.$refs.ruleForm.clearValidate('bapc')
// })
// }
this.$refs.ruleForm.validate(valid => {
if (valid) {
this.selectListPc.map(item => {
if (item.id == this.form.bapc) {
this.form.bapc = item.ggpc
}
})
this.selectListPc.map(item=>{
if(item.id==value){
this.form.cpsb = item.cpsb
this.form.cpmc = item.cpmc
this.form.cpxh = item.cpxh
getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{
this.form.dllx1=res.result.dllx1 == null|| res.result.dllx1=="" ?undefined:res.result.dllx1
this.form.dllx2=res.result.dllx2== null|| res.result.dllx2==""?undefined:res.result.dllx2
postAction('/ota/otaBaSjSjmbcx/add', { otaId: otaId, ...this.form }).then(res => {
if (res.code == 200) {
localStorage.setItem('otaId', res.result.otaId)
this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
}
})
} else {
this.form.bapc = undefined
}
})
},
next() {
this.save()
// if(this.form.bapc!=null && this.form.bapc!=undefined && this.form.bapc!=''){
// this.$nextTick(()=>{
// this.$refs.ruleForm.clearValidate('bapc')
// })
// }
this.$refs.ruleForm.validate(valid => {
if (valid) {
this.$emit('basicInformationForm')
}
})
},
getSelect() {
getAction('/ota/otaBaCxList/list').then(res => {
if (res.code == 200) {
this.selectListPc = []
res.result.forEach(item => {
if (item.ggpc != "" && item.ggpc != null) {
let obj = {}
obj = item
this.selectListPc.push(obj)
}
})
}
})
this.$forceUpdate()
},
update(val){
this.$forceUpdate()
localStorage.removeItem('otaId')
localStorage.removeItem('otaIdT')
localStorage.setItem('otaIdT',val)
this.getData()
},
update2(){
this.$forceUpdate()
getAction('/ota/otaBaSjList/list').then(res => {
if (res.code == 200) {
this.selectListMb = []
res.result.forEach(item => {
let obj = {}
obj.id = item.id
obj.cpdjbh = item.cpdjbh + '-' + item.ggpc + '-' + item.cpxh
this.selectListMb.push(obj)
})
}
})
},
changeSelect(target) {
this.form.dllx2 = undefined
if (target == '传统动力汽车') {
this.projectNameList2 = ['汽油', '柴油']
} else if (target == '节能汽车') {
this.projectNameList2 = ['混合动力', '天然气', '甲醇', '其他']
} else if (target == '新能源汽车') {
this.projectNameList2 = ['纯电动', '插电式混合动力', '燃料电池']
} else {
this.projectNameList2 = ['其他']
}
},
changeId(value, option) {
this.$nextTick(() => {
this.form = { ...this.form }
this.$refs.ruleForm.validateField('bapc')
})
this.selectListPc.map(item => {
if (item.id == value) {
this.form.cpsb = item.cpsb
this.form.cpmc = item.cpmc
this.form.cpxh = item.cpxh
getAction('/ota/otaBaCxJbxx/queryByOtaId', { otaIdT: '', otaId: item.id }).then(res => {
this.form.dllx1 = res.result.dllx1 == null || res.result.dllx1 == "" ? undefined : res.result.dllx1
this.form.dllx2 = res.result.dllx2 == null || res.result.dllx2 == "" ? undefined : res.result.dllx2
})
}
})
this.$forceUpdate()
},
update(val) {
this.$forceUpdate()
localStorage.removeItem('otaId')
localStorage.removeItem('otaIdT')
localStorage.setItem('otaIdT', val)
this.getData()
},
update2() {
this.$forceUpdate()
}
}
}
</script>
<style lang="less" scoped>
@import'~@assets/less/common.less';
.box {
padding: 0 24px 24px 24px;
box-sizing: border-box;
}
@import'~@assets/less/common.less';
.box-title-text-add {
//line-height: 1.4;
display: flex;
align-items: center;
}
.box {
padding: 0 24px 24px 24px;
box-sizing: border-box;
}
.title-text-add {
width: 114px;
text-align: right;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
height: 42px;
//line-height: 20px;
margin-top: 3px;
}
.box-title-text-add {
//line-height: 1.4;
display: flex;
align-items: center;
}
.title-text-add-input {
width: 80%;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
//line-height: 42px;
margin-top: 3px;
margin-bottom: 20px;
}
.title-text-add {
width: 114px;
text-align: right;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
height: 42px;
//line-height: 20px;
margin-top: 3px;
}
.title-text-text {
margin-top: 9px;
}
.title-text-add-input {
width: 80%;
display: inline-block;
font-weight: 500;
font-size: 14px;
margin-right: 16px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 42px;
//line-height: 42px;
margin-top: 3px;
margin-bottom: 20px;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
}
.title-text-text {
margin-top: 9px;
}
.box-input {
display: inline-block;
width: 100%;
height: 38px;
margin-top: 2px;
}
.itemModel {
width: calc(100% - 130px);
display: inline-block;
margin-top: 2px;
max-width: 486px;
}
.formAdd {
margin: 0 auto;
width: 670px;
}
.box-input {
display: inline-block;
width: 100%;
height: 38px;
margin-top: 2px;
}
.bootom-button{
text-align: center!important;
}
.plus{
margin-top: 5px;
line-height: 1.2;
}
.plus2{
word-break: break-all;
line-height: 1.2;
}
.Required {
.formAdd {
margin: 0 auto;
width: 670px;
}
.bootom-button {
text-align: center !important;
}
.plus {
margin-top: 5px;
line-height: 1.2;
}
.plus2 {
word-break: break-all;
line-height: 1.2;
}
.Required {
color: red;
margin-right: 3px;
}
</style>
jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+4 -4
View File
@@ -74,7 +74,7 @@
<span slot="softwaredevelopmententerprise" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" :title='record.rjkfqy' v-model="record.rjkfqy" :max-length="50"></a-input>
</span>
<span slot="operatingsystemversion" slot-scope="text,record">
<span slot="softwareversionnumber" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" :title='record.czxtbbh' v-model="record.czxtbbh" :max-length="50"></a-input>
</span>
<span slot="inflammatorydata" slot-scope="text,record">
@@ -263,12 +263,12 @@ import ImportFile from '@/components/ImportFileData/index'
scopedSlots: { customRender: 'softwaredevelopmententerprise' },
},
{
title: this.$t('operatingsystemversion'),
title: this.$t('softwareversionnumber'),
align: 'left',
dataIndex: 'operatingsystemversion',
dataIndex: 'softwareversionnumber',
ellipsis: true,
width: 170,
scopedSlots: { customRender: 'operatingsystemversion' },
scopedSlots: { customRender: 'softwareversionnumber' },
},
{
title: this.$t('inflammatorydata'),
jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+88 -88
View File
@@ -96,116 +96,116 @@
<span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('configuration')}}</span>
<span class='radio-text'>
<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 :value="1"> {{ $t('have') }} </a-radio>
<a-radio :value="2"> {{ $t('nothing') }} </a-radio>
</a-radio-group>
</span>
<span class='radio-text'>
<a-radio-group style='margin-left: 40px;' v-model="query.hmbldPz">
<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 class='radio-text'>
<a-radio-group style='margin-left: 40px;' v-model="query.csbldPz">
<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 class='radio-text'>
<a-radio-group style='margin-left: 40px;' v-model="query.sxthsPz">
<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 class='radio-text'>
<a-radio-group style='margin-left: 40px;' v-model="query.sxtdsdPz">
<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 class='radio-text'>
<a-radio-group style='margin-left: 40px;' v-model="query.jsyjkPz">
<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 class='radio-text'>
<a-radio-group style='margin-left: 40px;' v-model="query.jsyhwPz">
<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 class='radio-text-two'>
<a-radio-group style='margin-left: 40px;' v-model="query.czwxdwPz">
<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 class='radio-text-two'>
<a-radio-group style='margin-left: 40px;' v-model="query.gxdhPz">
<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 class='radio-text-two'>
<a-radio-group style='margin-left: 40px;' v-model="query.lsjPz">
<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 class='radio-text-two'>
<a-radio-group style='margin-left: 40px;' v-model="query.gjddtPz">
<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 class='radio-text-three'>
<a-radio-group style='margin-left: 40px;' v-model="query.dzwlPz">
<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 class='radio-text-four'>
<a-radio-group style='margin-left: 40px;' v-model="query.cztxPz">
<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 class='radio-text-five'>
<a-radio-group style='margin-left: 40px;' v-model="query.jsfzczjPz">
<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 class='radio-text-five'>
<a-radio-group style='margin-left: 40px;' v-model="query.jsfzzsqPz">
<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 class='radio-text-five'>
<a-radio-group style='margin-left: 40px;' v-model="query.fxptstsPz">
<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 class='radio-text-five'>
<a-radio-group style='margin-left: 40px;' v-model="query.jsyzyltsPz">
<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 class='radio-text-two'>
<a-radio-group style='margin-left: 40px;' v-model="query.dssadPz">
<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 class='radio-text-two'>
<a-radio-group style='margin-left: 40px;' v-model="query.edrPz">
<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>
</div>
@@ -304,7 +304,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('Quantity'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jgldBzwz',
@@ -320,7 +320,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('specificationmodel'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jgldScqy',
@@ -328,7 +328,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('productionenterprise'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'hmbldSl',
@@ -336,7 +336,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('Quantity'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'hmbldBzwz',
@@ -352,7 +352,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('specificationmodel'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'hmbldScqy',
@@ -360,7 +360,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('productionenterprise'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'csbldSl',
@@ -368,7 +368,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('Quantity'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'csbldBzwz',
@@ -384,7 +384,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('specificationmodel'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'csbldScqy',
@@ -392,7 +392,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('productionenterprise'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'sxthsSl',
@@ -400,7 +400,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('Quantity'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'sxthsBzwz',
@@ -416,7 +416,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('specificationmodel'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'sxthsScqy',
@@ -424,7 +424,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('productionenterprise'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'sxtdsdSl',
@@ -432,7 +432,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('Quantity'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'sxtdsdBzwz',
@@ -448,7 +448,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('specificationmodel'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'sxtdsdScqy',
@@ -456,7 +456,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('productionenterprise'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jsyjkSl',
@@ -464,7 +464,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('Quantity'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jsyjkBzwz',
@@ -480,7 +480,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('specificationmodel'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jsyjkScqy',
@@ -488,7 +488,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('productionenterprise'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jsyhwSl',
@@ -496,7 +496,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('Quantity'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jsyhwBzwz',
@@ -512,7 +512,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('specificationmodel'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jsyhwScqy',
@@ -520,7 +520,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('productionenterprise'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'czwxdwGgxh',
@@ -528,7 +528,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('specificationmodel'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'czwxdwScqy',
@@ -536,7 +536,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'gxdhGgxh',
@@ -544,7 +544,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('specificationmodel'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'gxdhScqy',
@@ -552,7 +552,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'lsjGgxh',
@@ -560,7 +560,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('specificationmodel'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'lsjScqy',
@@ -568,7 +568,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'gjddtGgxh',
@@ -576,7 +576,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('VersionNumber'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'gjddtScqy',
@@ -584,7 +584,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'dzwlDxxgcs',
@@ -592,7 +592,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('qualitativelydescriberelevantplaces'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'cztxXtmc',
@@ -600,7 +600,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('systemname'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'cztxGgxh',
@@ -616,7 +616,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('systemproductionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'cztxBbh',
@@ -624,7 +624,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('softwareversionnumber'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'cztxKfqy',
@@ -632,7 +632,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('softwaredevelopmententerprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jsfzczjMc',
@@ -640,7 +640,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('controlname'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jsfzczjYjxh',
@@ -648,7 +648,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('hardwarespecificationmodel'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jsfzczjScqy',
@@ -656,7 +656,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jsfzzsqMc',
@@ -664,7 +664,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('nameofindicatorsignaldevice'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jsfzzsqYjxh',
@@ -672,7 +672,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('hardwarespecificationmodel'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jsfzzsqScqy',
@@ -680,7 +680,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'fxptstsMc',
@@ -688,7 +688,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('nameofindicatorsignaldevice'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'fxptstsYjxh',
@@ -696,7 +696,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('hardwarespecificationmodel'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'fxptstsScqy',
@@ -704,7 +704,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jsyzyltsMc',
@@ -712,7 +712,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('nameofindicatorsignaldevice'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jsyzyltsYjxh',
@@ -720,7 +720,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('hardwarespecificationmodel'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'jsyzyltsScqy',
@@ -728,7 +728,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'dssadGgxh',
@@ -736,7 +736,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('specificationmodel'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'dssadScqy',
@@ -744,7 +744,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'edrGgxh',
@@ -752,7 +752,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('specificationmodel'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
{
key: 'edrScqy',
@@ -760,7 +760,7 @@ export default {
componentname: this.$t('networksecurityrequirements'),
configuration: this.$t('ineffectiveupgrades'),
ParameterName: this.$t('productionenterprise'),
fillincontent:this.$t('yesisselected'),
fillincontent:this.$t('haveisselected'),
},
],
queryParam: {},
jero-web/src/views/parameter/ParameterTemplate/index.vue
+6 -6
View File
@@ -164,7 +164,7 @@ export default {
{
title: this.$t('zoneOfApplication'),
align: 'left',
width: 160,
width: 235,
ellipsis: true,
sorter:true,
dataIndex: 'region_dictText',
@@ -172,7 +172,7 @@ export default {
{
title: this.$t('parameterTemplate'),
align: 'left',
width: 180,
width: 252,
ellipsis: true,
sorter:true,
dataIndex: 'paramsTemplateName',
@@ -184,7 +184,7 @@ export default {
ellipsis: true,
dataIndex: 'description',
// scopedSlots: { customRender: 'titleName' }
width: 192
width: 350
},
// {
// title: this.$t('zoneOfApplication'),
@@ -195,7 +195,7 @@ export default {
// },
{
title: this.$t('creater'),
align: 'center',
align: 'left',
width: 120,
ellipsis: true,
dataIndex: 'createBy'
@@ -204,14 +204,14 @@ export default {
title: this.$t('created'),
align: 'left',
dataIndex: 'createTime',
width: 160,
width: 200,
sorter:true,
ellipsis: true,
},
{
title: this.$t('updated'),
align: 'left',
width: 160,
width: 200,
ellipsis: true,
sorter:true,
dataIndex: 'updateTime'
jero-web/src/views/parameter/escalationlibrary/index.vue
+4 -4
View File
@@ -160,7 +160,7 @@
{
title: this.$t('entryName'),
align: 'left',
width: 210,
width: 405,
dataIndex: 'projectName',
sorter:true,
scopedSlots: { customRender: 'projectName' }
@@ -168,20 +168,20 @@
{
title: this.$t('ListTitle'),
align: 'left',
width: 380,
width: 553,
dataIndex: 'title',
},
{
title: this.$t('Version'),
align: 'left',
width: 382,
width: 384,
dataIndex: 'version'
},
{
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 200,
width: 220,
scopedSlots: { customRender: 'operation' }
}
],
jero-web/src/views/parameter/parameterexport/index.vue
+3 -3
View File
@@ -170,7 +170,7 @@ export default {
dataIndex: 'templateName',
sorter:true,
ellipsis: true,
width: 201,
width: 368,
scopedSlots: { customRender: 'templateName' }
},
{
@@ -178,12 +178,12 @@ export default {
align: 'left',
dataIndex: 'description',
ellipsis: true,
width: 192,
width: 372,
scopedSlots: { customRender: 'projectName' }
},
{
title: this.$t('zoneOfApplication'),
align: 'center',
align: 'left',
dataIndex: 'region_dictText',
ellipsis: true,
sorter:true,
jero-web/src/views/parameter/parameterlist/index.vue
+6 -6
View File
@@ -161,7 +161,7 @@ export default {
{
title: this.$t('NiONumber'),
align: 'left',
width: 130,
width: 190,
dataIndex: 'nioNumber',
sorter: true,
ellipsis: true,
@@ -170,7 +170,7 @@ export default {
title: this.$t('ParameterName'),
align: 'left',
dataIndex: 'paramsName',
width: 160,
width: 268,
ellipsis: true,
},
{
@@ -178,14 +178,14 @@ export default {
align: 'left',
dataIndex: 'description',
ellipsis: true,
width: 180,
width: 380,
// scopedSlots: { customRender: 'titleName' }
},
{
title: this.$t('areaOfResponsibility'),
align: 'left',
dataIndex: 'dutyTerritory_dictText',
width: 150,
width: 259,
sorter: true,
ellipsis: true,
},
@@ -194,14 +194,14 @@ export default {
align: 'left',
dataIndex: 'createTime',
sorter: true,
width: 180,
width: 265,
ellipsis: true,
},
{
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 120,
width: 200,
scopedSlots: { customRender: 'operation' }
}
],
jero-web/src/views/processCenter/procedure/index.vue
+3 -3
View File
@@ -132,21 +132,21 @@
dataIndex: 'name',
align: 'left',
ellipsis: true,
width: 240
width: 466
},
{
title: this.$t('ProcessType'),
dataIndex: 'categoryName',
align: 'left',
ellipsis: true,
width: 240
width: 518
},
{
title: this.$t('createTime'),
dataIndex: 'createTime',
align: 'left',
ellipsis: true,
width: 240,
width: 308,
customRender: function(t, r, index) {
return moment(t).format('YYYY-MM-DD HH:mm:ss')
}
jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+7 -7
View File
@@ -158,13 +158,13 @@
title: this.$t('title'),
align: 'left',
dataIndex: 'title',
width: 240,
width: 280,
scopedSlots: { customRender: 'paramsManifestClick' }
},
{
title: this.$t('status'),
align: 'left',
width: 80,
width: 100,
ellipsis: true,
sorter:true,
dataIndex: 'state'
@@ -172,14 +172,14 @@
{
title: this.$t('parameterTemplateName'),
align: 'left',
width: 180,
width: 200,
ellipsis: true,
dataIndex: 'paramsTemplateName'
},
{
title: this.$t('relatedProjectVersion'),
align: 'left',
width: 120,
width: 150,
ellipsis: true,
sorter:true,
dataIndex: 'projectVersion'
@@ -188,7 +188,7 @@
title: this.$t('collectionCompletionTime'),
align: 'left',
dataIndex: 'finishTime',
width: 180,
width: 200,
ellipsis: true,
sorter:true,
scopedSlots: { customRender: 'collectionCompletionTime' }
@@ -196,7 +196,7 @@
{
title: this.$t('Version'),
align: 'left',
width: 80,
width: 100,
ellipsis: true,
sorter:true,
dataIndex: 'version'
@@ -211,7 +211,7 @@
{
title: this.$t('created'),
align: 'left',
width: 160,
width: 200,
ellipsis: true,
sorter:true,
dataIndex: 'createTime'
jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+6
View File
@@ -21,6 +21,7 @@
<a-form-model-item class="itemModel" :prop="this.formInline.id?'':'serialNumber'">
<a-select :placeholder="$t('PleaseSelect')+$t('regulationNo')"
optionFilterProp="label"
v-if="!this.formInline.id"
@change="serialNumberChange"
:disabled="this.formInline.id?true:false"
showSearch
@@ -35,6 +36,11 @@
</span>
</a-select-option>
</a-select>
<a-input class="box-input"
:disabled="true"
v-else
v-model.trim="formInline.serialNumber"
:placeholder="$t('PleaseEnter')+this.$t('regulationNo')"/>
</a-form-model-item>
</div>
</a-col>
jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+1 -1
View File
@@ -342,7 +342,7 @@
align: 'left',
dataIndex: 'remark',
ellipsis: true,
width: 153
width: 188
},
{
title: this.$t('operation'),
jero-web/src/views/projectManagement/projectLibrary/index.vue
+3 -3
View File
@@ -217,7 +217,7 @@
title: this.$t('entryName'),
align: 'left',
dataIndex: 'projectName',
width: 260,
width: 300,
sorter:true,
ellipsis: true,
scopedSlots: { customRender: 'projectName' }
@@ -254,7 +254,7 @@
{
title: this.$t('explain'),
align: 'left',
width: 280,
width: 300,
ellipsis: true,
dataIndex: 'explanation'
},
@@ -276,7 +276,7 @@
{
title: this.$t('DigitalPlatform'),
align: 'left',
width: 180,
width: 205,
ellipsis: true,
sorter:true,
dataIndex: 'digitalPlatform'
jero-web/src/views/regulationsKanban/index.vue
+2 -2
View File
@@ -195,7 +195,7 @@ export default {
align: 'left',
ellipsis: true,
dataIndex: 'state_dicText',
width: 120
width: 150
},
// {
// title: this.$t('category'),
@@ -206,7 +206,7 @@ export default {
title: this.$t('technicalField'),
align: 'left',
dataIndex: 'technologyTerritory_dicText',
width: 250,
width: 634,
ellipsis: true,
scopedSlots: { customRender: 'technicalField' }
},
jero-web/src/views/system/DictList.vue
+3 -3
View File
@@ -130,7 +130,7 @@
title: this.$t('DictionaryName'),
align: 'left',
dataIndex: 'dictName',
width: 160,
width: 486,
ellipsis: true
},
// {
@@ -150,14 +150,14 @@
title: this.$t('DictionaryNumber'),
align: 'left',
dataIndex: 'dictCode',
width: 160,
width: 248,
ellipsis: true
},
{
title: this.$t('describe'),
align: 'left',
dataIndex: 'description',
width: 160,
width: 375,
ellipsis: true
},
{
jero-web/src/views/system/PermissionList.vue
+5 -5
View File
@@ -120,7 +120,7 @@
align: 'left',
key: 'menuEn',
ellipsis: true,
width: 180
width: 255
},
{
title: 'icon',
@@ -128,14 +128,14 @@
align: 'left',
key: 'icon',
ellipsis: true,
width: 180
width: 210
},
{
title: this.$t('assembly'),
dataIndex: 'component',
align: 'left',
key: 'component',
width: 240,
width: 317,
ellipsis: true,
scopedSlots: { customRender: 'component' }
},
@@ -144,7 +144,7 @@
dataIndex: 'url',
align: 'left',
key: 'url',
width: 240,
width: 280,
ellipsis: true,
scopedSlots: { customRender: 'url' }
},
@@ -152,7 +152,7 @@
title: this.$t('sort'),
dataIndex: 'sortNo',
align: 'left',
width: 80,
width: 169,
ellipsis: true,
key: 'sortNo'
},
jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+6 -6
View File
@@ -65,7 +65,7 @@
dataIndex: 'projectName',
scopedSlots: { customRender: 'RelatedItems' },
ellipsis: true,
width: 130
width: 392
},
{
title: this.$t('standardInformation'),
@@ -73,28 +73,28 @@
dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
width: 330
width: 353
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
width: 241
},
{
title: this.$t('Tasknode'),
align: 'left',
dataIndex: 'taskDefinitionKeyName',
ellipsis: true,
width: 150
width: 208
},
{
title: this.$t('Sponsor'),
align: 'left',
dataIndex: 'createBy',
ellipsis: true,
width: 130
width: 201
},
// {
// title: this.$t('LastProcessor'),
@@ -115,7 +115,7 @@
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 150
width: 108
},
// {
// title: this.$t('taskStatus'),
jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+7 -7
View File
@@ -78,7 +78,7 @@
dataIndex: 'projectName',
ellipsis: true,
scopedSlots: { customRender: 'RelatedItems' },
width: 150
width: 339
},
{
title: this.$t('standardInformation'),
@@ -86,42 +86,42 @@
dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 260
width: 265
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
width: 183
},
{
title: this.$t('Tasknode'),
align: 'left',
dataIndex: 'taskDefinitionKeyName',
ellipsis: true,
width: 170
width: 183
},
{
title: this.$t('typeOfDeliverables'),
align: 'left',
dataIndex: 'deliverableTypeName',
ellipsis: true,
width: 170
width: 183
},
{
title: this.$t('Sponsor'),
align: 'left',
dataIndex: 'createBy',
ellipsis: true,
width: 100
width: 108
},
{
title: this.$t('TaskCutOffTime'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 160,
width: 172,
scopedSlots: { customRender: 'endTime' }
},
// {
jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+6 -6
View File
@@ -71,7 +71,7 @@
dataIndex: 'projectName',
ellipsis: true,
scopedSlots: { customRender: 'RelatedItems' },
width: 130
width: 392
},
{
title: this.$t('standardInformation'),
@@ -79,28 +79,28 @@
dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 330
width: 353
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
width: 241
},
{
title: this.$t('Tasknode'),
align: 'left',
dataIndex: 'taskDefinitionKeyName',
ellipsis: true,
width: 130
width: 208
},
{
title: this.$t('Sponsor'),
align: 'left',
dataIndex: 'createBy',
ellipsis: true,
width: 130
width: 201
},
// {
// title: this.$t('CurrentProcessor'),
@@ -114,7 +114,7 @@
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 150
width: 108
},
// {
// title: this.$t('taskStatus'),
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue
+6 -6
View File
@@ -60,42 +60,42 @@
dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
width: 330
width: 333
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 130
width: 254
},
{
title: this.$t('LastProcessor'),
align: 'left',
dataIndex: 'lastAssigneeName',
ellipsis: true,
width: 130
width: 229
},
{
title: this.$t('CurrentProcessor'),
align: 'left',
dataIndex: 'assigneeName',
ellipsis: true,
width: 130
width: 238
},
{
title: this.$t('TaskCutOffTime'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 150
width: 204
},
{
title: this.$t('taskStatus'),
align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 130
width: 246
},
{
title: this.$t('operation'),
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue
+5 -5
View File
@@ -58,28 +58,28 @@
dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
width: 330
width: 463
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 130
width: 332
},
{
title: this.$t('Sponsor'),
align: 'left',
dataIndex: 'createBy',
ellipsis: true,
width: 130
width: 209
},
{
title: this.$t('TaskCutOffTime'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 150,
width: 230,
scopedSlots: { customRender: 'endTime' }
},
{
@@ -87,7 +87,7 @@
align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 130
width: 269
},
{
title: this.$t('operation'),
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue
+6 -6
View File
@@ -57,42 +57,42 @@
dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 330
width: 393
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 130
width: 292
},
{
title: this.$t('Sponsor'),
align: 'left',
dataIndex: 'createBy',
ellipsis: true,
width: 130
width: 212
},
{
title: this.$t('CurrentProcessor'),
align: 'left',
dataIndex: 'assigneeName',
ellipsis: true,
width: 130
width: 215
},
{
title: this.$t('TaskCutOffTime'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 150
width: 151
},
{
title: this.$t('taskStatus'),
align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 130
width: 241
},
{
title: this.$t('operation'),
jero-web/src/views/virtualAuthenticationList/index.vue
+3 -3
View File
@@ -215,14 +215,14 @@
title: this.$t('CertificationListName'),
align: 'left',
dataIndex: 'name',
width: 260,
width: 480,
ellipsis: true,
scopedSlots: { customRender: 'CertificationListName' }
},
{
title: this.$t('listStatus'),
align: 'left',
width: 260,
width: 536,
ellipsis: true,
dataIndex: 'state_dictText'
},
@@ -237,7 +237,7 @@
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 400,
width: 280,
scopedSlots: { customRender: 'operation' }
}
]
jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+2 -2
View File
@@ -293,7 +293,7 @@
align: 'left',
dataIndex: 'category',
width: 200,
fixed: 'left',
// fixed: 'left',
ellipsis: true
},
{
@@ -302,7 +302,7 @@
dataIndex: 'inspectionItem',
width: 200,
ellipsis: true,
fixed: 'left',
// fixed: 'left',
scopedSlots: { customRender: 'inspectionItems' }
},
{