1.功率负荷风速详情页中折线图中右纵坐标“日照（w/㎡）”需补充完整单位；2.报警登记需要替换为中文描述；

src/components/chart/line/multiple-y-line-chart-normal.vue

@@ -311,7 +311,7 @@ export default {
           min: item.min,
           max: item.max,
           position: item.position,
-          offset: p[item.position] * 50,
+          offset: -15,
           axisLabel: {
             formatter: "{value}",
             fontSize: 12,

src/views/Home/components/map/XH_GDC.vue

@@ -184,7 +184,6 @@
 		},
 		watch: {
 			data(res) {
-				console.log(res)
 				this.sourceMap = res;
 			},
 		},

src/views/NewPages/multiple-y-line-chart-normal.vue

@@ -289,7 +289,7 @@ export default {
     return {
       id: "",
       chart: null,
-      color: ["#323E6F", "#1DA0D7", "#05BB4C", "#EDB32F", "#DB5520"],
+      color: ["#1DA0D7","#05BB4C","#323E6F", "#EDB32F", "#DB5520"],
     };
   },
   computed: {
@@ -336,7 +336,7 @@ export default {
           //分格线
           splitLine: {
             lineStyle: {
-              color: partten.getColor("gray"),
+              color: this.$store.state.themeName === "dark" ? partten.getColor("gray") : partten.getColor("black"),
               type: "dashed",
             },
           },
@@ -385,8 +385,9 @@ export default {
   methods: {
     resize() {},
     initChart() {
+		
       const chart = echarts.init(this.$el);
-
+	
       let option = this.option();
       chart.clear();
 
@@ -406,16 +407,18 @@ export default {
       window.addEventListener("resize", this.resize);
     },
     option: function () {
+		let themeName = '';
+		this.$store.state.themeName === "dark" ? themeName = true : themeName = false;
       return {
         color: this.color,
         tooltip: {
           trigger: "axis",
           triggerOn:this.default?"click":"mousemove",
           alwaysShowContent:true,
-          backgroundColor: "rgba(0,0,0,0.4)",
-          borderColor: partten.getColor("gray"),
+          backgroundColor: themeName ? "rgba(0,0,0,0.4)" : "rgba(255,255,255,0.5)",
+          borderColor: themeName ? partten.getColor("gray"): "#000",
           textStyle: {
-            color: "#fff",
+            color: themeName ? "#fff" : "#000",
             fontSize: 12,
           },
         },
@@ -425,9 +428,9 @@ export default {
           top: "top",
           icon: "circle",
           itemWidth: 6,
-          inactiveColor: partten.getColor("gray"),
+          inactiveColor: themeName ? partten.getColor("gray"): "#000",
           textStyle: {
-            color: partten.getColor("grayl"),
+            color: themeName ? partten.getColor("grayl"): "#000",
             fontSize: 12,
           },
         },
@@ -452,7 +455,7 @@ export default {
               formatter: "{value}",
               fontSize: 12,
               textStyle: {
-                color: partten.getColor("gray"),
+                color: themeName ? partten.getColor("gray"): "#000",
               },
             },
             data: this.xdata,

src/views/alarmCenter/scadaAlarm.vue

@@ -232,7 +232,7 @@ export default {
           },
           {
             name: "报警等级",
-            field: "messageType",
+            field: "rank",
             is_num: false,
             is_light: false,
             sortable: true,
@@ -318,6 +318,10 @@ export default {
         },
         success(res) {
           if (res.data) {
+			  let rank = ['低','中低','中','中高','高'];
+			  res.data.records.forEach((ele,index) =>{
+				ele.rank = rank[parseInt(ele.rank) - 1]
+			  })
             that.tableData.data = res.data.records;
             that.tableData.total = res.data.total;
           } else {