白色版本css、换图、echarts

public/static/config/modeConfig.js

@@ -16,7 +16,7 @@ const tilesMaxLevel = 18;
 const adapterUrl = "http://10.155.32.4:8011/";
 
 // 切换模块时是否提示当前模块名称(用于对内介绍项目时便捷显示模块名称)
-const showModuleName = 1;
+const showModuleName = 0;
 
 if (localTest) {
     // baseURL = "http://192.168.10.13:8082/" // 联机调试 - 石林

src/components/chart/radar/radar-chart.vue

@@ -79,14 +79,14 @@ export default {
 	      },
 	  blue:{
 	        areaStyle: {
-	          color: 'rgba(75,85,174, 0.9)',
+	          color: 'none',
 	        },
 	        lineStyle: {
-	          color: "rgba(255,255,255, 0.85)",
+	          color: "rgba(75,85,174, 0.9)",
 	        },
 	        itemStyle: {
 	          color:'rgba(75,85,174, 0.9)',
-	          borderColor: "rgba(255,255,255, 0.5)",
+	          borderColor: "rgba(75,85,174, 0.9)",
 	          borderWidth: 0.5,
 	        },
 	      }
@@ -171,13 +171,13 @@ export default {
             },
             axisLine: {
               lineStyle: {
-                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : "#000"  + 40,
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : partten.getColor("grayl")  + 40,
               },
             },
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : "#000"  + 40,
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : partten.getColor("grayl")  + 40,
               },
             },
             splitArea: {
@@ -198,7 +198,7 @@ export default {
             },
             axisLine: {
               lineStyle: {
-                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : "#000"  + 40,
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : partten.getColor("grayl")  + 40,
                 shadowBlur: 1,
                 shadowColor: "#fff",
                 shadowOffsetX: 0.5,
@@ -208,7 +208,7 @@ export default {
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : "#000"  + 40,
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : partten.getColor("grayl")  + 40,
                 shadowColor: "#fff",
                 shadowBlur: 0,
                 shadowOffsetX: 0.5,
@@ -232,13 +232,13 @@ export default {
             },
             axisLine: {
               lineStyle: {
-                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : "#000"  + 40,
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : partten.getColor("grayl")  + 40,
               },
             },
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : partten.getColor("deepblue")	,
               },
             },
             splitArea: {
@@ -256,7 +256,7 @@ export default {
                     },
                     {
                       offset: 1,
-                      color: this.$store.state.themeName === "dark" ? partten.getColor("green") + 60 : partten.getColor("deepblue") + 60, // 100% 处的颜色
+                      color: this.$store.state.themeName === "dark" ? partten.getColor("green") + 60 : partten.getColor("deepblue") + 20, // 100% 处的颜色
                     },
                   ],
                   global: false, // 缺省为 false
@@ -275,13 +275,13 @@ export default {
             },
             axisLine: {
               lineStyle: {
-                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : "#000"  + 40,
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : partten.getColor("grayl")  + 40,
               },
             },
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
+                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : partten.getColor("grayl"),
               },
             },
             splitArea: {
@@ -299,7 +299,7 @@ export default {
                     },
                     {
                       offset: 1,
-                      color: this.$store.state.themeName === "dark" ? partten.getColor("green") + 60 : partten.getColor("deepblue") + 60, // 100% 处的颜色
+                      color: this.$store.state.themeName === "dark" ? partten.getColor("green") + 60 : partten.getColor("deepblue") + 20, // 100% 处的颜色
                     },
                   ],
                   global: false, // 缺省为 false
@@ -318,13 +318,13 @@ export default {
             },
             axisLine: {
               lineStyle: {
-                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : "#000"  + 40,
+                color: partten.getColor("gray") + 40,
               },
             },
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
+                color: partten.getColor("gray"),
               },
             },
             splitArea: {
@@ -345,13 +345,13 @@ export default {
             },
             axisLine: {
               lineStyle: {
-                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") + 40 : "#000"  + 40,
+                color: partten.getColor("grayl"),
               },
             },
             splitLine: {
               lineStyle: {
                 width: 1,
-                color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : "#000",
+                color: partten.getColor("grayl"),
               },
             },
             splitArea: {

src/views/WindSite/pages/Info/StandAloneImg.vue

@@ -111,8 +111,8 @@
 			</g>
 		</defs>
 		<!-- 背景图片 -->
-		<image x="0" y="90" height="787" width="1570" v-show="theme" href="./standAloneImg-green.png" />
-		<image x="0" y="90" height="787" width="1570" v-show="!theme" href="./standAloneImg-white.png" />
+		<image x="0" y="90" height="787" width="1570" v-show='$store.state.themeName === "dark"' href="./standAloneImg-green.png" />
+		<image x="0" y="90" height="787" width="1570" v-show='$store.state.themeName === "light"' href="./standAloneImg-white.png" />
 		<!-- 变桨 -->
 		<g class="stand-alone-img-g" :class="{ active: activeIndex == 3 }" @mouseover="mouseover(3)"
 			@mouseout="mouseout" @click="click(3)">
@@ -201,7 +201,6 @@
 		// 数据
 		data() {
 			return {
-				theme:'',//默认黑色，换图
 				StandAloneCircle1: false,
 				StandAloneCircle2: false,
 				StandAloneCircle3: false,
@@ -295,9 +294,6 @@
 			// 数据更新后
 		},
 		watch: {
-		  "$store.state.themeName"() {
-		    this.$store.state.themeName === "dark" ? this.theme = true : this.theme = false;
-		  },
 		},
 	};
 </script>

src/views/report/nhdl.vue

@@ -157,7 +157,7 @@
 				data.forEach((ele) => {
 					let dd = new Date(ele.recodedate).formatDate("dd");
 					let wpidName = ele.pjid.split("_")[0].match(/^[a-z|A-Z]+/gi)[0];
-					let power = ele.daypower + ele.nightpower;
+					let power = parseFloat((ele.daypower + ele.nightpower).toFixed(2));
 					if (pjid.indexOf(ele.pjid) === -1) {//判断有木有id，若没有，则加进去，并新增一条tableData的白天和夜间
 						pjid.push(ele.pjid);
 						tableData.push({
@@ -191,12 +191,12 @@
 							if (ele2.pjid === ele.pjid) {
 								if (ele2.speed === "白天") {
 									tableData[index2][dd] = ele.daypower;
-									tableData[index2].hj += power;
+									tableData[index2].hj = parseFloat((tableData[index2].hj + power).toFixed(2));
 								} else if (ele2.speed === "夜间") {
 									tableData[index2][dd] = ele.nightpower;
 								} else {
 									tableData[index2][dd] = power;
-									dqhj[wpidName] += power;
+									dqhj[wpidName] = parseFloat((dqhj[wpidName] + power).toFixed(2));
 								}
 							}
 						});
@@ -204,7 +204,7 @@
 				});
 				tableData.find((ele) => {//地区合并
 					if (ele.dqhj == 1) {
-						ele.dqhj = dqhj[ele.wpid.split("_")[0]];
+						ele.dqhj = parseFloat(dqhj[ele.wpid.split("_")[0]]);
 					}
 				});
 				let arr = [];
@@ -298,7 +298,7 @@
 						sums[index] = values.reduce((prev, curr) => {
 							const value = Number(curr);
 							if (!isNaN(value)) {
-								return prev + curr;
+								return parseFloat((prev + curr).toFixed(2));
 							} else {
 								return prev;
 							}

src/views/report/weather.vue

@@ -235,7 +235,6 @@
 						pageSize: that.pageSize,
 					},
 					success(res) {
-						console.log(res)
 						var dataTab = [];
 						if (res.data) {
 						  res.data.list.forEach(item => {