Merge branch 'yanyan_dev' into shenzhen-dev

src/views/goverment/largeScreen/components/center.vue

@@ -43,7 +43,7 @@ const projectNumber = async () => {
 	.bgImgOne {
 		width: 232px;
 		height: 82px;
-		background: url("/src/assets/images/screenImg/add.png") no-repeat center center;
+		background: url("@/assets/images/screenImg/add.png") no-repeat center center;
 		background-size: 100%;
 		.listItem {
 			padding: 15px 0 0 85px;
@@ -61,7 +61,7 @@ const projectNumber = async () => {
 	.bgImgTwo {
 		width: 232px;
 		height: 82px;
-		background: url("/src/assets/images/screenImg/completed.png") no-repeat center center;
+		background: url("@/assets/images/screenImg/completed.png") no-repeat center center;
 		background-size: 100%;
 		.listItem {
 			padding: 15px 0 0 85px;
@@ -79,7 +79,7 @@ const projectNumber = async () => {
 	.bgImgThree {
 		width: 232px;
 		height: 82px;
-		background: url("/src/assets/images/screenImg/importent.png") no-repeat center center;
+		background: url("@/assets/images/screenImg/importent.png") no-repeat center center;
 		background-size: 100%;
 		.listItem {
 			padding: 15px 0 0 85px;

src/views/goverment/largeScreen/components/left.vue

@@ -13,14 +13,14 @@
 		</div>
 		<div class="realNameSystem">
 			<div :class="realNameBlue.bgimg">
-				<img :src="realNameBlue.img" alt="" />
+				<img :src="getImageUrlGit(realNameBlue.img)" alt="" />
 				<div class="centerTitle">
 					<div class="titleNumber">{{ realNameBlue.number }}</div>
 					<div class="titleName">{{ realNameBlue.name }}</div>
 				</div>
 			</div>
 			<div :class="realNameGreen.bgimg">
-				<img :src="realNameGreen.img" alt="" />
+				<img :src="getImageUrlGit(realNameGreen.img)" alt="" />
 				<div class="centerTitle">
 					<div class="titleNumber">{{ realNameGreen.number }}</div>
 					<div class="titleName">{{ realNameGreen.name }}</div>
@@ -28,7 +28,7 @@
 				<div class="percent">{{ realNameGreen.percent }}</div>
 			</div>
 			<div :class="realNameRed.bgimg">
-				<img :src="realNameRed.img" alt="" />
+				<img :src="getImageUrlGit(realNameRed.img)" alt="" />
 				<div class="centerTitle">
 					<div class="titleNumber">{{ realNameRed.number }}</div>
 					<div class="titleName">{{ realNameRed.name }}</div>
@@ -44,7 +44,7 @@
 				<div v-for="(item, index) in companyLeft" :key="index" class="companyItemLeft">
 					<div class="flex">
 						<div class="leftIcon">
-							<img :src="item.img" />
+							<img :src="getImageUrlPng(item.img)" />
 						</div>
 						<div class="rightMessage">
 							<div class="unitName">{{ item.name }}</div>
@@ -57,7 +57,7 @@
 				<div v-for="(item, index) in companyRight" :key="index" class="companyItemRight">
 					<div class="flex">
 						<div class="leftIcon">
-							<img :src="item.img" />
+							<img :src="getImageUrlPng(item.img)" />
 						</div>
 						<div class="rightMessage">
 							<div class="unitName">{{ item.name }}</div>
@@ -98,23 +98,25 @@ const projectNumber = async () => {
 	}
 	projectNum.newNum = projectNum.num.split("");
 };
-
+function getImageUrlGit(name: string) {
+	return new URL(`../../../../assets/images/screenImg/${name}` + ".gif", import.meta.url).href;
+}
 //实名制统计
 const realNameBlue = ref({
-	img: "/src/assets/images/screenImg/blueCircle.gif",
+	img: "blueCircle",
 	bgimg: "bluebg",
 	name: "实名制人员",
 	number: "0"
 });
 const realNameGreen = ref({
-	img: "/src/assets/images/screenImg/greenCircle.gif",
+	img: "greenCircle",
 	bgimg: "greenbg",
 	name: "建筑工人",
 	number: "0",
 	percent: "92%"
 });
 const realNameRed = ref({
-	img: "/src/assets/images/screenImg/redCircle.gif",
+	img: "redCircle",
 	bgimg: "redbg",
 	name: "管理人员",
 	number: "0",
@@ -128,36 +130,39 @@ const realName = async () => {
 	realNameGreen.value.percent = result.workerRatio + "%";
 	realNameRed.value.percent = result.managerRatio + "%";
 };
+function getImageUrlPng(name: string) {
+	return new URL(`../../../../assets/images/screenImg/${name}` + ".png", import.meta.url).href;
+}
 //企业统计
 const companyLeft = ref([
 	{
 		name: "施工",
-		img: "/src/assets/images/screenImg/shigong.png",
+		img: "shigong",
 		number: "0",
 		bgImg: "blue"
 	},
 	{
 		name: "监理",
-		img: "/src/assets/images/screenImg/jianli.png",
+		img: "jianli",
 		number: "0",
 		bgImg: "blue"
 	},
-	{ name: "设计", img: "/src/assets/images/screenImg/sheji.png", number: "0", bgImg: "blue" }
+	{ name: "设计", img: "sheji", number: "0", bgImg: "blue" }
 ]);
 const companyRight = ref([
 	{
 		name: "建设",
-		img: "/src/assets/images/screenImg/jianshe.png",
+		img: "jianshe",
 		number: "0",
 		bgImg: "green"
 	},
 	{
 		name: "勘察",
-		img: "/src/assets/images/screenImg/kancha.png",
+		img: "kancha",
 		number: "0",
 		bgImg: "green"
 	},
-	{ name: "其他", img: "/src/assets/images/screenImg/qita.png", number: "0", bgImg: "green" }
+	{ name: "其他", img: "qita", number: "0", bgImg: "green" }
 ]);
 const conmpanyList = async () => {
 	const { result } = await getCompanyAll();

src/views/goverment/largeScreen/components/map2D.vue

@@ -35,7 +35,9 @@ const getProjectList = async () => {
 	console.log(mapProjectList.value, "aaa");
 	initMap();
 };
-
+function getImageUrl(name: string) {
+	return new URL(`../../../../assets/images/screenImg/mapImg/${name}` + ".png", import.meta.url).href;
+}
 const initMap = () => {
 	window._AMapSecurityConfig = {
 		securityJsCode: "6caf6429e4b98cf7f39db9bf7014a78b"
@@ -95,7 +97,7 @@ const initMap = () => {
 			// 第二种 直接写死 position 的经纬度值
 			mapProjectList.value.forEach((item, index, array) => {
 				const marker = new AMap.Marker({
-					icon: "/src/assets/images/screenImg/mapImg/dian.png",
+					icon: getImageUrl("dian"),
 					position: [`${item.longitude}`, `${item.latitude}`],
 					// 通过设置 offset 来添加偏移量
 					offset: new AMap.Pixel(-26, -24)