From 0e622f8109297e351fd766152640cead5d757a32 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 07 Jun 2021 16:48:14 +0800
Subject: [PATCH] 样式修改
---
src/views/realTimePolice/real.vue | 63 +++++++++++++++++--------------
src/views/policeTracking/policeTracking.vue | 8 ++++
src/page/index/logo.vue | 6 +-
3 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index cc9dc1e..fa7a833 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -348,7 +348,7 @@
};
},
created() {
- this.websocketStart();
+ //this.websocketStart();
},
computed: {
...mapGetters(["website", "keyCollapse"]),
@@ -793,10 +793,10 @@
}
if (window.WebSocket) {
// https
- window.socket = new WebSocket("wss://web.byisf.com/wss/websocket/");
+ //window.socket = new WebSocket("wss://web.byisf.com/wss/websocket/");
//http
- //window.socket = new WebSocket("ws://localhost:9034/websocket");
+ window.socket = new WebSocket("ws://localhost:9034/websocket");
window.socket.onmessage = function (event) {
// alert(event.data)
diff --git a/src/views/policeTracking/policeTracking.vue b/src/views/policeTracking/policeTracking.vue
index 2e14938..3e66dd5 100644
--- a/src/views/policeTracking/policeTracking.vue
+++ b/src/views/policeTracking/policeTracking.vue
@@ -548,6 +548,14 @@
},
onSubmit() {
var that = this;
+ if (typeof that.form.securityArr != "string"){
+ var security = "";
+ that.form.securityArr.forEach((item) => {
+ security = security + item + ",";
+ });
+ that.form.securityArr = security.substring(0, security.length - 1);
+ }
+
axios({
url: '/api/blade-jfpts/alarm/alarm/submit',
method: 'post',
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 9913e9f..9f4a4dc 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -211,22 +211,22 @@
trigger: "blur",
},
],
- },{
+ }, {
label: "备注",
prop: "bz",
- span:24,
+ span: 24,
},
{
label: "地址",
prop: "place",
- span:10,
+ span: 10,
},
{
label: null,
prop: "map",
labelWidth: "0",
- searchSpan:0,
- maxlength:0,
+ searchSpan: 0,
+ maxlength: 0,
hide: true,
span: 2,
// display:false,
@@ -236,23 +236,23 @@
label: "经度",
hide: true,
prop: "jd",
- searchSpan:2,
- width:"100",
+ searchSpan: 2,
+ width: "100",
labelWidth: "120",
- formatter: (row,value,label,column)=>{
- return value = value.substring(0,11);
+ formatter: (row, value, label, column) => {
+ return value = value.substring(0, 11);
},
- span:7,
+ span: 7,
},
{
label: "纬度",
labelWidth: "45",
hide: true,
prop: "wd",
- formatter: (row,value,label,column) => {
- return value = value.substring(0,10);
+ formatter: (row, value, label, column) => {
+ return value = value.substring(0, 10);
},
- span:5,
+ span: 5,
},
{
label: "省份",
@@ -383,7 +383,7 @@
if (val) {
//重新加载一次页面详情数据，解决新的省市区无法写入问题
//判断是新增还是修改
- if(that.isEdit){
+ if (that.isEdit) {
getclient(this.form.id).then(res => {
// that.province = res.data.data.province;
// that.city = res.data.data.city;
@@ -392,7 +392,7 @@
}
//地址截取，从县/区开始截取,并且取从县区第一个出现的位置开始
- if (val.formattedAddress == ""){
+ if (val.formattedAddress == "") {
return;
}
@@ -401,26 +401,26 @@
this.form.jd = val.longitude;
var address = val.formattedAddress.toString();
- if(address.search("县") != -1){
- this.form.place = address.substring(address.indexOf("县")+1,address.length);
+ if (address.search("县") != -1) {
+ this.form.place = address.substring(address.indexOf("县") + 1, address.length);
}
- if(address.search("区") != -1){
- this.form.place = address.substring(address.indexOf("区")+1,address.length);
+ if (address.search("区") != -1) {
+ this.form.place = address.substring(address.indexOf("区") + 1, address.length);
}
//写入新的省市区
that.form.province = val.addressComponent.province;
- if(val.addressComponent.city==""){
+ if (val.addressComponent.city == "") {
that.form.city = val.addressComponent.province;
- }else{
+ } else {
that.form.city = val.addressComponent.city;
}
that.form.district = val.addressComponent.district;
- }else{
- that.form.map = {
- formattedAddress:"",
- latitude: 28.68235075592195,
- longitude: 115.9021417169273,
- };
+ } else {
+ that.form.map = {
+ formattedAddress: "",
+ latitude: 28.68235075592195,
+ longitude: 115.9021417169273,
+ };
}
},
immediate: true,
@@ -480,6 +480,14 @@
);
},
rowUpdate(row, index, done, loading) {
+ if (typeof row.securityArr != "string") {
+ var security = "";
+ row.securityArr.forEach((item) => {
+ security = security + item + ",";
+ });
+ row.securityArr = security.substring(0, security.length - 1);
+ }
+
row.coordinate = "";
update(row).then(
() => {
@@ -873,7 +881,6 @@
this.onLoad(this.page, params);
},
getQBdata(e) {
- debugger;
this.search.releaseTimeRange = ["", ""];
this.activeClass = e;
var params = {};
--
Gitblit v1.9.3