diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue b/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue index 90eda7a..37a1793 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue @@ -1,10 +1,10 @@ +<<<<<<< HEAD + +======= +>>>>>>> hn1.0 diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue b/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue index be38964..54c8e99 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue @@ -1,10 +1,10 @@ +<<<<<<< HEAD + +======= +>>>>>>> hn1.0 diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue b/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue index ae9f7a5..c71f23d 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue @@ -13,9 +13,19 @@ + > + {{ + item.alias !== null && item.alias !== "" + ? item.alias + : item.channelname + }} +
@@ -95,9 +105,19 @@ + > + {{ + item.alias !== null && item.alias !== "" + ? item.alias + : item.channelname + }} + @@ -246,7 +266,7 @@ export default { this.searchloading = true; getPhotoParamApi({ channelId: this.selaccess, - cmdId: this.selcmdId, + termId: this.seltermid, }) .then((res) => { if (res.code == 200) { diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue index e4997a5..4fa8214 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue @@ -400,6 +400,8 @@ export default { }, handleclose() { this.isShow = false; + this.activeName = "1"; + this.tabsActive = "first"; }, }, }; diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue index e2ecc06..c687666 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue @@ -1,10 +1,10 @@ +<<<<<<< HEAD + +======= +>>>>>>> hn1.0 diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue b/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue index 8d37ce8..9424bab 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue @@ -13,9 +13,19 @@ + > + {{ + item.alias !== null && item.alias !== "" + ? item.alias + : item.channelname + }} +
@@ -78,9 +88,19 @@ + > + {{ + item.alias !== null && item.alias !== "" + ? item.alias + : item.channelname + }} + @@ -142,7 +162,7 @@ export default { selaccess: "", //选中的通道 capturenr: {}, //查询后的内容 setForm: { - preset: 255 + preset: 255, }, //设置参数 rules: { channelId: [{ required: true, message: "请选择通道", trigger: "blur" }], @@ -169,7 +189,7 @@ export default { //获取设备通道 getSingleAccess(val) { this.setForm = { - preset: 255 + preset: 255, }; console.log(val); this.seltermid = val.id; diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue index af4ec57..67c6318 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue @@ -1,10 +1,10 @@ +<<<<<<< HEAD + +======= +>>>>>>> hn1.0 diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue index 8a306bc..472481d 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/index.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue @@ -79,17 +79,19 @@ @row-click="handleRowClick" v-loading="loading" > - + + - + - +