From 7aa1905e6d124f009de17dfdf8bc174122bb6694 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 23 Apr 2021 11:53:00 +0800
Subject: [PATCH] 追踪页面布局稍微调整
---
src/views/policeTracking/policeTracking.vue | 416 ++++++++++++++++++++++++++-------------------------
src/views/supervisoryConsole/card.vue | 10
2 files changed, 216 insertions(+), 210 deletions(-)
diff --git a/src/views/policeTracking/policeTracking.vue b/src/views/policeTracking/policeTracking.vue
index 89a351e..ea5d109 100644
--- a/src/views/policeTracking/policeTracking.vue
+++ b/src/views/policeTracking/policeTracking.vue
@@ -22,148 +22,149 @@
</div>
</div>
- <el-form
- :model="form"
- label-position="right"
- size="mini"
- class="policeForm"
- label-width="100px"
- style="
- background: #fff;
- margin-top: 20px;
- margin-left: 10px;
- margin-right: 10px;
- height: calc(100% - 40px);
- width: calc(100% - 20px);
- "
- >
- <el-row>
- <el-col span="12">
- <el-form-item label="报警人">
- <el-input
- disabled="true"
- v-model="form.galarmPeople"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col span="12">
- <el-form-item label="报警人电话">
- <el-input
- disabled="true"
- v-model="form.phoneNumber"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col span="12">
- <el-form-item label="负责人">
- <el-input
- disabled="true"
- v-model="form.oneContacts"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col span="12">
- <el-form-item label="负责人电话">
- <el-input
- disabled="true"
- v-model="form.onePhone"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col span="12">
- <el-form-item label="省份" class="cityClassParams">
- <avue-form :option="itemOption" v-model="form"></avue-form>
- </el-form-item>
- </el-col>
- <el-col span="12">
- <el-form-item label="事发地址">
- <el-input
- disabled="true"
- v-model="form.place"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col span="12">
- <el-form-item label="警情类型">
- <el-input
- disabled="true"
- v-model="form.waringType"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col span="12">
- <el-form-item label="设备编号">
- <el-input
- disabled="true"
- v-model="form.deviceNumber"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col span="12">
- <el-form-item label="接警人">
- <el-input
- disabled="true"
- v-model="form.alarmPeople"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col span="12">
- <el-form-item label="报警内容">
- <el-input
- disabled="true"
- v-model="form.content"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col span="12">
- <el-form-item label="报警时间">
- <el-input
- disabled="true"
- v-model="form.alarmTime"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col span="12">
- <el-form-item label="历史视频">
- <el-button type="primary" @click.stop="oldOpenVideo"
- >视频播放
- </el-button>
- </el-form-item>
- </el-col>
- </el-row>
-
- <el-row>
- <el-col span="12">
- <el-form-item label="备注">
- <el-input
- disabled="true"
- v-model="form.bz"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
+ <el-card>
+ <el-form
+ :model="form"
+ label-position="right"
+ size="mini"
+ class="policeForm"
+ label-width="100px"
+ style="
+ background: #fff;
+ margin-top: 20px;
+ margin-left: 10px;
+ margin-right: 10px;
+ height: calc(100% - 40px);
+ width: calc(100% - 20px);
+ "
+ >
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="报警人">
+ <el-input
+ disabled="true"
+ v-model="form.galarmPeople"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="报警人电话">
+ <el-input
+ disabled="true"
+ v-model="form.phoneNumber"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="负责人">
+ <el-input
+ disabled="true"
+ v-model="form.oneContacts"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="负责人电话">
+ <el-input
+ disabled="true"
+ v-model="form.onePhone"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="省份" class="cityClassParams">
+ <avue-form :option="itemOption" v-model="form"></avue-form>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="事发地址">
+ <el-input
+ disabled="true"
+ v-model="form.place"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="警情类型">
+ <el-input
+ disabled="true"
+ v-model="form.waringType"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="设备编号">
+ <el-input
+ disabled="true"
+ v-model="form.deviceNumber"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="接警人">
+ <el-input
+ disabled="true"
+ v-model="form.alarmPeople"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="报警内容">
+ <el-input
+ disabled="true"
+ v-model="form.content"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="报警时间">
+ <el-input
+ disabled="true"
+ v-model="form.alarmTime"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="历史视频">
+ <el-button type="primary" @click.stop="oldOpenVideo"
+ >视频播放
+ </el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="备注">
+ <el-input
+ disabled="true"
+ v-model="form.bz"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-card>
<div
v-if="form.jtype != 2"
@@ -329,52 +330,54 @@
</div>
</div>
- <el-form
- :model="security"
- label-position="right"
- size="mini"
- label-width="100px"
- style="
- background: #fff;
- margin-top: 20px;
- margin-left: 10px;
- margin-right: 10px;
- height: calc(100% - 40px);
- width: calc(100% - 20px);
- "
- >
- <el-row>
- <el-col span="12">
- <el-form-item label="人员编号">
- <el-input
- disabled="true"
- v-model="security.snumber"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col span="12">
- <el-form-item label="人员名称">
- <el-input
- disabled="true"
- v-model="security.sname"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col span="12">
- <el-form-item label="联系电话">
- <el-input
- disabled="true"
- v-model="security.phone"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
+ <el-card>
+ <el-form
+ :model="security"
+ label-position="right"
+ size="mini"
+ label-width="100px"
+ style="
+ background: #fff;
+ margin-top: 20px;
+ margin-left: 10px;
+ margin-right: 10px;
+ height: calc(100% - 40px);
+ width: calc(100% - 20px);
+ "
+ >
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="人员编号">
+ <el-input
+ disabled="true"
+ v-model="security.snumber"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="人员名称">
+ <el-input
+ disabled="true"
+ v-model="security.sname"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="联系电话">
+ <el-input
+ disabled="true"
+ v-model="security.phone"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-card>
<el-row :gutter="20">
<el-col :span="16">
@@ -403,12 +406,15 @@
</div>
</div>
</div>
- <el-input
- disabled="true"
- type="textarea"
- v-model="security.describe"
- autocomplete="off"
- ></el-input>
+
+ <el-card>
+ <el-input
+ disabled="true"
+ type="textarea"
+ v-model="security.describe"
+ autocomplete="off"
+ ></el-input>
+ </el-card>
<div class="block">
<div
@@ -460,13 +466,15 @@
</div>
</div>
<div>
- <video
- :src="feedbackVideo"
- style="width: 100%; height: 100%; object-fit: fill"
- controls
- v-show="feedbackVideo != ''"
- ></video>
- <span v-show="feedbackVideo == ''">暂无现场视频</span>
+ <el-card>
+ <video
+ :src="feedbackVideo"
+ style="width: 100%; height: 100%; object-fit: fill"
+ controls
+ v-show="feedbackVideo != ''"
+ ></video>
+ <span v-show="feedbackVideo == ''">暂无现场视频</span>
+ </el-card>
</div>
</div>
</div>
@@ -620,7 +628,10 @@
arr.push(item);
}
});
- this.toggleSelection(arr);
+
+ if (this.form.jtype != 2) {
+ this.toggleSelection(arr);
+ }
},
methods: {
getDate() {
@@ -811,7 +822,6 @@
});
}
});
-
});
},
diff --git a/src/views/supervisoryConsole/card.vue b/src/views/supervisoryConsole/card.vue
index 39388a6..7c9f4bb 100644
--- a/src/views/supervisoryConsole/card.vue
+++ b/src/views/supervisoryConsole/card.vue
@@ -52,7 +52,7 @@
"
>
<div>{{ item.deviceName }}</div>
- <div style="width: 80%;">{{ item.street }}</div>
+ <div style="width: 80%">{{ item.street }}</div>
<div class="cet">
{{
@@ -129,7 +129,7 @@
this.loading = false;
}, 2000);
},
-
+
inputSearchBtn() {
this.getEquipmentLists();
},
@@ -161,11 +161,7 @@
});
} else if (this.radio == "仅显示设备掉线") {
res.data.data.forEach((item) => {
- if (item.jtype == 1 && item.onlineStatus != 1) {
- f.push(item);
- } else {
- if (item.onlineStatus != 1) b.push(item);
- }
+ if (item.onlineStatus != 1) b.push(item);
});
} else if (this.radio == "仅显示设备故障") {
res.data.data.forEach((item) => {
--
Gitblit v1.9.3