+ v-if="showShipinjiankong_zhengchang">
@@ -112,54 +112,23 @@
-
-
-
-
-
+
+
-
-
+
-
-
-
布防
-
撤防
-
报警确认
-
旁路
+ @click="openshipinDianziweilan(index)">
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -248,7 +217,7 @@
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
-import { getOtherList } from '@/api/device/device'
+import { getOtherList, sysArm, sysDisArm } from '@/api/device/device'
import { getVedioPcRecById, getVedioPcLiveById } from '@/api/deviceImage/deviceImage'
// import baojingchaxunAdd from './baojingchaxunAdd'
// import baojingchaxunInfo from './baojingchaxunInfo'
@@ -270,10 +239,8 @@ export default {
btnMenjinguanli: [],
btnDianziweilan: [],
btndisabled: false,
- zc_list: [
- { name: '左', number: '123', left: '2%', top: '2%' },
- { name: '右', number: 'ABC', left: '20%', top: '20%' }
- ],
+ zc_list: [],
+ dzwl_list: [],
btnList: [
{
type: 'info',
@@ -337,6 +304,7 @@ export default {
spUrl: '',
spRecUrl: '',
active: -1,
+ activeDzwl: -1,
isMute: true,
isPlay: false,
width: '100%', // 设置视频播放器的显示宽度（以像素为单位）
@@ -446,12 +414,27 @@ export default {
openshipinMenjinguanli() {
this.seenshipinMenjinguanli = !this.seenshipinMenjinguanli
},
- openshipinDianziweilan() {
+ openshipinDianziweilan(index) {
+ this.activeDzwl = index
this.seenshipinDianziweilan = !this.seenshipinDianziweilan
},
- // 、、、、
+ openArm(id) {
+ this.activeDzwl = -1
+ sysArm({ id: id }).then(res => {
+ console.log(res)
+ this.$message({ showClose: true, type: 'success', message: res.msg })
+ })
+ },
+ disArm(id) {
+ this.activeDzwl = -1
+ sysDisArm({ id: id }).then(res => {
+ this.$message({ showClose: true, type: 'success', message: res.msg })
+ })
+ },
+ noCall() {
+ this.activeDzwl = -1
+ },
openruqinbaojing() {
-
this.showRuqinbaojing = !this.showRuqinbaojing
},
openshipinjiankong() {
@@ -609,6 +592,13 @@ export default {
this.zc_list = res.data
}
})
+
+ getOtherList({ type: 2 }).then((res) => {
+ if (res.code == 200) {
+ this.dzwl_list = res.data
+ }
+ console.log(this.dzwl_list)
+ })
},
// 序号
indexMethod(index) {
@@ -1176,8 +1166,6 @@ export default {
.shipinstu .Dianziweilan_zhengchang1 {
position: absolute;
- top: 0%;
- left: 93%;
z-index: 500;
}
diff --git a/src/views/shebeitaizhang/shebeitaizhangAdd.vue b/src/views/shebeitaizhang/shebeitaizhangAdd.vue
index 4ccb8e2..fb7eaa9 100644
--- a/src/views/shebeitaizhang/shebeitaizhangAdd.vue
+++ b/src/views/shebeitaizhang/shebeitaizhangAdd.vue
@@ -85,14 +85,22 @@
-
+
上偏移
-
+
+
+ 所属报警主机子系统
+
+
+
+
+
+
请选择所属Nvr
@@ -139,8 +147,27 @@
-
-
+
+
+ 左偏移
+
+
+
+
+
+
+
+ 请选择报警主机
+
+
+
+
+
+
+
+
@@ -178,6 +205,8 @@ export default {
index: 0,
sxtFlag: false,
ckFlag: false,
+ dzwlFlag: false,
+ bjzjList: [],
viewState: 1,
viewTitle: '',
dialogStatus: '',
@@ -187,7 +216,7 @@ export default {
{ name: '摄像头', id: '1' },
{ name: '电子围栏', id: '2' },
{ name: '门禁', id: '3' },
- { name: '机器人', id: '4' },
+ { name: '报警主机', id: '4' },
{ name: '网络录像机', id: '5' }
],
maintenanceList: [
@@ -228,25 +257,15 @@ export default {
changeType(item) {
this.sxtFlag = false
this.ckFlag = false
+ this.dzwlFlag = false
if (item == '1') {
this.sxtFlag = true
- } else if (item == '5') {
+ } else if (item == '2') {
+ this.dzwlFlag = true
+ } else if (item == '5' || item == '4') {
this.ckFlag = true
}
-
- getOtherList({ type: 5 }).then(res => {
- if (res.code == 200) {
- this.nvrList = res.data
- }
- })
- },
- init() {
- typeValues({ type: 'supplierType' }).then((res) => {
- if (res.success) {
- this.supplierType_list = res.data
- }
- })
},
changeSupplierType(value) {
let bb = null
@@ -261,36 +280,57 @@ export default {
this.addForm.supplierType = bb.key
},
showAdd(typeSubmit) {
- this.sxtFlag = false
- this.dialogStatus = typeSubmit
getWareHouseList().then(res => {
console.log(res)
if (res.code == 200) {
this.ckList = res.data
}
})
- },
- showEdit(param) {
- this.sxtFlag = false
- this.ckFlag = false
getOtherList({ type: 5 }).then(res => {
if (res.code == 200) {
this.nvrList = res.data
console.log(this.nvrList)
}
})
+ getOtherList({ type: 4 }).then(res => {
+ if (res.code == 200) {
+ this.bjzjList = res.data
+ }
+ })
+ this.sxtFlag = false
+ this.dialogStatus = typeSubmit
+
+ },
+ showEdit(param) {
getWareHouseList().then(res => {
console.log(res)
if (res.code == 200) {
this.ckList = res.data
}
})
+ getOtherList({ type: 5 }).then(res => {
+ if (res.code == 200) {
+ this.nvrList = res.data
+ console.log(this.nvrList)
+ }
+ })
+ getOtherList({ type: 4 }).then(res => {
+ if (res.code == 200) {
+ this.bjzjList = res.data
+ }
+ })
+ this.sxtFlag = false
+ this.ckFlag = false
+ this.dzwlFlag = false
+
this.dialogStatus = param.typeSubmit
this.addForm = param.info
this.addForm.vCode = param.info.vcode
if (this.addForm.type == '1') {
this.sxtFlag = true
- } else if (this.addForm.type == '5') {
+ } else if (this.addForm.type == '2') {
+ this.dzwlFlag = true
+ } else if (this.addForm.type == '5' || this.addForm.type == '4') {
this.ckFlag = true
}
},
diff --git a/src/views/shebeitaizhang/shebeitaizhangInfo.vue b/src/views/shebeitaizhang/shebeitaizhangInfo.vue
index 62fe0dd..43c3714 100644
--- a/src/views/shebeitaizhang/shebeitaizhangInfo.vue
+++ b/src/views/shebeitaizhang/shebeitaizhangInfo.vue
@@ -57,14 +57,38 @@
{{ infoForm.serialNumber }}
-
+
+ 维修状态
+
+
+
+ {{ getMainTitle(infoForm.maintenance) }}
+
+
+
上偏移
-
+
{{ infoForm.topPosition }}
+
+ 所属报警主机
+
+
+
+ {{ getBjzj(infoForm.bjzjId) }}
+
+
+
+ 所属Nvr
+
+
+
+ {{ getNvrTitle(infoForm.nvrId) }}
+
+
仓库
@@ -92,13 +116,21 @@
-
+
- 所属Nvr
+ 左偏移
- {{ getNvrTitle(infoForm.nvrId) }}
+ {{ infoForm.leftPosition }}
+
+
+
+ 所属报警主机子系统
+
+
+
+ {{ infoForm.sysId }}
@@ -109,15 +141,12 @@