zzw

src/views/alarm/allData/index.vue

@@ -292,7 +292,7 @@ const handleCurrentChange = (val: number) => {
   getList();
 };
 
-const processTableData = ref([]);
+const processTableData = ref<any>([]);
 
 // 表格配置项
 let columns = reactive<ColumnProps[]>([]);
@@ -511,7 +511,7 @@ const updateColumns = () => {
   ];
 
   const newColumns = customizeColumns.value.map(item => ({
-    prop: item.data_id,
+    prop: item.data_id.toString(),
     label: item.data_name +'('+item.data_unit+')',
     sortable: true,
     // width: calculateTextLengthInPixels(item.data_name)
@@ -559,6 +559,7 @@ const getList = async () => {
   }
   const { data } = await getDataItemList(pageable.value);
   processTableData.value = data.list
+  
   pageable.value.total = data.total
 };
 

src/views/alarm/singleStationData/index.vue

@@ -189,126 +189,6 @@
 						</div>
 					</div>
 				</el-col>
-				<!-- <el-col :xs="12" :sm="8" :md="8" :lg="4" :xl="4">
-					<div class="chart_item info_box zhuti">
-						<div class="info_title">瞬时风速 ( m/s )</div>
-						<div class="mt15 ">
-							<div class="info_content">
-								0.2
-							</div>
-						</div>
-					</div>
-				</el-col>
-				<el-col :xs="12" :sm="8" :md="8" :lg="4" :xl="4">
-					<div class="chart_item info_box zhuti">
-						<div class="info_title">瞬时风向 ( ° )</div>
-						<div class="mt15 ">
-							<div class="info_content">
-								35
-							</div>
-						</div>
-					</div>
-				</el-col>
-				<el-col :xs="12" :sm="8" :md="8" :lg="4" :xl="4">
-					<div class="chart_item info_box zhuti">
-						<div class="info_title">气温 ( ℃ )</div>
-						<div class="mt15 ">
-							<div class="info_content">
-								23.5
-							</div>
-						</div>
-					</div>
-				</el-col>
-				<el-col :xs="12" :sm="8" :md="8" :lg="4" :xl="4">
-					<div class="chart_item info_box zhuti">
-						<div class="info_title">相对湿度 ( % )</div>
-						<div class="mt15 ">
-							<div class="info_content">
-								86
-							</div>
-						</div>
-					</div>
-				</el-col>
-				<el-col :xs="12" :sm="8" :md="8" :lg="4" :xl="4">
-					<div class="chart_item info_box zhuti">
-						<div class="info_title">露点温度 ( ℃ )</div>
-						<div class="mt15 ">
-							<div class="info_content">
-								12.5
-							</div>
-						</div>
-					</div>
-				</el-col>
-				<el-col :xs="12" :sm="8" :md="8" :lg="4" :xl="4">
-					<div class="chart_item info_box zhuti">
-						<div class="info_title">地面温度 ( ℃ )</div>
-						<div class="mt15 ">
-							<div class="info_content">
-								26.8
-							</div>
-						</div>
-					</div>
-				</el-col>
-				<el-col :xs="12" :sm="8" :md="8" :lg="4" :xl="4">
-					<div class="chart_item info_box zhuti">
-						<div class="info_title">云底高度 ( m )</div>
-						<div class="mt15 ">
-							<div class="info_content">
-								1800
-							</div>
-						</div>
-					</div>
-				</el-col>
-				<el-col :xs="12" :sm="8" :md="8" :lg="4" :xl="4">
-					<div class="chart_item info_box zhuti">
-						<div class="info_title">静电场强度 ( kV/m )</div>
-						<div class="mt15 ">
-							<div class="info_content" style="color:red ;">
-								10.9
-							</div>
-						</div>
-					</div>
-				</el-col>
-				<el-col :xs="12" :sm="8" :md="8" :lg="4" :xl="4">
-					<div class="chart_item info_box zhuti">
-						<div class="info_title">总云量 ( 成 )</div>
-						<div class="mt15 ">
-							<div class="info_content">
-								5
-							</div>
-						</div>
-					</div>
-				</el-col>
-				<el-col :xs="12" :sm="8" :md="8" :lg="4" :xl="4">
-					<div class="chart_item info_box zhuti">
-						<div class="info_title">低云云量 ( 成 )</div>
-						<div class="mt15 ">
-							<div class="info_content">
-								2
-							</div>
-						</div>
-					</div>
-				</el-col>
-				<el-col :xs="12" :sm="8" :md="8" :lg="4" :xl="4">
-					<div class="chart_item info_box zhuti">
-						<div class="info_title">光照度 ( lx )</div>
-						<div class="mt15 ">
-							<div class="info_content">
-								1
-							</div>
-						</div>
-					</div>
-				</el-col>
-				<el-col :xs="12" :sm="8" :md="8" :lg="4" :xl="4">
-					<div class="chart_item info_box zhuti">
-						<div class="info_title">小时累计日照时数 ( min )</div>
-						<div class="mt15 ">
-							<div class="info_content">
-								29
-							</div>
-						</div>
-					</div>
-				</el-col> -->
 			</el-row>
 
 			<el-row :gutter="15">
@@ -533,7 +413,7 @@
 
 <script setup lang="tsx" name="singleData">
 import * as echarts from 'echarts';
-import { ref, onMounted, reactive, watch, onDeactivated, onActivated, computed } from "vue";
+import { ref, onMounted, reactive, watch, onDeactivated, onActivated, computed, nextTick } from "vue";
 import { useGlobalStore } from "@/stores/modules/global";
 import { getDataItemList, getPlatformList, getRgDataList, getTacRecordList } from "@/api/modules/allData";
 import { Platform } from "@/api/interface";
@@ -1228,10 +1108,13 @@ const getList = async () => {
 	const res = await getDataItemList({ ...pageable.value, as_code_list: [pageable.value.as_code], data_items: arr });
 	dataItemInfo.value = res.data.list ? (res.data.list.length === 0 ? {} : res.data.list[0]) : {};
 
-	showTemp()
-	showHumidity()
-	showPressure()
-	showWindSpeed()
+
+	nextTick(() => {
+		showTemp()
+		showHumidity()
+		showPressure()
+		showWindSpeed()
+	})
 	currentValue.value = dataItemInfo.value[312] && dataItemInfo.value[312] != '--' ? dataItemInfo.value[312] : dataItemInfo.value[302] && dataItemInfo.value[302] != '--' ? dataItemInfo.value[302] : '--'
 	mincurrentValue.value = dataItemInfo.value[311] && dataItemInfo.value[311] != '--' ? dataItemInfo.value[311] : dataItemInfo.value[301] && dataItemInfo.value[301] != '--' ? dataItemInfo.value[301] : '--'
 	selectElement.value = res.data.list ? dataItemInfo.value?.data_list.filter(itemB => customizeColumns.value.some(itemA => itemA.data_id === itemB.data_id)) : [];
@@ -1240,6 +1123,8 @@ const getList = async () => {
 		.filter(item => ids.includes(item.data_id) && item.data_value !== '--' && item.data_value !== '' && item.data_value !== '0' && getYenSymbolLaterCharacters(item.remark) !== '无明显天气现象')
 		.map(item => item) : []
 	getHistoryList()
+
+
 };
 
 function adjustValue(value) {
@@ -1287,9 +1172,12 @@ const getHistoryList = async () => {
 		}
 	})
 
-	showTempLine()
-	showPressureLine()
-	showWind()
+
+	nextTick(() => {
+		showTempLine()
+		showPressureLine()
+		showWind()
+	})
 	showChart.value = true
 
 
@@ -1519,7 +1407,7 @@ const showPressure = () => {
 				detail: {
 					offsetCenter: [0, 0],
 					valueAnimation: true,
-					formatter: '{value}',
+					formatter: dataItemInfo.value && dataItemInfo.value[202] ? dataItemInfo.value[202] : '--',
 					color: isDark.value ? '#fff' : "#000",
 					fontSize: 30,
 				},
@@ -1658,7 +1546,7 @@ const showHumidity = () => {
 				detail: {
 					offsetCenter: [0, 0],
 					valueAnimation: true,
-					formatter: '{value}',
+					formatter: dataItemInfo.value && dataItemInfo.value[106] ? dataItemInfo.value[106] : '--',
 					color: isDark.value ? '#fff' : "#000",
 					fontSize: 30,
 				},
@@ -1906,8 +1794,7 @@ const showWind = () => {
 		// 	// name: "风速(m/s)",
 		// },
 		yAxis: {
-			min: 0,
-			max: 10,
+			boundaryGap: [0, '20%'],
 			type: 'value'
 		},
 		// 鼠标悬浮提示
@@ -1958,7 +1845,7 @@ const showWind = () => {
 			// },
 			itemStyle: {
 				normal: {
-					
+
 
 				},
 			},
@@ -2080,14 +1967,13 @@ const showTemp = () => {
 				detail: {
 					offsetCenter: [0, 0],
 					valueAnimation: true,
-					formatter: '{value}',
+					formatter: dataItemInfo.value && dataItemInfo.value[101] ? dataItemInfo.value[101] : '--',
 					color: isDark.value ? '#fff' : "#000",
 					fontSize: 30,
 				},
-
 				data: [
 					{
-						value: dataItemInfo.value[101],
+						value: dataItemInfo.value && dataItemInfo.value[101] ? dataItemInfo.value[101] : '--',
 					}
 				]
 			}

src/views/analysis/featureCurves/index.vue

@@ -42,7 +42,8 @@
     <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>
@@ -53,7 +54,8 @@
             </div>
           </el-col>
           <template v-for="(item, index) in array" :key="index">
-            <el-col :xs="24" :sm="12" :md="8" :lg="8" v-if="item && item.data_id !== 1 && item.data_id !== 2">
+            <el-col :xs="24" :sm="12" :md="8" :lg="8" v-if="item && item.data_id !== 1 && item.data_id !== 2"
+              >
               <div class="chart_item zhuti">
                 <div style="font-weight: bold;" class="item_title">
                   <span>{{ item.data_name }} ( {{ item.data_unit ? item.data_unit : '' }} )</span>
@@ -223,6 +225,14 @@
         </div>
       </template>
     </el-dialog>
+    <el-dialog v-model="dialogVisible" :title="dialogtitle" width="800">
+      <div class="mt5" v-if="showtype == 1">
+        <div ref="wind" class="ve-ring" style="height: 430px"></div>
+      </div>
+      <div class="mt5" v-else>
+        <div :id="'Access' + clickIndex" class="ve-ring" style="height: 330px"></div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -248,6 +258,30 @@ const changetype = (e) => {
   getHistoryList()
 }
 
+const dialogVisible = ref(false)
+const clickIndex = ref(null)
+const showtype = ref(1)
+const dialogtitle = ref('')
+const showBig = (type, item, index) => {
+  showtype.value = type
+  if (type == 1) {
+    dialogtitle.value = '2分钟平均风向 ( ° )/2分钟平均风速 ( m/s )'
+    dialogVisible.value = true
+    nextTick(() => {
+      showWind()
+    })
+  } else {
+    clickIndex.value = index
+    dialogtitle.value = item.data_name 
+    dialogVisible.value = true
+
+    nextTick(() => {
+      Access()
+    })
+  }
+
+}
+
 const dragStart = (event, index) => {
   event.dataTransfer.effectAllowed = 'move';
   // 保存当前拖动的元素索引
@@ -579,12 +613,12 @@ const historyColumns = ref([
     data_type: "降水",
     data_h_table: "LI_SHI_LIU_YAO_SU_SHU_JU",
     data_r_table: "SHI_SHI_LIU_YAO_SU_SHU_JU",
-    data_id: 309,
-    data_name: "日降水量",
+    data_id: 312,
+    data_name: "小时累计降水量(称重)",
     data_condition: 0,
     data_value: "",
     data_unit: "mm",
-    data_item: "RI_JIANG_SHUI_LIANG",
+    data_item: "XIAO_SHI_LEI_JI_JIANG_SHUI_LIANG_CHENG_ZHONG",
     data_order: 0,
     isSelected: true
   },
@@ -600,7 +634,7 @@ const historyColumns = ref([
     data_h_table: "LI_SHI_LIU_YAO_SU_SHU_JU",
     data_type: "能见度",
     isSelected: true
-}
+  }
 ])
 
 
@@ -883,8 +917,7 @@ const showWind = () => {
     // 	// name: "风速(m/s)",
     // },
     yAxis: {
-      min: 0,
-      max: 10,
+      boundaryGap: [0, '20%'],
       type: 'value'
     },
     // 鼠标悬浮提示

src/views/query/deviceHealth/index.vue

@@ -350,7 +350,7 @@ const changeAslist =(row)=>{
 
 }
 
-const processTableData = ref([]);
+const processTableData = ref<any>([]);
 
 const sensorList =ref<any>([])
 // 被选中当条数据下标
@@ -679,7 +679,7 @@ const updateColumns = () => {
     { prop: "data_time_i", label: "观测时间", width: 140,fixed:true }
   ];
   const newColumns = customizeColumns.value.map(item => ({
-    prop: item.se_type===0?'yclq_state':item.se_type,
+    prop: item.se_type===0?'yclq_state':item.se_type.toString(),
     label: item.se_name,
     width: calculateTextLengthInPixels(item.se_name)
   }));

src/views/query/qualityAudits/index.vue

@@ -342,8 +342,6 @@ function processTableDatas(){
 
         const t2 = `${year}-${month}-${day} ${hour}:00`;
         datas2[t] = checkDataTimeExists(t2);
-
-        console.log(t2)
       }else {
         const  t2 = `${yearDate.value}-${monthDateStr}-${dayStr} ${hourStr}:00`;
         datas2[t] = checkDataTimeExists(t2);

src/views/query/queryObservationData/index.vue

@@ -581,7 +581,7 @@ const handleCurrentChange = (val: number) => {
 
 };
 
-const processTableData = ref([]);
+const processTableData = ref<any>([]);
 
 // 表格配置项
 let columns = reactive<ColumnProps[]>([]);
@@ -730,7 +730,7 @@ const updateColumns = () => {
   ];
 
   const newColumns = customizeColumns.value.map(item => ({
-    prop: item.data_id,
+    prop: item.data_id.toString(),
     label: item.data_name + '(' + item.data_unit + ')',
     sortable: true,
     // width: calculateTextLengthInPixels(item.data_name)