From e76fdcca88f0f5bc94e5101412313f1f4498035f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 07 Jun 2021 11:32:46 +0800
Subject: [PATCH] 样式修改
---
src/config/website.js | 6 +++---
src/lang/zh.js | 6 +++---
src/page/login/index.vue | 6 +++---
src/views/realTimePolice/real.vue | 19 +++++++++++++++----
public/index.html | 2 +-
src/views/dataL/homeL.vue | 2 +-
src/page/index/logo.vue | 6 +++---
7 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/public/index.html b/public/index.html
index 71393ae..0bcdaf3 100644
--- a/public/index.html
+++ b/public/index.html
@@ -19,7 +19,7 @@
<script type="text/javascript" src='https://webapi.amap.com/maps?v=1.4.11&key=7ab53b28352e55dc5754699add0ad862&plugin=AMap.PlaceSearch'></script>
<script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>
<link rel="icon" href="img/1.jpg">
- <title>警群联控后台管理系统</title>
+ <title>群防群控后台管理系统</title>
<style>
html,
body,
diff --git a/src/config/website.js b/src/config/website.js
index 8a322af..fde4f7b 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -2,10 +2,10 @@
* 全局配置文件
*/
export default {
- title: "警群联控后台管理系统",
+ title: "群防群控后台管理系统",
logo: "S",
- key: '警群联控后台管理系统',//配置主键,目前用于存储
- indexTitle: '警群联控后台管理系统',
+ key: '群防群控后台管理系统',//配置主键,目前用于存储
+ indexTitle: '群防群控后台管理系统',
clientId: 'saber', // 客户端id
clientSecret: 'saber_secret', // 客户端密钥
tenantMode: true, // 是否开启租户模式
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 841a6e6..b18935d 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -1,6 +1,6 @@
export default {
tip: '提示',
- title: '警群联控后台管理系统',
+ title: '群防群控后台管理系统',
logoutTip: '退出系统, 是否继续?',
submitText: '确定',
cancelText: '取消',
@@ -66,8 +66,8 @@
test: '测试页面'
},
login: {
- title: '警群联控后台管理系统 ',
- info: '警群联控后台管理系统',
+ title: '群防群控后台管理系统 ',
+ info: '群防群控后台管理系统',
tenantId: '请输入租户ID',
username: '请输入账号',
password: '请输入密码',
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index a90d833..cc9dc1e 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -364,7 +364,7 @@
},
}).then(function (response) {
var userId = JSON.parse(
- window.localStorage.getItem("警群联控后台管理系统-userInfo")
+ window.localStorage.getItem("群防群控后台管理系统-userInfo")
).content.user_id;
if (response.data.data.records.length > 0) {
@@ -822,7 +822,7 @@
}
if (window.socket.readyState == WebSocket.OPEN) {
var userId = JSON.parse(
- window.localStorage.getItem("警群联控后台管理系统-userInfo")
+ window.localStorage.getItem("群防群控后台管理系统-userInfo")
).content.user_id;
window.socket.send(userId);
@@ -852,7 +852,7 @@
Recorder.getPermission().then(() => {});
this.videoConversationReal = true;
var userId = JSON.parse(
- window.localStorage.getItem("警群联控后台管理系统-userInfo")
+ window.localStorage.getItem("群防群控后台管理系统-userInfo")
).content.user_id;
newAxios
.post(
diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index 3c9c59b..72d9d71 100644
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -36,9 +36,9 @@
<codeLogin></codeLogin>
</div>
- <div class="company-jx">
- 技术支持：中国移动江西公司
- </div>
+<!-- <div class="company-jx">-->
+<!-- 技术支持：中国移动江西公司-->
+<!-- </div>-->
</div>
</template>
diff --git a/src/views/dataL/homeL.vue b/src/views/dataL/homeL.vue
index 3d448b9..ae66bad 100644
--- a/src/views/dataL/homeL.vue
+++ b/src/views/dataL/homeL.vue
@@ -1,7 +1,7 @@
<template>
<div id="homeL">
<div class="homeL-up">
- <span class="h1">警群联控后台管理系统</span>
+ <span class="h1">群防群控后台管理系统</span>
<!-- <span class="h2">IoT security cloud service platform</span>-->
</div>
<div class="homeL-bar">
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index d5cb4a3..a6c4055 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -230,7 +230,7 @@
hide: true,
span: 2,
// display:false,
- component: "AvueMap"
+ component: "AvueMap",
},
{
label: "经度",
@@ -379,8 +379,8 @@
"form.map": {
// form是表单或者表格绑定的数据集，v-model='form'
handler(val) {
+ var that = this;
if (val) {
- var that = this;
//重新加载一次页面详情数据，解决新的省市区无法写入问题
//判断是新增还是修改
if(that.isEdit){
@@ -391,10 +391,15 @@
});
}
+ //地址截取，从县/区开始截取,并且取从县区第一个出现的位置开始
+ if (val.formattedAddress == ""){
+ return;
+ }
+
//经纬度替换
this.form.wd = val.latitude;
this.form.jd = val.longitude;
- //地址截取，从县/区开始截取,并且取从县区第一个出现的位置开始
+
var address = val.formattedAddress.toString();
if(address.search("县") != -1){
this.form.place = address.substring(address.indexOf("县")+1,address.length);
@@ -410,6 +415,12 @@
that.form.city = val.addressComponent.city;
}
that.form.district = val.addressComponent.district;
+ }else{
+ that.form.map = {
+ formattedAddress:"",
+ latitude: 28.68235075592195,
+ longitude: 115.9021417169273,
+ };
}
},
immediate: true,
@@ -451,7 +462,7 @@
});
row.securityArr = security.substring(0, security.length - 1);
var userId = JSON.parse(
- window.localStorage.getItem("警群联控后台管理系统-userInfo")
+ window.localStorage.getItem("群防群控后台管理系统-userInfo")
).content.real_name;
row.alarmPeople = userId;
add(row).then(
--
Gitblit v1.9.3