修改井筒图表不显示问题

vue/src/views/query/index.vue

@@ -168,6 +168,7 @@ export default defineComponent({
     const displayChartYbar = ref<typeof DisplayChartYbar>();
     const exportData = ref<typeof ExportData>();
 
+    const dataList=ref({});
     const activeTab = ref('1');
     const showTree = ref(true);
     const loading = ref(false);
@@ -224,16 +225,19 @@ export default defineComponent({
     const tabChange = (key) => {
       console.log("tabChange", key);
       if (key == "2") {
+        (displayChartBar.value as any).setData(dataList.value);
         setTimeout(function () {
           (displayChartBar.value as any).resize();
         }, 100);
       }
       if (key == "3") {
+        (displayChartLine.value as any).setData(dataList.value);
         setTimeout(function () {
           (displayChartLine.value as any).resize();
         }, 100);
       }
       if (key == "4") {
+        (displayChartYbar.value as any).setData(dataList.value);
         setTimeout(function () {
           (displayChartYbar.value as any).resize();
         }, 100);
@@ -278,11 +282,9 @@ export default defineComponent({
           modal.value.open = true;
           modal.value.sqlString = result["sqlString"];
         }
+        dataList.value=result;
         //将数据给视图，视图组装并显示
         (display.value as any).setData(result);
-        (displayChartBar.value as any).setData(result);
-        (displayChartLine.value as any).setData(result);
-        (displayChartYbar.value as any).setData(result);
 
         loading.value = false;
       });

vue/src/views/wellinfo/index.vue

@@ -118,7 +118,7 @@
                   multiple
                   tree-line
                   :tree-data="filterUnitTree(subjectTrees.constructUnitTree)"
-                  tree-node-filter-prop="label"  @change="onUnitTreeChange">
+                  tree-node-filter-prop="label" @change="onUnitTreeChange">
                 </a-tree-select>
               </a-form-item>
             </a-col>
@@ -537,11 +537,13 @@ export default defineComponent({
     };
     const tabChange = (key) => {
       console.log("tabChange", key);
+      formState.org_id_a1 = '';
+      formState.project_id = '';
+      formState.orgList = [];
+      formState.unitList = [];
       if (key == "2") {
-        formState.org_id_a1 = '';
         subjectTrees.value.data = Object.assign(subjectTrees.value.constructUnitTree);
       } else {
-        formState.project_id = ''
         subjectTrees.value.data = Object.assign(subjectTrees.value.organizationTree);
       }
       loadData();
@@ -640,20 +642,22 @@ export default defineComponent({
         if (activeTab.value == "1") {
           formState.org_id_a1 = selected.length > 0 ? selectedNodes.node.key : '';
           formState.orgList = selected.length > 0 ? [formState.org_id_a1] : [];
+          onOrgTreeChange();
         } else {
           formState.project_id = selected.length > 0 ? selectedNodes.node.key : '';
           formState.unitList = selected.length > 0 ? [formState.project_id] : [];
+          onUnitTreeChange();
         }
         loadData();
       }
     }
-    const orgUnitList: any =ref([]);
-    const unitOrgList: any =ref([]);
+    const orgUnitList: any = ref([]);
+    const unitOrgList: any = ref([]);
     let filterTreeData: any[] = [];
 
     //组织机构和地质单元联动，选择组织机构只显示该组织机构的地质单元
     function filterOrgTree(treeData: any[]) {
-      if(formState.unitList.length==0){
+      if (formState.unitList.length == 0) {
         return treeData;
       }
       filterTreeData = [];
@@ -685,13 +689,15 @@ export default defineComponent({
         orgUnitList.value = data.map(x => x.project_id);
       })
     }
+
     function onUnitTreeChange() {
       postData('wellInfo/getOrgProjectList', {unitList: formState.unitList}).then((data: any[]) => {
         unitOrgList.value = data.map(x => x.org_id);
       })
     }
+
     function filterUnitTree(treeData: any[]) {
-      if(formState.orgList.length==0){
+      if (formState.orgList.length == 0) {
         return treeData;
       }
       filterTreeData = [];
@@ -717,6 +723,7 @@ export default defineComponent({
         eachUnitTreeNode(node.children);
       })
     }
+
     const showDoc = (id) => {
       get('wellInfo/getWellDocumentList', {wellId: id}).then(data => {
         docList.value = data;
@@ -728,16 +735,56 @@ export default defineComponent({
     const labelCol = {style: {width: '100px'}};
 
     return {
-      route, selectedRowKeys, loading, activeTab, showTree, onSelectChange, data,
-      expand, onQuery, loadData, onRangeChange, showQuery, wellTypeList, wellPurposeList, replaceFields,
-      formRef, viewModel, handleTableChange, detail,
-      formState, isShowDoc, showDoc, docKey, docList, resetFields, showColumnType, filterColumns, filterUnitTree,filterOrgTree,
-      labelCol, getTdColor, downFile,
-      tabChange, onCheckboxChange, treeRef, colspan,
+      route,
+      selectedRowKeys,
+      loading,
+      activeTab,
+      showTree,
+      onSelectChange,
+      data,
+      expand,
+      onQuery,
+      loadData,
+      onRangeChange,
+      showQuery,
+      wellTypeList,
+      wellPurposeList,
+      replaceFields,
+      formRef,
+      viewModel,
+      handleTableChange,
+      detail,
+      formState,
+      isShowDoc,
+      showDoc,
+      docKey,
+      docList,
+      resetFields,
+      showColumnType,
+      filterColumns,
+      filterUnitTree,
+      filterOrgTree,
+      labelCol,
+      getTdColor,
+      downFile,
+      tabChange,
+      onCheckboxChange,
+      treeRef,
+      colspan,
       treeOnExpand,
-      subjectTrees, fileOptions, onBusTypeChange, onOrgTreeChange,onUnitTreeChange,
-      getSubjectTree, searchTree,
-      treeOnSelect, pagination, getSettingColumns, wellPurposeTree, wellTypeTree, numberToCurrencyNo,
+      subjectTrees,
+      fileOptions,
+      onBusTypeChange,
+      onOrgTreeChange,
+      onUnitTreeChange,
+      getSubjectTree,
+      searchTree,
+      treeOnSelect,
+      pagination,
+      getSettingColumns,
+      wellPurposeTree,
+      wellTypeTree,
+      numberToCurrencyNo,
       handleResizeColumn: (w, col) => {
         col.width = w;
       }