Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-operate-ui/src/views/project/overview/index.vue

@@ -419,7 +419,6 @@ export default {
   },
   methods: {
     getAllRecord(page){
-      console.log(this.$store.state)
       this.recordParams.userId = this.$store.state.user.userId
       if(page){
         this.recordParams.pageNum = 1;
@@ -516,8 +515,8 @@ export default {
                 }
             })
             this.$nextTick(()=>{
-          console.log(this.viewData4)
-
+              let chartDom1 = document.getElementById("drawChinese")
+              this.myChart4 = echarts.init(chartDom1)
               this.initChart4()
             })
           }
@@ -627,10 +626,10 @@ export default {
 
     },
     initChart2(){
-      //储备项目统计
+      //储备项目资金来源统计
       let data =[]
       this.viewData2.length>0&&this.viewData2.map(item=>{
-        data.push({value:item.totalAmount,name:item.amountSource})
+        data.push({value:item.totalAmount,name:item.amountSource+'金额（万元）'})
       })
       let option1 = {
         tooltip: {
@@ -753,18 +752,21 @@ export default {
     },
     //中国地图
     initChart4(){
-      let chartDom1 = document.getElementById("drawChinese")
-      this.myChart4 = echarts.init(chartDom1)
-      let _this = this
       // 指定图表的配置项和数据
       // 绘制图表
+      let data =[]
+      this.viewData4.length>0&&this.viewData4.map(item=>{
+        data.push({value:item.count,name:item.name,money:item.money})
+      })
       let options = {
         tooltip: {
           trigger: 'item',
           show: true,
           formatter: function(params) {
-            console.dir(params )
-            return `${params.value}`
+            return `<span style="color:rgba(35, 35, 35, 1);font-size:14px;">${params.name}</span><br>
+            <span style="color:#3D3D3D;font-size:12px;">招标数量</span><span style="color:#3D3D3D;font-size:12px;font-weight:700;">  ${params.value}</span><br>
+            <span style="color:#3D3D3D;font-size:12px;">总投资(万元)</span><span style="color:#3D3D3D;font-size:12px;font-weight:700;">  ${params.data.money}</span><br>
+            `
           }
         },
         // 左侧小导航图标
@@ -774,7 +776,7 @@ export default {
           y: 'center',
           min: 0,
           max: 830000,
-          color: ['#DDECFF', '#ADD4FF']
+          color: ['#D1E6FF']
         },
         selectedMode: 'single',
         series: [{
@@ -783,15 +785,11 @@ export default {
           mapType: 'china',
           roam: false,
           zoom: 1.2,
-          
           label: {
             normal: {
               show: false, // 省份名称
             },
-            emphasis: {
-              show: true,
-              textStyle:{color:"#FFFFFF", fontSize: '10'}//省份标签字体颜色
-            }
+            
           },
           itemStyle: {
             normal: { // 未选中状态
@@ -802,25 +800,19 @@ export default {
               }
             },
             emphasis: { // 也是选中样式
-              areaColor: '#0081FF',
-              label: {
-                show: true,
-                textStyle: {
-                  color: '#FFFFFF'
-                }
-              }
+              areaColor: '#FDD85E',
             }
           },
-          data: this.viewData4
+          data: data
         }]
       }
-      _this.myChart4.setOption(options)
+      this.myChart4.setOption(options)
     },
     initChart5(){
-      //储备项目统计
+      //公招项目投资金额统计
       let data =[]
       this.viewData5.length>0&&this.viewData5.map(item=>{
-        data.push({value:item.count,name:item.rangeName})
+        data.push({value:item.count,name:item.rangeName+'招标数量（个）'})
       })
       let option1 = {
         tooltip: {