From 404af06b4d2e3f7859f8d13439ee431af0fa243a Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 27 Apr 2021 11:52:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/policeTracking/policeTracking.vue | 35 +++++++++++++++++++++++++----------
src/views/security/security.vue | 14 ++++++++++----
src/views/clientManagement/clientManagement.vue | 3 ---
src/views/system/cs.vue | 6 +++++-
4 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index bdc9ea3..c41299b 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -687,7 +687,6 @@
var that = this;
//重新加载一次页面详情数据，解决新的省市区无法写入问题
getclient(this.form.id).then(res => {
- debugger;
this.form = res.data.data;
//经纬度替换
this.form.wd = val.latitude;
@@ -707,7 +706,6 @@
}else{
that.form.city = val.addressComponent.city;
}
-
that.form.district = val.addressComponent.district;
});
}
@@ -907,7 +905,6 @@
});
},
beforeOpen(done, type) {
- debugger;
if (["edit", "view"].includes(type)) {
getclient(this.form.id).then(res => {
this.form = res.data.data;
diff --git a/src/views/policeTracking/policeTracking.vue b/src/views/policeTracking/policeTracking.vue
index ad909a7..64f8200 100644
--- a/src/views/policeTracking/policeTracking.vue
+++ b/src/views/policeTracking/policeTracking.vue
@@ -156,7 +156,7 @@
<el-col span="12">
<el-form-item label="备注">
<el-input
- disabled="form.securityArr.length > 0"
+ :disabled="form.securityArr.length > 0"
v-model="form.bz"
autocomplete="off"
></el-input>
@@ -334,7 +334,7 @@
<el-card>
<el-form
- :model="security"
+ :model="form"
label-position="right"
size="mini"
label-width="100px"
@@ -352,7 +352,7 @@
<el-form-item label="人员编号">
<el-input
disabled="true"
- v-model="security.snumber"
+ v-model="form.baname"
autocomplete="off"
></el-input>
</el-form-item>
@@ -361,7 +361,7 @@
<el-form-item label="人员名称">
<el-input
disabled="true"
- v-model="security.sname"
+ v-model="form.baid"
autocomplete="off"
></el-input>
</el-form-item>
@@ -372,7 +372,7 @@
<el-form-item label="联系电话">
<el-input
disabled="true"
- v-model="security.phone"
+ v-model="form.baphone"
autocomplete="off"
></el-input>
</el-form-item>
@@ -786,6 +786,7 @@
res.data.data.records.forEach((item) => {
if (
+ item.roleName == "处警员" &&
that.form.securityArr.indexOf(item.id) != -1 &&
item.id != that.form.securityId
) {
@@ -798,14 +799,28 @@
status: "已通知",
tenantName: item.tenantName,
});
+ } else if (
+ item.roleName == "处警员" &&
+ that.form.securityArr.indexOf(item.id) == -1 &&
+ item.id != that.form.securityId
+ ) {
+ that.tableData.push({
+ id: item.id,
+ ind: (i += 1),
+ name: item.name,
+ phone: item.phone,
+ online_status: item.online_status == 1 ? "在线" : "掉线",
+ status: "未通知",
+ tenantName: item.tenantName,
+ });
}
});
- that.tableData.forEach(item => {
- if (item.id == that.form.oneId) {
- item.status+='(负责人)'
- }
- })
+ that.tableData.forEach((item) => {
+ if (item.id == that.form.oneId) {
+ item.status += "(负责人)";
+ }
+ });
} else {
res.data.data.records.forEach((item) => {
if (item.id == that.form.oneId) {
diff --git a/src/views/security/security.vue b/src/views/security/security.vue
index 86c5c0b..f5e744e 100644
--- a/src/views/security/security.vue
+++ b/src/views/security/security.vue
@@ -251,15 +251,21 @@
//打开地图
handleMap(row) {
var that =this;
- that.baseUrl = `/map/index.html?ISinit=1&openid=SecurityMap&jd=${row.jd}&wd=${row.wd}&code=${row.code}&name=${row.realName}`;
+ if(row.jd=="" || row.jd=="0.0"){
+ var rwjd = "115.862321";
+ var rwwd = "28.591108";
+ that.baseUrl = `/map/index.html?ISinit=1&openid=SecurityMap&jd=${rwjd}&wd=${rwwd}&code=${row.code}&name=${row.realName}`;
+ }else{
+ that.baseUrl = `/map/index.html?ISinit=1&openid=SecurityMap&jd=${row.jd}&wd=${row.wd}&code=${row.code}&name=${row.realName}`;
+ }
this.showMap=true;
this.$refs.securityMap.onload = () => {
if (window.frames[0].init) {
- if(row.jd==""){
+ if(row.jd=="" || row.jd=="0.0"){
//如果处警员无位置信息，则赋值一个默认数据，否则地图无法加载
window.frames[0].init("SecurityMap", {
- x: "115.862321",
- y: "28.591108",
+ x: rwjd,
+ y: rwwd,
code:row.code
});
}else{
diff --git a/src/views/system/cs.vue b/src/views/system/cs.vue
index 27d561c..88df297 100644
--- a/src/views/system/cs.vue
+++ b/src/views/system/cs.vue
@@ -730,7 +730,11 @@
}
//写入新的省市区
that.form.province = val.addressComponent.province;
- that.form.city = val.addressComponent.city;
+ if(val.addressComponent.city==""){
+ that.form.city = val.addressComponent.province;
+ }else{
+ that.form.city = val.addressComponent.city;
+ }
that.form.district = val.addressComponent.district;
}
},
--
Gitblit v1.9.3