zzw

.env.development

@@ -18,5 +18,5 @@ VITE_PWA = false
 VITE_API_URL = /api
 
 # 开发环境跨域代理，支持配置多个
-# VITE_PROXY = [["/api","http://192.168.43.77:18088"]]
-VITE_PROXY = [["/api","http://192.168.127.123:18088"]]
+VITE_PROXY = [["/api","http://192.168.43.77:18088"]]
+# VITE_PROXY = [["/api","http://192.168.127.123:18088"]]

src/components/WangEditor/index.vue

@@ -107,7 +107,6 @@ props.editorConfig.MENU_CONF!["uploadImage"] = {
 
 // 图片上传前判断
 const uploadImgValidate = (file: File): boolean => {
-  console.log(file);
   return true;
 };
 
@@ -133,7 +132,6 @@ props.editorConfig.MENU_CONF!["uploadVideo"] = {
 
 // 视频上传前判断
 const uploadVideoValidate = (file: File): boolean => {
-  console.log(file);
   return true;
 };
 

src/hooks/useTable.ts

@@ -46,7 +46,6 @@ export const useTable = (
       };
     },
     set: (newVal: any) => {
-      console.log("我是分页更新之后的值", newVal);
     }
   });
 

src/utils/dateTime.ts

@@ -27,7 +27,7 @@ export function isWithinThirtyMinutes(time1, time2) {
 	// 将时间差转换为分钟并检查是否小于三小时 
 	return timeDifference <= (180 * 60 * 1000); // 30分钟 * 60秒/分钟 * 1000毫秒/秒  
 };
-export function isWithin24Hours(time1, time2) {  
+export function isWithin48Hours(time1, time2) {  
 	function parseTime(timeStr) {
 		const [dateStr, timeStrPart] = timeStr.split(' ');
 		const [year, month, day] = dateStr.split('-').map(Number);
@@ -44,8 +44,8 @@ export function isWithin24Hours(time1, time2) {
     // 将时间差转换为小时  
     const hoursDifference = timeDifference / (1000 * 60 * 60);  
       
-    // 检查是否小于或等于24小时  
-    return hoursDifference <= 24;  
+    // 检查是否小于或等于48小时  
+    return hoursDifference <= 48;  
 } 
 
 

src/views/alarm/allData/index.vue

@@ -209,10 +209,6 @@ const cancel = () => {
   dialog.visible = false;
 }
 const handleSortChange = ({ column, prop, order }) => {
-  console.log('column:', column);
-  console.log('prop:', prop);
-  console.log('order:', order);
-
   // Reset sorting if order is null
   if (order === null) {
     pageable.value.time_order = 0;

src/views/alarm/allDevice/index.vue

@@ -99,11 +99,11 @@
 
 <script setup lang="ts" name="allDevice">
 import * as echarts from 'echarts';
-import { isToday, isWithinThirtyMinutes, getTimeStamp, getStamp, isDateFuture, isDateRangeWithinDays, groupByType } from "@/utils/dateTime";
+import {  getStamp, groupByType,getNextDayMidnight } from "@/utils/dateTime";
 import { ElMessage } from "element-plus";
 import { useGlobalStore } from "@/stores/modules/global";
 import { ref, computed, onMounted, reactive, watch, onDeactivated, onActivated, nextTick } from "vue";
-import { getDataItemList, getPlatformList, getRgDataList, getTacRecordList, getFTPList, getCertificateList, getStaitemList, getArriveList } from "@/api/modules/allData";
+import {  getTacRecordList, getFTPList, getCertificateList, getStaitemList, getArriveList } from "@/api/modules/allData";
 import { Platform } from "@/api/interface";
 import { parseTime } from '@/utils/index';
 import { useRouter } from "vue-router";
@@ -201,7 +201,7 @@ const control = ref()
 const arriveList = ref<any>({ aa: [], bb: [], cc: [] })
 const arriveTime = ref<any>()
 const getArrive = async () => {
-	const { data } = await getArriveList({ ...pageable.value, time_space: 60, data_type: false, end_time: getStamp(parseTime(new Date(), '{y}-{m}-{d} {h}') + ':00'), begin_time: getStamp(parseTime(new Date(), '{y}-{m}-{d}') + ' 00:00') })
+	const { data } = await getArriveList({ ...pageable.value, time_space: 60, data_type: false, end_time: getStamp(parseTime(new Date(), '{y}-{m}-{d} {h}') + ':00'), begin_time: getStamp(parseTime(new Date(), '{y}-{m}-{d}') + ' 01:00') })
 	arriveTime.value = Object.keys(data)
 
 	const arr = <any>{ aa: [], bb: [], cc: [] }
@@ -717,7 +717,7 @@ onActivated(() => {
 		getFTP();
 		getDeviceStatus();
 		getArrive();
-	}, 600 * 1000);
+	}, 60 * 1000);
 });
 
 onDeactivated(() => {

src/views/alarm/allWeather/index.vue

@@ -149,9 +149,7 @@ function findLabelByValue(noticeTypeList, value) {
 }
 
 const handleSortChange = ({ column, prop, order }) => {
-  console.log('column:', column);
-  console.log('prop:', prop);
-  console.log('order:', order);
+
 };
 
 

src/views/alarm/gis/index.vue

@@ -583,10 +583,8 @@ function hideStationName() {
     try{
       const { data } = await getPlatformList(queryas.value);
       platformList.value = data.list;
-      console.log("platformList.value:",+ platformList.value); // 在控制台输出平台列表
 
       getStations(data.list);
-      // console.log("打印data.list的数据：",+data.list)
     }catch(error){
       console.log("获取平台列表失败：",error)
     }
@@ -620,7 +618,6 @@ function hideStationName() {
 
   // 地图台站信息标注
   const getStations = (stations) => {
-    console.log(stations,'getstation2');
 
     stationSource.clear();  // 清除之前的站点标记
     stations.forEach(station => {

src/views/alarm/singleDevice/index.vue

@@ -275,7 +275,6 @@ const handlePlatform = (item) => {
       processTableData2.value = processTableFrom.value?.sta_txmk || [];
       break;
     default:
-      console.log(se_type);
       const result = processTableFrom.value?.sta_list?.find(obj => obj.id === se_type.toString());
       if (result) {
         processTableData2.value = result.item || [];

src/views/alarm/singleStationData/index.vue

@@ -1236,7 +1236,6 @@ const getList = async () => {
 	dangerWeather.value = res.data.list ? dataItemInfo.value.data_list
 		.filter(item => ids.includes(item.data_id) && item.data_value !== '--' && item.data_value !== ''&& item.data_value !== '0'&&getYenSymbolLaterCharacters(item.remark)!=='无明显天气现象')
 		.map(item => item) : []
-	console.log(dangerWeather.value, 666);
 
 	// .filter(item => ids.includes(item.data_id) && getYenSymbolLaterCharacters(item.remark) !== '无明显天气现象')
 	getHistoryList()
@@ -1929,7 +1928,13 @@ const showWind = () => {
 			data: windLineArr.value,
 			type: 'line',
 			smooth: true, //这句就是让曲线变平滑的
-			symbol: 'path://M4.866,0,0,15.193l4.866-4.449L9.738,15.2Z',
+			symbol: function (params) {
+				if (Number(params) < 0.5) {
+					return
+				} else {
+					return 'path://M4.866,0,0,15.193l4.866-4.449L9.738,15.2Z'
+				}
+			},
 			symbolSize: 11,
 			//折线样式
 			lineStyle: {
@@ -2389,7 +2394,7 @@ onActivated(() => {
 		getList();
 		weatherInfo()
 		// getHistoryList()
-	}, 600 * 1000);
+	}, 60 * 1000);
 });
 
 onDeactivated(() => {

src/views/analysis/featureCurves/index.vue

@@ -243,7 +243,7 @@
 
 <script setup lang="ts" name="dataSynthesis">
 import * as echarts from 'echarts';
-import { ElMessage } from "element-plus";
+import { ElMessage, formatter } from "element-plus";
 import { useGlobalStore } from "@/stores/modules/global";
 import { ref, computed, onMounted, reactive, watch, onDeactivated, onActivated, nextTick } from "vue";
 import { getDataItemList, getPlatformList, getRgDataList, getTacRecordList } from "@/api/modules/allData";
@@ -909,7 +909,6 @@ const getHistoryList = async () => {
 	nextTick(() => {
 		if (array.value.length > 0) Access();
 	});
-	// console.log(array.value, 'array');
 
 
 	if (arr.some(item => item.data_id === 1)) {
@@ -1025,7 +1024,13 @@ const showWind = () => {
 			data: windLineArr.value,
 			type: 'line',
 			smooth: true, //这句就是让曲线变平滑的
-			symbol: 'path://M4.866,0,0,15.193l4.866-4.449L9.738,15.2Z',
+			symbol: function (params) {
+				if (Number(params) < 0.5) {
+					return
+				} else {
+					return 'path://M4.866,0,0,15.193l4.866-4.449L9.738,15.2Z'
+				}
+			},
 			symbolSize: 11,
 			//折线样式
 			lineStyle: {

src/views/analysis/lightningArea/index.vue

@@ -16,13 +16,13 @@
 				</el-form-item>
 				<el-form-item label="观测时间：" prop="base">
 					<div>
-						<el-switch v-model="value1" @change="changetype" class="ml-2" inline-prompt active-text="日"
-							inactive-text="小时" style="margin-right: 10px;" />
+						<el-switch v-model="value1" @change="changetype" class="ml-2" inline-prompt active-text="正点"
+							inactive-text="分钟" style="margin-right: 10px;" />
 						<el-date-picker v-model="dateRange" value-format="YYYY-MM-DD HH:mm"
 							:format="value1 ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm'"
 							:type="value1 ? 'daterange' : 'datetimerange'" range-separator="-" start-placeholder="开始时间"
-							end-placeholder="结束时间" :disabled-date="disabledDate" 
-							@focus="handleFocus" @calendar-change="handleChange" @change="handleDateChange"
+							end-placeholder="结束时间" :disabled-date="disabledDate" @focus="handleFocus"
+							@calendar-change="handleChange" @change="handleDateChange"
 							:default-time="[new Date(2000, 1, 1, 0, 0), new Date(2000, 1, 1, new Date().getHours(), 0)]"
 							style="width: 300px;"></el-date-picker>
 					</div>
@@ -62,7 +62,7 @@ import { getDataItemList, getPlatformList, getRgDataList, getTacRecordList } fro
 import { Platform } from "@/api/interface";
 import { parseTime } from '@/utils/index';
 import { isToday, isWithinThirtyMinutes, getTimeStamp, getStamp, isDateFuture, isDateRangeWithinDays } from "@/utils/dateTime";
-import {useUserStore} from "@/stores/modules/user";
+import { useUserStore } from "@/stores/modules/user";
 const value1 = ref(true)
 const dateRange = ref<[any, any]>([parseTime(new Date(), '{y}-{m}-{d}') + ' 00:00', parseTime(new Date(), '{y}-{m}-{d} {h}:{i}')]);
 const changetype = (e) => {
@@ -100,11 +100,11 @@ const handleDateChange = async (e) => {
 				ElMessage.error("分钟模式下时间间隔不能大于3小时");
 			}
 		} else {
-			if (isDateRangeWithinDays(e[0], e[1], 7)) {
+			if (isDateRangeWithinDays(e[0], e[1], 90)) {
 				await handleDateRangeChange(e)
 				getHistoryList()
 			} else {
-				ElMessage.error("日模式下时间间隔不能大于7天");
+				ElMessage.error("正点模式下时间间隔不能大于90天");
 			}
 		}
 	}
@@ -118,19 +118,13 @@ const limitTime = 1000 * 60 * 60 * 24 * 6
 const disabledDate = (time: Date) => {
 	return time.getTime() > Date.now() - 8.64e6
 
-	
+
 }
 const handleChange = (val: Date[]) => {
 	const [pointDay] = val
 	pickDay.value = pointDay
 }
 
-
-
-
-
-
-
 const pageable = ref({
 	data_type: true,
 	time_order: 1,
@@ -180,14 +174,13 @@ let historyColumns = [
 
 // 查询自动站列表
 const queryas = ref<Platform>({
-	pageSize: 50,
 	pageNum: 1,
 	currentpage: 1
 })
 
 
 const userStore = useUserStore();
-const platformList =ref<any>(computed(() => userStore.stations))
+const platformList = ref<any>(computed(() => userStore.stations))
 const selectPlatform = ref()
 
 const getPlatforms = async () => {
@@ -217,74 +210,78 @@ function formatDate(timestamp, type) {
 }
 
 
-const timeArr = ref()
+const timeArr = ref<any>()
 const series = ref<any>([])
 
 const getHistoryList = async () => {
-	
-	const { data } = await getDataItemList({ ...pageable.value, pageSize: 9999, as_code_list: [pageable.value.as_code], data_items: historyColumns, data_type: false, time_space: value1.value ? 60 : 1, end_time: getStamp(dateRange.value[1]), begin_time: getStamp(dateRange.value[0]) });
+	timeArr.value = []
+	series.value = []
+
+	const { data } = await getDataItemList({ pageNum: 1, as_code_list: [pageable.value.as_code], data_items: historyColumns, data_type: false, time_space: value1.value ? 60 : 1, end_time: getStamp(dateRange.value[1]), begin_time: getStamp(dateRange.value[0]) });
 	timeArr.value = data.list?.map(item => {
 		return formatDate(item.data_time_i, 1)
 	})
 
-	data.list?.forEach((item, index) => {
+	for (let i = 0; i < data?.list?.length; i++) {
+
+		const item = data.list[i];
+
 		// 初始化一个空数组来存储生成的对象  
 		let resultArray = <any>[];
-
 		// 初始化起始角度和结束角度  
 		let startAngle = 359.50;
 		let endAngle = 0.00; // 注意，这个值实际上是开区间 (0, 360] 的起点前一个值，所以设置为0 - 0.5的极限情况  
 		let step = -0.50;
+		if (item[1003] != '--') {
 
-		// 循环生成对象  
-		for (let angle = startAngle; angle >= endAngle; angle += step) {
-			if (item[1001] != '--') {
+			// 循环生成对象  
+			// if (item[1003] != '--') {
+			for (let angle = startAngle; angle >= endAngle; angle += step) {
+				// if (item[1001] != '--') {
 				if (angle == 0 && (Number(item[1011]) >= 359.75 || Number(item[1011]) < 0.25)) {
 					resultArray.push(Number(item[1010]))
 				} else if (Number(item[1011]) >= angle - 0.25 && Number(item[1011]) < angle + 0.25) {
 					resultArray.push(Number(item[1010]))
 				} else {
-					resultArray.push(null)
+					resultArray.push(0)
 				}
-
+				// }
 			}
-			// if (item[1011] != '--' && Number(item[1011]) == angle) {
-			// 	resultArray.push(Number(item[1010]))
-			// 	console.log(resultArray, 'resultArray');
-
-			// } else {
-			// 	resultArray.push(0)
-			// }
-			// resultArray.push(obj);
-		}
-		series.value.push({
-			name: 'No.' + index,
-			type: 'radar',
-			itemStyle: {
-				borderWidth: 10,
-				borderColor: 'transparent'
-			},
-			data: [
-				{
-					value: resultArray,
-					name: item.data_time,
-					info: item,
-					lineStyle: {
-						normal: {
-							color: 'transparent'
-						}
-					},
-					itemStyle: { // 单个拐点标志的样式设置。
-						normal: {
-							color: '#5470c6'
-						}
-					},
+
+
+			series.value.push({
+				name: 'No.' + i,
+				type: 'radar',
+				itemStyle: {
+					borderWidth: 10,
+					borderColor: 'transparent'
 				},
+				data: [
+					{
+						value: resultArray,
+						name: item.data_time,
+						info: item,
+						lineStyle: {
+							normal: {
+								color: 'transparent'
+							}
+						},
+						itemStyle: { // 单个拐点标志的样式设置。
+							normal: {
+								color: '#5470c6'
+							}
+						},
+					},
+				]
+			})
 
-			]
-		})
-	})
-	nextTick(()=>{
+		}
+
+
+
+	}
+
+	nextTick(() => {
 		showData()
 	})
 };
@@ -298,14 +295,15 @@ const isDark = computed(() => globalStore.isDark);
 
 // resetForm
 const resetForm = () => {
-	dateRange.value =[parseTime(new Date(), '{y}-{m}-{d}') + ' 00:00', parseTime(new Date(), '{y}-{m}-{d} {h}:{i}')]
+	dateRange.value = [parseTime(new Date(), '{y}-{m}-{d}') + ' 00:00', parseTime(new Date(), '{y}-{m}-{d} {h}:{i}')]
 	value1.value = true
 	pageable.value.as_code = platformList.value[0].as_code
 	getHistoryList()
 };
 
-const clickNum=ref(0)
+const clickNum = ref(0)
 const showData = () => {
+
 	// 初始化一个空数组来存储生成的对象  
 	let resultArray = <any>[];
 
@@ -378,8 +376,10 @@ const showData = () => {
 	window.addEventListener("resize", function () {
 		mychart.resize();
 	});
+
 }
 
+
 watch(isDark, () => {
 	showData()
 });
@@ -456,4 +456,4 @@ onMounted(() => {
 	height: calc(100vh - 215px);
 	// height: 100%;
 }
-</style>
+</style>

src/views/analysis/rainfall/index.vue

@@ -18,7 +18,8 @@
 					<div>
 						<!-- <el-switch v-model="value1" @change="changetype" class="ml-2" inline-prompt active-text="日"
 							inactive-text="小时" style="margin-right: 10px;" /> -->
-						<el-select v-model="value1" placeholder="Select"  @change="changetype"  style="width: 160px;margin-right: 20px;">
+						<el-select v-model="value1" placeholder="Select" @change="changetype"
+							style="width: 160px;margin-right: 20px;">
 							<el-option label="日数据" :value="1440" />
 							<el-option label="正点数据" :value="60" />
 							<el-option label="分钟数据" :value="1" />
@@ -28,7 +29,7 @@
 							:type="value1 === 1440 ? 'daterange' : 'datetimerange'" range-separator="-"
 							start-placeholder="开始时间" end-placeholder="结束时间" :disabled-date="disabledDate"
 							@focus="handleFocus" @calendar-change="handleChange" @change="handleDateChange"
-							:default-time="[new Date(2000, 1, 1, 0, 0), new Date(2000, 1, 1, new Date().getHours(), 0)]"
+							:default-time="[new Date(2000, 1, 1, 0, 0), new Date(2000, 1, 1, 0, 0)]"
 							style="width: 300px;"></el-date-picker>
 					</div>
 				</el-form-item>
@@ -67,22 +68,21 @@ import { ref, computed, onMounted, reactive, watch, onDeactivated, onActivated,
 import { getDataItemList, getPlatformList, getRgDataList, getTacRecordList } from "@/api/modules/allData";
 import { Platform } from "@/api/interface";
 import { parseTime } from '@/utils/index';
-import { isToday, isWithinThirtyMinutes, getTimeStamp, getStamp, isWithin24Hours, isDateFuture, isDateRangeWithinDays } from "@/utils/dateTime";
+import { isToday, isWithinThirtyMinutes, getTimeStamp, getStamp, isWithin48Hours, isDateFuture, isDateRangeWithinDays } from "@/utils/dateTime";
 import { useUserStore } from "@/stores/modules/user";
 const value1 = ref(1440)
 const dateRange = ref<[any, any]>([parseTime(new Date(getTimeStamp(5)), '{y}-{m}-{d}') + ' 00:00', parseTime(new Date(), '{y}-{m}-{d}') + ' 00:00']);
 const changetype = (e) => {
-	console.log(e);
 	if (e == 1440) {
-	    dateRange.value = [parseTime(new Date(getTimeStamp(5)), '{y}-{m}-{d}') + ' 00:00', parseTime(new Date(), '{y}-{m}-{d}') + ' 00:00']
-	}else if (e == 60) {
-	    dateRange.value = [parseTime(getTimeStamp(2), '{y}-{m}-{d} {h}:{i}'), parseTime(new Date(), '{y}-{m}-{d} {h}') + ':00']
-	}else {
+		dateRange.value = [parseTime(new Date(getTimeStamp(5)), '{y}-{m}-{d}') + ' 00:00', parseTime(new Date(), '{y}-{m}-{d}') + ' 00:00']
+	} else if (e == 60) {
+		dateRange.value = [parseTime(getTimeStamp(2), '{y}-{m}-{d} {h}:{i}'), parseTime(new Date(), '{y}-{m}-{d} {h}') + ':00']
+	} else {
 		dateRange.value = [parseTime(getTimeStamp(1), '{y}-{m}-{d} {h}:{i}'), parseTime(new Date(), '{y}-{m}-{d} {h}:{i}')]
 	}
 	getHistoryList()
 
-	
+
 	// if (!e) {
 	// 	dateRange.value = [parseTime(getTimeStamp(2), '{y}-{m}-{d} {h}:{i}'), parseTime(new Date(), '{y}-{m}-{d} {h}') + ':00']
 	// } else {
@@ -106,25 +106,24 @@ const handleDateRangeChange = (newVal) => {
 	}
 };
 const handleDateChange = async (e) => {
-
 	if (isDateFuture(e[0]) || isDateFuture(e[1])) {
 		ElMessage.error("不得选择未来的时间");
 	} else {
-		if (value1.value !== 1440) {
-			// if (isWithin24Hours(e[0], e[1])) {
-			// 获取参数
-			getHistoryList()
-
-			// } else {
-			// 	ElMessage.error("小时模式下时间间隔不能大于24小时");
-			// }
-		} else {
-			// if (isDateRangeWithinDays(e[0], e[1], 30)) {
+		if (value1.value === 1440) {
 			await handleDateRangeChange(e)
 			getHistoryList()
-			// } else {
-			// 	ElMessage.error("日模式下时间间隔不能大于30天");
-			// }
+		} else if (value1.value === 60) {
+			if (isDateRangeWithinDays(e[0], e[1], 60)) {
+				getHistoryList()
+			} else {
+				ElMessage.error("正点模式下时间间隔不能大于60天");
+			}
+		} else {
+			if (isWithin48Hours(e[0], e[1])) {
+				getHistoryList()
+			} else {
+				ElMessage.error("分钟模式下时间间隔不能大于48小时");
+			}
 		}
 	}
 }
@@ -351,12 +350,27 @@ const showData = () => {
 			},
 		},
 		grid: {
-			left: '20',
-			right: '20',
-			bottom: '20',
+			left: '30',
+			right: '30',
+			bottom: '90',
 			// top: '20',
 			containLabel: true
 		},
+		dataZoom: [
+			{
+				type: 'inside',
+			
+				
+			},
+			{
+				type: 'slider',
+				
+					left: '100',
+					right:'100'
+				
+			
+			}
+		],
 
 		xAxis: [
 			{
@@ -365,10 +379,10 @@ const showData = () => {
 				axisTick: {
 					alignWithLabel: true
 				},
-				axisLabel: {
-					interval: 1,
+				// axisLabel: {
+				// 	interval: 1,
 
-				},
+				// },
 			}
 		],
 		yAxis: [
@@ -383,7 +397,7 @@ const showData = () => {
 				type: 'bar',
 				barWidth: '50%',
 				color: '#88c1ff',
-				data: value1.value===1440 ? dayArr.value : value1.value===60? hourArr1.value:minArr.value
+				data: value1.value === 1440 ? dayArr.value : value1.value === 60 ? hourArr1.value : minArr.value
 			}
 		]
 	};

src/views/analysis/windSpeed/index.vue

@@ -59,7 +59,7 @@ import { ref, computed, onMounted, reactive, watch, onDeactivated, onActivated }
 import { getDataItemList, getPlatformList, getRgDataList, getTacRecordList } from "@/api/modules/allData";
 import { Platform } from "@/api/interface";
 import { parseTime } from '@/utils/index';
-import { isToday, isWithinThirtyMinutes, getTimeStamp, getStamp, isWithin24Hours, isDateFuture, isDateRangeWithinDays } from "@/utils/dateTime";
+import { isToday, isWithinThirtyMinutes, getTimeStamp, getStamp,  isDateRangeWithinDays } from "@/utils/dateTime";
 import { ElLoading } from "element-plus";
 import {useUserStore} from "@/stores/modules/user";
 

src/views/assembly/uploadFile/index.vue

@@ -203,7 +203,6 @@ const fromModel1 = ref({
 const ruleFormRef = ref<FormInstance>();
 const submit = () => {
   ruleFormRef.value!.validate(valid => {
-    console.log(valid);
   });
 };
 </script>

src/views/maintenance/siteRecords/index.vue

@@ -138,7 +138,7 @@ import { useUserStore } from "@/stores/modules/user";
 import { getMaintainrecordList } from "@/api/modules/allData";
 import { parseTime } from '@/utils/index';
 import { ElMessage } from "element-plus";
-import { getNextDayMidnight, isWithinThirtyMinutes, getTimeStamp, getStamp, isWithin24Hours, isDateFuture, isDateRangeWithinDays } from "@/utils/dateTime";
+import { getNextDayMidnight,  getStamp } from "@/utils/dateTime";
 
 const dateValue = ref<any>(parseTime(new Date(), '{y}-{m}-{d}'))
 
@@ -250,7 +250,6 @@ const handleCurrentChange = (val: number) => {
 const processTableData = ref<any>([]);
 
 const getList = async () => {
-  console.log(parseTime(new Date(getNextDayMidnight(dateValue.value)), '{y}-{m}-{d}') + ' 00:00',parseTime(new Date(dateValue.value), '{y}-{m}-{d}') + ' 00:01');
   
   if (!dateValue.value) return ElMessage.error("请选择日期");
 
@@ -258,9 +257,6 @@ const getList = async () => {
   pageable.value.total = data.total
   processTableData.value = data.list
 
-  console.log(data);
-
-
 }
 
 

src/views/proTable/complexProTable/index.vue

@@ -145,7 +145,6 @@ const tableRowClassName = ({ rowIndex }: { row: User.ResUserList; rowIndex: numb
 // 单击行
 const rowClick = (row: User.ResUserList, column: TableColumnCtx<User.ResUserList>) => {
   if (column.property == "radio" || column.property == "operation") return;
-  console.log(row);
   ElMessage.success("当前行被点击了！");
 };
 

src/views/proTable/useProTable/index.vue

@@ -207,8 +207,6 @@ const columns = reactive<ColumnProps<User.ResUserList>[]>([
 
 // 表格拖拽排序
 const sortTable = ({ newIndex, oldIndex }: { newIndex?: number; oldIndex?: number }) => {
-  console.log(newIndex, oldIndex);
-  console.log(proTable.value?.tableData);
   ElMessage.success("修改列表排序成功");
 };
 

src/views/query/deviceHealth/index.vue

@@ -453,7 +453,6 @@ const getSensorList = async () => {
 const submitForm = () => {
   dialog.visible = false;
   customizeColumns.value = [...copiedCustomizeColumns.value]
-  console.log( customizeColumns.value)
   updateColumns()
   saveCustomizeColumns()
 }
@@ -469,8 +468,7 @@ const updateColumns = () => {
     label: item.se_name,
     width: calculateTextLengthInPixels(item.se_name)
   }));
-  console.log('==============')
-  console.log(newColumns)
+
 
   columns = [...column, ...newColumns];
   pageable.value.data_items = [...customizeColumns.value];
@@ -540,9 +538,7 @@ const getList = async () => {
 
 const handleSortChange = ({ column, prop, order }) =>{
   // 在这里发送请求到服务器端进行远程排序
-  console.log('column:', column)
-  console.log('prop:', prop)
-  console.log('order:', order)
+
 
 }
 

src/views/query/hazardousWeather/index.vue

@@ -181,9 +181,7 @@ function findLabelByValue(noticeTypeList, value) {
 }
 
 const handleSortChange = ({ column, prop, order }) => {
-  console.log('column:', column);
-  console.log('prop:', prop);
-  console.log('order:', order);
+
 };
 
 

src/views/query/queryObservationData/index.vue

@@ -315,9 +315,7 @@ const cancel = () => {
 }
 
 const handleSortChange = ({ column, prop, order }) => {
-  console.log('column:', column);
-  console.log('prop:', prop);
-  console.log('order:', order);
+
 
   // Reset sorting if order is null
   if (order === null) {
@@ -471,7 +469,6 @@ const changePoints=(row)=>{
 
 }
 const changeTime =(time)=>{
-  console.log("========")
   const timeStamp = new Date(time).getTime();
   if(points.value){
     //0点
@@ -492,7 +489,6 @@ const changeTime =(time)=>{
     nextDay.setHours(18, 0, 0, 0); // 设置时间为18:00:00
     const endTimeStamp = nextDay.getTime(); // 获取当天18:00:00的时间戳
 
-    console.log(startTimeStamp);
     pageable.value.begin_time = startTimeStamp / 1000;
     pageable.value.end_time = endTimeStamp / 1000;
   }
@@ -594,8 +590,7 @@ const resetQuery = () => {
 const handleSizeChange = (val: number) => {
   pageable.value.pageSize = val
   getList()
-  console.log("=====");
-  console.log(val);
+
 };
 
 /**
@@ -606,8 +601,7 @@ const handleSizeChange = (val: number) => {
 const handleCurrentChange = (val: number) => {
   pageable.value.pageNum = val
   getList()
-  console.log("=====1");
-  console.log(val);
+
 };
 
 const processTableData = ref([]);

src/views/system/disposition/components/configurationAuthorization.vue

@@ -87,7 +87,6 @@ onMounted(() => {
 });
 watch(modelValue, (newVal) => {
   // 在这里处理 modelValue 的变化
-  console.log("====")
   dataProcessing()
 });
 
@@ -99,7 +98,6 @@ const dataProcessing= async ()=>{
     }
     if(item.item_key==='10'){
       formInline.value.periodReissue = itemValue
-      console.log(formInline.value.periodReissue)
     }
     if(item.item_key==='8'){
       const [timingType, timingPlatform,timingIP,timingPlatformPORT] = itemValue.split('#');

src/views/system/stations/components/strategySafeguard.vue

@@ -479,7 +479,6 @@ const getDailyData=()=>{
       }
     });
 
-    console.log(tableDailyData.value)
   }
 }
 

src/views/system/stations/components/threshold.vue

@@ -211,7 +211,6 @@ const getYasthresholdList= async ()=>{
   if(voltageHigh.value===undefined){
     return;
   }
-  console.log(voltageHigh.value)
   //云底高度设置
   as_h_yun.value = voltageHigh.value.as_h_yun
   as_z_yun.value = voltageHigh.value.as_z_yun

src/views/system/stations/components/verificationCertificate.vue

@@ -57,9 +57,9 @@
         </div>
       </div>
       <div class="disposition-bottom">
-        <el-button disabled > 取消 </el-button>
-        <el-button disabled  type="primary" plain> 上一步 </el-button>
-        <el-button disabled  type="primary"> 下一步 </el-button>
+        <el-button disabled> 取消 </el-button>
+        <el-button disabled type="primary" plain> 上一步 </el-button>
+        <el-button disabled type="primary"> 下一步 </el-button>
       </div>
     </div>
     <!-- 添加或修改对话框 -->
@@ -72,9 +72,10 @@
                 <el-radio-button v-for="(item, index) in seTypeList" :key="index" :label="item.name" :value="item.name"
                   plain />
               </template>
-              <el-radio-button v-else label="p" value="p" disabled
-                  plain />
-
+              <template v-else>
+                <el-radio-button v-for="(item, index) in novalSetypeList" :key="index" :label="item" :value="item"
+                  disabled plain />
+              </template>
             </el-radio-group>
           </el-col>
         </el-row>
@@ -97,24 +98,24 @@
         <el-row :gutter="20" style="margin-top: 10px">
           <el-col :span="12">
             <el-form-item label="检定条件" prop="verification">
-              <el-input disabled  v-model="selectTable.cal_condition" clearable />
+              <el-input disabled v-model="selectTable.cal_condition" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="证书编号" prop="certificate">
-              <el-input disabled  v-model="selectTable.cal_calsn" clearable />
+              <el-input disabled v-model="selectTable.cal_calsn" clearable />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="检定员编号" prop="inspector">
-              <el-input disabled  v-model="selectTable.cal_calman" clearable />
+              <el-input disabled v-model="selectTable.cal_calman" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="检定参数类型" prop="typeParameter" style="display: flex; align-items: center">
-              <el-radio-group disabled  v-model="selectTable.cal_type">
+              <el-radio-group disabled v-model="selectTable.cal_type">
                 <el-radio :value="1" size="large">校准系数</el-radio>
                 <el-radio :value="2" size="large">多点校准系数</el-radio>
               </el-radio-group>
@@ -124,7 +125,7 @@
         <el-row :gutter="20" v-if="selectTable.cal_type === 1">
           <el-col :span="12">
             <el-form-item label="校准系数" prop="coefficient">
-              <el-input  disabled  v-model="selectTable.cal_param" clearable />
+              <el-input disabled v-model="selectTable.cal_param" clearable />
             </el-form-item>
           </el-col>
         </el-row>
@@ -135,7 +136,7 @@
                 :show-overflow-tooltip="true">
                 <template v-if="item.prop === 'operation'">
                   <el-tooltip class="box-item" effect="dark" content="删除" placement="top">
-                    <el-button type="primary" disabled  link>
+                    <el-button type="primary" disabled link>
                       <el-icon>
                         <Delete />
                       </el-icon>
@@ -171,8 +172,8 @@
 <script setup lang="tsx">
 import { defineProps, reactive, ref, onMounted } from "vue";
 import { ColumnProps } from "@/components/ProTable/interface";
-import { getQuerCertList } from "@/api/modules/allData";
-const props = defineProps(['selectData','sensorList'])
+import { getQuerCertList, getQueryAllSysItem } from "@/api/modules/allData";
+const props = defineProps(['selectData', 'sensorList'])
 
 
 // 获取检定证书
@@ -317,6 +318,7 @@ const selectTable = ref<any>({
   cal_param_list: [],
 })
 const list = ref<any>([])
+const novalSetypeList = ref<any>(['P'])
 const handleUpdate = async (row?: any) => {
   reset();
   list.value = stationCal.value?.filter(obj => obj.se_type === row.se_type);
@@ -328,7 +330,7 @@ const handleUpdate = async (row?: any) => {
     acc[cal_probeid].push(item);
     return acc;
   }, {});
-  
+
 
   if (groupedData) {
     seTypeList.value = Object.keys(groupedData).map(key => ({
@@ -336,7 +338,7 @@ const handleUpdate = async (row?: any) => {
       list: groupedData[key]
     }));
   }
-  
+
   seTypeList.value.forEach(item => {
     item.list?.forEach(obj => {
       obj.cal_param_list = obj.cal_param.split(',').map(pair => {
@@ -345,7 +347,23 @@ const handleUpdate = async (row?: any) => {
       });
     });
   });
-  console.log(row,stationCal.value,list.value,groupedData,seTypeList.value);
+  if (seTypeList.value?.length == 0) {
+    if (row.se_type === 100) {
+      novalSetypeList.value = allSystem.value.find(item => item.item_key === '19')?.item_value.split('|')
+    } else if (row.se_type === 200) {
+      novalSetypeList.value = allSystem.value.find(item => item.item_key === '23')?.item_value.split('|')
+    } else if (row.se_type === 300) {
+      novalSetypeList.value = allSystem.value.find(item => item.item_key === '22')?.item_value.split('|')
+    }else if (row.se_type === 1000) {
+      novalSetypeList.value = allSystem.value.find(item => item.item_key === '20')?.item_value.split('|')
+    } else if (row.se_type === 1300) {
+      novalSetypeList.value = allSystem.value.find(item => item.item_key === '21')?.item_value.split('|')
+    } else if (row.se_type === 1400) {
+      novalSetypeList.value = allSystem.value.find(item => item.item_key === '21')?.item_value.split('|')
+    } else {
+      novalSetypeList.value = ['P']
+    }
+  }
 
   selectInfo.value = seTypeList.value[0]
   instrumentForm.value.type = seTypeList?.value[0]?.name
@@ -377,7 +395,6 @@ const cancel = () => {
 /** 表单重置 */
 const reset = () => {
   instrumentForm.value = { ...initFormData };
-  console.log(instrumentForm.value)
   formRef.value?.resetFields();
 }
 
@@ -451,9 +468,16 @@ const saveEdit = (row: any, field: string) => {
   editingField.value = null;
 };
 
+const allSystem = ref<any>([])
+const getAllSystem = async () => {
+  const { data } = await getQueryAllSysItem()
+  allSystem.value = data.list
+
+}
 
 onMounted(() => {
   getCertList();
+  getAllSystem()
 });
 </script>
 

src/views/system/stations/index.vue

@@ -167,7 +167,6 @@ const handleQuery = () => {
   pageable.value.total = filteredData.length; // 更新总数
   // 确保通过 .value 修改 ref 的值
   showList.value = filteredData;
-  console.log(showList.value);
 };
 
 // 重置功能