zhanghao 2 maanden geleden
bovenliggende
commit
3a909e0c79

BIN
src/assets/zhang/myMap/carPosition.png


BIN
src/assets/zhang/myMap/projectPosition.png


+ 47 - 38
src/views/screen/engineering/main.vue

@@ -49,6 +49,13 @@
           <div class="desc">{{ item.name }}</div>
         </div>
       </div> -->
+<!--      <province
+        v-if="showMap"
+        ref="province"
+        height="850px"
+        @mapClick="onMapClick"
+      ></province>-->
+      <Map v-if="showMap"></Map>
       <div
         v-if="showLocal"
         class="img-area flex-row align-items-center flex-center"
@@ -57,7 +64,7 @@
       </div>
 
       <!-- 返回按钮 -->
-      <div class="bottom-area flex-row align-items-center space-between">
+<!--      <div class="bottom-area flex-row align-items-center space-between">
         <div class="bottom-left flex-row align-items-center">
           <div class="left-item">
             <el-cascader
@@ -109,10 +116,10 @@
                   ></span>
                   <span>{{ data.label }}</span>
                 </div>
-                <!-- <div
+                &lt;!&ndash; <div
                     v-if="data.level == 2"
                     style="width: 1.5vh;height: 1.5vh;background-color: red;border-radius: 60%;margin-top:10px;margin-left:10px;float:right"
-                  ></div> -->
+                  ></div> &ndash;&gt;
               </template>
             </el-cascader>
           </div>
@@ -126,7 +133,7 @@
             class="back"
           />
         </div>
-      </div>
+      </div>-->
     </div>
     <div class="right">
       <div class="right-cont">
@@ -219,6 +226,7 @@ import IssueListDia from "./issueListDia.vue"
 import ProjectCameraDia from "./projectCameraDia.vue";
 import UnitProjectDia from "./unitProjectDia.vue";
 import Province from "../map/province.vue";
+import Map from "../map/map.vue";
 import UnitAccess from "./unitAccess.vue";
 import UnitAccessTo from "./unitAccessto.vue";
 import CameraOnline from "./cameraOnline.vue";
@@ -248,6 +256,7 @@ export default {
     ProjectCameraDia,
     UnitProjectDia,
     Province,
+    Map,
     UnitAccess,
     UnitAccessTo,
     CameraOnline,
@@ -471,41 +480,41 @@ export default {
     },
 
     //返回操作
-    onBack() {
-      this.curDeep = 1;
-      if (this.curDeep <= 1) {
-        this.showBack = false;
-        this.showMap = true;
-        this.showLocal = false;
-        this.curCompany = [];
-      }
-      this.appOrg = "0000";
-      this.$refs.province.reloadMap(this.curDeep);
-    },
+    // onBack() {
+    //   this.curDeep = 1;
+    //   if (this.curDeep <= 1) {
+    //     this.showBack = false;
+    //     this.showMap = true;
+    //     this.showLocal = false;
+    //     this.curCompany = [];
+    //   }
+    //   this.appOrg = "0000";
+    //   this.$refs.province.reloadMap(this.curDeep);
+    // },
 
     //选择公司
-    handleCompanyChange(e) {
-      console.log(e);
-      if (e && e.length > 0) {
-        if (e[1] == "10001") {
-          this.showMap = false;
-          this.showLocal = true;
-          this.showBack = true;
-        } else {
-          this.showMap = true;
-          this.showLocal = false;
-        }
-        let appOrg = e[e.length - 1];
-        this.appOrg = appOrg;
-      }
-      if(e[1] == "1A001" || e[1] == "1A002" || e[1] == "1A004" || e[1] == "1A005"){
-        this.showMap = true;
-        this.showLocal = false;
-        this.showBack = true;
-        // return;
-      }
-      this.$refs.province.chooseUnit(e);
-    },
+    // handleCompanyChange(e) {
+    //   console.log(e);
+    //   if (e && e.length > 0) {
+    //     if (e[1] == "10001") {
+    //       this.showMap = false;
+    //       this.showLocal = true;
+    //       this.showBack = true;
+    //     } else {
+    //       this.showMap = true;
+    //       this.showLocal = false;
+    //     }
+    //     let appOrg = e[e.length - 1];
+    //     this.appOrg = appOrg;
+    //   }
+    //   if(e[1] == "1A001" || e[1] == "1A002" || e[1] == "1A004" || e[1] == "1A005"){
+    //     this.showMap = true;
+    //     this.showLocal = false;
+    //     this.showBack = true;
+    //     // return;
+    //   }
+    //   this.$refs.province.chooseUnit(e);
+    // },
   },
 };
 </script>
@@ -550,7 +559,7 @@ export default {
     }
   }
   .middle {
-    background: url('../../../assets/zhang/project_map.png') no-repeat center;
+    //background: url('../../../assets/zhang/project_map.png') no-repeat center;
     display: flex;
     flex: 1;
     align-items: center;

+ 1 - 1
src/views/screen/engineering/unitAccess.vue

@@ -16,7 +16,7 @@
               <div style="position: absolute;left: 0;height: 100%;width: 10px;border: 1px solid #00FFFF;border-right: none; "></div>
               <div style="width: 294.15px;height: 52.5px;background-image: linear-gradient(270deg, #00ffff00 0%, #00ffff1a 100%);display: flex;justify-content: space-around;align-items: center">
                 <div style="width: 96px;font-family: DingTalk-JinBuTi;font-weight: JinBuTi;font-size: 24px;color: #00FFFF;letter-spacing: 0;line-height: 32.93px;">在建项目</div>
-                <div style="font-size: 24px;color: #00FFFF;font-family: 'electronicFont'">{{ num }}<span style="font-size: 12px">个</span></div>
+                <div style="font-size: 30px;letter-spacing: 6px;color: #00FFFF;font-family: 'electronicFont'">{{ num }}<span style="font-size: 12px">个</span></div>
               </div>
 
 

+ 1 - 1
src/views/screen/engineering/unitAccessDialog.vue

@@ -24,7 +24,7 @@
               <div style="position: absolute;left: 0;height: 100%;width: 10px;border: 1px solid #00FFFF;border-right: none; "></div>
               <div style="width: 294.15px;height: 52.5px;background-image: linear-gradient(270deg, #00ffff00 0%, #00ffff1a 100%);display: flex;justify-content: space-around;align-items: center">
                 <div style="width: 96px;font-family: DingTalk-JinBuTi;font-weight: JinBuTi;font-size: 24px;color: #00FFFF;letter-spacing: 0;line-height: 32.93px;">在建项目</div>
-                <div style="font-size: 24px;color: #00FFFF;font-family: 'electronicFont'">{{ num }}<span style="font-size: 12px">个</span></div>
+                <div style="font-size: 30px;letter-spacing: 6px;color: #00FFFF;font-family: 'electronicFont'">{{ num }}<span style="font-size: 12px">个</span></div>
               </div>
             </div>
 

+ 1 - 1
src/views/screen/engineering/unitAccessto.vue

@@ -163,7 +163,7 @@ export default {
         if (Number(res.code) === 200) {
           this.monitorList = res.data;
           this.monitorList.forEach((item, index) => {
-            item.name = item.unitName;
+            item.name = item.appName;
             item.num = item.projectNum;
             item.onLineNum = item.cameraNum;
           });

+ 134 - 0
src/views/screen/map/map.vue

@@ -0,0 +1,134 @@
+<template>
+  <div style="width: 580px">
+    <div ref="charts" style="width: 100%; height: 850px"></div>
+    <img
+        id="mapBackground"
+        src="@/assets/images/main/map_bg.jpg"
+        alt=""
+        style="display: none"
+    />
+  </div>
+</template>
+
+
+<script>
+import * as echarts from "echarts";
+import shanxi from "./shanxi.json"
+let imgElement
+export default {
+  created () {},
+  mounted() {
+    this.$nextTick(() => {
+      imgElement = document.getElementById("mapBackground");
+      setTimeout(() => {
+        this.initCharts();
+      }, 500);
+    });
+  },
+  methods: {
+    initCharts() {
+      const points = [
+        { name: "太原市", coordinate: [112.4493, 37.8570], x: "1", y: "2" },
+        { name: "大同市", coordinate: [113.3002, 40.0768], x: "1", y: "2" },
+        { name: "阳泉市", coordinate: [113.5805, 37.8563], x: "1", y: "2" },
+        { name: "长治市", coordinate: [113.1163, 36.1954], x: "1", y: "2" },
+        { name: "晋城市", coordinate: [112.8513, 35.4907], x: "1", y: "2" },
+        { name: "朔州市", coordinate: [112.4329, 39.3312], x: "1", y: "2" },
+        { name: "晋中市", coordinate: [112.8527, 37.6870], x: "1", y: "2" },
+        { name: "临汾市", coordinate: [111.5186, 36.0882], x: "1", y: "2" },
+        { name: "忻州市", coordinate: [112.7341, 38.4167], x: "1", y: "2" },
+        { name: "运城市", coordinate: [111.0069, 35.0264], x: "1", y: "2" },
+        { name: "吕梁市", coordinate: [111.1443, 37.5183], x: "1", y: "2" }
+      ];
+      const charts = echarts.init(this.$refs["charts"]);
+      const option = {
+        // 设置背景颜色,"transparent" 表示透明背景
+        backgroundColor: "transparent",
+
+        // 提示浮窗(Tooltip)配置
+        tooltip: {
+          show: true, // 是否显示 tooltip
+          trigger: "item", // 触发类型,"item" 表示鼠标悬浮在图形上时触发
+          formatter: (params) => // 格式化提示框内容
+              params.seriesType === "scatter"
+                  ? `在建项目:${params.data.x}<br/>施工项目:${params.data.y}`
+                  : params.name, // 如果是 scatter 图表,显示额外数据,否则显示地区名称
+          backgroundColor: "rgba(5,13,21,0.25)", // 提示框背景颜色(半透明黑色)
+          borderColor: "rgba(0, 0, 0, 0.16)", // 边框颜色
+          triggerOn: "mousemove", // 鼠标移动时触发
+          enterable: true, // 允许鼠标移动到 tooltip 内部(适用于可点击 tooltip)
+          textStyle: {
+            color: "#fff", // 文字颜色
+            fontSize: 12, // 字体大小
+            overflow: "break", // 文字超出时换行
+          },
+          padding: 3, // 提示框内边距
+        },
+
+        // 地理坐标系组件(用于地图绘制)
+        geo: {
+          map: "shanxi", // 使用 "shanxi" 地图
+          zoom: 1.1, // 初始缩放比例(可调整地图大小)
+          itemStyle: {
+            borderColor: "#11F6F2", // 地图区域边界颜色
+            borderWidth: 5, // 边界宽度
+            shadowColor: "#0E7683", // 地图阴影颜色
+            shadowBlur: 0, // 阴影模糊度
+            shadowOffsetX: 5, // 阴影水平偏移
+            shadowOffsetY: 13, // 阴影垂直偏移
+          },
+          layoutCenter: ["50%", "50%"], // 控制地图的中心位置
+        },
+
+        // 图表数据系列(series)
+        series: [
+          {
+            type: "map", // 地图类型
+            map: "shanxi", // 绑定的地图名称(与 `geo` 对应)
+            zoom: 1.1, // 缩放级别
+            itemStyle: {
+              areaColor: { image: imgElement, repeat: "no-repeat" }, // 地图区域背景颜色(使用图片填充)
+              borderColor: "#11F4F0", // 地图边界颜色
+              borderWidth: 1, // 地图边界宽度
+            },
+            emphasis: {
+              itemStyle: {
+                areaColor: "#0D7481", // 鼠标悬浮时的区域颜色
+              },
+            },
+            select: { disabled: true }, // 禁用地图的选中状态,防止点击后颜色锁定
+            label: {
+              show: true, // 显示区域名称
+              color: "#FFF", // 文字颜色
+              fontSize: 16, // 文字大小
+              fontWeight: 600, // 字重
+              emphasis: { color: "#fff" }, // 悬浮时的文字颜色
+            },
+          },
+
+          {
+            type: "scatter", // 散点图(用于标注特殊位置)
+            coordinateSystem: "geo", // 使用 `geo` 作为坐标系
+            symbol: "image://" + require("@/assets/zhang/myMap/projectPosition.png"), // 自定义标记(图片)
+            symbolSize: [30, 20], // 标记大小(宽 30,高 20)
+            data: points.map(({ name, coordinate, x, y }) => ({
+              name, // 点名称
+              value: coordinate, // 经纬度坐标
+              x, // 额外数据(在建项目数)
+              y, // 额外数据(施工项目数)
+            })),
+          },
+        ],
+      };
+      // 地图注册,第一个参数的名字必须和option.geo.map一致
+      echarts.registerMap("shanxi",shanxi)
+
+      charts.setOption(option);
+    },
+  },
+};
+</script>
+
+<style scoped>
+
+</style>

+ 280 - 0
src/views/screen/map/mapTwo.vue

@@ -0,0 +1,280 @@
+<template>
+  <div style="width: 580px">
+    <div ref="charts" style="width: 100%;height: 900px;margin-top: -120px"></div>
+    <img
+        id="mapBackground"
+        src="@/assets/images/main/map_bg.jpg"
+        alt=""
+        style="display: none"
+    />
+    <img
+      v-if="showBack"
+      @click="beBack"
+      src="@/assets/images/main/back.png"
+      style="width: 34px;height: 30px;cursor: pointer;position: absolute;right: 50px;bottom: 50px;"
+    />
+  </div>
+</template>
+
+
+<script>
+import * as echarts from "echarts";
+import shanxi from "./shanxi.json"
+import 大同市 from '@/views/screen/map/大同市.json'
+import 朔州市 from '@/views/screen/map/朔州市.json'
+import 忻州市 from '@/views/screen/map/忻州市.json'
+import 吕梁市 from '@/views/screen/map/吕梁市.json'
+import 太原市 from '@/views/screen/map/太原市.json'
+import 阳泉市 from '@/views/screen/map/阳泉市.json'
+import 晋中市 from '@/views/screen/map/晋中市.json'
+import 临汾市 from '@/views/screen/map/临汾市.json'
+import 长治市 from '@/views/screen/map/长治市.json'
+import 运城市 from '@/views/screen/map/运城市.json'
+import 晋城市 from '@/views/screen/map/晋城市.json'
+let imgElement
+export default {
+  data() {
+    return {
+      showBack: false,
+      dataSource: {
+        大同市: 大同市,
+        朔州市: 朔州市,
+        忻州市: 忻州市,
+        吕梁市: 吕梁市,
+        太原市: 太原市,
+        阳泉市: 阳泉市,
+        晋中市: 晋中市,
+        临汾市: 临汾市,
+        长治市: 长治市,
+        运城市: 运城市,
+        晋城市: 晋城市,
+      }
+    }
+  },
+  created () {},
+  mounted() {
+    this.$nextTick(() => {
+      imgElement = document.getElementById("mapBackground");
+      setTimeout(() => {
+        this.initCharts();
+      }, 500);
+    });
+  },
+  methods: {
+    initCharts() {
+      const area = [
+        { name: "太原市", appOrg: "1A003" },
+        { name: "大同市", appOrg: "1B001" },
+        { name: "阳泉市", appOrg: "1C001" },
+        { name: "长治市", appOrg: "1D001" },
+        { name: "晋城市", appOrg: "1E001" },
+        { name: "朔州市", appOrg: "1F001" },
+        { name: "晋中市", appOrg: "1K001" },
+        { name: "临汾市", appOrg: "1L001" },
+        { name: "忻州市", appOrg: "1H001" },
+        { name: "运城市", appOrg: "1M001" },
+        { name: "吕梁市", appOrg: "1J001" }
+      ];
+      const points = [
+        { name: "太原市", coordinate: [112.4493, 37.6570], x: "399", y: "2" },
+        { name: "大同市", coordinate: [113.3002, 40.0768], x: "399", y: "2" },
+        { name: "阳泉市", coordinate: [113.6805, 37.7863], x: "399", y: "2" },
+        { name: "长治市", coordinate: [113.1163, 36.1954], x: "399", y: "2" },
+        { name: "晋城市", coordinate: [113.1513, 35.5907], x: "399", y: "2" },
+        { name: "朔州市", coordinate: [112.4329, 39.5312], x: "399", y: "2" },
+        { name: "晋中市", coordinate: [112.8527, 37.5870], x: "399", y: "2" },
+        { name: "临汾市", coordinate: [111.5186, 35.8582], x: "399", y: "2" },
+        { name: "忻州市", coordinate: [112.7341, 38.4167], x: "399", y: "2" },
+        { name: "运城市", coordinate: [110.9069, 34.9264], x: "399", y: "2" },
+        { name: "吕梁市", coordinate: [111.1443, 37.4183], x: "399", y: "2" }
+      ];
+      const charts = echarts.init(this.$refs["charts"]);
+      const option = {
+        // 设置背景颜色,"transparent" 表示透明背景
+        backgroundColor: "transparent",
+
+        // 提示浮窗(Tooltip)配置
+        tooltip: {
+          show: true, // 是否显示 tooltip
+          trigger: "item", // 触发类型,"item" 表示鼠标悬浮在图形上时触发
+          formatter: `{b}`,
+          backgroundColor: "rgba(5,13,21,0.25)", // 提示框背景颜色(半透明黑色)
+          borderColor: "rgba(0, 0, 0, 0.16)", // 边框颜色
+          triggerOn: "mousemove", // 鼠标移动时触发
+          enterable: true, // 允许鼠标移动到 tooltip 内部(适用于可点击 tooltip)
+          textStyle: {
+            color: "#fff", // 文字颜色
+            fontSize: 12, // 字体大小
+            overflow: "break", // 文字超出时换行
+          },
+          padding: 3, // 提示框内边距
+        },
+
+        // 地理坐标系组件(用于地图绘制)
+        geo: {
+          map: "shanxi", // 使用 "shanxi" 地图
+          zoom: 1.1, // 初始缩放比例(可调整地图大小)
+          itemStyle: {
+            borderColor: "#11F6F2", // 地图区域边界颜色
+            borderWidth: 5, // 边界宽度
+            shadowColor: "#0E7683", // 地图阴影颜色
+            shadowBlur: 0, // 阴影模糊度
+            shadowOffsetX: 5, // 阴影水平偏移
+            shadowOffsetY: 13, // 阴影垂直偏移
+          },
+          layoutCenter: ["50%", "50%"], // 控制地图的中心位置
+        },
+
+        // 图表数据系列(series)
+        series: [
+          {
+            type: "map", // 地图类型
+            map: "shanxi", // 绑定的地图名称(与 `geo` 对应)
+            zoom: 1.1, // 缩放级别
+            itemStyle: {
+              areaColor: { image: imgElement, repeat: "no-repeat" }, // 地图区域背景颜色(使用图片填充)
+              borderColor: "#11F4F0", // 地图边界颜色
+              borderWidth: 1, // 地图边界宽度
+            },
+            emphasis: {
+              itemStyle: {
+                areaColor: "#0D7481", // 鼠标悬浮时的区域颜色
+              },
+            },
+            select: { disabled: true }, // 禁用地图的选中状态,防止点击后颜色锁定
+            label: {
+              show: true, // 显示区域名称
+              color: "#FFF", // 文字颜色
+              fontSize: 16, // 文字大小
+              fontWeight: 600, // 字重
+              emphasis: { color: "#fff" }, // 悬浮时的文字颜色
+            },
+            data: area
+          },
+
+          {
+            type: "scatter", // 散点图(用于标注特殊位置)
+            coordinateSystem: "geo", // 使用 `geo` 作为坐标系
+            symbol: "image://" + require("@/assets/zhang/myMap/carPosition.png"), // 自定义标记(图片)
+            symbolSize: [20, 30], // 标记大小(宽 30,高 20)
+            label: {
+              show: true, // 显示数字
+              position: "top", // 数字显示在图标的正上方
+              color: "#fff", // 文字颜色(白色)
+              fontSize: 14, // 字体大小
+              offset: [0, 10],
+              fontWeight: "bold", // 加粗
+              backgroundColor: "rgba(147,245,245,0.35)", // 文字背景色(可选)
+              padding: [2, 5], // 文字内边距(可选)
+              borderRadius: 2, // 文字框圆角(可选)
+            },
+            data: points.map(({ name, coordinate, x, y }) => ({
+              name, // 点名称
+              value: coordinate, // 经纬度坐标
+              label: { formatter: `${x}` }, // 显示 `x` 数据(可换成 y)
+              x, // 额外数据(在建项目数)
+              y, // 额外数据(施工项目数)
+            })),
+          },
+        ],
+      };
+      // 地图注册,第一个参数的名字必须和option.geo.map一致
+      echarts.registerMap("shanxi",shanxi)
+      charts.setOption(option);
+      // 监听点击事件
+      charts.on("click", (params) => {
+        if (params.componentType === "geo") {
+          // 点击的是地图区域
+          console.log("Clicked map area: ", params.name);
+        } else if (params.componentType === "series") {
+          // 点击的是自定义图标(scatter)
+          console.log("Clicked scatter point: ", params.name, params.data.appOrg);
+          // 销毁当前图表实例
+          charts.dispose();
+          // 重新初始化并设置新的配置项
+          this.$nextTick(() => {
+            this.initChildren(params.name) // 重新初始化图表
+            this.showBack = true
+          });
+        }
+      });
+    },
+    initChildren(cityName){
+      const charts = echarts.init(this.$refs["charts"]);
+      const option = {
+        // 设置背景颜色,"transparent" 表示透明背景
+        backgroundColor: "transparent",
+
+        // 提示浮窗(Tooltip)配置
+        tooltip: {
+          show: true, // 是否显示 tooltip
+          trigger: "item", // 触发类型,"item" 表示鼠标悬浮在图形上时触发
+          formatter: `{b}`,
+          backgroundColor: "rgba(5,13,21,0.25)", // 提示框背景颜色(半透明黑色)
+          borderColor: "rgba(0, 0, 0, 0.16)", // 边框颜色
+          triggerOn: "mousemove", // 鼠标移动时触发
+          enterable: true, // 允许鼠标移动到 tooltip 内部(适用于可点击 tooltip)
+          textStyle: {
+            color: "#fff", // 文字颜色
+            fontSize: 12, // 字体大小
+            overflow: "break", // 文字超出时换行
+          },
+          padding: 3, // 提示框内边距
+        },
+
+        // 地理坐标系组件(用于地图绘制)
+        geo: {
+          map: "child", // 使用 "shanxi" 地图
+          zoom: 1.1, // 初始缩放比例(可调整地图大小)
+          itemStyle: {
+            borderColor: "#11F6F2", // 地图区域边界颜色
+            borderWidth: 5, // 边界宽度
+            shadowColor: "#0E7683", // 地图阴影颜色
+            shadowBlur: 0, // 阴影模糊度
+            shadowOffsetX: 5, // 阴影水平偏移
+            shadowOffsetY: 13, // 阴影垂直偏移
+          },
+          layoutCenter: ["50%", "50%"], // 控制地图的中心位置
+        },
+
+        // 图表数据系列(series)
+        series: [
+          {
+            type: "map", // 地图类型
+            map: "child", // 绑定的地图名称(与 `geo` 对应)
+            zoom: 1.1, // 缩放级别
+            itemStyle: {
+              areaColor: { image: imgElement, repeat: "no-repeat" }, // 地图区域背景颜色(使用图片填充)
+              borderColor: "#11F4F0", // 地图边界颜色
+              borderWidth: 1, // 地图边界宽度
+            },
+            emphasis: {
+              itemStyle: {
+                areaColor: "#0D7481", // 鼠标悬浮时的区域颜色
+              },
+            },
+            select: { disabled: true }, // 禁用地图的选中状态,防止点击后颜色锁定
+            label: {
+              show: true, // 显示区域名称
+              color: "#FFF", // 文字颜色
+              fontSize: 16, // 文字大小
+              fontWeight: 600, // 字重
+              emphasis: { color: "#fff" }, // 悬浮时的文字颜色
+            },
+          }
+        ]
+      };
+      echarts.registerMap("child", this.dataSource[cityName])
+      charts.setOption(option);
+    },
+    beBack(){
+      this.initCharts()
+      this.showBack = false
+    }
+  },
+};
+</script>
+
+<style scoped>
+
+</style>

+ 1 - 1
src/views/screen/map/province.vue

@@ -755,7 +755,7 @@ export default {
               show: false,
               color: "#fff",
             },
-            symbol: this.deep <= 1 
+            symbol: this.deep <= 1
               ? "image://" + require("@/assets/images/build_icon.png")
               : "",
             symbolSize: this.deep <= 1 ? 40 : 0,

+ 10 - 7
src/views/screen/official/main.vue

@@ -38,14 +38,15 @@
       </div>
     </div>
     <div class="middle" style="">
-      <img
+      <MapTwo></MapTwo>
+<!--      <img
         v-if="showLocal"
         class="build"
         src="@/assets/images/build.png"
         alt=""
-      />
+      />-->
       <!-- 返回按钮 -->
-      <div class="bottom-area flex-row align-items-center space-between">
+<!--      <div class="bottom-area flex-row align-items-center space-between">
         <div class="bottom-left flex-row align-items-center">
           <div class="left-item">
             <el-cascader
@@ -97,10 +98,10 @@
                   ></span>
                   <span>{{ data.label }}</span>
                 </div>
-                <!-- <div
+                &lt;!&ndash; <div
                     v-if="data.level == 2"
                     style="width: 1.5vh;height: 1.5vh;background-color: red;border-radius: 60%;margin-top:10px;margin-left:10px;float:right"
-                  ></div> -->
+                  ></div> &ndash;&gt;
               </template>
             </el-cascader>
           </div>
@@ -114,7 +115,7 @@
             class="back"
           />
         </div>
-      </div>
+      </div>-->
     </div>
     <div class="right">
       <div class="right-cont" v-if="rightShow">
@@ -191,11 +192,13 @@ import company from "@/views/screen/data/company.json";
 import CarCost from '@/views/screen/official/carCost.vue'
 import CarHealth from '@/views/screen/official/carHealth.vue'
 import CarStockDialog from "@/views/screen/logistics/car/carStockDialog.vue";
+import MapTwo from '@/views/screen/map/mapTwo.vue'
 
 
 export default {
   name: "OfficialMain",
   components: {
+    MapTwo,
     CarHealth,
     CarCost,
     ResourceList,
@@ -416,7 +419,7 @@ export default {
     }
   }
   .middle {
-    background: url('../../../assets/zhang/public_map.png') no-repeat center;
+    //background: url('../../../assets/zhang/public_map.png') no-repeat center;
     display: flex;
     flex: 1;
     align-items: center;