From b305a75f4fc8c270886e018bb2228f8796780eab Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 25 Mar 2021 15:02:16 +0800
Subject: [PATCH] 部分文件修改，主追踪页面改动
---
src/views/realTimePolice/real.vue | 20 +++++++---
package-lock.json | 10 +++++
src/views/policeTracking/policeTracking.vue | 57 +++++++++++++++++++++-------
public/map/widgets/alertSecurity/AlertSecurity.js | 23 +++++++----
src/page/index/logo.vue | 1
5 files changed, 81 insertions(+), 30 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index df9eaf6..1d2cce6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11707,6 +11707,16 @@
"resolved": "https://registry.npm.taobao.org/vue-axios/download/vue-axios-2.1.5.tgz?cache=0&sync_timestamp=1609936343418&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-axios%2Fdownload%2Fvue-axios-2.1.5.tgz",
"integrity": "sha1-GvS/EhjtcTCcdq+zjQ9oPjEsJKc="
},
+ "vue-directive-image-previewer": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npm.taobao.org/vue-directive-image-previewer/download/vue-directive-image-previewer-2.2.2.tgz",
+ "integrity": "sha1-VtdOerEJvptf05mob/ho8uLKdUo=",
+ "dev": true,
+ "requires": {
+ "lodash": "^4.17.10",
+ "vue": "^2.4.2"
+ }
+ },
"vue-eslint-parser": {
"version": "2.0.3",
"resolved": "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-2.0.3.tgz?cache=0&sync_timestamp=1608031064701&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-eslint-parser%2Fdownload%2Fvue-eslint-parser-2.0.3.tgz",
diff --git a/public/map/widgets/alertSecurity/AlertSecurity.js b/public/map/widgets/alertSecurity/AlertSecurity.js
index 4123c68..968226a 100644
--- a/public/map/widgets/alertSecurity/AlertSecurity.js
+++ b/public/map/widgets/alertSecurity/AlertSecurity.js
@@ -202,14 +202,10 @@
var lgtd = that.getQueryStringByKey('jd');
var lttd = that.getQueryStringByKey('wd');
- $.ajax({
- url: "https://web.byisf.com/api/blade-jfpts/jingdan/jingdan/detail?id=" + openid,
- type: 'get',
- dataType: 'JSON',
- success: function (data) {
- that.addPoint(that.addEntitys, data.data.jd, data.data.wd, './images/jingbaored.png')
- }
- })
+ console.log(openid, lgtd, lttd, 123465)
+
+ that.addPoint(that.addEntitys, lgtd, lttd, './images/jingbaored.png');
+
$.ajax({
url: "https://web.byisf.com/api/blade-jfpts/position/position/selectfj",
@@ -222,7 +218,7 @@
success: function (data) {
console.log(data)
data.data.forEach(item => {
- that.addPoint(that.addEntitys, item.jd, item.wd, './images/security.png')
+ that.addPoints(that.addEntitys, item.jd, item.wd, './images/security.png')
})
}
})
@@ -283,6 +279,15 @@
},
addPoint: function (entitys, lgtd, lttd, img) {
+ var symbol = new esri.symbol.PictureMarkerSymbol(img, 22, 32);
+ var pt = new Point(lgtd, lttd, new SpatialReference({
+ wkid: 4326
+ }));
+ var graphic = new esri.Graphic(pt, symbol);
+ entitys.add(graphic);
+ },
+
+ addPoints: function (entitys, lgtd, lttd, img) {
var symbol = new esri.symbol.PictureMarkerSymbol(img, 20, 20);
var pt = new Point(lgtd, lttd, new SpatialReference({
wkid: 4326
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index 4451528..d8dbed0 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -171,6 +171,7 @@
>视频通话
</el-button>
<el-button
+ v-show="false"
type="primary"
@click.stop="
(oldVideoSatart = true), (videoConversationReal = false)
diff --git a/src/views/policeTracking/policeTracking.vue b/src/views/policeTracking/policeTracking.vue
index 60726c5..1b64d8e 100644
--- a/src/views/policeTracking/policeTracking.vue
+++ b/src/views/policeTracking/policeTracking.vue
@@ -156,6 +156,7 @@
</el-form>
<div
+ v-if="form.jtype != 2"
style="margin-top: 20px"
role="tab"
aria-expanded="true"
@@ -174,17 +175,18 @@
<i class="el-icon-document avue-group__icon"></i>
<h1 class="avue-group__title">人员信息</h1>
<el-button
- @click="onSubmit('通知保安')"
- type="danger"
+ @click="onSubmit('通知' + ensureNames, 1), (flag = false)"
size="small"
style="position: absolute; right: 0"
+ :disabled="!flag"
+ :type="!flag ? 'info' : 'danger'"
>通 知</el-button
>
</div>
</div>
</div>
- <el-card>
+ <el-card v-if="form.jtype != 2">
<el-table
ref="multipleTable"
:data="tableData"
@@ -193,7 +195,12 @@
@selection-change="handleSelectionChange"
max-height="240"
>
- <el-table-column v-if="false" type="selection" width="55" align="center">
+ <el-table-column
+ v-if="flag"
+ type="selection"
+ width="55"
+ align="center"
+ >
</el-table-column>
<el-table-column
@@ -463,7 +470,7 @@
<el-row :align="center" style="margin-top: 40px">
<el-col :offset="10">
<el-button
- @click="onSubmit('处理完成')"
+ @click="onSubmit('处理完成', 2)"
:disabled="form.jtype == 2 ? true : false"
:type="form.jtype == 2 ? 'info' : 'danger'"
>处理完成</el-button
@@ -478,7 +485,7 @@
<iframe
id="mapDiv"
ref="mapDiv"
- src="https://web.byisf.com/map/index.html?openid=ClientManagement"
+ :src="baseUrl"
frameborder="0"
width="100%"
height="100%"
@@ -491,8 +498,10 @@
import axios from "axios";
export default {
+ inject: ["reload"],
data() {
return {
+ flag: true,
selectOptions: [],
receivingList: [],
security: {
@@ -564,18 +573,26 @@
},
tableData: [],
multipleSelection: [],
+ ensureNames: "",
+ baseUrl: "",
};
},
created() {
this.form = this.$route.query;
this.getReceivingAlarm();
+ this.baseUrl = `/map/index.html?ISinit=1&openid=AlertSecurity&id=${this.form.id}&jd=${this.form.jd}&wd=${this.form.wd}`;
},
mounted() {
this.getList();
+
+ this.$refs.mapDiv.onload = () => {
+ window.frames[0].init("AlertSecurity", {
+ x: this.form.jd,
+ y: this.form.wd,
+ });
+ };
},
updated() {
-
-
var arr = [];
this.tableData.forEach((item) => {
if (item.roleName == "管理员") {
@@ -693,7 +710,7 @@
currenS,
};
},
- onSubmit(zc) {
+ onSubmit(zc, jtype) {
var that = this;
axios
.post(
@@ -702,7 +719,7 @@
{
params: {
jid: this.form.id,
- jtype: 2,
+ jtype: jtype,
rid: this.form.alarmId,
bz: this.form.bz,
snumber: this.form.alarmId,
@@ -713,7 +730,9 @@
}
)
.then(function (res) {
- if (res.msg == "修改成功") {
+ that.getReceivingAlarm();
+
+ if (jtype == 2) {
var arr = [];
that.$store.state.tags.tagList.forEach((item) => {
if (item.value != that.$store.state.tags.tag.value) {
@@ -723,7 +742,6 @@
that.$store.state.tags.tagList = arr;
that.$router.go(-1);
}
- that.getReceivingAlarm();
});
},
@@ -737,12 +755,10 @@
getList() {
var that = this;
- // .post("/api/blade-jfpts/alarm/alarm/queryBa", {}, {})
axios
- .get("/api/blade-user/page?current=1&size=9999&deptId=&work_status=")
+ .get("/api/blade-user/pages?current=1&size=9999&deptId=&work_status=")
.then(function (res) {
that.tableData = [];
- console.log(res);
var i = 0;
res.data.data.records.forEach((item) => {
if (item.roleName == "处警员" || item.roleName == "管理员") {
@@ -760,6 +776,17 @@
},
handleSelectionChange(val) {
+ this.ensureNames = "";
+ val.forEach((item, index) => {
+ if (index == val.length - 1) {
+ this.ensureNames += item.name;
+ this.ensureNames += "。";
+ } else {
+ this.ensureNames += item.name;
+ this.ensureNames += "、";
+ }
+ });
+
this.multipleSelection = val;
},
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 7e7f7de..c6c4a29 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-22 11:52:42
+ * @Last Modified time: 2021-03-25 14:59:09
*/
<template>
<basic-container>
@@ -332,6 +332,7 @@
>视频通话
</el-button>
<el-button
+ v-show="false"
type="primary"
@click.stop="
(oldVideoSatart = true), (videoConversationReal = false)
@@ -812,7 +813,7 @@
};
if (
- this.$route.query.waringType &&
+ this.$route.query.waringType &&
this.$route.query != undefined &&
this.$route.query != null &&
this.$route.query != ""
@@ -853,12 +854,16 @@
};
}
- if(this.$route.query.startTime!=undefined && this.$route.query.startTime!=null && this.$route.query.startTime!=''){
+ if (
+ this.$route.query.startTime != undefined &&
+ this.$route.query.startTime != null &&
+ this.$route.query.startTime != ""
+ ) {
params = {
waringType: this.$route.query.waringType,
beginTime: this.$route.query.startTime,
- endTime: this.$route.query.endTime
- }
+ endTime: this.$route.query.endTime,
+ };
}
}
@@ -1120,7 +1125,10 @@
.then(function () {
that.dialogTableVisible = false;
that.onLoad(that.page, that.query);
- that.$router.push({ path: "/policeTracking/track", query: that.form });
+ that.$router.push({
+ path: "/policeTracking/track",
+ query: that.form,
+ });
});
},
beginTimeOrEndTime(time) {
--
Gitblit v1.9.3