From 37a63edd31e61d337ec9ef1f0f2a17ac6e8db1b2 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 12 Mar 2021 14:28:55 +0800
Subject: [PATCH] 样式修改，及部分JS改动
---
public/map/popup/js/routename-and-peoplename.js | 12 ++++--
public/map/popup/style/region-name.css | 8 +++
public/map/popup/style/route-name-layer.css | 10 ++++-
public/map/lib/layui/css/modules/layer/myskin/region-name.css | 23 +++++++----
public/map/lib/layui/css/modules/layer/myskin/routename-and-peoplename.css | 6 +++
public/map/popup/js/route-name-layer.js | 11 ++++-
public/map/lib/layui/css/modules/layer/myskin/route-name-layer.css | 21 ++++++----
public/map/popup/style/routename-and-peoplename.css | 6 +++
8 files changed, 70 insertions(+), 27 deletions(-)
diff --git a/public/map/lib/layui/css/modules/layer/myskin/region-name.css b/public/map/lib/layui/css/modules/layer/myskin/region-name.css
index f283cde..47f346d 100644
--- a/public/map/lib/layui/css/modules/layer/myskin/region-name.css
+++ b/public/map/lib/layui/css/modules/layer/myskin/region-name.css
@@ -1,20 +1,25 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-03-12 11:50:26
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-03-12 11:50:26
+ */
.region-name {
background: transparent;
+ border-radius: 10px;
}
+
.region-name .layui-layer-title {
padding: 0 80px;
text-align: center;
- background: rgba(12, 25, 49, 0.8);
+ background: #fff;
border: none;
- color: #fff;
+ color: #677788;
font-size: 20px;
-}
-
-.region-name .layui-layer-setwin .layui-layer-close1 {
- background-position: -80px -40px;
+ border-radius: 10px 10px 0 0;
}
.region-name .layui-layer-content {
- background: rgba(12, 25, 49, 0.8);
-
-}
+ background: #fff;
+ border-radius: 0 0 10px 10px;
+}
\ No newline at end of file
diff --git a/public/map/lib/layui/css/modules/layer/myskin/route-name-layer.css b/public/map/lib/layui/css/modules/layer/myskin/route-name-layer.css
index 50f7367..342fc3c 100644
--- a/public/map/lib/layui/css/modules/layer/myskin/route-name-layer.css
+++ b/public/map/lib/layui/css/modules/layer/myskin/route-name-layer.css
@@ -1,20 +1,25 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-03-12 11:52:39
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-03-12 11:52:39
+ */
.route-name-layer {
background: transparent;
+ border-radius: 10px;
}
+
.route-name-layer .layui-layer-title {
padding: 0 80px;
text-align: center;
- background: rgba(12, 25, 49, 0.8);
+ background: #fff;
border: none;
- color: #fff;
+ color: #677788;
font-size: 20px;
-}
-
-.route-name-layer .layui-layer-setwin .layui-layer-close1 {
- background-position: -80px -40px;
+ border-radius: 10px 10px 0 0;
}
.route-name-layer .layui-layer-content {
- background: rgba(12, 25, 49, 0.8);
-
+ background: #fff;
+ border-radius: 0 0 10px 10px;
}
\ No newline at end of file
diff --git a/public/map/lib/layui/css/modules/layer/myskin/routename-and-peoplename.css b/public/map/lib/layui/css/modules/layer/myskin/routename-and-peoplename.css
index bb65b3d..0071310 100644
--- a/public/map/lib/layui/css/modules/layer/myskin/routename-and-peoplename.css
+++ b/public/map/lib/layui/css/modules/layer/myskin/routename-and-peoplename.css
@@ -1,3 +1,9 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-03-12 11:52:36
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-03-12 11:52:36
+ */
.routename-and-peoplename {
background: transparent;
border-radius: 10px;
diff --git a/public/map/popup/js/route-name-layer.js b/public/map/popup/js/route-name-layer.js
index 7dbd660..c961c3a 100644
--- a/public/map/popup/js/route-name-layer.js
+++ b/public/map/popup/js/route-name-layer.js
@@ -1,3 +1,9 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-03-12 11:57:38
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-03-12 11:57:38
+ */
$(function () {
// var code = GetQueryString("id");
@@ -10,17 +16,16 @@
// 查看保安人员下拉
$.ajax({
- url: 'http://36.134.81.48:18001/api/blade-jfpts/blade-user/selectry',
+ url: 'http://36.134.81.48:18001/api/blade-jfpts/security/security/selectry',
type: 'GET',
dataType: 'JSON',
success: function (data) {
- console.log(data);
var res = data.data;
$('.route-name-layer-box .route-personnel').empty();
$('.route-name-layer-box .route-personnel').append("<option value='' disabled selected style='display:none;'>选择人员</option>");
for (var i = 0; i < res.length; i++) {
- $('.route-name-layer-box .route-personnel').append('<option peopleid='+res[i].id+'>'+res[i].real_name+'</option>')
+ $('.route-name-layer-box .route-personnel').append('<option peopleid='+res[i].id+'>'+res[i].sname+'</option>')
}
diff --git a/public/map/popup/js/routename-and-peoplename.js b/public/map/popup/js/routename-and-peoplename.js
index 874f6fb..c6f9a9e 100644
--- a/public/map/popup/js/routename-and-peoplename.js
+++ b/public/map/popup/js/routename-and-peoplename.js
@@ -1,3 +1,9 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-03-12 11:57:34
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-03-12 11:57:34
+ */
$(function () {
@@ -25,15 +31,13 @@
type: 'GET',
dataType: 'JSON',
success: function (data) {
- console.log(data);
var res = data.data;
-
for (var i = 0; i < res.length; i++) {
- $('.routename-and-peoplename-box .peoplename-update').append('<option peopleid=' + res[i].id + '>' + res[i].real_name + '</option>')
+ $('.routename-and-peoplename-box .peoplename-update').append('<option peopleid=' + res[i].id + '>' + res[i].sname + '</option>')
- if (peopleName == res[i].real_name) {
+ if (peopleName == res[i].sname) {
$('.routename-and-peoplename-box .peoplename-update').children('option:eq('+i+')').attr('selected', true);
}
}
diff --git a/public/map/popup/style/region-name.css b/public/map/popup/style/region-name.css
index 2d95d11..8dbf298 100644
--- a/public/map/popup/style/region-name.css
+++ b/public/map/popup/style/region-name.css
@@ -1,3 +1,9 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-03-12 11:52:22
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-03-12 11:52:22
+ */
html,
body {
margin: 0;
@@ -16,7 +22,7 @@
width: 100%;
height: 100%;
box-sizing: border-box;
- color: #fff;
+ color: #677788;
}
.region-name-box li {
diff --git a/public/map/popup/style/route-name-layer.css b/public/map/popup/style/route-name-layer.css
index 5b42a11..ed55112 100644
--- a/public/map/popup/style/route-name-layer.css
+++ b/public/map/popup/style/route-name-layer.css
@@ -1,3 +1,9 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-03-12 11:51:19
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-03-12 11:51:19
+ */
html,
body {
margin: 0;
@@ -16,7 +22,7 @@
width: 100%;
height: 100%;
box-sizing: border-box;
- color: rgb(255, 255, 255);
+ color: #677788;
}
.route-name-layer-box li {
@@ -46,7 +52,7 @@
height: 28px;
width: 100%;
outline: none;
- color: #747575;
+ color: #677788;
}
.route-name-layer-box li:nth-child(3) select option {
diff --git a/public/map/popup/style/routename-and-peoplename.css b/public/map/popup/style/routename-and-peoplename.css
index 2a26ef8..cc3cca7 100644
--- a/public/map/popup/style/routename-and-peoplename.css
+++ b/public/map/popup/style/routename-and-peoplename.css
@@ -1,3 +1,9 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-03-12 11:51:22
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-03-12 11:51:22
+ */
html,
body {
margin: 0;
--
Gitblit v1.9.3