Merge branch 'dev' into pr@dev_station_msg

frontend/src/views/chart/chart/table/table-info.js

@@ -145,6 +145,7 @@ export function baseTableInfo(s2, container, chart, action, tableData) {
 
 export function baseTableNormal(s2, container, chart, action, tableData) {
   const containerDom = document.getElementById(container)
+  if(!containerDom) return
 
   // fields
   const fields = chart.data.fields

frontend/src/views/chart/components/ChartComponent.vue

@@ -167,6 +167,9 @@ export default {
   destroyed() {
     this.myChart.dispose()
   },
+  created() {
+    this.loadThemeStyle()
+  },
   methods: {
     reDrawView() {
       this.myChart.dispatchAction({ type: 'unselect', seriesIndex: this.linkageActiveParam.seriesIndex, name: this.linkageActiveParam.name })
@@ -213,6 +216,21 @@ export default {
         })
       })
     },
+    loadThemeStyle() {
+      let themeStyle = null
+      if (this.themeStyle) {
+        themeStyle = JSON.parse(JSON.stringify(this.themeStyle))
+        if (themeStyle && themeStyle.backgroundColorSelect) {
+          const panelColor = themeStyle.color
+          if (panelColor !== '#FFFFFF') {
+            const reverseValue = reverseColor(panelColor)
+            this.buttonTextColor = reverseValue
+          } else {
+            this.buttonTextColor = null
+          }
+        }
+      }
+    },
     drawEcharts(activeParam) {
       const chart = this.chart
       let chart_option = {}

frontend/src/views/chart/components/senior/MapMapping.vue

@@ -215,16 +215,17 @@ export default {
         })
       }
       const cCode = this.currentAreaCode
+      if(!cCode) return
       if (this.$store.getters.geoMap[cCode]) {
         const json = this.$store.getters.geoMap[cCode]
-        innerCallBack(json, cCode)
+        json && innerCallBack(json, cCode)
       } else {
         geoJson(cCode).then(res => {
           this.$store.dispatch('map/setGeo', {
             key: cCode,
             value: res
           }).then(() => {
-            innerCallBack(res, cCode)
+            res && innerCallBack(res, cCode)
           })
         })
       }