Bladeren bron

[Fix 0000] 关联分析初始化状态报错问题修复

houzekong 1 maand geleden
bovenliggende
commit
5cecd4e2d5

+ 5 - 4
src/views/analysis/warningAnalysis/connectAnalysis/AnalysisChart.vue

@@ -55,7 +55,7 @@
     <!-- 动态图表区域-->
     <div class="echart-box">
       <div class="check-title">
-        <CheckboxNav :filters="filters" :options="checkboxOptions" @check-box-change="checkBoxChange"></CheckboxNav>
+        <CheckboxNav :filters="checkList" :options="checkboxOptions" @check-box-change="checkBoxChange"></CheckboxNav>
       </div>
       <div class="check-line">
         <echartDivder></echartDivder>
@@ -128,7 +128,7 @@
   // 筛选相关响应式数据
   const dateRange = ref([dayjs().add(-props.dateForm, 'day'), dayjs()]); // 默认时间范围(近1天)
   // const mineStore = useMineDepartmentStore();
-  const checkList = ref<any[]>(props.checkboxOptions.map((e) => e.value)); //当前选中要进行显示的选项
+  const checkList = ref<any[]>(filters.length ? filters : props.checkboxOptions.map((e) => e.value)); //当前选中要进行显示的选项
   const echartData = reactive({
     xData: [] as any,
     yData: [] as any,
@@ -158,12 +158,13 @@
 
   // 生成折线图核心逻辑
   async function generateChart() {
-    echartData.yData.length = 0;
-    echartData.flag = false;
     if (!goafId.value) {
       return message.info('请先选择煤矿及老空区');
     }
 
+    echartData.yData.length = 0;
+    echartData.flag = false;
+
     const startTime = dateRange.value[0].format('YYYY-MM-DD HH:mm:ss');
     const endTime = dateRange.value[1].format('YYYY-MM-DD HH:mm:ss');
     const res = await getGoafHistory({

+ 3 - 3
src/views/analysis/warningAnalysis/connectAnalysis/components/checkbox-nav.vue

@@ -17,7 +17,7 @@
   // import { plainOptions } from '../connectAnalysis.data';
 
   const props = defineProps<{
-    /** 初始状态过滤器,传空数组为不过滤 */
+    /** 初始状态过滤器 */
     filters: string[];
     options: any[];
   }>();
@@ -25,7 +25,7 @@
   const state = reactive({
     indeterminate: true,
     checkAll: false,
-    checkedList: [],
+    checkedList: props.filters,
   });
 
   const $emit = defineEmits(['checkBoxChange']);
@@ -42,7 +42,7 @@
     $emit('checkBoxChange', state);
   };
 
-  onChangeGroup(props.filters.length ? props.filters : props.options.map((e) => e.value));
+  // onChangeGroup(props.filters.length ? props.filters : props.options.map((e) => e.value));
 </script>
 
 <style lang="less" scoped>