代码提交

src/stores/modules/global.ts

@@ -30,7 +30,7 @@ export const useGlobalStore = defineStore({
     // 折叠菜单
     isCollapse: false,
     // 菜单手风琴
-    accordion: false,
+    accordion: true,
     // 页面水印
     watermark: false,
     // 面包屑导航

src/views/alarm/singleDevice/index.vue

@@ -342,7 +342,9 @@ const submitForm = () => {
 
 const updateColumns = () => {
   // pageable.value.data_items = [...customizeColumns.value];
-  getList()
+  if(pageable.value.as_code_list&&pageable.value.as_code_list.length>0){
+    getList()
+  }
 }
 
 const as_code_list = ref('')
@@ -358,8 +360,6 @@ const changeCodeList =(value)=>{
     pageable.value.as_code_list= []
     processTableFrom.value = {}
   }
-
-
 }
 
 

src/views/query/deviceHealth/index.vue

@@ -534,7 +534,6 @@ const getPlatforms = async () => {
 
 const getList = async () => {
   const { data } = await getStaitemList(pageable.value);
-  console.log(transformData(data.list))
   processTableData.value = transformData(data.list)
   pageable.value.total = data.total
 };
@@ -553,6 +552,7 @@ const handleSortChange = ({ column, prop, order }) =>{
 const handleQuery = () => {
   if(isStand.value){
     //多站
+    processTableData.value = []
     pageable.value.pageNum = 1;
     getList();
   }else {
@@ -566,6 +566,7 @@ const handleQuery = () => {
       });
       return
     }
+    processTableData.value = []
     pageable.value.pageNum = 1;
     getList();
   }
@@ -590,6 +591,7 @@ const resetQuery = () => {
     pageNum: 1,
     pageSize: 24
   }
+  processTableData.value = []
   getList();
 };
 

src/views/query/queryObservationData/index.vue

@@ -445,8 +445,9 @@ const changePoints=(row)=>{
 
 }
 const changeTime =(time)=>{
+  console.log("========")
   const timeStamp = new Date(time).getTime();
-  if(points){
+  if(points.value){
     //0点
     const startTime = timeStamp + 60 * 1000; // 添加1分钟（60秒）
     const endTime = timeStamp + 24 * 60 * 60 * 1000; // 添加一天（24小时）
@@ -459,6 +460,7 @@ const changeTime =(time)=>{
     nextDay.setDate(nextDay.getDate() + 1); // 设置为第二天
     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
   }
@@ -527,6 +529,8 @@ const resetQuery = () => {
  * @return void
  * */
 const handleSizeChange = (val: number) => {
+  pageable.value.pageSize = val
+  getList()
   console.log("=====");
   console.log(val);
 };
@@ -538,6 +542,7 @@ const handleSizeChange = (val: number) => {
  * */
 const handleCurrentChange = (val: number) => {
   pageable.value.pageNum = val
+  getList()
   console.log("=====1");
   console.log(val);
 };