diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 145ab5724..a0430f3be 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -712,6 +712,7 @@ module.exports = {
uploadTime: 'Upload time',
enclosure: 'Enclosure',
// 认证
+ Theselectedconfiguration: 'The selected item has incomplete data collection, unable to add configuration',
theCurrent: 'The current status of this data is',
thisbuttonCompleted: 'This button can only be operated when the status is completed',
Frozenstatus: 'Frozen status, can only be viewed',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index a3f7909fb..a164de6be 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -723,6 +723,7 @@ module.exports = {
uploadTime: '上传时间',
enclosure: '附件',
// 认证
+ Theselectedconfiguration: '所选项目有未完成收集数据,不能添加配置',
theCurrent: '此数据当前状态为',
thisbuttonCompleted: '当状态为"已完成"时,才可操作此按钮',
Frozenstatus: '冻结状态,仅可以查看',
diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue
index d7ff0adab..85ed02afb 100644
--- a/jero-web/src/views/parameter/ParameterTemplate/index.vue
+++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue
@@ -60,7 +60,7 @@
{{text}}
- {{ text && text.length > 100 ? text.slice(0, 99) + '...' : text }}
+ {{ text && text.length > 80 ? text.slice(0, 79) + '...' : text }}
{{$t('edit')}}
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
index 6357fca90..718596192 100644
--- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
@@ -80,7 +80,7 @@
:projectId='this.$route.query.id'>
-
+
@@ -188,7 +188,8 @@
templatetitleId: '',
rowId: '',
version: 0,
- itemId: '',
+ itemId: '', // 配置id
+ itemRow: {}, // 配置一行数据
historicalVisible: false,
historicalRow: {}, // 历史版本得数据
drawerVisible: false,
@@ -239,8 +240,9 @@
},
// 配置
configure(item) {
- this.itemId = item.id
- this.$refs.configureRef.addModel(item.id)
+ this.itemId = item.id
+ this.itemRow = item
+ this.$refs.configureRef.addModel(item.id)
},
handleCancel(val) {
this.areaVisible = val
diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue
index fe8580dcd..12dfe9c7b 100644
--- a/jero-web/src/views/projectManagement/dialog/configure.vue
+++ b/jero-web/src/views/projectManagement/dialog/configure.vue
@@ -130,6 +130,11 @@ export default {
type: Object,
default: '',
require: true
+ },
+ itemRow: {
+ type: Object,
+ default: '',
+ require: true
}
},
data() {
@@ -200,14 +205,18 @@ export default {
})
},
addConfiguration(item) {
- this.paramsConfigEOList.splice(item.displaySeq + 1,0,{
- id: '',
- configName: '', // 配置名称
- version: '', // 版本
- carType: '', // 车型
- battery: '', // 电池
- motor: '', // 电机
- })
+ if(this.itemRow.configFlag) {
+ this.paramsConfigEOList.splice(item.displaySeq + 1,0,{
+ id: '',
+ configName: '', // 配置名称
+ version: '', // 版本
+ carType: '', // 车型
+ battery: '', // 电池
+ motor: '', // 电机
+ })
+ } else {
+ this.$message.warning(this.$t('Theselectedconfiguration'))
+ }
},
deleteConfiguration(displaySeq,index) {
if(this.paramsConfigEOList.length === 1) {