From 1795a3c57962067361fc655a03c8a4a159df766e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 09 Mar 2021 16:46:28 +0800
Subject: [PATCH] 解决警情分发编辑报错问题以及新增错误
---
src/api/policeInformation/index.js | 17 ++++-------------
src/views/realTimePolice/real.vue | 2 +-
src/views/policeInformationDistribution/index.vue | 4 ++--
public/map/index.html | 6 +++---
src/views/clientManagement/clientManagement.vue | 23 ++++++++++++++++++++---
5 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/public/map/index.html b/public/map/index.html
index b246857..d801c7e 100644
--- a/public/map/index.html
+++ b/public/map/index.html
@@ -24,7 +24,7 @@
<script src="js/layer/layer.js"></script>
<script src="js/laydate/laydate.js"></script>
<script type="text/javascript" src="js/comm/heard.js"></script>
- <script type="text/javascript" src="js/script.js"></script>
+<!-- <script type="text/javascript" src="js/script.js"></script>-->
<script src="./lib/layui/layui.js"></script>
<script src="env.js"></script>
@@ -47,13 +47,13 @@
_framework.onSiderContainerShow();
_framework.resize();
_AppEvent = AppEvent;
-
+
_AppEvent.addAppEventListener("mapLoad", function(map){
if (locationObj && locationObj != null) {
map.centerAndZoom(new esri.geometry.Point(locationObj.x,locationObj.y, new esri.SpatialReference({ wkid: 4326 })), 14);
}
});
-
+
var openId = getQueryStringByKey('openid');
if (openId) showFun(openId);
}
diff --git a/src/api/policeInformation/index.js b/src/api/policeInformation/index.js
index 166b89c..1b82706 100644
--- a/src/api/policeInformation/index.js
+++ b/src/api/policeInformation/index.js
@@ -2,7 +2,7 @@
export const remove = (ids) => {
return request({
- url: '/api/blade-jfpts/alarm/alarm/remove',
+ url: '/api/blade-jfpts/jingdan/jingdan/remove',
method: 'post',
params: {
ids,
@@ -12,7 +12,7 @@
export const add = (row) => {
return request({
- url: '/api/blade-jfpts/alarm/alarm/submit',
+ url: '/api/blade-jfpts/jingdan/jingdan/submit',
method: 'post',
data: row
})
@@ -20,7 +20,7 @@
export const update = (row) => {
return request({
- url: '/api/blade-jfpts/alarm/alarm/submit',
+ url: '/api/blade-jfpts/jingdan/jingdan/submit',
method: 'post',
data: row
})
@@ -28,7 +28,7 @@
export const getclient = (id) => {
return request({
- url: '/api/blade-jfpts/alarm/alarm/detail',
+ url: '/api/blade-jfpts/jingdan/jingdan/detail',
method: 'get',
params: {
id
@@ -45,15 +45,6 @@
current,
size,
}
- })
-}
-
-
-export const addP = (row) => {
- return request({
- url: '/api/blade-jfpts/jingdan/jingdan/submit',
- method: 'post',
- data: row
})
}
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 97d5f48..c211442 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -43,6 +43,22 @@
}}
</el-tag>
</template>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ icon="el-icon-video-camera-solid"
+ :size="size"
+ :type="type"
+ @click.stop="handleStart(row)"
+ >视频
+ </el-button>
+ <el-button
+ icon="el-icon-location-outline"
+ :size="size"
+ :type="type"
+ @click.stop="handleMap(row)"
+ >定位
+ </el-button>
+ </template>
<template slot-scope="{ row }" slot="dxzt">
<el-tag>{{
@@ -129,7 +145,7 @@
calcHeight: 80,
labelWidth: '100',
dialogWidth: 950,
- menuWidth: 160,
+ menuWidth: 250,
size: "mini",
tip: false,
searchShow: true,
@@ -143,7 +159,7 @@
column: [
{
label: "设备名称",
- width: 130,
+ width: 200,
prop: "deviceName",
searchPlaceholder: "设备名称/编号",
search: true,
@@ -274,10 +290,11 @@
{
label: "权属",
prop: "ownership",
+ width: 150
}, {
label: "街道",
prop: "street",
- width: 150
+ width: 200
}, {
label: "安装时间",
prop: "stime",
diff --git a/src/views/policeInformationDistribution/index.vue b/src/views/policeInformationDistribution/index.vue
index 1640637..ef45fdd 100644
--- a/src/views/policeInformationDistribution/index.vue
+++ b/src/views/policeInformationDistribution/index.vue
@@ -130,7 +130,7 @@
value: "dictValue"
},
//cascaderItem: ["city", "district"],
- dicUrl: "/api/blade-system/dict-biz/child-list?parentId=1356516807043231746",
+ dicUrl: "/api/blade-system/dict-biz/child-list?parentId=1356523651644043266",
},
{
label: "报警时间",
@@ -282,7 +282,7 @@
addBtn: this.vaildData(this.permission.distribution_add, false),
viewBtn: this.vaildData(null, false),
delBtn: this.vaildData(null, false),
- editBtn: this.vaildData(this.permission.real_edit, false)
+ editBtn: this.vaildData(this.permission.distribution_edit, false)
};
},
ids() {
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 44a4541..14ec982 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -356,7 +356,7 @@
value: "dictValue"
},
//cascaderItem: ["city", "district"],
- dicUrl: "/api/blade-system/dict-biz/child-list?parentId=1356516807043231746",
+ dicUrl: "/api/blade-system/dict-biz/child-list?parentId=1356523651644043266",
},
{
label: "报警时间",
--
Gitblit v1.9.3