diff --git a/src/assets/img/shuju/command/ico2/IS_DB.png b/src/assets/img/shuju/command/ico2/IS_DB.png
new file mode 100644
index 000000000..4fc475b2c
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_DB.png differ
diff --git a/src/assets/img/shuju/command/ico2/IS_DBH.png b/src/assets/img/shuju/command/ico2/IS_DBH.png
new file mode 100644
index 000000000..337a37735
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_DBH.png differ
diff --git a/src/assets/img/shuju/command/ico2/IS_KC.png b/src/assets/img/shuju/command/ico2/IS_KC.png
new file mode 100644
index 000000000..2bba7ab46
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_KC.png differ
diff --git a/src/assets/img/shuju/command/ico2/IS_MB.png b/src/assets/img/shuju/command/ico2/IS_MB.png
new file mode 100644
index 000000000..9e61bc50e
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_MB.png differ
diff --git a/src/assets/img/shuju/command/ico2/IS_OLD_PEOPLE.png b/src/assets/img/shuju/command/ico2/IS_OLD_PEOPLE.png
new file mode 100644
index 000000000..28745908a
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_OLD_PEOPLE.png differ
diff --git a/src/assets/img/shuju/command/ico2/IS_UNEMPLOYED.png b/src/assets/img/shuju/command/ico2/IS_UNEMPLOYED.png
new file mode 100644
index 000000000..353440c5c
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_UNEMPLOYED.png differ
diff --git a/src/assets/img/shuju/command/ico2/IS_YLFN.png b/src/assets/img/shuju/command/ico2/IS_YLFN.png
new file mode 100644
index 000000000..353440c5c
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_YLFN.png differ
diff --git a/src/assets/img/shuju/command/ico2/anzhibangjiao.png b/src/assets/img/shuju/command/ico2/anzhibangjiao.png
new file mode 100644
index 000000000..077e3a75c
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/anzhibangjiao.png differ
diff --git a/src/assets/img/shuju/command/ico2/buliangqingshaonian.png b/src/assets/img/shuju/command/ico2/buliangqingshaonian.png
new file mode 100644
index 000000000..5a77abd57
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/buliangqingshaonian.png differ
diff --git a/src/assets/img/shuju/command/ico2/enterprise_patrol_unqualified.png b/src/assets/img/shuju/command/ico2/enterprise_patrol_unqualified.png
new file mode 100644
index 000000000..222b77a14
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/enterprise_patrol_unqualified.png differ
diff --git a/src/assets/img/shuju/command/ico2/event_tdnd.png b/src/assets/img/shuju/command/ico2/event_tdnd.png
new file mode 100644
index 000000000..582a78149
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/event_tdnd.png differ
diff --git a/src/assets/img/shuju/command/ico2/resi.png b/src/assets/img/shuju/command/ico2/resi.png
new file mode 100644
index 000000000..1c5bb3099
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/resi.png differ
diff --git a/src/assets/img/shuju/command/ico2/resi_xfry.png b/src/assets/img/shuju/command/ico2/resi_xfry.png
new file mode 100644
index 000000000..484d4fa78
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/resi_xfry.png differ
diff --git a/src/assets/img/shuju/command/ico2/shequjiaozheng.png b/src/assets/img/shuju/command/ico2/shequjiaozheng.png
new file mode 100644
index 000000000..79d3ed2a7
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/shequjiaozheng.png differ
diff --git a/src/assets/img/shuju/command/ico2/xidurenyuan.png b/src/assets/img/shuju/command/ico2/xidurenyuan.png
new file mode 100644
index 000000000..25a3fc3df
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/xidurenyuan.png differ
diff --git a/src/assets/img/shuju/command/ico2/xiejiaorenyuan.png b/src/assets/img/shuju/command/ico2/xiejiaorenyuan.png
new file mode 100644
index 000000000..31ce7ad11
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/xiejiaorenyuan.png differ
diff --git a/src/assets/img/shuju/command/ico2/zhaoshizhaohuojingshenbing.png b/src/assets/img/shuju/command/ico2/zhaoshizhaohuojingshenbing.png
new file mode 100644
index 000000000..6099d0332
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/zhaoshizhaohuojingshenbing.png differ
diff --git a/src/assets/img/shuju/command/ico2/zhzl_rq.png b/src/assets/img/shuju/command/ico2/zhzl_rq.png
new file mode 100644
index 000000000..b1d1edb68
Binary files /dev/null and b/src/assets/img/shuju/command/ico2/zhzl_rq.png differ
diff --git a/src/assets/img/shuju/command/ico3/IS_DB.png b/src/assets/img/shuju/command/ico3/IS_DB.png
new file mode 100644
index 000000000..134e2daf5
Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_DB.png differ
diff --git a/src/assets/img/shuju/command/ico3/IS_DBH.png b/src/assets/img/shuju/command/ico3/IS_DBH.png
new file mode 100644
index 000000000..18236e75a
Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_DBH.png differ
diff --git a/src/assets/img/shuju/command/ico3/IS_KC.png b/src/assets/img/shuju/command/ico3/IS_KC.png
new file mode 100644
index 000000000..48bd3208c
Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_KC.png differ
diff --git a/src/assets/img/shuju/command/ico3/IS_MB.png b/src/assets/img/shuju/command/ico3/IS_MB.png
new file mode 100644
index 000000000..a7a87afa4
Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_MB.png differ
diff --git a/src/assets/img/shuju/command/ico3/IS_OLD_PEOPLE.png b/src/assets/img/shuju/command/ico3/IS_OLD_PEOPLE.png
new file mode 100644
index 000000000..8aee93ce3
Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_OLD_PEOPLE.png differ
diff --git a/src/assets/img/shuju/command/ico3/IS_UNEMPLOYED.png b/src/assets/img/shuju/command/ico3/IS_UNEMPLOYED.png
new file mode 100644
index 000000000..3e4d62f2c
Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_UNEMPLOYED.png differ
diff --git a/src/assets/img/shuju/command/ico3/anzhibangjiao.png b/src/assets/img/shuju/command/ico3/anzhibangjiao.png
new file mode 100644
index 000000000..f95e5fbe1
Binary files /dev/null and b/src/assets/img/shuju/command/ico3/anzhibangjiao.png differ
diff --git a/src/assets/img/shuju/command/ico3/buliangqingshaonian.png b/src/assets/img/shuju/command/ico3/buliangqingshaonian.png
new file mode 100644
index 000000000..1fbccbaf1
Binary files /dev/null and b/src/assets/img/shuju/command/ico3/buliangqingshaonian.png differ
diff --git a/src/assets/img/shuju/command/ico3/enterprise_patrol_unqualified.png b/src/assets/img/shuju/command/ico3/enterprise_patrol_unqualified.png
new file mode 100644
index 000000000..0edae4416
Binary files /dev/null and b/src/assets/img/shuju/command/ico3/enterprise_patrol_unqualified.png differ
diff --git a/src/assets/img/shuju/command/ico3/event_tdnd.png b/src/assets/img/shuju/command/ico3/event_tdnd.png
new file mode 100644
index 000000000..8d10d18c3
Binary files /dev/null and b/src/assets/img/shuju/command/ico3/event_tdnd.png differ
diff --git a/src/assets/img/shuju/command/ico3/resi_xfry.png b/src/assets/img/shuju/command/ico3/resi_xfry.png
new file mode 100644
index 000000000..9dc9cded7
Binary files /dev/null and b/src/assets/img/shuju/command/ico3/resi_xfry.png differ
diff --git a/src/assets/img/shuju/command/ico3/shequjiaozheng.png b/src/assets/img/shuju/command/ico3/shequjiaozheng.png
new file mode 100644
index 000000000..7b4af580b
Binary files /dev/null and b/src/assets/img/shuju/command/ico3/shequjiaozheng.png differ
diff --git a/src/assets/img/shuju/command/ico3/xidurenyuan.png b/src/assets/img/shuju/command/ico3/xidurenyuan.png
new file mode 100644
index 000000000..6e9addcde
Binary files /dev/null and b/src/assets/img/shuju/command/ico3/xidurenyuan.png differ
diff --git a/src/assets/img/shuju/command/ico3/xiejiaorenyuan.png b/src/assets/img/shuju/command/ico3/xiejiaorenyuan.png
new file mode 100644
index 000000000..f2a720395
Binary files /dev/null and b/src/assets/img/shuju/command/ico3/xiejiaorenyuan.png differ
diff --git a/src/assets/img/shuju/command/ico3/zhaoshizhaohuojingshenbing.png b/src/assets/img/shuju/command/ico3/zhaoshizhaohuojingshenbing.png
new file mode 100644
index 000000000..e4e802c63
Binary files /dev/null and b/src/assets/img/shuju/command/ico3/zhaoshizhaohuojingshenbing.png differ
diff --git a/src/assets/img/shuju/command/search.png b/src/assets/img/shuju/command/search.png
new file mode 100644
index 000000000..e59cb1592
Binary files /dev/null and b/src/assets/img/shuju/command/search.png differ
diff --git a/src/assets/scss/modules/visual/command.scss b/src/assets/scss/modules/visual/command.scss
index 6503ec184..0df662873 100644
--- a/src/assets/scss/modules/visual/command.scss
+++ b/src/assets/scss/modules/visual/command.scss
@@ -54,6 +54,133 @@
position: relative;
}
+.m-mapmenu {
+ position: absolute;
+ z-index: 100;
+ left: 20px;
+ top: 20px;
+}
+
+.m-search {
+ position: absolute;
+ z-index: 200;
+ left: 0;
+ right: 0;
+ top: 30px;
+ width: 630px;
+ margin: 0 auto;
+
+ .input {
+ width: 100%;
+ background-color: #fff;
+ border-radius: 8px;
+ display: flex;
+ align-items: center;
+ overflow: hidden;
+ border: 1px solid #5aafff;
+ box-shadow: 0px 4px 8px 0px rgba(147, 147, 147, 0.26);
+
+ > input {
+ width: 420px;
+ border: none;
+ line-height: 45px;
+ font-size: 18px;
+ font-family: PingFang SC;
+ font-weight: 400;
+ color: #333333;
+ }
+
+ > img {
+ margin: 0 16px;
+ width: 30px;
+ height: 30px;
+ }
+
+ .btn {
+ margin-left: auto;
+ width: 120px;
+ height: 53px;
+ line-height: 53px;
+ background: #0082fb;
+ border-radius: 0px 8px 8px 0px;
+ color: #fff;
+ text-align: center;
+ font-size: 22px;
+ font-family: PingFang SC;
+ font-weight: 500;
+ color: #ffffff;
+ cursor: pointer;
+ }
+ }
+
+ .result {
+ position: relative;
+ box-sizing: border-box;
+ padding: 0 15px;
+ width: 509px;
+ background: rgba(#020340, 0.58);
+ border-radius: 8px;
+ .result-item {
+ position: relative;
+ padding: 12px 0;
+ border-bottom: 1px solid rgba(#fff, 0.2);
+
+ .result-panel {
+ position: absolute;
+ box-sizing: border-box;
+ padding: 15px;
+ left: 509px - 10px;
+ top: 0;
+ width: 500px;
+ background: rgba(#020340, 0.58);
+ border-radius: 8px;
+ }
+
+ .result-type {
+ margin-bottom: 10px;
+ font-size: 20px;
+ line-height: 30px;
+ font-family: PingFang SC;
+ font-weight: bold;
+ color: #00f0ff;
+ }
+
+ .result-more {
+ position: absolute;
+ right: 0;
+ top: 20px;
+ width: 50px;
+ height: 22px;
+ text-align: center;
+ line-height: 22px;
+ background: #dd8d02;
+ border-radius: 2px;
+ font-size: 14px;
+ font-family: PingFang SC;
+ font-weight: 400;
+ color: #ffffff;
+ cursor: pointer;
+ }
+
+ .result-li {
+ line-height: 28px;
+ font-size: 16px;
+ font-family: PingFang SC;
+ font-weight: 400;
+ color: #ffffff;
+ cursor: pointer;
+ @include toe;
+ i {
+ margin-right: 5px;
+ }
+ span {
+ width: 100%;
+ }
+ }
+ }
+ }
+}
+
.m-sidemenu {
margin-left: 20px;
width: 360px;
@@ -79,7 +206,7 @@
}
.list {
- min-height: 800px;
+ min-height: 780px;
}
}
diff --git a/src/assets/scss/shuju-card.scss b/src/assets/scss/shuju-card.scss
index 595575e6a..548f0bfbd 100644
--- a/src/assets/scss/shuju-card.scss
+++ b/src/assets/scss/shuju-card.scss
@@ -8,7 +8,7 @@
min-width: 200px;
width: 100%;
height: 100%;
- padding: 22px 16px 22px 22px;
+ padding: 22px 22px 22px 22px;
.card-wrap {
height: 100%;
@@ -82,6 +82,7 @@
background-repeat: repeat;
overflow-y: auto;
height: 100%;
+ margin-right: -8px;
@include scrollBar;
}
}
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index 3a0e2ccee..b0275579a 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -135,7 +135,7 @@ import BasicInfoCommunity from "./basicInfoCommunity";
import People from "./people";
import cptCard from "@/views/modules/visual/cpts/card";
-import gridMap from "@/views/modules/visual/basicinfo/cpts/grid-map";
+import gridMap from "@/views/modules/visual/cpts/map/index";
import ScreenLoading from "@/views/modules/visual/cpts/loading";
let loading; //加载动画
diff --git a/src/views/modules/visual/basicinfo/cpts/grid-map.vue b/src/views/modules/visual/basicinfo/cpts/grid-map.vue
deleted file mode 100644
index 01b186eb3..000000000
--- a/src/views/modules/visual/basicinfo/cpts/grid-map.vue
+++ /dev/null
@@ -1,423 +0,0 @@
-
-