zzw

src/views/alarm/singleStationData/index.vue

@@ -1186,7 +1186,8 @@ const getHistoryList = async () => {
 		return {
 			value: item[8],
 			symbolRotate: adjustValue(item[9]),
-			symbolRotateStr: item[9] === 'C' ? 0 : item[9]
+			symbolRotateStr: item[9]
+			// symbolRotateStr: item[9] === 'C' ? 0 : item[9]
 		}
 	})
 
@@ -1819,13 +1820,19 @@ const showWind = () => {
 		tooltip: {
 			trigger: "axis",
 			formatter(params) {
+				let aa=''
+				if (params[0].data) {
+					aa=params[0].data.symbolRotateStr==='c'||params[0].data.symbolRotateStr==='C'?'C':params[0].data.symbolRotateStr + '°'
+				} else {
+					aa='--'
+				}
 				let tip =
 					"时间:" +
 					params[0].axisValue +
 					"<br/>风速:" +
 					(params[0].value ? params[0].value : "--") +
 					"m/s<br/>风向:" +
-					(params[0].data ? params[0].data.symbolRotateStr + '°' : "--")
+					(aa)
 				return tip;
 			},
 		},

src/views/analysis/featureCurves/index.vue

@@ -42,15 +42,14 @@
     <div class="main_list">
       <el-row :gutter="15">
         <template v-if="array.length > 0">
-          <el-col :xs="24" :sm="12" :md="8" :lg="8" v-if="windLineArr && windLineArr.length > 0"
-           >
+          <el-col :xs="24" :sm="12" :md="8" :lg="8" v-if="windLineArr && windLineArr.length > 0">
             <div class="chart_item zhuti">
               <div style="font-weight: bold;" class="item_title">
                 <span>2分钟平均风向 ( ° )/2分钟平均风速 ( m/s )</span>
 
-                  <el-icon style="vertical-align: middle;cursor: pointer;"  @click="showBig(1, 0, 0)">
-                    <Search />
-                  </el-icon>
+                <el-icon style="vertical-align: middle;cursor: pointer;" @click="showBig(1, 0, 0)">
+                  <Search />
+                </el-icon>
 
               </div>
               <div class="mt5">
@@ -862,7 +861,7 @@ function adjustValue(value) {
   if (value === 'C') {
     return 0
   } else if (value <= 180) {
-    return  -value-180;
+    return -value - 180;
   } else {
     return 180 - value;
   }
@@ -938,13 +937,19 @@ const showWind = () => {
     tooltip: {
       trigger: "axis",
       formatter(params) {
+        let aa = ''
+        if (params[0].data) {
+          aa = params[0].data.symbolRotateStr === 'c' || params[0].data.symbolRotateStr === 'C' ? 'C' : params[0].data.symbolRotateStr + '°'
+        } else {
+          aa = '--'
+        }
         let tip =
           "时间:" +
           params[0].axisValue +
           "<br/>风速:" +
           (params[0].value ? params[0].value : "--") +
           "m/s<br/>风向:" +
-          (params[0].data ? params[0].data.symbolRotateStr + '°' : "--")
+          (aa)
         return tip;
       },
     },
@@ -996,132 +1001,132 @@ const showWind = () => {
 
 const showWind2 = () => {
 
-let mychart = echarts.init(wind2.value);
-let option = {
-  title: {
-    text: '暂无数据',
-    show: !timeArr.value ? true : false,
-    x: 'center',
-    y: 'center',
-    textStyle: {
-      fontSize: 14,
-      fontWeight: 'normal',
-    }
-  },
-
-  grid: {
-    left: '10',
-    right: '10',
-    bottom: '90',
-    top: 20,
-    containLabel: true
-  },
-  dataZoom: [
-			{
-				type: 'inside',
-				start: 0,
-				end: 50
-			},
-			{
-				type: 'slider',
-
-				left: '100',
-				right: '100'
-
-
-			}
-		],
-  // X轴
-  xAxis: {
-    type: 'category',
-    splitLine: {
-      show: false
+  let mychart = echarts.init(wind2.value);
+  let option = {
+    title: {
+      text: '暂无数据',
+      show: !timeArr.value ? true : false,
+      x: 'center',
+      y: 'center',
+      textStyle: {
+        fontSize: 14,
+        fontWeight: 'normal',
+      }
     },
-    boundaryGap: true,
-    axisTick: {
-      alignWithLabel: true, // true：标签位于刻度线正下方；false：标签位于2个刻度线中间
+
+    grid: {
+      left: '10',
+      right: '10',
+      bottom: '90',
+      top: 20,
+      containLabel: true
     },
-    data: timeArr.value,
-    axisLabel: {
-      // interval: 4,
-      formatter: function (value) {
-        // if (value.index % 4 === 0) {
-        // 	return value.replace(/ /g, '\n');
-        // } else {
-        // 	return '';
-        // }
-        return value.replace(/ /g, '\n');
+    dataZoom: [
+      {
+        type: 'inside',
+        start: 0,
+        end: 50
       },
+      {
+        type: 'slider',
+
+        left: '100',
+        right: '100'
+
 
-    },
-  },
-  // Y轴
-  // yAxis: {
-  // 	type: 'value',
-  // 	// name: "风速(m/s)",
-  // },
-  yAxis: {
-    boundaryGap: [0, '20%'],
-    type: 'value'
-  },
-  // 鼠标悬浮提示
-  tooltip: {
-    trigger: "axis",
-    formatter(params) {
-      let tip =
-        "时间:" +
-        params[0].axisValue +
-        "<br/>风速:" +
-        (params[0].value ? params[0].value : "--") +
-        "m/s<br/>风向:" +
-        (params[0].data ? params[0].data.symbolRotateStr + '°' : "--")
-      return tip;
-    },
-  },
-  // 数据
-  series: [{
-    data: windLineArr.value,
-    type: 'line',
-    smooth: true, //这句就是让曲线变平滑的
-    symbol: function (params) {
-      if (Number(params) < 0.3) {
-        return
-      } else {
-        return 'path://M4.866,0,0,15.193l4.866-4.449L9.738,15.2Z'
       }
+    ],
+    // X轴
+    xAxis: {
+      type: 'category',
+      splitLine: {
+        show: false
+      },
+      boundaryGap: true,
+      axisTick: {
+        alignWithLabel: true, // true：标签位于刻度线正下方；false：标签位于2个刻度线中间
+      },
+      data: timeArr.value,
+      axisLabel: {
+        // interval: 4,
+        formatter: function (value) {
+          // if (value.index % 4 === 0) {
+          // 	return value.replace(/ /g, '\n');
+          // } else {
+          // 	return '';
+          // }
+          return value.replace(/ /g, '\n');
+        },
+
+      },
     },
-    symbolSize: function (params) {
-      if (Number(params) < 0.3) {
-        return 5
-      } else {
-        return 14
-      }
+    // Y轴
+    // yAxis: {
+    // 	type: 'value',
+    // 	// name: "风速(m/s)",
+    // },
+    yAxis: {
+      boundaryGap: [0, '20%'],
+      type: 'value'
     },
-    //折线样式
-    lineStyle: {
-      color: '#a5cfff',
-      width: 1,
+    // 鼠标悬浮提示
+    tooltip: {
+      trigger: "axis",
+      formatter(params) {
+        let tip =
+          "时间:" +
+          params[0].axisValue +
+          "<br/>风速:" +
+          (params[0].value ? params[0].value : "--") +
+          "m/s<br/>风向:" +
+          (params[0].data ? params[0].data.symbolRotateStr + '°' : "--")
+        return tip;
+      },
     },
-    // label: {
-    // 	normal: {
-    // 		formatter: '{c}',
-    // 		show: false,
-    // 		position: 'top',
-    // 		distance: 15
-    // 	}
-    // },
-    itemStyle: {
-      normal: {
+    // 数据
+    series: [{
+      data: windLineArr.value,
+      type: 'line',
+      smooth: true, //这句就是让曲线变平滑的
+      symbol: function (params) {
+        if (Number(params) < 0.3) {
+          return
+        } else {
+          return 'path://M4.866,0,0,15.193l4.866-4.449L9.738,15.2Z'
+        }
+      },
+      symbolSize: function (params) {
+        if (Number(params) < 0.3) {
+          return 5
+        } else {
+          return 14
+        }
+      },
+      //折线样式
+      lineStyle: {
+        color: '#a5cfff',
+        width: 1,
+      },
+      // label: {
+      // 	normal: {
+      // 		formatter: '{c}',
+      // 		show: false,
+      // 		position: 'top',
+      // 		distance: 15
+      // 	}
+      // },
+      itemStyle: {
+        normal: {
 
+        },
       },
-    },
-  }]
-};
+    }]
+  };
 
-mychart.setOption(option)
-window.addEventListener("resize", function () {
-  mychart.resize();
-});
+  mychart.setOption(option)
+  window.addEventListener("resize", function () {
+    mychart.resize();
+  });
 }
 
 

src/views/analysis/rainfall/index.vue

@@ -47,7 +47,7 @@
 				<el-col :span="24">
 					<div class="chart_item zhuti">
 						<div style="font-weight: bold;" class="item_title">
-							<span>降水量（mm）</span>
+							<span>{{ value1 == 1440 ? '日' : value1 == 60?'小时':'分钟' }}降水量（mm）</span>
 							<!-- <span v-else>小时累计降水量 ({{ isFANDOU ? '翻斗' : '称重'}})(mm)</span> -->
 						</div>
 						<div class="mt5">