fix:悬浮框样式更新

src/components/Customize/HorizontalHistogram.vue

@@ -218,7 +218,6 @@ export default {
               align: `left`,
               fontSize: `80%`,
               formatter: function (params) {
-                console.log(params)
                 return params.data.name
               },
             },

src/components/Customize/map/index.vue

@@ -393,7 +393,6 @@ export default {
       myChart.setOption(this.option)
       myChart.on(`click`, function (params) {
         const idx = params.dataIndex
-        console.log(that)
         that.$emit(`toView`, params.data.adcode)
       })
     },

src/components/Customize/wavyLineChart.vue

@@ -88,30 +88,63 @@ export default {
           backgroundColor: `rgba(9,40,84,0.8)`,
           borderColor: `rgba(9,40,84,0.8)`,
           textStyle: {
-            fontSize: 20,
+            fontSize: 17,
             color: `#fff`,
           },
           axisPointer: {
             type: `shadow`,
           },
           formatter: function (params) {
-            console.log(params)
-            return [
-              params[0].axisValue +
-                `<i style="padding:0 6px"></i> ` +
-                params[0].value +
-                `<i style="padding:0 12px"></i> ` +
-                `较上日` +
-                `<i style="padding:0 6px"></i> ` +
-                params[2].value,
-              params[1].axisValue +
-                `<i style="padding:0 6px"></i> ` +
-                params[1].value +
-                `<i style="padding:0 12px"></i> ` +
-                `较去年` +
-                `<i style="padding:0 6px"></i> ` +
-                params[3].value,
-            ].join(`<br>`)
+            const temMarkerStyle =
+              `display: inline-block; width: 14px; height: 14px;border-radius:14px; margin-right:3px; background-color: ` +
+              params[0].color +
+              `;`
+            const humMarkerStyle =
+              `display: inline-block; width: 14px; height: 14px; margin-right:3px;border-radius:14px; background-color: ` +
+              params[1].color +
+              `;`
+            if (params.length > 2) {
+              let name = `较上日`
+              if (params[0].axisValue.length > 4) {
+                name = `较上月`
+              }
+              let name1 = `较上月`
+              if (params[0].axisValue.length > 4) {
+                name1 = `较去年`
+              }
+              return [
+                `${`<span style="` + temMarkerStyle + `"></span>`}` +
+                  params[0].axisValue +
+                  `<i style="padding:0 6px"></i> ` +
+                  params[0].value +
+                  `<i style="padding:0 12px"></i> ` +
+                  `${name}` +
+                  `<span style="padding:0 6px;color:${
+                    params[2].value > 0 ? `#1DEFB3` : `#FF8D00`
+                  }">${params[2].value}%</span> `,
+                `${`<span style="` + humMarkerStyle + `"></span>`}` +
+                  params[1].axisValue +
+                  `<i style="padding:0 6px"></i> ` +
+                  params[1].value +
+                  `<i style="padding:0 12px"></i> ` +
+                  `${name1}` +
+                  `<span style="padding:0 6px;color:${
+                    params[3].value > 0 ? `#1DEFB3` : `#FF8D00`
+                  }">${params[3].value}%</span> `,
+              ].join(`<br>`)
+            } else {
+              return [
+                params[0].axisValue,
+                `${`<span style="` + temMarkerStyle + `"></span>`}` +
+                  `今年` +
+                  `<i style="padding:0 6px"></i> ` +
+                  params[0].value,
+                `${`<span style="` + humMarkerStyle + `"></span>`}` +
+                  `去年` +
+                  `<i style="padding:0 6px"></i> ` +
+                  params[1].value,
+              ].join(`<br>`)
+            }
           },
         },
         grid: {
@@ -235,14 +268,25 @@ export default {
           {
             data: this.dataArray.comparisonLastDay,
             type: `line`,
+            symbolSize: 0, // symbol的大小设置为0
+            showSymbol: false, // 不显示symbol
+            lineStyle: {
+              width: 0, // 线宽是0
+              color: `rgba(0, 0, 0, 0)`, // 线的颜色是透明的
+            },
           },
           {
             data: this.dataArray.comparisonLastYear,
             type: `line`,
+            symbolSize: 0, // symbol的大小设置为0
+            showSymbol: false, // 不显示symbol
+            lineStyle: {
+              width: 0, // 线宽是0
+              color: `rgba(0, 0, 0, 0)`, // 线的颜色是透明的
+            },
           },
         ],
       }
-
       myChart.setOption(this.option, true)
     },
   },

src/components/Customize/weatherForecast.vue

@@ -96,7 +96,7 @@ export default {
             return [
               params[0].axisValueLabel,
               params[0].value +
-                `度` +
+                `℃` +
                 `<i style="padding:0 12px"></i> ` +
                 params[1].value,
             ].join(`<br>`)

src/views/page2/cmap.vue

@@ -24,9 +24,7 @@ export default {
   },
   methods: {
     async initAMap() {
-      const json = await this.$http.get(
-        `https://geo.datav.aliyun.com/areas_v3/bound/geojson?code=520600_full`
-      )
+      const json = await this.$http.get(`/api/mapOfTongren`)
       window._AMapSecurityConfig = {
         securityJsCode: `a2017cdc059be6c03b430a3185098003`,
       }
@@ -58,6 +56,9 @@ export default {
               console.log(`mouseover`)
               // 如果缩放过大还变色, 万一人家是想看放大后的详细地点, 变色后反而不方便
               if (window.map.getZoom() <= 11) {
+                content = [` <div class='info_box_contant'>222</div>`]
+                infoWindow._originOpts.content = content.join(`</br>`)
+                console.log(infoWindow._originOpts, `2222222222`)
                 // infoWindow.open(window.map, [e.lnglat.lng, e.lnglat.lat]) // 后面的参数指的是经纬度，在此显示窗口
                 infoWindow.open(window.map, center) // 后面的参数指的是经纬度，在此显示窗口
                 polygon.setOptions({
@@ -81,7 +82,7 @@ export default {
           const infoWindow = new AMap.InfoWindow({
             isCustom: true, // 使用自定义窗体
             content: content.join(`<br>`),
-            offset: new AMap.Pixel(-15, -25),
+            offset: new AMap.Pixel(0, -25),
           })
           window.map = new AMap.Map(`container`, {
             // resizeEnable: true,

src/views/page2/index.vue

@@ -124,8 +124,8 @@ export default {
           area.push(element.时间)
           dataArray.LastYear.push(element.去年)
           dataArray.thisYear.push(element.今年)
-          dataArray.comparisonLastDay.push(element.较上日 + `%`)
-          dataArray.comparisonLastYear.push(element.较去年 + `%`)
+          dataArray.comparisonLastDay.push(element.较上日)
+          dataArray.comparisonLastYear.push(element.较去年)
         })
         this.monthTrendarea = area
         this.monthTrendDataArray = dataArray
@@ -145,8 +145,8 @@ export default {
           area.push(element.时间)
           dataArray.LastYear.push(element.去年)
           dataArray.thisYear.push(element.今年)
-          dataArray.comparisonLastDay.push(element.较上日 + `%`)
-          dataArray.comparisonLastYear.push(element.较去年 + `%`)
+          dataArray.comparisonLastDay.push(element.较上日)
+          dataArray.comparisonLastYear.push(element.较去年)
         })
         this.yearTrendarea = area
         this.yearTrendDataArray = dataArray

src/views/page3/index.vue

@@ -69,7 +69,7 @@
         id="`月度移栽面积分析`"
         barWidth="448px"
         style="position: absolute; right: 550px; top: 730px; z-index: 10"
-        v-if="isMonthTrend"
+        v-if="isAnalyseMonthTrend"
         :lineName="monthName"
         title="月度移栽面积分析"
         class="animated fadeInRight"
@@ -96,7 +96,7 @@
         :area.sync="yearTrendAnalysearea"
         class="animated fadeInRight"
         :dataArray.sync="yearTrendAnalyseDataArray"
-        v-if="isYearTrend"
+        v-if="isAnalyseYearTrend"
       />
     </div>
   </bgBox>
@@ -184,6 +184,8 @@ export default {
       },
       isMonthTrend: false,
       isYearTrend: false,
+      isAnalyseMonthTrend: false,
+      isAnalyseYearTrend: false,
       yearName: {
         lastName: `去年`,
         thisName: `今年`,
@@ -294,8 +296,8 @@ export default {
           area.push(element.时间)
           dataArray.LastYear.push(element.去年)
           dataArray.thisYear.push(element.今年)
-          dataArray.comparisonLastDay.push(element.较上日 + `%`)
-          dataArray.comparisonLastYear.push(element.较去年 + `%`)
+          dataArray.comparisonLastDay.push(element.较上日)
+          dataArray.comparisonLastYear.push(element.较去年)
         })
         this.monthTrendarea = area
         this.monthTrendDataArray = dataArray
@@ -315,12 +317,12 @@ export default {
           area.push(element.时间)
           dataArray.LastYear.push(element.去年)
           dataArray.thisYear.push(element.今年)
-          dataArray.comparisonLastDay.push(element.较上日 + `%`)
-          dataArray.comparisonLastYear.push(element.较去年 + `%`)
+          dataArray.comparisonLastDay.push(element.较上日)
+          dataArray.comparisonLastYear.push(element.较去年)
         })
         this.monthTrendAnalysearea = area
         this.monthTrendAnalyseDataArray = dataArray
-        this.isMonthTrend = true
+        this.isAnalyseMonthTrend = true
       })
     },
     getThisYearsTransplantingDataTrend() {
@@ -336,8 +338,8 @@ export default {
           area.push(element.时间)
           dataArray.LastYear.push(element.去年)
           dataArray.thisYear.push(element.今年)
-          dataArray.comparisonLastDay.push(element.较上日 + `%`)
-          dataArray.comparisonLastYear.push(element.较去年 + `%`)
+          dataArray.comparisonLastDay.push(element.较上日)
+          dataArray.comparisonLastYear.push(element.较去年)
         })
         this.yearTrendarea = area
         this.yearTrendDataArray = dataArray
@@ -357,12 +359,12 @@ export default {
           area.push(element.时间)
           dataArray.LastYear.push(element.去年)
           dataArray.thisYear.push(element.今年)
-          dataArray.comparisonLastDay.push(element.较上日 + `%`)
-          dataArray.comparisonLastYear.push(element.较去年 + `%`)
+          dataArray.comparisonLastDay.push(element.较上日)
+          dataArray.comparisonLastYear.push(element.较去年)
         })
         this.yearTrendAnalysearea = area
         this.yearTrendAnalyseDataArray = dataArray
-        this.isYearTrend = true
+        this.isAnalyseYearTrend = true
       })
     },
     getStatistics() {