Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/components/Viewer/smViewer.scss

@@ -36,7 +36,7 @@
     font-size: 20px;
     z-index: 98;
     cursor: pointer;
-    z-index: 9999;
+    z-index: 101;
 }
 
 .cesium-viewer-timelineContainer {

src/views/cockpit/common/DiscountedAColumnar.vue

@@ -72,18 +72,41 @@ export default {
             echarts.graphic.registerShape('CubeTop', CubeTop)
             // 数据
             const VALUE = [210.9, 260.8, 204.2, 504.9, 740.5]
+            const VALUE_line = [10, 45, 78, 6, 3]
+
             let option = {
                 //你的代码
                 backgroundColor: 'rgba(17, 42, 62, 0)',//"#012366",
+                // tooltip: {
+                //     show:true,
+                //     trigger: 'axis',
+                //     axisPointer: {
+                //         type: 'shadow'
+                //     },
+                //     formatter: function (params) {
+                //         console.log('params: ', params);
+                //         const item = params[1]
+                //         return item.name + "\n" + item.value;
+                //     }
+                // },
                 tooltip: {
-                    show:false,
-                    trigger: 'axis',
-                    axisPointer: {
-                        type: 'shadow'
-                    },
-                    formatter: function (params) {
-                        const item = params[1]
-                        return item.name + "\n" + item.value;
+                    backgroundColor: 'RGBA(20, 106, 178, 0.4)',
+                    trigger: "axis",
+                    textStyle: { fontSize: '100%' },
+                    formatter: params => {
+                        console.log('params: ', params);
+                        let rander = params.map(item =>
+                            `
+                        
+                    <div style='
+                        border:none;
+                        border-radius:3px;
+                        color:#FFF;
+                        font-size:12px
+                        '>
+                            ${item.seriesName}: ${item.value}
+                    </div>`).join('')
+                        return rander
                     }
                 },
                 grid: {
@@ -176,6 +199,7 @@ export default {
                     },],
                 series: [
                     {
+                        name: "临时用地",
                         type: 'custom',
                         renderItem: (params, api) => {
                             const location = api.coord([api.value(0), api.value(1)])
@@ -268,6 +292,7 @@ export default {
                         data: VALUE
                     },
                     {
+                        name: "项目个数",
                         type: 'line',
                         smooth: true,
                         itemStyle: {
@@ -275,7 +300,7 @@ export default {
                                 color: '#FFCC64'  // 折线的颜色
                             }
                         },
-                        data: VALUE,
+                        data: VALUE_line,
                     },
                 ]
             };

src/views/cockpit/hysy.vue

@@ -252,8 +252,8 @@ export default {
                         type: 'pie',
                         itemStyle: {
                             normal: {
-                                borderWidth: 2,
-                                borderColor: "#030d22"
+                                borderWidth: 1,
+                                borderColor: "#5ecef09a"
                             }
                         },
                         radius: ['38%', '50%'],

src/views/map3d.vue

@@ -137,18 +137,6 @@ export default {
     handleMenuSelect(item) {
       this.$router.push({ path: item });
 
-      // if (item == "/checkmodel") {
-      //   store.setToolBarShow(true); //显示工具栏
-      //   // this.$refs.routeViewRef["switch"]();
-
-      // } else {
-      //   store.setToolBarShow(false); //显示工具栏
-      //   // this.$refs.routeViewRef["switch"]();
-
-      // }
-
-
-
 
 
       // 菜单切换的时候取消左或者右高亮菜单
@@ -185,6 +173,7 @@ export default {
       this.$router.push({ path: item.path });
     },
     GetRouters() {
+ 
       getRouters().then((res) => {
 
         this.menu_left = res.data[0].children.slice(0, 3);