diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue index da08f6cd9..7c7b1e57b 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue @@ -10,7 +10,7 @@
-
+
+ v-html="item.serial_number"> - + - +
diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 7d07ab124..dda041031 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -274,17 +274,10 @@ }, // 配置 configure(item) { - console.log(item) this.itemId = item.id - getAction(this.url.configurelist, { paramsManifestId: this.itemId }).then((res) => { - if (res.success) { - this.configFlag = res.result - } else { - this.$message.warning(res.message) - } - }) + this.itemRow = item - this.$refs.configureRef.addModel(item.id,this.configFlag) + 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 77b79bd53..b0ae4022b 100644 --- a/jero-web/src/views/projectManagement/dialog/configure.vue +++ b/jero-web/src/views/projectManagement/dialog/configure.vue @@ -175,6 +175,7 @@ }, mounted() { + }, methods: { getNameList() { @@ -186,13 +187,19 @@ } }) }, - addModel(id,configFlag) { + addModel(id) { this.paramsConfigEOList = [] this.visible = true this.title = this.$t('MaintainConfigureInfo') - this.configFlag = configFlag this.formInline = {} this.getconList(id) + getAction(this.url.configurelist, { paramsManifestId: this.itemRow.id }).then((res) => { + if (res.success) { + this.configFlag = res.result + } else { + this.$message.warning(res.message) + } + }) }, getconList(id) { getAction(`${this.url.conList}?paramsManifestId=${id}`, {}).then((res) => { @@ -219,7 +226,8 @@ }) }, addConfiguration(item) { - if (this.configFlag) { + console.log(this.configFlag) + if (this.configFlag == true) { this.paramsConfigEOList.splice(item.displaySeq + 1, 0, { id: '', configName: '', // 配置名称