diff --git a/src/views/firefighting/checklist/components/edit.vue b/src/views/firefighting/checklist/components/edit.vue
index 49bda77..7ac546c 100644
--- a/src/views/firefighting/checklist/components/edit.vue
+++ b/src/views/firefighting/checklist/components/edit.vue
@@ -235,6 +235,19 @@
+
+
+
+
+
@@ -404,8 +417,10 @@ export default {
POSTNAME: '',
USERNAME: '',
varList: [],
- idListFcS: []
+ idListFcS: [],
+ DEPARTMENT_ID: ''
},
+ treeDataDepart: [],
pointList: [],
pointCode: '',
// ------------end
@@ -531,7 +546,8 @@ export default {
FIRE_DEVICE_TYPE_ID: this.waitFor.FIRE_DEVICE_TYPE_ID,
FIRE_POINT_ID: this.waitFor.FIRE_POINT_ID,
FIRE_DEVICE_CODE: this.waitFor.FIRE_DEVICE_CODE,
- FIRE_REGION_ID: this.waitFor.FIRE_REGION_ID
+ FIRE_REGION_ID: this.waitFor.FIRE_REGION_ID,
+ DEPARTMENT_ID: this.waitFor.DEPARTMENT_ID
}
).then((data) => {
this.listLoading = false
@@ -587,6 +603,7 @@ export default {
this.treeData.forEach((item) => {
item.isDisabled = true
})
+ this.treeDataDepart = JSON.parse(data.zTreeNodes)
resolve()
}).catch((e) => {
})
@@ -828,6 +845,7 @@ export default {
this.waitFor.FIRE_DEVICE_ID = ''
this.waitFor.FIRE_DEVICE_CODE = ''
this.waitFor.FIRE_POINT_NAME = ''
+ this.waitFor.DEPARTMENT_ID = ''
this.pointList = []
this.getList()
this.getDevice()
diff --git a/src/views/threeSystems/safetyProductionResponsibilitySystem/components/textLibraryInfo.vue b/src/views/threeSystems/safetyProductionResponsibilitySystem/components/textLibraryInfo.vue
index 1c4beb9..e87b3b9 100644
--- a/src/views/threeSystems/safetyProductionResponsibilitySystem/components/textLibraryInfo.vue
+++ b/src/views/threeSystems/safetyProductionResponsibilitySystem/components/textLibraryInfo.vue
@@ -95,7 +95,12 @@ export default {
this.loading = false
this.form = data.data
this.form.FILE = []
- this.remoteControl.keyOne = !(this.form.CATEGORY_LIST[0].CATEGORY_ID === '7158f688d0f34054a28a9275139298df')
+ // CATEGORY_LIST为空的时候,下方的判断会报错,所以当CATEGORY_LIST为空时,keyOne为true
+ if (this.form.CATEGORY_LIST.length > 0) {
+ this.remoteControl.keyOne = !(this.form.CATEGORY_LIST[0].CATEGORY_ID === '7158f688d0f34054a28a9275139298df')
+ } else {
+ this.remoteControl.keyOne = true
+ }
}).catch((e) => {
this.$message.error(e)
this.loading = false