Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-aff...

shuishen

2023-01-09 65162db42fbc2426f9a10b0eb8d948e819a042ff

 src/views/home/components/leftContainer.vue

@@ -349,7 +349,10 @@
                tooltip: {
                    trigger: 'item',
                    formatter: ' <span style="display: inline-block; margin-right: 4px; border-radius: 10px; width: 10px; height: 10px;background-color: #91cc75;"></span> {b0}<strong style="margin-left:10px">{c0}人</strong>',
                    backgroundColor: 'rgba(8, 56, 185, 0.9)',
                    borderColor: 'rgba(8, 56, 185, 0.9)',
                    textStyle: {
                        color: '#fff',
                        fontSize: fontSize(14)
                    }
                },
@@ -462,7 +465,10 @@
                        msg = `${params.marker}${params.name}<strong style="margin-left:10px">${msg}</strong>'`
                        return msg
                    },
                    backgroundColor: 'rgba(8, 56, 185, 0.9)',
                    borderColor: 'rgba(8, 56, 185, 0.9)',
                    textStyle: {
                        color: '#fff',
                        fontSize: fontSize(14)
                    }
                },
@@ -506,10 +512,11 @@
                        itemStyle: {
                            normal: {
                                barBorderRadius: [0, 30, 30, 0],
                                color: function (params) {
                                    var num = myColor.length
                                    return myColor[params.dataIndex % num]
                                },
                                //     color: function (params) {
                                //         var num = myColor.length
                                //         return myColor[params.dataIndex % num]
                                //     },
                                color: '#ed7c2f'
                            }
                        },
                    },
@@ -574,7 +581,10 @@
                    formatter: params => {
                        return `${params.marker} ${params.name}: ${params.value} 个`
                    },
                    backgroundColor: 'rgba(8, 56, 185, 0.9)',
                    borderColor: 'rgba(8, 56, 185, 0.9)',
                    textStyle: {
                        color: '#fff',
                        fontSize: fontSize(14)
                    }
                },
@@ -612,10 +622,10 @@
                        itemStyle: {
                            normal: {
                                barBorderRadius: [30, 30, 0, 0],
                                color: function (params) {
                                    var num = Math.floor(Math.random() * (myLandColors.length - 1) + 1)
                                    return myLandColors[params.dataIndex % num]
                                },
                                // color: function (params) {
                                //     var num = Math.floor(Math.random() * (myLandColors.length - 1) + 1)
                                //     return myLandColors[params.dataIndex % num]
                                // },
                            }
                        },
                    }