地图优化

env/.env.dev

@@ -5,4 +5,6 @@ VITE_BUILD_MODE = 'dev'
 # 开发环境接口地址
 VITE_API_URL = '/proxyApi'
 # 代理地址
-VITE_proxyTarget = "http://10.40.92.229:8080"
+VITE_proxyTarget = "http://10.40.92.64:9501/"
+
+

src/components/customCom/equipmentLeasing.vue

@@ -254,7 +254,7 @@ onBeforeMount(()=>{
     width: 46px;
     height: 59px;
     position: absolute;
-    right: 402px;
+    right: 280px;
     bottom: 6px;
     img{
         width: 46px;
@@ -271,7 +271,8 @@ onBeforeMount(()=>{
 
 .e_content {
     display: flex;
-    justify-content: flex-start;
+    justify-content: center;
+
 }
 
 .left_nav_list {
@@ -302,7 +303,7 @@ onBeforeMount(()=>{
     display: flex;
     justify-content: flex-start;
     position: absolute;
-    left: 40px;
+    left: 100px;
     bottom: 16px;
     .out_dot1,
     .out_dot2,

src/components/echartsCom/barCom.vue

@@ -116,6 +116,12 @@ const propsVal = defineProps({
         type: String,
         default: ""
     },
+    tooltipProps:{
+        type: Object,
+        default: {
+
+        }
+    },
     formatCallBack: {//提示数据格式化
         type: Function,
         default: () => { }
@@ -169,6 +175,10 @@ const handleSeriesData = () => {
 const option = {
     tooltip: {
         trigger: "axis",
+        backgroundColor:"rgba(255,255,255,0)",
+        borderColor:'rgba(255,255,255,0)',
+        shadowBlur: 0,
+        shadowColor: 'rgba(0, 0, 0, 0)'
     },
     title: {
         text: propsVal.title,

src/http/api/myInfo.ts

@@ -1,9 +1,11 @@
-import { post } from '../index'
+import { get, post } from '../index'
 
-export function apiTest() {
+export function apiTest1() {
     return post('system/user/getInfo', {})
 }
-
+export function apiTest() {
+    return get('maLeaseInfo/type-list', {})
+}
 export function apiNoticeAdd() {
     return post('system/notice/add', {
         "noticeTitle": "测试",

src/views/screen/sharePlatform.vue

@@ -115,6 +115,7 @@
                             :seriseData="barComProps.seriseData" :emphasisItemStyle="barComProps.emphasisItemStyle"
                             :itemStyle="barComProps.itemStyle" :stackFlag="barComProps.stackFlag"
                             :stackLabel="barComProps.stackLabel" :borderRadius="barComProps.borderRadius"
+                            :tooltipProps="barComProps.tooltipProps"
                             :barWidth="barComProps.barWidth" :formatCallBack="barComProps.formatCallBack"></barCom>
                     </div>
                     <div class="bottom_row_center_bar_right">
@@ -124,7 +125,8 @@
                             :emphasisItemStyle="barComPropsSimple.emphasisItemStyle"
                             :itemStyle="barComPropsSimple.itemStyle" :stackFlag="barComPropsSimple.stackFlag"
                             :stackLabel="barComPropsSimple.stackLabel" :borderRadius="barComPropsSimple.borderRadius"
-                            :barWidth="barComProps.barWidth" :formatCallBack="barComPropsSimple.formatCallBack"></barCom>
+                            :tooltipProps="barComPropsSimple.tooltipProps"
+                            :barWidth="barComPropsSimple.barWidth" :formatCallBack="barComPropsSimple.formatCallBack"></barCom>
                     </div>
                 </div>
             </div>
@@ -141,6 +143,7 @@
                         :itemStyle="barComPropsHorizontal.itemStyle" :stackFlag="barComPropsHorizontal.stackFlag"
                         :stackLabel="barComPropsHorizontal.stackLabel" :borderRadius="barComPropsHorizontal.borderRadius"
                         :itemBackgroundStyle="barComPropsHorizontal.itemBackgroundStyle"
+                        :tooltipProps="barComPropsHorizontal.tooltipProps"
                         :formatCallBack="barComPropsHorizontal.formatCallBack"> </barCom>
                 </div>
 
@@ -222,15 +225,22 @@ const barComProps = reactive({
     stackLabel: {
         show: true,
         position: 'top',
-        color: "rgba(255,255,255,0.4)"
+        color: "rgba(255,255,255,0.5)"
     },
     borderRadius: 0,
     barWidth: 14,
+    tooltipProps: {
+        trigger: "axis",
+        backgroundColor:"rgba(255,255,255,0)",
+        borderColor:'rgba(255,255,255,0)',
+        shadowBlur: 0,
+        shadowColor: 'rgba(0, 0, 0, 0)'
+    },
     formatCallBack: (params: any) => {
         if (!params || params.length == 0 || !Array.isArray(params)) return
         let fromatStr = ""
         params.forEach((ele: any) => {
-            fromatStr += '<div style="border-bottom:1px solid #ccc;"><span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:' + ele.color + '"></span>' + ele.data + "</div>"
+            fromatStr += '<div style="<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:rgba(255,255,255,0);color:#fff;"></span> <span style="color:#fff;">'+ele.data+'</span>' + "</div>"
         })
         return fromatStr
     }
@@ -270,11 +280,18 @@ const barComPropsSimple = reactive({
     },
     borderRadius: 4,
     barWidth: 14,
+    tooltipProps: {
+        trigger: "axis",
+        backgroundColor:"rgba(255,255,255,0)",
+        borderColor:'rgba(255,255,255,0)',
+        shadowBlur: 0,
+        shadowColor: 'rgba(0, 0, 0, 0)'
+    },
     formatCallBack: (params: any) => {
         if (!params || params.length == 0 || !Array.isArray(params)) return
         let fromatStr = ""
         params.forEach((ele: any) => {
-            fromatStr += '<div style="border-bottom:1px solid #ccc;"><span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:' + ele.color + '"></span>' + ele.data + "</div>"
+            fromatStr += '<div style="<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:rgba(255,255,255,0);color:#fff;"></span> <span style="color:#fff;">'+ele.data+'</span>' + "</div>"
         })
         return fromatStr
     }
@@ -315,11 +332,18 @@ const barComPropsHorizontal = reactive({
     borderRadius: 0,
     barWidth: 14,
     itemBackgroundStyle:"rgba(255,255,255,0.05)",
+    tooltipProps: {
+        trigger: "axis",
+        backgroundColor:"rgba(255,255,255,0)",
+        borderColor:'rgba(255,255,255,0)',
+        shadowBlur: 0,
+        shadowColor: 'rgba(0, 0, 0, 0)'
+    },
     formatCallBack: (params: any) => {
         if (!params || params.length == 0 || !Array.isArray(params)) return
         let fromatStr = ""
         params.forEach((ele: any) => {
-            fromatStr += '<div style="border-bottom:1px solid #ccc;"><span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:' + ele.color + '"></span>' + ele.data + "</div>"
+            fromatStr += '<div style="<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:rgba(255,255,255,0);color:#fff;"></span> <span style="color:#fff;">'+ele.data+'</span>' + "</div>"
         })
         return fromatStr
     }