|
@@ -304,7 +304,7 @@ export default {
|
|
|
let proId = localStorage.getItem('projectId');
|
|
|
let secret = localStorage.getItem('secret');
|
|
|
let params = {
|
|
|
- filters: 'inputMode in ["L1","L2","L","M"]',
|
|
|
+ filters: 'category != STATIC',
|
|
|
orders: "sort asc",
|
|
|
pageNumber: 1,
|
|
|
pageSize: 500,
|
|
@@ -358,7 +358,7 @@ export default {
|
|
|
if (this.instance && this.instance.hasOwnProperty(i.Path) && this.currentRadio != 2) {
|
|
|
i.value = this.instance[i.Path]
|
|
|
}
|
|
|
- if (i.InputMode == 'C5') {
|
|
|
+ if (i.dataType == 'DATETIME') {
|
|
|
if (this.instance && this.instance.hasOwnProperty(i.Path)) {
|
|
|
let time = this.instance[i.Path]
|
|
|
i.value = this.formatDate(time)
|
|
@@ -367,14 +367,14 @@ export default {
|
|
|
if (i.DataSource && i.DataSource.length) {
|
|
|
let source = JSON.parse(i.DataSource)
|
|
|
//判断输入类型
|
|
|
- if (i.InputMode == 'D1L') {
|
|
|
+ if (i.dataType == 'ENUM') {
|
|
|
let d1l = tools.formatDataSource(i.DataSource)
|
|
|
d1l.forEach(k => {
|
|
|
if (k.Code == this.instance[i.Path]) {
|
|
|
i.value = k.Name
|
|
|
}
|
|
|
})
|
|
|
- } else if (i.InputMode == 'D2' || i.InputMode == 'C6') {
|
|
|
+ } else if (i.dataType == 'MENUM' || i.dataType == 'DATETIME') {
|
|
|
if (this.instance && this.instance.hasOwnProperty(i.Path)) {
|
|
|
if (!Array.isArray(this.instance[i.Path])) {
|
|
|
let transArray = this.instance[i.Path].split(',')
|
|
@@ -388,13 +388,8 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
- switch (i.InputMode) {
|
|
|
- case "L":
|
|
|
- case "L1":
|
|
|
- case "L2":
|
|
|
- case "M":
|
|
|
- break;
|
|
|
- default:
|
|
|
+ switch (i.category) {
|
|
|
+ case "STATIC":
|
|
|
if (result[`${i.FirstName}${i.SecondName ? '/' + i.SecondName : ''}`]) {
|
|
|
result[`${i.FirstName}${i.SecondName ? '/' + i.SecondName : ''}`].paths.push({
|
|
|
Path: i.Path,
|
|
@@ -403,7 +398,7 @@ export default {
|
|
|
Value: i.value,
|
|
|
Visible: i.Visible,
|
|
|
KeyWord: i.KeyWord,
|
|
|
- InputMode: i.InputMode
|
|
|
+ dataType: i.dataType
|
|
|
})
|
|
|
} else {
|
|
|
result[`${i.FirstName}${i.SecondName ? '/' + i.SecondName : ''}`] = {
|
|
@@ -414,11 +409,11 @@ export default {
|
|
|
Value: i.value,
|
|
|
Visible: i.Visible,
|
|
|
KeyWord: i.KeyWord,
|
|
|
- InputMode: i.InputMode
|
|
|
+ dataType: i.dataType
|
|
|
}]
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ break
|
|
|
}
|
|
|
})
|
|
|
this.exhibitionBaseInformation.information = result
|