From e842ff261567edee37a843bd43ecebc159524c5d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sun, 25 Apr 2021 11:34:46 +0800
Subject: [PATCH] 追踪人员信息相关修改
---
src/views/policeTracking/policeTracking.vue | 117 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 73 insertions(+), 44 deletions(-)
diff --git a/src/views/policeTracking/policeTracking.vue b/src/views/policeTracking/policeTracking.vue
index 1d7858c..d378b21 100644
--- a/src/views/policeTracking/policeTracking.vue
+++ b/src/views/policeTracking/policeTracking.vue
@@ -167,7 +167,6 @@
</el-card>
<div
- v-if="form.jtype != 2"
style="margin-top: 20px"
role="tab"
aria-expanded="true"
@@ -191,15 +190,15 @@
"
size="small"
style="position: absolute; right: 0"
- :disabled="!flag"
- :type="!flag ? 'info' : 'danger'"
+ :disabled="form.securityArr.length > 0"
+ :type="form.securityArr.length > 0 ? 'info' : 'danger'"
>通 知</el-button
>
</div>
</div>
</div>
- <el-card v-if="form.jtype != 2">
+ <el-card>
<el-table
ref="multipleTable"
:data="tableData"
@@ -209,7 +208,7 @@
max-height="240"
>
<el-table-column
- v-if="flag"
+ v-if="!(form.securityArr.length > 0)"
type="selection"
width="55"
align="center"
@@ -250,10 +249,20 @@
align="center"
>
</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="100"
+ width="120"
align="center"
>
</el-table-column>
@@ -404,7 +413,7 @@
<el-input
disabled="true"
type="textarea"
- v-model="security.describe"
+ v-model="security.result"
autocomplete="off"
></el-input>
</el-card>
@@ -467,17 +476,6 @@
></video>
<span v-show="feedbackVideo == ''">暂无现场视频</span>
</el-card>
-
- <el-row :align="center" style="margin-top: 40px">
- <el-col :offset="10">
- <el-button
- @click="onSubmit('处理完成', 2)"
- :disabled="form.jtype == 2 ? true : false"
- :type="form.jtype == 2 ? 'info' : 'danger'"
- >处理完成</el-button
- >
- </el-col>
- </el-row>
</el-card>
</div>
</el-col>
@@ -789,33 +787,64 @@
that.tableData = [];
var i = 0;
- res.data.data.records.forEach((item) => {
- if (item.id == that.form.oneId) {
- that.tableData.push({
- id: item.id,
- ind: (i += 1),
- name: item.name,
- phone: item.phone,
- online_status: item.online_status == 1 ? "在线" : "掉线",
- roleName: item.roleName + "(负责人)",
- tenantName: item.tenantName,
- });
- }
- });
+ if (that.form.securityArr.length > 0) {
+ res.data.data.records.forEach((item) => {
- res.data.data.records.forEach((item) => {
- if (item.roleName == "处警员" && item.id != that.form.oneId) {
- that.tableData.push({
- id: item.id,
- ind: (i += 1),
- name: item.name,
- phone: item.phone,
- online_status: item.online_status == 1 ? "在线" : "掉线",
- roleName: item.roleName,
- tenantName: item.tenantName,
- });
- }
- });
+ if (item.id == that.form.securityId) {
+ that.tableData.push({
+ id: item.id,
+ ind: (i += 1),
+ name: item.name,
+ phone: item.phone,
+ online_status: item.online_status == 1 ? "在线" : "掉线",
+ status: "接警人(已通知)",
+ tenantName: item.tenantName,
+ });
+ }
+ });
+
+ res.data.data.records.forEach((item) => {
+ if (that.form.securityArr.indexOf(item.id) != -1 && item.id != that.form.securityId) {
+ that.tableData.push({
+ id: item.id,
+ ind: (i += 1),
+ name: item.name,
+ phone: item.phone,
+ online_status: item.online_status == 1 ? "在线" : "掉线",
+ status: "已通知",
+ tenantName: item.tenantName,
+ });
+ }
+ });
+ } else {
+ res.data.data.records.forEach((item) => {
+ if (item.id == that.form.oneId) {
+ that.tableData.push({
+ id: item.id,
+ ind: (i += 1),
+ name: item.name,
+ phone: item.phone,
+ online_status: item.online_status == 1 ? "在线" : "掉线",
+ roleName: item.roleName + "(负责人)",
+ tenantName: item.tenantName,
+ });
+ }
+ });
+
+ res.data.data.records.forEach((item) => {
+ if (item.roleName == "处警员" && item.id != that.form.oneId) {
+ that.tableData.push({
+ id: item.id,
+ ind: (i += 1),
+ name: item.name,
+ phone: item.phone,
+ online_status: item.online_status == 1 ? "在线" : "掉线",
+ roleName: item.roleName,
+ tenantName: item.tenantName,
+ });
+ }
+ });
+ }
});
},
--
Gitblit v1.9.3