This commit is contained in:
duanxiaohai 2024-10-24 10:56:14 +08:00
commit de0347a616
28 changed files with 103 additions and 40 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

@ -1437,21 +1437,21 @@ const showEc = (val) => {
1411, 1232, 1232, 1411, 1232, 1232,
]; // ]; //
dataEc.times = [ dataEc.times = [
"09",
"10",
"11",
"12",
"13",
"14",
"15",
"16",
"17",
"18",
"19",
"20",
"21",
"22",
"23", "23",
"24",
"25",
"26",
"27",
"28",
"29",
"30",
"01",
"02",
"03",
"04",
"05",
"06",
"07",
]; ];
dialogShowEc.value = true; dialogShowEc.value = true;
break; break;

View File

@ -131,9 +131,10 @@
<img <img
:src="item.img" :src="item.img"
class="zyys_content_item_left" class="zyys_content_item_left"
v-if="item.img" :class="{
imgB: item.name == '菜市场' || item.name == '停车场' || item.name == '文化广场'|| item.name == '残疾人之家',
}"
/> />
<div class="zyys_content_item_left circleY" v-else></div>
<div class="zyys_content_item_right">{{ item.name }}</div> <div class="zyys_content_item_right">{{ item.name }}</div>
</div> </div>
</div> </div>
@ -428,23 +429,12 @@ import j10_map from "@/assets/images/map/j10_map.png";
import j11_map from "@/assets/images/map/j11_map.png"; import j11_map from "@/assets/images/map/j11_map.png";
import dwd from "@/assets/images/map/dwd.png"; import dwd from "@/assets/images/map/dwd.png";
import fwqbg1 from "@/assets/images/map/qlv.png"; import fwqbg1 from "@/assets/images/map/qlv.png";
import fwqbg2 from "@/assets/images/map/qlan.png";
import fwqbg3 from "@/assets/images/map/slan.png";
import fwqbg4 from "@/assets/images/map/slv.png";
import fwqbg5 from "@/assets/images/map/shuang.png";
import fwqbg6 from "@/assets/images/map/qqlv.png";
import b1 from "@/assets/images/map/bb1.png";
import b2 from "@/assets/images/map/b2.png"; import b2 from "@/assets/images/map/b2.png";
import b3 from "@/assets/images/map/b3.png";
import b4 from "@/assets/images/map/b4.png";
import b5 from "@/assets/images/map/b5.png";
import b6 from "@/assets/images/map/b6.png";
import xcbg from "@/assets/images/map/xcbg.png"; import xcbg from "@/assets/images/map/xcbg.png";
import AED from "@/assets/images/map/AED.png"; import AED from "@/assets/images/map/AED.png";
import Dialog from "./dialog/dialogMapDp.vue"; import Dialog from "./dialog/dialogMapDp.vue";
import DialogCamera from "./dialog/dialogCameras.vue"; import DialogCamera from "./dialog/dialogCameras.vue";
import personDetail from "./person/index.vue"; import personDetail from "./person/index.vue";
// import gcj02towgs84 from "@/utils/gcj02towgs84.js";
import { import {
DrawScene, DrawScene,
PolygonDraw, PolygonDraw,
@ -453,6 +443,22 @@ import {
DrawingType, DrawingType,
OperateEventType, OperateEventType,
} from "bmap-draw"; } from "bmap-draw";
import zcd from "@/assets/images/map/zcd.png";
import dqfwzx from "@/assets/images/map/dqfwzx.png";
import cjrzj from "@/assets/images/map/cjrzj.png";
import bxjsf from "@/assets/images/map/bxjsf.png";
import bmfwzx from "@/assets/images/map/bmfwzx.png";
import csc from "@/assets/images/map/csc.png";
import tcc from "@/assets/images/map/tcc.png";
import lnhds from "@/assets/images/map/lnhds.png";
import lqc from "@/assets/images/map/lqc.png";
import zqc from "@/assets/images/map/zqc.png";
import whgc from "@/assets/images/map/whgc.png";
import lspd from "@/assets/images/map/lspd.png";
import gc from "@/assets/images/map/gc.png";
import whlt from "@/assets/images/map/whlt.png";
import njsw from "@/assets/images/map/njsw.png";
import xxg from "@/assets/images/map/xxg.png";
//--------------- //---------------
// //
const drawing = ref(false); const drawing = ref(false);
@ -946,6 +952,42 @@ const lingshibiaoqian = reactive([
tagId: "555", tagId: "555",
rksl: 137, rksl: 137,
}, },
{
id: "消防员",
name: "消防员",
tagId: "555",
rksl: 82,
},
{
id: "无偿献血荣誉证",
name: "无偿献血荣誉证",
tagId: "555",
rksl: 212,
},
{
id: "四级/中级工",
name: "四级/中级工",
tagId: "555",
rksl: 2330,
},
{
id: "三级/高级工",
name: "三级/高级工",
tagId: "555",
rksl: 2171,
},
{
id: "二级/技师",
name: "二级/技师",
tagId: "555",
rksl: 524,
},
{
id: "一级/高级技师",
name: "一级/高级技师",
tagId: "555",
rksl: 246,
},
]); ]);
const data = reactive({ const data = reactive({
serviceCircleList: [], serviceCircleList: [],
@ -1094,13 +1136,14 @@ const yaosuTotal = ref([
{ {
id: 25, id: 25,
name: "菜市场", name: "菜市场",
img: csc,
wz: true, wz: true,
click: false, click: false,
}, },
{ {
id: 26, id: 26,
name: "停车场", name: "停车场",
img: tcc,
wz: true, wz: true,
click: false, click: false,
}, },
@ -1108,30 +1151,35 @@ const yaosuTotal = ref([
{ {
id: 21, id: 21,
name: "党群服务中心", name: "党群服务中心",
img: dqfwzx,
wz: true, wz: true,
click: false, click: false,
}, },
{ {
id: 22, id: 22,
name: "残疾人之家", name: "残疾人之家",
img: cjrzj,
wz: true, wz: true,
click: false, click: false,
}, },
{ {
id: 23, id: 23,
name: "百姓健身房", name: "百姓健身房",
img: bxjsf,
wz: true, wz: true,
click: false, click: false,
}, },
{ {
id: 31, id: 31,
name: "绿色跑道", name: "绿色跑道",
img: lspd,
wz: true, wz: true,
click: false, click: false,
}, },
{ {
id: 24, id: 24,
name: "便民服务中心", name: "便民服务中心",
img: bmfwzx,
wz: true, wz: true,
click: false, click: false,
}, },
@ -1139,24 +1187,28 @@ const yaosuTotal = ref([
{ {
id: 27, id: 27,
name: "老年活动室", name: "老年活动室",
img: lnhds,
wz: true, wz: true,
click: false, click: false,
}, },
{ {
id: 28, id: 28,
name: "篮球场", name: "篮球场",
img: lqc,
wz: false, wz: false,
click: false, click: false,
}, },
{ {
id: 29, id: 29,
name: "足球场", name: "足球场",
img: zqc,
wz: false, wz: false,
click: false, click: false,
}, },
{ {
id: 30, id: 30,
name: "文化广场", name: "文化广场",
img: whgc,
wz: false, wz: false,
click: false, click: false,
}, },
@ -1164,30 +1216,35 @@ const yaosuTotal = ref([
{ {
id: 32, id: 32,
name: "公厕", name: "公厕",
img: gc,
wz: false, wz: false,
click: false, click: false,
}, },
{ {
id: 33, id: 33,
name: "文化礼堂", name: "文化礼堂",
img: whlt,
wz: false, wz: false,
click: false, click: false,
}, },
{ {
id: 34, id: 34,
name: "农家书屋", name: "农家书屋",
img: njsw,
wz: false, wz: false,
click: false, click: false,
}, },
{ {
id: 20, id: 20,
name: "助餐点", name: "助餐点",
img: zcd,
wz: false, wz: false,
click: false, click: false,
}, },
{ {
id: 35, id: 35,
name: "乡贤馆", name: "乡贤馆",
img: xxg,
wz: false, wz: false,
click: false, click: false,
}, },
@ -5502,11 +5559,9 @@ onMounted(async () => {
height: 18px; height: 18px;
margin-right: 3px; margin-right: 3px;
} }
.circleY { .imgB{
margin-right: 4px !important; width: 25px;
border-radius: 50%; /* 使其成为一个圆形 */ height: 22px;
border: 1px solid #ffffff; /* 设置边框的样式和颜色 */
display: inline-block; /* 使其可以与其他元素在同一行 */
} }
.zyys_content_item_right { .zyys_content_item_right {
font-weight: 500; font-weight: 500;

View File

@ -111,7 +111,11 @@
<i></i> <i></i>
</div> </div>
</div> </div>
<div class="tableBox" v-if="data.tabPublicService.length > 0"> <div
class="tableBox"
:class="{ tableBox2: !show_7yx }"
v-if="data.tabPublicService.length > 0"
>
<div <div
class="tableBoxTop" class="tableBoxTop"
:style="{ backgroundImage: 'url(' + item.Bj + ')' }" :style="{ backgroundImage: 'url(' + item.Bj + ')' }"
@ -964,6 +968,10 @@ onMounted(() => {
cursor: pointer; cursor: pointer;
} }
} }
.tableBox2 {
align-content: start;
height: 800px;
}
// .tableBox::-webkit-scrollbar { // .tableBox::-webkit-scrollbar {
// display: none; /* Chrome Safari */ // display: none; /* Chrome Safari */
// } // }