From dbecf369cd23f22391f0024a29b7387ae2fc906a Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 25 Apr 2021 21:18:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/policeTracking/policeTracking.vue | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/views/policeTracking/policeTracking.vue b/src/views/policeTracking/policeTracking.vue
index 7165e0f..ad909a7 100644
--- a/src/views/policeTracking/policeTracking.vue
+++ b/src/views/policeTracking/policeTracking.vue
@@ -156,7 +156,7 @@
<el-col span="12">
<el-form-item label="备注">
<el-input
- disabled="true"
+ disabled="form.securityArr.length > 0"
v-model="form.bz"
autocomplete="off"
></el-input>
@@ -251,17 +251,8 @@
</el-table-column>
<el-table-column
- v-if="form.securityArr.length > 0"
prop="status"
label="通知状态"
- width="120"
- align="center"
- >
- </el-table-column>
- <el-table-column
- v-else
- prop="roleName"
- label="所属角色"
width="120"
align="center"
>
@@ -503,8 +494,8 @@
<video
:src="vaddress"
muted="muted"
- autoplay="autoplay"
loop
+ autoplay="autoplay"
id="old_video"
style="width: 100%; height: 100%; object-fit: fill"
controls
@@ -787,7 +778,7 @@
name: item.name,
phone: item.phone,
online_status: item.online_status == 1 ? "在线" : "掉线",
- status: "接警人(已通知)",
+ status: "已接警",
tenantName: item.tenantName,
});
}
@@ -809,6 +800,12 @@
});
}
});
+
+ that.tableData.forEach(item => {
+ if (item.id == that.form.oneId) {
+ item.status+='(负责人)'
+ }
+ })
} else {
res.data.data.records.forEach((item) => {
if (item.id == that.form.oneId) {
@@ -818,7 +815,7 @@
name: item.name,
phone: item.phone,
online_status: item.online_status == 1 ? "在线" : "掉线",
- roleName: item.roleName + "(负责人)",
+ status: "未通知(负责人)",
tenantName: item.tenantName,
});
}
@@ -832,7 +829,7 @@
name: item.name,
phone: item.phone,
online_status: item.online_status == 1 ? "在线" : "掉线",
- roleName: item.roleName,
+ status: "未通知",
tenantName: item.tenantName,
});
}
@@ -972,4 +969,8 @@
}
}
}
+
+#old_video::-webkit-media-controls-timeline {
+ display: block;
+}
</style>
--
Gitblit v1.9.3