Explorar el Código

echarts图表无数据时bug修复

ming hace 3 años
padre
commit
9f566885c2

+ 2 - 3
src/views/dataManage/chainAnalysis/ehcarts/index.vue

@@ -56,7 +56,6 @@ export default defineComponent({
           textStyle: {
             color: 'black',
           },
-
           left: 'center',
           // bottom: '0',
         },
@@ -145,7 +144,7 @@ export default defineComponent({
     }
 
     const writeValue = (val) => {
-      alert(1)
+   
       val
 
       getData()
@@ -154,7 +153,7 @@ export default defineComponent({
 
     //监听变化
     watch(
-      () => props.echartsDataBefore,
+      () => props.echartsDataOne,
       (newVal, oldVal, clear) => {
         // 执行异步任务,并得到关闭异步任务的 id
         // console.log(newVal)

+ 4 - 3
src/views/dataManage/chainAnalysis/index.vue

@@ -85,7 +85,7 @@
           </div>
         </el-radio-group>
       </div>
-      <div class="chainEcharts" v-if="flag && flag2">
+      <div class="chainEcharts" >
         <echarts
           v-for="(item, index) in echartsDataObj"
           :key="index"
@@ -242,8 +242,9 @@ export default defineComponent({
         })
         console.log('echartsDataObj.value')
         console.log(echartsDataObj.value)
-        console.log(flag.value)
-         console.log(flag2.value)
+         if(echartsDataObj.value.length==[]){
+           ElMessage.error('暂无结果') 
+         }
 
       } else {
         console.log('', 1)

+ 10 - 9
src/views/dataManage/sameAnalysis/index.vue

@@ -79,9 +79,10 @@
         </el-radio-group>
       </div>
       <div class="sameEcharts">
-         <echarts :ecahrtsData="ecahrtsData"  v-if="flag&&ecahrtsData"></echarts>
-        <!-- <echarts :ecahrtsData="ecahrtsData"  v-if="flag&&ecahrtsData.length>0"></echarts> -->
-        <!-- <div v-else style="text-align:center;margin:50px">暂无数据</div> -->
+        <echarts
+          :ecahrtsData="ecahrtsData"
+          v-if="flag && ecahrtsData[0]"
+        ></echarts>
       </div>
     </div>
   </div>
@@ -143,9 +144,7 @@ export default defineComponent({
     }
 
     function searchData() {
-  
-
-      if(!dateTime.value){
+      if (!dateTime.value) {
         ElNotification({
           title: '提示',
           message: '请选择开始和结束时间',
@@ -172,6 +171,10 @@ export default defineComponent({
             if (requset.status === 'SUCCESS') {
               flag.value = true
               ecahrtsData.value = requset.data
+
+              if (!ecahrtsData.value[0]) {
+                ElMessage.error('暂无结果')
+              }
             } else {
               ElMessage.error(requset.msg)
             }
@@ -191,9 +194,7 @@ export default defineComponent({
       store.commit('publicDeviceList')
     }
 
-    onMounted(() => {
-     
-    })
+    onMounted(() => {})
 
     return {
       store,

+ 6 - 2
src/views/powerQuality/unbalanceAnalysis/electricChart.vue

@@ -11,6 +11,7 @@ export default defineComponent({
   name: 'ElectricChart',
   props: {
     echartsData: Object,
+    electricChartData:Object
   },
   setup(props) {
     let lineChartBanlance = ref(null)
@@ -19,6 +20,10 @@ export default defineComponent({
     // 读取数据 func
     const loading = ref(true)
     const getData = async () => {
+
+      console.log('props.electricChartData.value')
+      console.log(props.electricChartData)
+     
       var arrOld = props.echartsData
       let dataTime = arrOld.map((item) => {
         return item.dataTime
@@ -38,7 +43,6 @@ export default defineComponent({
       electricChart.value.lb = lb
       electricChart.value.lc = lc
       loading.value = false
-      loading.value = false
     }
     function echarts2(){
       let myChart = echarts.init(lineChartBanlance.value)
@@ -147,7 +151,7 @@ export default defineComponent({
 
     //监听变化
     watch(
-      () => props.getTableData,
+      () => props.echartsData,
       (newVal, oldVal, clear) => {
         // 执行异步任务,并得到关闭异步任务的 id
         // console.log(newVal)

+ 1 - 1
src/views/powerQuality/unbalanceAnalysis/electricChart2.vue

@@ -156,7 +156,7 @@ export default defineComponent({
 
     //监听变化
     watch(
-      () => props.getTableData,
+      () => props.echartsData,
       (newVal, oldVal, clear) => {
         // 执行异步任务,并得到关闭异步任务的 id
         // console.log(newVal)

+ 1 - 6
src/views/powerQuality/unbalanceAnalysis/index.vue

@@ -49,12 +49,10 @@
           <div class="blanceChartTit">电压不平衡度</div>
           <voltage-chart
             :echartsData="echartsData"
-            v-if="echartsData[0]"
           ></voltage-chart>
           <el-divider></el-divider>
           <voltage-chart2
             :echartsData="echartsData"
-            v-if="echartsData[0]"
           ></voltage-chart2>
         </div>
       </el-col>
@@ -63,12 +61,10 @@
           <div class="blanceChartTit">电流不平衡度</div>
           <electric-chart
             :echartsData="echartsData"
-            v-if="echartsData[0]"
           ></electric-chart>
           <el-divider></el-divider>
           <electric-chart2
             :echartsData="echartsData"
-            v-if="echartsData[0]"
           ></electric-chart2>
         </div>
       </el-col>
@@ -172,8 +168,7 @@ export default defineComponent({
                ElMessage.error('暂无数据') 
                return
             }
-            console.log('requset.data')
-            console.log(echartsData.value)
+      
           } else {
             ElMessage.error(requset.msg)
           }

+ 1 - 1
src/views/powerQuality/unbalanceAnalysis/voltageChart.vue

@@ -143,7 +143,7 @@ export default defineComponent({
 
     //监听变化
     watch(
-      () => props.getTableData,
+      () => props.echartsData,
       (newVal, oldVal, clear) => {
         // 执行异步任务,并得到关闭异步任务的 id
         // console.log(newVal)

+ 1 - 1
src/views/powerQuality/unbalanceAnalysis/voltageChart2.vue

@@ -156,7 +156,7 @@ export default defineComponent({
 
     //监听变化
     watch(
-      () => props.getTableData,
+      () => props.echartsData,
       (newVal, oldVal, clear) => {
         // 执行异步任务,并得到关闭异步任务的 id
         // console.log(newVal)

+ 0 - 102
src/views/siteManage/addGroupCom copy.vue

@@ -1,102 +0,0 @@
-<template>
-    <el-dialog
-      :title="dialogTitle"
-      v-model="dialogVisible"
-      width="400px"
-      @close="closeDialog(0)"
-       @open="open"
-    >
-      <el-form
-        ref="formInfo"
-        :model="form"
-        class="demo-form-inline"
-        label-width="100px"
-        :rules="rules"
-      >
-        <el-form-item label="分组名称:" prop="watchName">
-          <el-input v-model="form.watchName"  ></el-input>
-        </el-form-item>
-      
-        <div style="text-align: right">
-          <el-button type="primary" @click="submitForm('formInfo')"
-            >保存</el-button
-          >
-        </div>
-      </el-form>
-    </el-dialog>
-</template>
-<script>
-
-export default {
-  name: "AddGroupCom",
-  props: {
-    dialogTitle: {
-      type: String,
-      default: "新建分组",
-    },
-    itemInfo: {
-      type: Object,
-      default: function () {
-        return {};
-      },
-    },
-  },
-  data() {
-    return {
-       checked: true,
-      showDialog: false,
-      formInfo: JSON.parse(JSON.stringify(this.itemInfo)),
-      rules: {
-        watchName: [
-          // required  是否为必填项, trigger:表单验证的触发时机,失去焦点进行验证
-          { required: true, message: "请输入分组名称", trigger: "blur" },
-          {
-            min: 3,
-            max: 6,
-            message: "用户名长度在 3 到 6 个字符",
-            trigger: "blur",
-          },
-        ],
-      },
-    };
-  },
-  methods: {
-    roleValid(rule, value, callback) {
-      if (value.length === 0) {
-        callback(new Error("不能为空"));
-      } else {
-        callback();
-      }
-    },
-
-    // 保存操作
-    submitForm(formName) {
-      const params = Object.assign(this.formInfo, {});
-      params
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          // 走保存请求
-          this.$message({
-            message: "操作成功!",
-            type: "success",
-          });
-          this.closeDialog(1);
-        } else {
-          return false;
-        }
-      });
-    },
-    // 关闭弹框
-    closeDialog(flag) {
-      this.$refs["formInfo"].resetFields();
-      this.showDialog = false;
-      this.$emit("closeDialog", flag);
-    },
-  },
-};
-</script>
- 
-<style scoped lang="scss">
-
-
-</style>

+ 1 - 0
src/views/siteManage/addGroupCom.vue

@@ -90,6 +90,7 @@ export default defineComponent({
                 ElMessage.error(requset.msg)
               }
             })
+
         } else {
           console.log('error submit!!')
           return false

+ 0 - 114
src/views/siteManage/addSiteCom copy.vue

@@ -1,114 +0,0 @@
-<template>
-  <transition name="dialog-fade">
-    <el-dialog
-      v-if="showDialog"
-      :title="dialogTitle"
-      class="add-group-com"
-      v-model="showDialog"
-      width="400px"
-      @close="closeDialog(0)"
-    >
-      <el-form
-        ref="formInfo"
-        :model="formInfo"
-        class="demo-form-inline"
-        label-width="100px"
-        :rules="rules"
-      >
-        <el-form-item label="站点名称:" prop="watchName">
-          <el-input v-model="formInfo.watchName"></el-input>
-        </el-form-item>
-         <el-form-item label="站点编号:" prop="watchName">
-          <el-input v-model="formInfo.watchName"></el-input>
-        </el-form-item>
-         <el-form-item label="选择模板:" prop="region">
-            <el-select v-model="formInfo.region" placeholder="请选择">
-              <el-option label="选择模板1" value="1"></el-option>
-              <el-option label="选择模板2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-      
-        <div style="text-align: right">
-          <el-button type="primary" @click="submitForm('formInfo')"
-            >保存</el-button
-          >
-        </div>
-      </el-form>
-    </el-dialog>
-  </transition>
-</template>
-<script>
-
-export default {
-  name: "AddSiteCom",
-  props: {
-    dialogTitle: {
-      type: String,
-      default: "新建站点",
-    },
-    itemInfo: {
-      type: Object,
-      default: function () {
-        return {};
-      },
-    },
-  },
-  data() {
-    return {
-       checked: true,
-      showDialog: false,
-      formInfo: JSON.parse(JSON.stringify(this.itemInfo)),
-      rules: {
-        watchName: [
-          // required  是否为必填项, trigger:表单验证的触发时机,失去焦点进行验证
-          { required: true, message: "请输入站点名称", trigger: "blur" },
-          {
-            min: 3,
-            max: 6,
-            message: "用户名长度在 3 到 6 个字符",
-            trigger: "blur",
-          },
-        ],
-      },
-    };
-  },
-  methods: {
-    roleValid(rule, value, callback) {
-      rule
-      if (value.length === 0) {
-        callback(new Error("不能为空"));
-      } else {
-        callback();
-      }
-    },
-
-    // 保存操作
-    submitForm(formName) {
-      const params = Object.assign(this.formInfo, {});
-      params
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          // 走保存请求
-          this.$message({
-            message: "操作成功!",
-            type: "success",
-          });
-          this.closeDialog(1);
-        } else {
-          return false;
-        }
-      });
-    },
-    // 关闭弹框
-    closeDialog(flag) {
-      this.$refs["formInfo"].resetFields();
-      this.showDialog = false;
-      this.$emit("closeDialog", flag);
-    },
-  },
-};
-</script>
- 
-<style scoped lang="scss">
-
-</style>

+ 3 - 0
src/views/siteManage/addSiteCom.vue

@@ -95,6 +95,9 @@ export default defineComponent({
           if(form.value.region){
             //选择模板
             alert('选择模板')
+
+            
+
           }else{
             // 无选择模板
             alert('无选择模板')

+ 6 - 1
src/views/siteManage/basicInfo/index.vue

@@ -346,7 +346,9 @@ export default defineComponent({
     //站点详情请求
     function getSite() {
       fileListImages.value = []
-      api.getSite({ id: props.siteId }).then((requset) => {
+      if(props.siteId){
+      
+        api.getSite({ id: props.siteId }).then((requset) => {
         if (requset.status === 'SUCCESS') {
           console.log(requset.data[0])
           ruleForm.value = requset.data[0]
@@ -391,6 +393,9 @@ export default defineComponent({
           ElMessage.error(requset.msg)
         }
       })
+
+      }
+      
     }
 
     //表单提交

+ 0 - 66
src/views/siteManage/groupInfoCom-ora.vue

@@ -1,66 +0,0 @@
-<template>
-  <div class="siteManage-main groupInfo">
-    <el-form
-      :model="form"
-      :rules="rules"
-      ref="form"
-      label-width="100px"
-    >
-          <div class="grid-content bg-purple">
-            <div class="el-form-item blockTitle">
-               分组信息
-             </div>
-            <div></div>
-            <el-form-item label="分组名称" prop="name" label-width="130px">
-              <el-input v-model="name"></el-input>
-            </el-form-item>
-
-          
-            <el-form-item>
-              <el-button type="primary" @click="submitForm('form')"
-                >保存</el-button>
-            
-            </el-form-item>
-
-          </div>
-       
-    </el-form>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "GroupInfoCom",
-  data() {
-    return {
-    
-        groupingName: "分组1",
-      
-      rules: {
-        groupingName: [
-          { required: true, message: "请输入分组名称", trigger: "blur" },
-          { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
-        ],
-      },
-    };
-  },
-  methods: {
-    handleRemove(file) {
-      console.log(file);
-    },
-  
-    submitForm(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          alert("submit!");
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-</style>

+ 0 - 340
src/views/siteManage/index orange.vue

@@ -1,340 +0,0 @@
-<template>
-  <div class="app-container page-nesting" style="position: relative">
-    <!-- 树形组件start -->
-    <div class="grid-content treeDom">
-      <div style="text-align: center" class="mb-20">
-        <el-button v-if="this.treeLevel == 3" disabled @click="addGroup()">
-          添加分组
-        </el-button>
-        <el-button type="primary" v-else @click="addGroup()">
-          添加分组
-        </el-button>
-        <el-button v-if="this.treeLevel == 3" disabled @click="addSite()">
-          添加站点
-        </el-button>
-        <el-button type="primary" v-else @click="addSite()">添加站点</el-button>
-      </div>
-      <el-input
-        placeholder="输入关键字进行过滤"
-        v-model="filterText"
-        class="mb-20 searchInput"
-      >
-        <template>
-          <i class="el-icon-search el-input__icon"></i>
-        </template>
-      </el-input>
-
-      <el-tree
-        class="filter-tree siteTree"
-        :data="data"
-        node-key="id"
-        :props="defaultProps"
-        :expand-on-click-node="false"
-        default-expand-all
-        @node-click="handleNodeClick"
-        :filter-node-method="filterNode"
-        ref="tree"
-      >
-        <template #default="{ node, data }">
-          <span
-            class="custom-tree-node"
-            style="width: 100%"
-            @mouseenter="mouseenter(data)"
-            @mouseleave="mouseleave(data)"
-          >
-            <span>{{ node.label }}</span>
-            <span>
-              <a
-                class="deleteLink"
-                v-show="data.show"
-                @click="remove(node, data)"
-              >
-                <i size="mini" class="el-icon-delete"></i>
-              </a>
-            </span>
-          </span>
-        </template>
-      </el-tree>
-    </div>
-    <!-- 树形组件end -->
-
-    <!-- 站点主题start -->
-    <div class="grid-content nestingDom" style="width: calc(100% - 300px);">
-      <el-tabs
-        v-if="this.treeLevel == 3"
-        v-model="activeName"
-        type="card"
-      >
-        <el-tab-pane label="基本信息" name="first">
-          <basic-info class="basicInfo"></basic-info>
-        </el-tab-pane>
-        <el-tab-pane label="监控设备" name="second">
-          <watch-dog
-            v-on:success="success(res)"
-            :avtiveName="activeName"
-            @func="getMsgFormSon"
-          ></watch-dog>
-        </el-tab-pane>
-        <el-tab-pane label="变量列表" name="third">
-          <variable-list :activeName="activeName"></variable-list>
-        </el-tab-pane>
-        <el-tab-pane label="摄像头" name="five">
-          <camera></camera>
-        </el-tab-pane>
-        <el-tab-pane label="电能质量评分配置" name="six">
-          <power-Score></power-Score>
-        </el-tab-pane>
-      </el-tabs>
-
-      <!-- 分组信息start -->
-      <group-info-com
-        v-if="this.treeLevel == 2 || this.treeLevel == 1"
-      ></group-info-com>
-      <!-- 分组信息end -->
-
-      <!-- 新建分组start -->
-      <add-group-com
-        v-if="showDialog"
-        ref="addGroupCom"
-        :dialog-title="dialogTitle"
-        :item-info="tableItem"
-        @closeDialog="closeDialog"
-      ></add-group-com>
-      <!-- 新建分组end -->
-
-      <!-- 新建站点start -->
-      <add-site-com
-        v-if="showDialog"
-        ref="addSiteCom"
-        :dialog-title="dialogTitle"
-        :item-info="tableItem"
-        @closeDialog="closeDialog"
-      ></add-site-com>
-      <!-- 新建站点end -->
-    </div>
-    <!-- 站点主题end -->
-  </div>
-</template>
-
-<script>
-import basicInfo from './basicInfo'
-import WatchDog from './watchDog'
-import variableList from './variableList'
-import camera from './camera'
-import PowerScore from './powerScore'
-
-import groupInfoCom from './groupInfoCom'
-import addGroupCom from './addGroupCom'
-import addSiteCom from './addSiteCom'
-
-export default {
-  components: {
-    basicInfo,
-    WatchDog,
-    variableList,
-    camera,
-    PowerScore,
-    groupInfoCom,
-    addGroupCom,
-    addSiteCom,
-  },
-  data() {
-    return {
-      showDialog: false,
-      treeLevel: 0,
-      activeName: 'first',
-      filterText: '',
-      data: [
-        {
-          label: '所有站点',
-          children: [
-            {
-              label: '分组一',
-              children: [
-                {
-                  label: '站点 1-1',
-                  show: false,
-                },
-                {
-                  label: '站点 1-2',
-                  show: false,
-                },
-                {
-                  label: '站点 1-3',
-                  show: false,
-                },
-                {
-                  label: '站点 1-4',
-                  show: false,
-                },
-              ],
-            },
-            {
-              label: '分组二',
-              children: [
-                {
-                  label: '站点 2-1',
-                  show: false,
-                },
-                {
-                  label: '站点 2-2',
-                  show: false,
-                },
-                {
-                  label: '站点 2-3',
-                  show: false,
-                },
-                {
-                  label: '站点 2-4',
-                  show: false,
-                },
-              ],
-            },
-            {
-              label: '其他分组',
-              children: [
-                {
-                  label: '其他 3-1',
-                  show: false,
-                },
-                {
-                  label: '其他 3-2',
-                  show: false,
-                },
-                {
-                  label: '其他 3-3',
-                  show: false,
-                },
-                {
-                  label: '其他 3-4',
-                  show: false,
-                },
-              ],
-            },
-          ],
-        },
-      ],
-      defaultProps: {
-        children: 'children',
-        label: 'label',
-      },
-    }
-  },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    },
-  },
-
-  methods: {
-    getMsgFormSon() {
-      this.activeName = 'third';
-    },
-    mouseenter(data) {
-      data.show = true
-    },
-    mouseleave(data) {
-      data.show = false
-    },
-    filterNode(value, data) {
-      if (!value) return true
-      return data.label.indexOf(value) !== -1
-    },
-    handleNodeClick(data, obj, node) {
-      data, node
-      this.treeLevel = obj.level
-    },
-
-    // 关闭操作
-    closeDialog() {
-      this.showDialog = false
-    },
-    //新建分组
-    addGroup() {
-      this.tableItem = {
-        id: '',
-        name: '',
-      }
-      this.dialogTitle = '新建分组'
-      this.showDialog = true
-      this.$nextTick(() => {
-        this.$refs['addGroupCom'].showDialog = true
-      })
-    },
-
-    //新建站点
-    addSite() {
-      this.tableItem = {
-        stationName: '',
-      }
-      this.dialogTitle = '新建站点'
-      this.showDialog = true
-      this.$nextTick(() => {
-        this.$refs['addSiteCom'].showDialog = true
-      })
-    },
-    remove(node, data) {
-      const parent = node.parent
-      const children = parent.data.children || parent.data
-      const index = children.findIndex((d) => d.id === data.id)
-      children.splice(index, 1)
-      this.dataSource = [...this.dataSource]
-    },
-  },
-}
-</script>
-<style scoped lang="scss">
-.app-container.page-nesting {
-  padding: 0;
-  background: rgba(0, 0, 0, 0);
-}
-.grid-content {
-  background: #fff;
-  height: calc(100vh - 130px);
-  overflow-y: auto;
-}
-.el-input__inner {
-  border-radius: 20px !important;
-}
-.treeDom {
-  width: 270px;
-  position: absolute;
-  left: 0;
-  // margin-left: 20px;
-  padding: 20px;
-  min-height: calc(100vh - 130px);
-
-  .el-icon-search {
-    color: #409eff;
-  }
-  .el-button {
-    width: 100px;
-  }
-}
-.nestingDom {
-  margin-left: 300px;
-}
-</style>
-<style lang="scss">
-// tab重置样式
-.el-tabs--card > .el-tabs__header .el-tabs__item {
-  line-height: 50px;
-  height: 50px;
-  font-size: 16px;
-}
-.el-tabs--card > .el-tabs__header .el-tabs__item.is-active {
-  border-bottom: 2px solid #409eff;
-  color: #409eff;
-}
-.el-tabs--card .el-tabs__header:hover,
-.el-tabs__item:hover {
-  color: #409eff !important;
-}
-.el-tabs__header {
-  margin-bottom: 0;
-}
-.el-tabs--card > .el-tabs__header .el-tabs__item,
-.el-tabs--card > .el-tabs__header .el-tabs__nav {
-  border: none;
-}
-</style>

+ 9 - 7
src/views/siteManage/index.vue

@@ -3,13 +3,13 @@
     <!-- 树形组件start -->
     <div class="grid-content treeDom">
       <div style="text-align: center" class="mb-20">
-        <el-button v-if="treeLevel == 3 || groupingId == 0" disabled>
+        <el-button v-if="treeLevel == 3 || groupingId == 0||treeLevel == 1" disabled>
           添加分组
         </el-button>
         <el-button v-else type="primary" @click="addGroup()">
           添加分组
         </el-button>
-        <el-button v-if="treeLevel == 3 || groupingId == 0" disabled>
+        <el-button v-if="treeLevel == 3 || groupingId == 0||treeLevel == 1" disabled>
           添加站点
         </el-button>
         <el-button v-else type="primary" @click="addSite()">添加站点</el-button>
@@ -83,7 +83,7 @@
     <div
       class="grid-content nestingDom"
       style="width: calc(100% - 300px)"
-      v-if="flag2"
+      v-if="flag2&&treeLevel!= 1"
     >
       <el-tabs
         v-if="treeLevel == 3 || groupingId == 0"
@@ -129,6 +129,7 @@
         :dialogTitle="dialogTitle"
         :itemInfo="tableItem"
         @closeDialog="closeDialog"
+        @closeDialog2="closeDialog2"
         :flag="showDialog"
       ></add-group-com>
       <!-- 新建分组end -->
@@ -254,12 +255,12 @@ export default defineComponent({
     const handleNodeClick = (data, obj, node) => {
       data, node
       flag2.value = true
-      console.log(obj.data)
+
       treeLevel.value = obj.level
       groupingId.value = obj.data.grouping_id
       label.value = obj.data.label
       console.log('obj.data')
-      console.log(obj.data)
+      console.log(obj)
 
       if (treeLevel.value == 3) {
         siteId.value = obj.data.id
@@ -268,8 +269,7 @@ export default defineComponent({
         // console.log(obj.data)
         siteId.value = obj.data.id
       }
-      console.log('父组件的siteId')
-      console.log(siteId.value)
+
     }
 
      function filterNode(value, data) {
@@ -297,6 +297,7 @@ export default defineComponent({
 
     // 关闭操作
     const closeDialog = () => {
+
       showDialog.value = false
       showDialog2.value = false
       siteTreeList()
@@ -307,6 +308,7 @@ export default defineComponent({
 
     // 关闭操作
     const closeDialog2 = () => {
+ 
      showDialog.value = false
       showDialog2.value = false
       flag2.value = true