From becf4b68d07cc3248cba8c652768a8be41875410 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Mar 2021 11:35:40 +0800
Subject: [PATCH] 部分弹框样式修改，省-区三级联动，部分接口调整
---
src/styles/real.scss | 17 -
src/views/realTimePolice/real.vue | 318 +++++--------------
src/views/policeTracking/policeTracking.vue | 479 +++++++++++++++++++----------
src/page/index/top/index.vue | 6
public/img/police-num.png | 0
src/page/index/logo.vue | 114 +++---
src/views/distribution/index.vue | 2
7 files changed, 445 insertions(+), 491 deletions(-)
diff --git a/public/img/police-num.png b/public/img/police-num.png
index 7f5dd2d..831bcf6 100644
--- a/public/img/police-num.png
+++ b/public/img/police-num.png
Binary files differ
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index e618f06..c75cbed 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -20,10 +20,6 @@
:append-to-body="true"
:close-on-press-escape="false"
:close-on-click-modal="false"
-<<<<<<< HEAD
-=======
- :show-close="false"
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
@close="closeDialog"
>
<el-form
@@ -68,7 +64,6 @@
disabled="true"
v-model="form.phoneNumber"
autocomplete="off"
-<<<<<<< HEAD
style="width: calc(100% - 110px)"
></el-input>
<el-button
@@ -84,20 +79,13 @@
<i class="el-icon-phone-outline"></i>
联系负责人
</el-button>
-=======
- ></el-input>
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col span="12">
- <el-form-item label="行政区">
- <el-input
- disabled="true"
- v-model="form.district"
- autocomplete="off"
- ></el-input>
+ <el-form-item label="省份" class="cityClassParams">
+ <avue-form :option="itemOption" v-model="form"></avue-form>
</el-form-item>
</el-col>
<el-col span="12">
@@ -161,7 +149,6 @@
</el-form-item>
</el-col>
<el-col span="12">
-<<<<<<< HEAD
<el-form-item label="监控视频">
<el-button type="success" @click.stop="queryOldVideo(form)"
>视频通话
@@ -171,45 +158,21 @@
</el-button>
</el-form-item>
</el-col>
-=======
- <el-form-item label="备注">
- <el-input v-model="form.bz" autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-form-item label="报警内容">
- <el-input
- disabled="true"
- v-model="form.content"
- autocomplete="off"
- ></el-input>
- </el-form-item>
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
</el-row>
<el-row>
<el-col span="12">
-<<<<<<< HEAD
<el-form-item label="报警内容">
<el-input
disabled="true"
v-model="form.content"
autocomplete="off"
></el-input>
-=======
- <el-form-item label="视频通话">
- <el-button type="primary" @click.stop="queryOldVideo(form)"
- >查看视频
- </el-button>
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
</el-form-item>
</el-col>
<el-col span="12">
- <el-form-item label="历史视频">
- <el-button type="primary" @click.stop="queryOldVideo(form)"
- >查看视频
- </el-button>
+ <el-form-item label="备注">
+ <el-input v-model="form.bz" autocomplete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -217,7 +180,6 @@
<el-row :align="center">
<el-col class="opt-btn">
<el-form-item>
-<<<<<<< HEAD
<el-button type="success" @click.stop="revoke(form)"
>办结</el-button
>
@@ -231,14 +193,6 @@
alt=""
/>
-=======
- <el-button type="warning" @click.stop="revoke(form)"
- >办结</el-button
- >
- <el-button type="danger" class="push-nmb-btn"
- >推送110</el-button
- >
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
<el-button type="primary" @click.stop="generate(form)"
>派发保安</el-button
>
@@ -283,6 +237,57 @@
innerVisibleVideo: false,
deviceId: null,
form: {},
+ itemOption: {
+ menuBtn: false,
+ column: [
+ {
+ disabled: true,
+ row: false,
+ prop: "province",
+ type: "select",
+ placeholder: "省份",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ cascaderItem: ["city", "district"],
+ dicUrl: "/api/blade-system/region/select",
+ span: 1,
+ labelWidth: "0",
+ className: "cityClassSelect",
+ },
+ {
+ disabled: true,
+ row: false,
+ prop: "city",
+ type: "select",
+ placeholder: "地市",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ dicUrl: "/api/blade-system/region/select?code={{key}}",
+ span: 1,
+ labelWidth: "0",
+ className: "cityClassSelect",
+ },
+ {
+ disabled: true,
+ row: false,
+ prop: "district",
+ type: "select",
+ placeholder: "区县",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ dicUrl: "/api/blade-system/region/select?code={{key}}",
+ span: 1,
+ labelWidth: "0",
+ className: "cityClassSelect",
+ },
+ ],
+ },
};
},
created() {
@@ -307,6 +312,7 @@
layerRealtime() {
var that = this;
window.clearTimeout(window.realTimeQuery);
+ // that.deviceId = 384; // 测试用
window.realTimeQuery = setInterval(function () {
axios({
url: "/api/blade-jfpts/alarm/alarm/selecttx?id=" + that.deviceId,
@@ -644,11 +650,7 @@
bottom: 0 !important;
left: 0 !important;
right: 400px !important;
-<<<<<<< HEAD
height: 558px !important;
-=======
- height: 630px !important;
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
border-radius: 10px 10px 10px 10px;
}
@@ -669,11 +671,7 @@
right: 0 !important;
bottom: 0 !important;
margin: auto !important;
-<<<<<<< HEAD
height: 558px;
-=======
- height: 630px;
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
}
.ss-video-dialog .el-dialog .el-dialog__body {
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 932e734..395e94d 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -19,14 +19,8 @@
</span>
</div>
<div class="top-bar__right">
-<<<<<<< HEAD
<img src="/img/ydlg.png" style="height: 44px; vertical-align: middle;" alt="">
-=======
-
- <img src="/img/ydlg.png" style="width: 100px;" alt="">
-
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
<el-tooltip v-if="showColor"
effect="dark"
:content="$t('navbar.color')"
diff --git a/src/styles/real.scss b/src/styles/real.scss
index c4a4106..ed7c488 100644
--- a/src/styles/real.scss
+++ b/src/styles/real.scss
@@ -1,5 +1,4 @@
.opt-btn {
-<<<<<<< HEAD
margin-bottom: 0px;
height: 100%;
text-align: center;
@@ -17,21 +16,5 @@
}
}
-=======
- text-align: center;
- .el-form-item__content {
- margin-left: 0 !important;
- .el-button {
- width: 80px;
- height: 40px;
- margin: 0 40px;
- }
- .push-nmb-btn {
- width: 80px;
- height: 80px;
- border-radius: 50%;
- }
- }
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
}
diff --git a/src/views/distribution/index.vue b/src/views/distribution/index.vue
index 1c19868..d898a3b 100644
--- a/src/views/distribution/index.vue
+++ b/src/views/distribution/index.vue
@@ -328,7 +328,7 @@
this.selectOptions.forEach((item) => {
if (item.snumber == value) {
this.form.handName = item.value;
- handName = item.value;
+ this.handName = item.value;
this.form.handleP = value;
}
});
diff --git a/src/views/policeTracking/policeTracking.vue b/src/views/policeTracking/policeTracking.vue
index f338ba2..e6740f7 100644
--- a/src/views/policeTracking/policeTracking.vue
+++ b/src/views/policeTracking/policeTracking.vue
@@ -1,18 +1,26 @@
<template>
<el-row>
<el-col :span="12">
- <div style="background: #fff;height: 100%;">
+ <div style="background: #fff; height: 100%">
<el-card class="trackClass">
-
- <div style="margin-top: 20px;" role="tab" aria-expanded="true" aria-controls="el-collapse-content-823"
- aria-describedby="el-collapse-content-823">
- <div role="button" tabindex="0"
- class="el-collapse-item__header focusing is-active">
- <div class="avue-group__header avue-group"><i class="el-icon-message-solid avue-group__icon"></i>
- <h1 class="avue-group__title">警情信息</h1></div>
+ <div
+ style="margin-top: 20px"
+ role="tab"
+ aria-expanded="true"
+ aria-controls="el-collapse-content-823"
+ aria-describedby="el-collapse-content-823"
+ >
+ <div
+ role="button"
+ tabindex="0"
+ class="el-collapse-item__header focusing is-active"
+ >
+ <div class="avue-group__header avue-group">
+ <i class="el-icon-message-solid avue-group__icon"></i>
+ <h1 class="avue-group__title">警情信息</h1>
+ </div>
</div>
</div>
-
<el-form
:model="form"
@@ -20,130 +28,157 @@
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)"
+ 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-col span="12">
<el-form-item label="报警人姓名">
<el-input
disabled="true"
v-model="form.galarmPeople"
autocomplete="off"
></el-input>
- </el-form-item
- >
+ </el-form-item>
</el-col>
- <el-col span="12"
- >
+ <el-col span="12">
<el-form-item label="联系方式">
<el-input
disabled="true"
v-model="form.phoneNumber"
autocomplete="off"
></el-input>
- </el-form-item
- >
+ </el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col span="12"
- >
+ <el-col span="12">
<el-form-item label="事发地址">
<el-input
disabled="true"
v-model="form.place"
autocomplete="off"
></el-input>
- </el-form-item
- >
+ </el-form-item>
</el-col>
- <el-col span="12"
- >
+ <el-col span="12">
<el-form-item label="设备编号">
<el-input
disabled="true"
v-model="form.deviceNumber"
autocomplete="off"
></el-input>
- </el-form-item
- >
+ </el-form-item>
</el-col>
-
</el-row>
<el-row>
- <el-col span="12"
- >
+ <el-col span="12">
<el-form-item label="报警时间">
<el-input
disabled="true"
v-model="form.galarmTime"
autocomplete="off"
></el-input>
- </el-form-item
- >
+ </el-form-item>
</el-col>
- <el-col span="12"
- >
+ <el-col span="12">
<el-form-item label="报警内容">
<el-input
disabled="true"
v-model="form.content"
autocomplete="off"
></el-input>
- </el-form-item
- >
+ </el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col span="12"
- >
+ <el-col span="12">
<el-form-item label="处置时间">
<el-input
disabled="true"
v-model="form.czTime"
autocomplete="off"
></el-input>
- </el-form-item
- >
+ </el-form-item>
</el-col>
- <el-col span="12"
- >
+ <el-col span="12">
<el-form-item label="备注">
<el-input
disabled="true"
v-model="form.bz"
autocomplete="off"
></el-input>
- </el-form-item
- >
+ </el-form-item>
</el-col>
</el-row>
-
<el-row>
- <el-col span="12"
- >
+ <el-col span="12">
<el-form-item label="警情类型">
<el-input
disabled="true"
v-model="form.waringType"
autocomplete="off"
></el-input>
- </el-form-item
- >
+ </el-form-item>
+ </el-col>
+ <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-row>
</el-form>
- <div style="margin-top: 20px;" role="tab" aria-expanded="true" aria-controls="el-collapse-content-823"
- aria-describedby="el-collapse-content-823">
- <div role="button" tabindex="0"
- class="el-collapse-item__header focusing is-active">
- <div class="avue-group__header avue-group"><i class="el-icon-s-custom avue-group__icon"></i>
- <h1 class="avue-group__title">保安信息</h1></div>
+ <div
+ style="margin-top: 20px"
+ role="tab"
+ aria-expanded="true"
+ aria-controls="el-collapse-content-823"
+ aria-describedby="el-collapse-content-823"
+ >
+ <div
+ role="button"
+ tabindex="0"
+ class="el-collapse-item__header focusing is-active"
+ >
+ <div class="avue-group__header avue-group">
+ <i class="el-icon-document avue-group__icon"></i>
+ <h1 class="avue-group__title">接警信息</h1>
+ </div>
+ </div>
+ </div>
+
+ <el-card class="receiving-alarm-box">
+ <div v-for="(item, index) in receivingList" :key="index">
+ {{ item.zctime + " " + item.sname + " " + item.zc }}
+ </div>
+ </el-card>
+
+ <div
+ style="margin-top: 20px"
+ role="tab"
+ aria-expanded="true"
+ aria-controls="el-collapse-content-823"
+ aria-describedby="el-collapse-content-823"
+ >
+ <div
+ role="button"
+ tabindex="0"
+ class="el-collapse-item__header focusing is-active"
+ >
+ <div class="avue-group__header avue-group">
+ <i class="el-icon-s-custom avue-group__icon"></i>
+ <h1 class="avue-group__title">保安信息</h1>
+ </div>
</div>
</div>
@@ -152,102 +187,102 @@
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)"
+ 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-col span="12">
<el-form-item label="人员编号">
<el-input
disabled="true"
v-model="security.snumber"
autocomplete="off"
></el-input>
- </el-form-item
- >
+ </el-form-item>
</el-col>
- <el-col span="12"
- >
+ <el-col span="12">
<el-form-item label="人员名称">
<el-input
disabled="true"
v-model="security.sname"
autocomplete="off"
></el-input>
- </el-form-item
- >
+ </el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col span="12"
- >
+ <el-col span="12">
<el-form-item label="性别">
<el-input
disabled="true"
v-model="security.sex"
autocomplete="off"
></el-input>
- </el-form-item
- >
+ </el-form-item>
</el-col>
- <el-col span="12"
- >
+ <el-col span="12">
<el-form-item label="年龄">
<el-input
disabled="true"
v-model="security.age"
autocomplete="off"
></el-input>
- </el-form-item
- >
+ </el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col span="12"
- >
+ <el-col span="12">
<el-form-item label="联系电话">
<el-input
disabled="true"
v-model="security.phone"
autocomplete="off"
></el-input>
- </el-form-item
- >
+ </el-form-item>
</el-col>
- <el-col span="12"
- >
+ <el-col span="12">
<el-form-item label="家庭住址">
<el-input
disabled="true"
v-model="security.address"
autocomplete="off"
></el-input>
- </el-form-item
- >
+ </el-form-item>
</el-col>
</el-row>
</el-form>
<el-row :gutter="20">
<el-col :span="16">
- <div class="grid-content bg-purple">
-
- </div>
+ <div class="grid-content bg-purple"></div>
</el-col>
<el-col :span="8">
- <div class="grid-content bg-purple">
-
- </div>
+ <div class="grid-content bg-purple"></div>
</el-col>
</el-row>
<div class="demo-image__placeholder">
- <div role="tab" aria-expanded="true" aria-controls="el-collapse-content-823"
- aria-describedby="el-collapse-content-823">
- <div role="button" tabindex="0"
- class="el-collapse-item__header focusing is-active">
- <div class="avue-group__header avue-group"><i class="el-icon-s-order avue-group__icon"></i>
- <h1 class="avue-group__title">警情反馈</h1></div>
+ <div
+ role="tab"
+ aria-expanded="true"
+ aria-controls="el-collapse-content-823"
+ aria-describedby="el-collapse-content-823"
+ >
+ <div
+ role="button"
+ tabindex="0"
+ class="el-collapse-item__header focusing is-active"
+ >
+ <div class="avue-group__header avue-group">
+ <i class="el-icon-s-order avue-group__icon"></i>
+ <h1 class="avue-group__title">警情反馈</h1>
+ </div>
</div>
</div>
<el-input
@@ -258,31 +293,60 @@
></el-input>
<div class="block">
- <div style="margin-top: 20px;" role="tab" aria-expanded="true" aria-controls="el-collapse-content-823"
- aria-describedby="el-collapse-content-823">
- <div role="button" tabindex="0"
- class="el-collapse-item__header focusing is-active">
- <div class="avue-group__header avue-group"><i class="el-icon-camera-solid avue-group__icon"></i>
- <h1 class="avue-group__title">现场图片</h1></div>
+ <div
+ style="margin-top: 20px"
+ role="tab"
+ aria-expanded="true"
+ aria-controls="el-collapse-content-823"
+ aria-describedby="el-collapse-content-823"
+ >
+ <div
+ role="button"
+ tabindex="0"
+ class="el-collapse-item__header focusing is-active"
+ >
+ <div class="avue-group__header avue-group">
+ <i class="el-icon-camera-solid avue-group__icon"></i>
+ <h1 class="avue-group__title">现场图片</h1>
+ </div>
</div>
</div>
<div>
- <el-image :src="src" style="width: 150px;margin-left: 5px"></el-image>
- <el-image :src="src" style="width: 150px;margin-left: 5px"></el-image>
- <el-image :src="src" style="width: 150px;margin-left: 5px"></el-image>
+ <el-image
+ :src="src"
+ style="width: 150px; margin-left: 5px"
+ ></el-image>
+ <el-image
+ :src="src"
+ style="width: 150px; margin-left: 5px"
+ ></el-image>
+ <el-image
+ :src="src"
+ style="width: 150px; margin-left: 5px"
+ ></el-image>
</div>
</div>
<div class="block">
- <div style="margin-top: 20px;" role="tab" aria-expanded="true" aria-controls="el-collapse-content-823"
- aria-describedby="el-collapse-content-823">
- <div role="button" tabindex="0"
- class="el-collapse-item__header focusing is-active">
- <div class="avue-group__header avue-group"><i class="el-icon-video-camera-solid avue-group__icon"></i>
- <h1 class="avue-group__title">现场视频</h1></div>
+ <div
+ style="margin-top: 20px"
+ role="tab"
+ aria-expanded="true"
+ aria-controls="el-collapse-content-823"
+ aria-describedby="el-collapse-content-823"
+ >
+ <div
+ role="button"
+ tabindex="0"
+ class="el-collapse-item__header focusing is-active"
+ >
+ <div class="avue-group__header avue-group">
+ <i class="el-icon-video-camera-solid avue-group__icon"></i>
+ <h1 class="avue-group__title">现场视频</h1>
+ </div>
</div>
</div>
<div>
- <el-image :src="src" style="width: 150px;margin-left: 5px">
+ <el-image :src="src" style="width: 150px; margin-left: 5px">
<div slot="placeholder" class="image-slot">
加载中<span class="dot">...</span>
</div>
@@ -296,7 +360,6 @@
<el-button @click="onSubmit" type="danger">处理完成</el-button>
</el-col>
</el-row>
-
</el-card>
</div>
</el-col>
@@ -311,81 +374,147 @@
height="100%"
></iframe>
</el-col>
-
</el-row>
-
</template>
<script>
- import axios from "axios";
+import axios from "axios";
- export default {
- data() {
- return {
- selectOptions: [],
- security: {
- snumber: 20018,
- sname: "金同涛",
- sex: "男",
- age: 23,
- phone: 1387975426,
- address: "江西省南昌市西湖区",
- },
- src: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
- form: {},
- };
- }, created() {
- this.form = this.$route.query;
- }
- , methods: {
- onSubmit() {
- var newAxios = axios.create({
- baseURL: "https://web.byisf.com:18001",
- withCredentials: false,
- headers: {},
- });
-
- newAxios
- .post(
- "/api/blade-jfpts/jingdan/jingdan/updateInfo",
- {},
- {
- params: {
- id: this.form.id,
- handleP: this.form.handleP,
- handName: this.form.handName,
- handletype: this.form.handletype,
- type: "2",
- },
- }
- )
- .then((res) => {
- if (res.data.msg == "修改成功") {
- var arr = [];
- this.$store.state.tags.tagList.forEach((item) => {
- if (item.value != this.$store.state.tags.tag.value) {
- arr.push(item);
- }
- });
- this.$store.state.tags.tagList = arr;
- this.$router.go(-1);
- }
- });
+export default {
+ data() {
+ return {
+ selectOptions: [],
+ receivingList: [],
+ security: {
+ snumber: 20018,
+ sname: "金同涛",
+ sex: "男",
+ age: 23,
+ phone: 1387975426,
+ address: "江西省南昌市西湖区",
},
+ src:
+ "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg",
+ form: {},
+ itemOption: {
+ menuBtn: false,
+ column: [
+ {
+ disabled: true,
+ row: false,
+ prop: "province",
+ type: "select",
+ placeholder: "省份",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ cascaderItem: ["city", "district"],
+ dicUrl: "/api/blade-system/region/select",
+ span: 1,
+ labelWidth: "0",
+ className: "cityClassSelect",
+ },
+ {
+ disabled: true,
+ row: false,
+ prop: "city",
+ type: "select",
+ placeholder: "地市",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ dicUrl: "/api/blade-system/region/select?code={{key}}",
+ span: 1,
+ labelWidth: "0",
+ className: "cityClassSelect",
+ },
+ {
+ disabled: true,
+ row: false,
+ prop: "district",
+ type: "select",
+ placeholder: "区县",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ dicUrl: "/api/blade-system/region/select?code={{key}}",
+ span: 1,
+ labelWidth: "0",
+ className: "cityClassSelect",
+ },
+ ],
+ },
+ };
+ },
+ created() {
+ this.form = this.$route.query;
+ this.getReceivingAlarm();
+ },
+ methods: {
+ onSubmit() {
+ var newAxios = axios.create({
+ baseURL: "https://web.byisf.com:18001",
+ withCredentials: false,
+ headers: {},
+ });
+
+ newAxios
+ .post(
+ "/api/blade-jfpts/jingdan/jingdan/updateInfo",
+ {},
+ {
+ params: {
+ id: this.form.id,
+ handleP: this.form.handleP,
+ handName: this.form.handName,
+ handletype: this.form.handletype,
+ type: "2",
+ },
+ }
+ )
+ .then((res) => {
+ if (res.data.msg == "修改成功") {
+ var arr = [];
+ this.$store.state.tags.tagList.forEach((item) => {
+ if (item.value != this.$store.state.tags.tag.value) {
+ arr.push(item);
+ }
+ });
+ this.$store.state.tags.tagList = arr;
+ this.$router.go(-1);
+ }
+ });
},
- }
+
+ getReceivingAlarm() {
+ axios.get("/api/blade-jfpts/operation/list").then((res) => {
+ this.receivingList = res.data.data.records;
+ });
+ },
+ },
+};
</script>
-<style>
- .el-col {
- height: 95%;
+<style lang="scss">
+.el-col {
+ height: 95%;
+}
+
+.trackClass {
+ height: 100%;
+ overflow: auto;
+ overflow-x: hidden;
+}
+
+.receiving-alarm-box {
+ line-height: 32px !important;
+ height: 200px;
+ overflow-y: auto;
+ .el-card__body {
+ padding: 0 10px !important;
}
-
- .trackClass {
- height: 100%;
- overflow: auto;
- overflow-x: hidden;
- }
-
-
+}
</style>
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 66eb9d4..b13a290 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-03-17 15:21:33
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-03-17 16:44:50
+ * @Last Modified time: 2021-03-18 11:24:28
*/
<template>
<basic-container>
@@ -192,12 +192,8 @@
</el-row>
<el-row>
<el-col span="12">
- <el-form-item label="行政区">
- <el-input
- disabled="true"
- v-model="form.district"
- autocomplete="off"
- ></el-input>
+ <el-form-item label="省份" class="cityClassParams">
+ <avue-form :option="itemOption" v-model="form"></avue-form>
</el-form-item>
</el-col>
<el-col span="12">
@@ -262,7 +258,6 @@
</el-form-item>
</el-col>
<el-col span="12">
-<<<<<<< HEAD
<el-form-item label="监控视频">
<el-button type="success" @click.stop="queryOldVideo(form)"
>视频通话
@@ -270,15 +265,10 @@
<el-button type="primary" @click.stop="queryOldVideo(form)"
>查看历史
</el-button>
-=======
- <el-form-item label="备注">
- <el-input v-model="form.bz" autocomplete="off"></el-input>
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
</el-form-item>
</el-col>
</el-row>
-<<<<<<< HEAD
<el-row>
<el-col span="12">
<el-form-item label="报警内容">
@@ -287,31 +277,11 @@
v-model="form.content"
autocomplete="off"
></el-input>
-=======
- <el-row>
- <el-form-item label="报警内容">
- <el-input
- disabled="true"
- v-model="form.content"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-row>
-
- <el-row>
- <el-col span="12">
- <el-form-item label="视频通话">
- <el-button type="primary" @click.stop="queryOldVideo(form)"
- >查看视频
- </el-button>
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
</el-form-item>
</el-col>
<el-col span="12">
- <el-form-item label="历史视频">
- <el-button type="primary" @click.stop="queryOldVideo(form)"
- >查看视频
- </el-button>
+ <el-form-item label="备注">
+ <el-input v-model="form.bz" autocomplete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -325,7 +295,6 @@
@click.stop="aKeyToCall($event, form)"
>查看视频
</el-button> -->
-<<<<<<< HEAD
<el-button type="success" @click.stop="revoke(form)"
>办结
</el-button>
@@ -336,12 +305,6 @@
alt=""
/>
-=======
- <el-button type="warning" @click.stop="revoke(form)"
- >办结
- </el-button>
- <el-button type="danger" class="push-nmb-btn">推送110</el-button>
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
<el-button type="primary" @click.stop="generate(form)"
>派送保安
</el-button>
@@ -374,15 +337,6 @@
import Recorder from "js-audio-recorder";
-<<<<<<< HEAD
-var newAddOper = axios.create({
- baseURL: "http://s16s652780.51mypc.cn",
- withCredentials: false,
- headers: {},
-});
-
-=======
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
export default {
data() {
return {
@@ -391,11 +345,7 @@
videoSource: "",
dialogTableVisible: false,
innerVisibleVideo: false,
-<<<<<<< HEAD
- activeClass: -1,
-=======
activeClass: 3,
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
form: {},
query: {},
dateTime: [],
@@ -600,6 +550,57 @@
},
],
},
+ itemOption: {
+ menuBtn: false,
+ column: [
+ {
+ disabled: true,
+ row: false,
+ prop: "province",
+ type: "select",
+ placeholder: "省份",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ cascaderItem: ["city", "district"],
+ dicUrl: "/api/blade-system/region/select",
+ span: 1,
+ labelWidth: "0",
+ className: "cityClassSelect",
+ },
+ {
+ disabled: true,
+ row: false,
+ prop: "city",
+ type: "select",
+ placeholder: "地市",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ dicUrl: "/api/blade-system/region/select?code={{key}}",
+ span: 1,
+ labelWidth: "0",
+ className: "cityClassSelect",
+ },
+ {
+ disabled: true,
+ row: false,
+ prop: "district",
+ type: "select",
+ placeholder: "区县",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ dicUrl: "/api/blade-system/region/select?code={{key}}",
+ span: 1,
+ labelWidth: "0",
+ className: "cityClassSelect",
+ },
+ ],
+ },
data: [],
isActive: false,
recorder: null,
@@ -647,7 +648,6 @@
(error) => {
window.console.log(error);
loading();
-<<<<<<< HEAD
}
);
},
@@ -668,28 +668,6 @@
}
);
},
-=======
- }
- );
- },
- rowUpdate(row, index, done, loading) {
- row.coordinate = "";
- update(row).then(
- () => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
- }
- );
- },
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
@@ -708,11 +686,7 @@
});
},
searchReset() {
-<<<<<<< HEAD
- this.activeClass = -1;
-=======
this.activeClass = 3;
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
this.query = {};
this.onLoad(this.page);
},
@@ -846,14 +820,11 @@
currentData.getMinutes() < 10
? "0" + currentData.getMinutes()
: currentData.getMinutes();
-<<<<<<< HEAD
//秒
var currenS =
currentData.getSeconds() < 10
? "0" + currentData.getSeconds()
: currentData.getSeconds();
-=======
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
return {
week: {
@@ -884,7 +855,6 @@
currenM +
":00",
},
-<<<<<<< HEAD
current:
currentY +
"-" +
@@ -897,8 +867,6 @@
currenM +
":" +
currenS,
-=======
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
};
},
getBZdata(e) {
@@ -975,11 +943,6 @@
this.dialogTableVisible = true;
},
generate(row) {
-<<<<<<< HEAD
-=======
- console.log(row);
- return;
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
var that = this;
if (row.czTime == "" || row.czTime == null) {
this.$message({
@@ -1021,7 +984,6 @@
message: "生成警单成功",
type: "success",
});
-<<<<<<< HEAD
that.updateJtyep(row);
that.dialogTableVisible = false;
@@ -1043,12 +1005,11 @@
}
},
revoke(row) {
- console.log(row);
var that = this;
-
- newAddOper
+
+ axios
.post(
- "/blade-jfpts/operation/save",
+ "/api/blade-jfpts/operation/save",
{},
{
params: {
@@ -1176,142 +1137,6 @@
.then((result) => {
this.innerVisibleVideo = true;
-=======
-
- that.updateJtyep(row);
- that.dialogTableVisible = false;
- var arr = [];
- that.$store.state.tags.tagList.forEach((item) => {
- if (item.label != "警情分发处置") {
- arr.push(item);
- }
- });
- that.$store.state.tags.tagList = arr;
-
- row.type = 0;
- row.id = response.data.data;
- that.$router.push({ path: "/distribution/index", query: row });
- })
- .catch(function (error) {
- that.dialogTableVisible = false;
- });
- }
- },
- revoke(row) {
- var that = this;
- axios({
- url: "/api/blade-jfpts/alarm/alarm/deletejj?id=" + row.id,
- method: "post",
- }).then(function () {
- that.dialogTableVisible = false;
- that.onLoad(that.page, that.query);
- });
- },
- updateJtyep(row) {
- var that = this;
- axios({
- url:
- "/api/blade-jfpts/alarm/alarm/updateJtype?id=" +
- row.id +
- "&czTime=" +
- row.czTime +
- "&bz=" +
- row.bz,
- method: "post",
- }).then(function () {
- that.onLoad(that.page, that.query);
- });
- },
-
- beginTimeOrEndTime(time) {
- var beginTime = new Date(time);
-
- var endTime = new Date(new Date(time).valueOf() - 1000 * 60 * 60 * 3);
-
- var beginY = beginTime.getFullYear();
-
- var beginM =
- beginTime.getMonth() + 1 < 10
- ? "0" + (beginTime.getMonth() + 1)
- : beginTime.getMonth() + 1;
-
- var beginD =
- beginTime.getDate() < 10
- ? "0" + beginTime.getDate()
- : beginTime.getDate();
-
- var beginH =
- beginTime.getHours() < 10
- ? "0" + beginTime.getHours()
- : beginTime.getHours();
-
- var beginm =
- beginTime.getMinutes() < 10
- ? "0" + beginTime.getMinutes()
- : beginTime.getMinutes();
-
- var begins =
- beginTime.getSeconds() < 10
- ? "0" + beginTime.getSeconds()
- : beginTime.getSeconds();
-
- var endY = endTime.getFullYear();
-
- var endM =
- endTime.getMonth() + 1 < 10
- ? "0" + (endTime.getMonth() + 1)
- : endTime.getMonth() + 1;
-
- var endD =
- endTime.getDate() < 10 ? "0" + endTime.getDate() : endTime.getDate();
-
- var endH =
- endTime.getHours() < 10 ? "0" + endTime.getHours() : endTime.getHours();
-
- var endm =
- endTime.getMinutes() < 10
- ? "0" + endTime.getMinutes()
- : endTime.getMinutes();
-
- var ends =
- endTime.getSeconds() < 10
- ? "0" + endTime.getSeconds()
- : endTime.getSeconds();
- return {
- begin: beginY + beginM + beginD + beginH + beginm + begins,
- end: endY + endM + endD + endH + endm + ends,
- };
- },
- queryOldVideo(data) {
- var newAxios = axios.create({
- baseURL: "https://web.byisf.com:18000",
- withCredentials: false,
- headers: {
- "Content-type": "application/x-www-form-urlencoded",
- },
- });
-
- var time = this.beginTimeOrEndTime(data.alarmTime);
-
- newAxios
- .post(
- "/api_control",
- {},
- {
- params: {
- param: JSON.stringify({ PktType: "GetAccessToken" }),
- },
- }
- )
- .then((res) => {
- newAxios
- .get(
- `https://web.byisf.com:18000/GetPlayUrl?deviceCode=${data.serialNumber}&chl=${data.channelNumber}`
- )
- .then((result) => {
- this.innerVisibleVideo = true;
-
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
this.videoSource = result.data.data.m3u8;
});
@@ -1479,6 +1304,31 @@
padding-right: 0px !important;
}
+.cityClassParams .avue-form__group.avue-form__group--flex {
+ display: flex;
+ justify-content: space-between;
+}
+
+.cityClassParams .cityClassSelect {
+ flex: 1;
+ margin: 0 !important;
+ padding-left: 0px !important;
+ padding-right: 0px !important;
+}
+
+.cityClassParams .cityClassSelect:nth-child(2) {
+ margin: 0 10px !important;
+}
+
+.cityClassParams .cityClassSelect .el-form-item {
+ margin-bottom: 0px !important;
+}
+
+.cityClassParams .cityClassSelect .el-form-item .el-input__inner {
+ height: 28px !important;
+ line-height: 28px !important;
+}
+
.cityClass2 div label {
display: none;
}
--
Gitblit v1.9.3