代码提交

src/api/modules/allData.ts

@@ -23,6 +23,11 @@ export const getDataItemList = (params:{}) => {
   return http.post<ResPage<any>>(PORT1 + `/querydataitem`,params,{ loading: false });
 };
 
+//查询观测要素
+export const getDataItemList2 = (params:{}) => {
+  return http.post<ResPage<any>>(PORT1 + `/querydataitem`,params);
+};
+
 
 //根据条件查询危险天气记录表
 export const getTacRecordList = (params:{}) => {

src/views/alarm/allData/index.vue

@@ -550,6 +550,7 @@ const selectedItems =(data)=>{
     const allCodes = platformList.value.map(item => item.as_code);
     pageable.value.as_code_list = allCodes
   }
+  getList()
 };
 
 // 查询所有人工要素字典表

src/views/alarm/allWeather/index.vue

@@ -177,15 +177,13 @@ const resetQuery = () => {
 //搜索站号
 const selectedData= ref([])
 const selectedItems =(data)=>{
-  console.log(data)
   if(data.length>0){
     pageable.value.as_code_list = data
   }else {
-    // const firstCode = platformList.value[0]?.as_code ?? null;
-    // pageable.value.as_code_list = firstCode ? [firstCode] : [];
     const allCodes = platformList.value.map(item => item.as_code);
     pageable.value.as_code_list = allCodes
   }
+  getList()
 };
 
 /**

src/views/query/deviceHealth/index.vue

@@ -19,7 +19,7 @@
               />
 
               <el-form-item v-if="!hot" label="数据密度:">
-                <el-select v-model="pageable.time_space" style="width: 240px"  filterable placeholder="请选择" clearable>
+                <el-select v-model="pageable.time_space" style="width: 100px" filterable placeholder="请选择" clearable>
                   <el-option
                     v-for="item in timeSpaceList"
                     :key="item.value"
@@ -40,6 +40,10 @@
                   @change="changePoints"
                 />
                 <el-date-picker style="margin-left: 10px" v-model="singleTime" type="date" placeholder="请选择" @change="changeTime" />
+                <!-- 减少一天 -->
+                <el-button style="margin: 0 5px" @click="decreaseDay" icon="ArrowLeft"></el-button>
+                <!-- 增加一天 -->
+                <el-button @click="increaseDay" icon="ArrowRight" :disabled="isIncreaseDay"></el-button>
               </el-form-item>
 
             </el-form-item>
@@ -299,6 +303,16 @@ const changeTime = (time) => {
     pageable.value.begin_time = startTimeStamp / 1000;
     pageable.value.end_time = endTimeStamp / 1000;
   }
+
+  const newDate = new Date(time);
+  const today = new Date();
+  today.setHours(0, 0, 0, 0); // 将时间设置为当天的0点0分0秒
+  if (newDate < today) {
+    isIncreaseDay.value = false
+  }else {
+    isIncreaseDay.value = true
+  }
+  getList()
 }
 
 
@@ -705,12 +719,9 @@ function loadCustomizeColumns() {
 const platformList =ref<any>(computed(() => userStore.stations))
 
 const getList = async () => {
-  if(pageable.value.as_code_list===undefined||pageable.value.as_code_list.length===0){
-    // 没有站不给数据
-    processTableData.value = []
-    pageable.value.total=0
-    return;
-  }
+// 没有站不给数据
+  processTableData.value = []
+  pageable.value.total=0
   const { data } = await getStaitemList(pageable.value);
   processTableData.value = transformData(data.list)
   pageable.value.total = data.total
@@ -718,6 +729,8 @@ const getList = async () => {
 
 
 
+
+
 const handleSortChange = ({ column, prop, order }) =>{
   // 在这里发送请求到服务器端进行远程排序
 
@@ -760,6 +773,7 @@ const selectedItems =(data)=>{
     const allCodes = platformList.value.map(item => item.as_code);
     pageable.value.as_code_list = allCodes
   }
+  getList()
 };
 
 
@@ -772,6 +786,7 @@ const selectedItems2 =(data)=>{
     const allCodes = platformList.value.map(item => item.as_code);
     pageable.value.as_code_list = allCodes
   }
+  getList()
 };
 
 
@@ -863,6 +878,30 @@ const initSingle=()=>{
   pageable.value.data_items = [...customizeColumns.value];
 }
 
+const isIncreaseDay =ref(true)
+const decreaseDay = () => {
+  if (singleTime.value) {
+    pageable.value.pageNum = 1;
+    const newDate = new Date(singleTime.value);
+    newDate.setDate(newDate.getDate() - 1);
+    singleTime.value = newDate;
+    changeTime(newDate);
+    getList()
+  }
+};
+
+const increaseDay = () => {
+  if (singleTime.value) {
+    pageable.value.pageNum = 1;
+    const newDate = new Date(singleTime.value);
+    newDate.setDate(newDate.getDate() + 1);
+    singleTime.value = newDate;
+    changeTime(newDate);
+    getList()
+  }
+};
+
+
 </script>
 
 <style scoped lang="scss">

src/views/query/hazardousWeather/index.vue

@@ -124,6 +124,7 @@ const changeBeginTime = (value: Date | string | null) => {
   }else {
     isIncreaseDay.value = true
   }
+  getList()
 };
 
 const tact_state =ref(0)

src/views/query/qualityAudits/index.vue

@@ -74,7 +74,7 @@ import SelectItem from "@/components/SelectItem/index.vue";
 import {ref, computed, onMounted} from "vue";
 import { ColumnProps } from "@/components/ProTable/interface";
 import {useUserStore} from "@/stores/modules/user";
-import {getDataItemList} from "@/api/modules/allData";
+import {getDataItemList, getDataItemList2} from "@/api/modules/allData";
 
 //获取站列表
 const userStore = useUserStore();
@@ -306,7 +306,7 @@ const getList = async () => {
     return;
   }
   pageable.value.data_items = customizeColumns.value
-  const { data } = await getDataItemList(pageable.value);
+  const { data } = await getDataItemList2(pageable.value);
   processTableData2.value = data.list
   pageable.value.total = data.total
   processTableData.value = processTableDatas()

src/views/query/queryObservationData/index.vue

@@ -33,6 +33,11 @@
                 <el-date-picker v-if="!hot" v-model="multiTime" style="margin-left: 10px" type="datetime"
                                 @change="changeMultiTime" format="YYYY-MM-DD HH:mm" placeholder="选择日期时间">
                 </el-date-picker>
+
+                <!-- 减少小时或分钟 -->
+                <el-button style="margin: 0 5px" @click="decreaseDay2" icon="ArrowLeft"></el-button>
+                <!-- 增加小时或分钟  -->
+                <el-button @click="increaseDay2" icon="ArrowRight" :disabled="isIncreaseDay"></el-button>
               </el-form-item>
 
               <!--单选自动站 观测时间-->
@@ -40,6 +45,10 @@
                 <span class="form-item__label2">日界:</span>
                 <el-switch v-model="points" inline-prompt active-text="0点" size="default" inactive-text="18点" @change="changePoints" />
                 <el-date-picker style="margin-left: 10px" v-model="singleTime" type="date" placeholder="请选择" @change="changeTime" />
+                <!-- 减少一天 -->
+                <el-button style="margin: 0 5px" @click="decreaseDay" icon="ArrowLeft"></el-button>
+                <!-- 增加一天 -->
+                <el-button @click="increaseDay" icon="ArrowRight" :disabled="isIncreaseDay"></el-button>
               </el-form-item>
 
             </el-form-item>
@@ -416,6 +425,7 @@ const changeHot = (row) => {
   } else {
     pageable.value.time_space = 1
   }
+  changeMultiTime(multiTime.value)
 }
 
 const changeMultiTime = (time) => {
@@ -428,6 +438,25 @@ const changeMultiTime = (time) => {
     pageable.value.end_time = undefined
   }
 
+// 创建一个新的日期对象，代表传入的时间
+  const newDate = new Date(time);
+  // 创建一个当前日期的对象，并设置为当天的0点0分0秒
+  const today = new Date();
+
+  if(hot.value){
+    // 给新日期对象加上一个小时
+    newDate.setHours(newDate.getHours() + 1);
+    isIncreaseDay.value = newDate >  today;
+  }else {
+    // 创建一个新的日期对象，代表传入的时间
+    // 给新日期对象加上一个小时
+    newDate.setMinutes(newDate.getMinutes() + pageable.value.time_space);
+    isIncreaseDay.value = newDate >  today;
+  }
+
+
+
+  getList()
 }
 
 
@@ -462,6 +491,16 @@ const changeTime = (time) => {
     pageable.value.begin_time = startTimeStamp / 1000;
     pageable.value.end_time = endTimeStamp / 1000;
   }
+
+  const newDate = new Date(time);
+  const today = new Date();
+  today.setHours(0, 0, 0, 0); // 将时间设置为当天的0点0分0秒
+  if (newDate < today) {
+    isIncreaseDay.value = false
+  }else {
+    isIncreaseDay.value = true
+  }
+  getList()
 }
 
 // 查询功能
@@ -498,6 +537,7 @@ const selectedItems = (data) => {
     const allCodes = platformList.value.map(item => item.as_code);
     pageable.value.as_code_list = allCodes
   }
+  getList()
 };
 
 //搜索站号
@@ -508,6 +548,8 @@ const selectedItems2 = (data) => {
     const allCodes = platformList.value.map(item => item.as_code);
     pageable.value.as_code_list = allCodes
   }
+
+  getList()
 };
 
 
@@ -817,6 +859,7 @@ const renderHeader = ({ column }: { column: any }) => {
 
 // 单站
 const initSingle=()=>{
+  isStand.value =false
   pageable.value = {
     data_type: false,
     time_order: 0,
@@ -848,6 +891,7 @@ const initSingle=()=>{
 
 // 多站
 const initMany=()=>{
+  isStand.value =true
   pageable.value = {
     data_type: false,
     time_order: 0,
@@ -875,6 +919,70 @@ const initMany=()=>{
   pageable.value.data_items = [...customizeColumns.value];
 }
 
+const isIncreaseDay =ref(true)
+
+const decreaseDay = () => {
+  if (singleTime.value) {
+    pageable.value.pageNum = 1;
+    const newDate = new Date(singleTime.value);
+    newDate.setDate(newDate.getDate() - 1);
+    singleTime.value = newDate;
+    changeTime(newDate);
+    getList()
+  }
+};
+
+const increaseDay = () => {
+  if (singleTime.value) {
+    pageable.value.pageNum = 1;
+    const newDate = new Date(singleTime.value);
+    newDate.setDate(newDate.getDate() + 1);
+    singleTime.value = newDate;
+    changeTime(newDate);
+    getList()
+  }
+};
+
+const decreaseDay2 = () => {
+  if (multiTime.value) {
+    pageable.value.pageNum = 1;
+    const newDate = new Date(multiTime.value);
+    if (hot.value) {
+      // 如果 hot 为 true，则减去一天
+      newDate.setMinutes(newDate.getMinutes() - 60);
+    } else {
+      // 如果 hot 为 false，则减去分钟，这里需要具体逻辑，比如减去30分钟
+      newDate.setMinutes(newDate.getMinutes() - pageable.value.time_space);
+    }
+    // 更新 multiTime 的值
+    multiTime.value = newDate;
+    // 调用 changeMultiTime 更新日期
+    changeMultiTime(newDate);
+    // 调用 getList 获取列表
+    getList();
+  }
+};
+
+const increaseDay2 = () => {
+  if (multiTime.value) {
+    pageable.value.pageNum = 1;
+    const newDate = new Date(multiTime.value);
+    if (hot.value) {
+      // 如果 hot 为 true，则减去一天
+      newDate.setMinutes(newDate.getMinutes() + 60);
+    } else {
+      // 如果 hot 为 false，则减去分钟，这里需要具体逻辑，比如减去30分钟
+      newDate.setMinutes(newDate.getMinutes() + pageable.value.time_space);
+    }
+    // 更新 multiTime 的值
+    multiTime.value = newDate;
+    // 调用 changeMultiTime 更新日期
+    changeMultiTime(newDate);
+    // 调用 getList 获取列表
+    getList();
+  }
+};
+
 </script>
 <style lang="scss" scoped >
 .tpc .el-time-spinner__wrapper {