From e2f60c807e967e9b50d00a4fe22c0b015ad6dfff Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 11 Mar 2021 17:05:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/realTimePolice/real.vue | 110 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 77 insertions(+), 33 deletions(-)
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 8e80dba..db7aac6 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -60,6 +60,12 @@
}}
</el-tag>
</template>
+ <template slot-scope="{ row }" slot="cid">
+ <el-tag>{{
+ row.cid == "1" ? "事件发生" : row.cid == "3" ? "是" : "事件恢复"
+ }}
+ </el-tag>
+ </template>
<template slot-scope="{ type, size, row }" slot="menu">
<el-button
@@ -83,7 +89,7 @@
:size="size"
:type="type"
@click.stop="handleManage(row)"
- >处置
+ >核实
</el-button
>
<el-button
@@ -98,7 +104,7 @@
</avue-crud>
<el-dialog
- title="警情处置"
+ title="警情核实"
:visible.sync="dialogTableVisible"
append-to-body="true"
@close="innerVisibleVideo = false"
@@ -288,7 +294,7 @@
<iframe
id="mapDiv"
ref="mapDiv"
- src="/map/index.html?openid=ClientManagement"
+ src="/map/index.html?openid=ClientManagement&ISinit=1"
frameborder="0"
width="100%"
height="100%"
@@ -348,7 +354,7 @@
prop: "waringType",
search: true,
searchSpan: 3,
- searchLabelWidth: 80,
+ className: "waringTypeClass",
searchPlaceholder: "请选择",
type: "select",
props: {
@@ -356,8 +362,7 @@
value: "dictValue"
},
//cascaderItem: ["city", "district"],
- dicUrl: "/api/blade-system/dict-biz/child-list?parentId=1356516807043231746",
- span: 6
+ dicUrl: "/api/blade-system/dict-biz/child-list?parentId=1356523651644043266",
},
{
label: "报警时间",
@@ -371,8 +376,8 @@
label: "报警时间",
prop: "releaseTimeRange",
type: "datetime",
- format: "yyyy-MM-dd HH:mm:ss",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
searchRange: true,
searchSpan: 5,
hide: true,
@@ -390,11 +395,11 @@
},
{
label: "报警内容",
- prop: "rname"
+ prop: "content"
},
{
label: "报警人",
- prop: "alarmPeople"
+ prop: "galarmPeople"
},
{
label: "联系电话",
@@ -403,7 +408,7 @@
},
{
label: "接警人",
- prop: "galarmPeople"
+ prop: "alarmPeople"
},
{
label: "接警时间",
@@ -428,11 +433,12 @@
{
label: "生成警单",
search: true,
- searchSpan: 3,
+ searchSpan: 2,
slot: true,
- searchPlaceholder: "",
+ searchPlaceholder: " ",
prop: "jtype",
type: "select",
+ className: "jtypeClass",
dicData: [
{
label: "否",
@@ -448,8 +454,8 @@
label: "省份",
prop: "province",
search: true,
- searchSpan: 3,
- searchLabelWidth: 60,
+ searchSpan: 2,
+ searchLabelWidth: 45,
placeholder: "省份",
type: "select",
props: {
@@ -496,7 +502,24 @@
span: 3,
labelWidth: "0",
className: "cityClass3"
- }
+ },
+ {
+ label: "警情状态",
+ searchSpan: 3,
+ prop: "cid",
+ slot: true,
+ type: "select",
+ dicData: [
+ {
+ label: "事件发生",
+ value: '1'
+ },
+ {
+ label: "事件恢复",
+ value: '3'
+ }
+ ],
+ },
]
},
data: [],
@@ -798,7 +821,7 @@
});
this.$store.state.tags.tagList = arr;
this.$router.push({
- path: `/real/video/${row.channelNumber}/${row.serialNumber}`
+ path: `/real/video/`,query:row
});
},
handleHistory(row) {
@@ -815,7 +838,7 @@
this.showMap = true;
this.$nextTick(() => {
this.$refs.mapDiv.onload = () => {
- window.frames[0].init(null,{x: row.jd, y: row.wd});
+ window.frames[0].init("ClientManagement",{x: row.jd, y: row.wd});
};
})
},
@@ -863,6 +886,7 @@
message: "生成警单成功",
type: "success"
});
+
that.updateJtyep(row);
that.dialogTableVisible = false;
that.$router.push({ path: "/distribution/index", query: row });
@@ -1083,14 +1107,6 @@
.getElementById("real_audio")
.setAttribute("src", URL.createObjectURL(blob));
- console.log(
- blob,
- newbolb,
- fileOfBlob,
- window.URL.createObjectURL(blob),
- 99999
- );
-
this.recorder.play();
newCallAxios
@@ -1121,11 +1137,43 @@
</script>
<style>
- .cityClass1 {
- padding-right: 5px !important;
+
+ .el-card__body .jtypeClass{
+ width: 10%;
}
- .cityClass2 {
+ .el-card__body .waringTypeClass{
+ width: 12%;
+ }
+
+ /*页面样式*/
+ .el-card__body .cityClass1 {
+ width: 155px;
+ padding-right: 0px !important;
+ }
+ .el-card__body .cityClass2 {
+ width: 100px;
+ padding-left: 0px !important;
+ padding-right: 0px !important;
+ }
+ .el-card__body .cityClass3 {
+ width: 100px;
+ padding-left: 0px !important;
+ padding-right: 0px !important;
+ }
+
+ /*新增窗体样式*/
+ .el-dialog .cityClass1 {
+ width: 220px;
+ padding-right: 0px !important;
+ }
+ .el-dialog .cityClass2 {
+ width: 110px;
+ padding-left: 0px !important;
+ padding-right: 0px !important;
+ }
+ .el-dialog .cityClass3 {
+ width: 110px;
padding-left: 0px !important;
padding-right: 0px !important;
}
@@ -1136,10 +1184,6 @@
.cityClass3 div label {
display: none;
- }
-
- .cityClass3 {
- padding-left: 5px !important;
}
.old-video-dialog {
--
Gitblit v1.9.3