diff --git a/src/assets/images/menhu/dikong.png b/src/assets/images/menhu/dikong.png index 906aefc..71d7dd5 100644 Binary files a/src/assets/images/menhu/dikong.png and b/src/assets/images/menhu/dikong.png differ diff --git a/src/assets/images/menhu/guanlixitong.png b/src/assets/images/menhu/guanlixitong.png index 6bd0ed6..6fcc272 100644 Binary files a/src/assets/images/menhu/guanlixitong.png and b/src/assets/images/menhu/guanlixitong.png differ diff --git a/src/assets/images/menhu/image.png b/src/assets/images/menhu/image.png deleted file mode 100644 index a806a60..0000000 Binary files a/src/assets/images/menhu/image.png and /dev/null differ diff --git a/src/assets/images/menhu/portal1.png b/src/assets/images/menhu/portal1.png index 813a449..0eb5a3d 100644 Binary files a/src/assets/images/menhu/portal1.png and b/src/assets/images/menhu/portal1.png differ diff --git a/src/assets/images/menhu/zhongda.png b/src/assets/images/menhu/zhongda.png index 3d4550d..9befa66 100644 Binary files a/src/assets/images/menhu/zhongda.png and b/src/assets/images/menhu/zhongda.png differ diff --git a/src/assets/images/phone.png b/src/assets/images/phone.png index 3e35685..aebaa50 100644 Binary files a/src/assets/images/phone.png and b/src/assets/images/phone.png differ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 5f8828b..b288652 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -7,7 +7,7 @@ diff --git a/src/views/Map/Map_Dikong/index.vue b/src/views/Map/Map_Dikong/index.vue index 76e8615..5657793 100644 --- a/src/views/Map/Map_Dikong/index.vue +++ b/src/views/Map/Map_Dikong/index.vue @@ -194,7 +194,7 @@ export default { imgSrc: require("@/assets/images/icon/xuncha.png") }, { - position: [121.318413448767714, 32.411908360092688], + position: [121.318413448767714, 32.3981908360092688], id: 3, name: "飞机", content: '', diff --git a/src/views/Map/Map_ZhongDahuodong/index.vue b/src/views/Map/Map_ZhongDahuodong/index.vue index 97c52b8..66137e4 100644 --- a/src/views/Map/Map_ZhongDahuodong/index.vue +++ b/src/views/Map/Map_ZhongDahuodong/index.vue @@ -13,10 +13,10 @@ + lineCap="round" @click="(e) => { polylineclick(e, '线1') }" :strokeWeight="4" :strokeOpacity="10" /> + lineCap="round" @click="(e) => { polylineclick(e, '线2') }" :strokeWeight="4" :strokeOpacity="10" /> @@ -27,7 +27,7 @@ -
+
{{ markername }}信息
@@ -75,7 +75,7 @@
{{ 79898 }}
-
+
语音呼叫
查看监控
+
{{ markername }}信息
-
+
-
驾驶员姓名:
+
驾驶员:
{{ "张三" }}
+
联系方式:
{{ "1361111111" }}
@@ -107,6 +108,7 @@
+
车辆类型:
{{ "轿车" }}
@@ -114,15 +116,16 @@
+
车牌号:
苏E1958
- +
- -
+ +
{{ markername }}信息
@@ -135,7 +138,7 @@
{{ "张三" }}
- +
@@ -157,7 +160,7 @@
长沙镇108号
- +
@@ -233,7 +236,7 @@ import righttEcahts from "./righttEcahts/index.vue" export default { name: "map-view", - components: { ZhanshiTubiao, leftrightEcahts, righttEcahts, MapHuodongdialog,Mapdialogyuyin,Mapdialogyuyinshipin }, + components: { ZhanshiTubiao, leftrightEcahts, righttEcahts, MapHuodongdialog, Mapdialogyuyin, Mapdialogyuyinshipin }, data() { return { zoom: 11.8, @@ -260,7 +263,7 @@ export default { visible: true, draggable: false }, - markername:"设备", + markername: "设备", // 车辆辆 markers: [ { @@ -275,7 +278,7 @@ export default { id: 2, name: "车辆", content: '', - imgSrc: require("@/assets/images/icon/genduofuwu.png") + imgSrc: require("@/assets/images/icon/genduofuwu.png") }, { position: [121.318413448767714, 32.411908360092688], @@ -397,7 +400,7 @@ export default { } - if(type == "线2"){ + if (type == "线2") { this.$refs.MapHuodongdialog.open("person") } }, @@ -426,7 +429,7 @@ export default { travelPath() { this.$refs.Mapdialogyuyin.open("person") - }, + }, // 切换人员 markersradio(type) { @@ -460,4 +463,47 @@ export default { font-size: 26px; } } + +::v-deep .person-maincheliangxinxi { + width: 270px; + height: 200px; + + .person-info { + width: 270px; + } + + .name { + flex: none !important; + margin-right: 10px; + text-align: right; + width: 75px; + } + + .position { + flex: none !important; + + } +} + +::v-deep .person-maincheliangxinxiTow { + width: 270px; + height: 200px; + + .person-info { + width: 270px; + } + + .name { + flex: none !important; + margin-right: 10px; + text-align: right; + width: 60px; + } + + .position { + flex: none !important; + + } +} + diff --git a/src/views/Map/Map_ZhongDahuodong/leftrightEcahts/index.vue b/src/views/Map/Map_ZhongDahuodong/leftrightEcahts/index.vue index f30a589..09b46c4 100644 --- a/src/views/Map/Map_ZhongDahuodong/leftrightEcahts/index.vue +++ b/src/views/Map/Map_ZhongDahuodong/leftrightEcahts/index.vue @@ -14,7 +14,7 @@
-
+
重大活动预案
@@ -128,9 +128,9 @@ export default { .activity-info { margin: 20px 0px; - display: grid; - grid-template-columns: 1fr; - row-gap: 10px; + // display: grid; + // grid-template-columns: 1fr; + // row-gap: 10px; height: calc(100% - 80px); overflow: scroll; @@ -141,6 +141,8 @@ export default { justify-content: space-between; border-radius: 5px; background-color: #2d609c; + height: 60px; + margin-bottom: 20px; cursor: pointer; div { diff --git a/src/views/Map/Map_ZhongDahuodong/righttEcahts/index.vue b/src/views/Map/Map_ZhongDahuodong/righttEcahts/index.vue index d4e7e13..9ddad44 100644 --- a/src/views/Map/Map_ZhongDahuodong/righttEcahts/index.vue +++ b/src/views/Map/Map_ZhongDahuodong/righttEcahts/index.vue @@ -54,7 +54,7 @@
-
+
重大活动预案预警提示
16:00:00
@@ -147,12 +147,12 @@ export default { .activity-info { margin: 0px 0px; - display: grid; - grid-template-columns: 1fr; - row-gap: 10px; - height: 100%; + // display: grid; + // grid-template-columns: 1fr; + // row-gap: 10px; + height: 300px; overflow: scroll; - padding-bottom: 400px; + padding-bottom: 150px; .activity-items { @@ -161,6 +161,8 @@ export default { align-items: center; justify-content: space-between; border-radius: 5px; + height: 60px; + margin: 10px 0; background-color: #2d609c; cursor: pointer; diff --git a/src/views/Map/Map_Zhongdianrenyuan/leftrightEcahts/index.vue b/src/views/Map/Map_Zhongdianrenyuan/leftrightEcahts/index.vue index 8696e4c..bb91d52 100644 --- a/src/views/Map/Map_Zhongdianrenyuan/leftrightEcahts/index.vue +++ b/src/views/Map/Map_Zhongdianrenyuan/leftrightEcahts/index.vue @@ -65,9 +65,8 @@ export default { }, xAxis: { type: 'value', - min: 200, - max: 600, - interval: 50, + + interval: 100, // 去掉 y 轴刻度线 axisLabel: { textStyle: { diff --git a/src/views/Map/Map_Zhongdianrenyuan/righttEcahts/ChangeinformationList.vue b/src/views/Map/Map_Zhongdianrenyuan/righttEcahts/ChangeinformationList.vue index d343348..3c2a494 100644 --- a/src/views/Map/Map_Zhongdianrenyuan/righttEcahts/ChangeinformationList.vue +++ b/src/views/Map/Map_Zhongdianrenyuan/righttEcahts/ChangeinformationList.vue @@ -40,64 +40,25 @@ export default { name:"张三", phone:"13618681115" },{ - name:"张三", - phone:"13618681115" - },{ - name:"张三", - phone:"13618681115" - },{ - name:"张三", - phone:"13618681115" - },{ - name:"张三", - phone:"13618681115" - },{ - name:"张三", - phone:"13618681115" - },{ - name:"张三", - phone:"13618681115" - },{ - name:"张三", - phone:"13618681115" - },{ - name:"张三", - phone:"13618681115" - },{ - name:"张三", - phone:"13618681115" - },{ - name:"张三", + name:"李四", phone:"13618681115" },{ - name:"张三", + name:"王五", phone:"13618681115" },{ - name:"张三", + name:"赵六", phone:"13618681115" },{ - name:"张三", + name:"孙七", phone:"13618681115" },{ - name:"张三", + name:"周八", phone:"13618681115" },{ - name:"张三", + name:"吴九", phone:"13618681115" },{ - name:"张三", - phone:"13618681115" - },{ - name:"张三", - phone:"13618681115" - },{ - name:"张三", - phone:"13618681115" - },{ - name:"张三", - phone:"13618681115" - },{ - name:"张三", + name:"郑十", phone:"13618681115" },], query: { diff --git a/src/views/ZhongdianRen/Yihuyidang/loudongguanli/index.vue b/src/views/ZhongdianRen/Yihuyidang/loudongguanli/index.vue index ee1474b..9a98d36 100644 --- a/src/views/ZhongdianRen/Yihuyidang/loudongguanli/index.vue +++ b/src/views/ZhongdianRen/Yihuyidang/loudongguanli/index.vue @@ -7,34 +7,14 @@
小区名称:
- +
物业管理公司:
- +
物业电话:
- +
- 查询 - 重置 + 查询 + 重置
@@ -42,7 +22,7 @@
-
小区管理列表
+
楼栋管理列表
@@ -56,60 +36,27 @@
- + - + - + - + - + - + - + - + - +