Merge remote-tracking branch 'origin/develop1.0' into dyl_dev

DYL0109

2025-04-16 75f043dfa6660716364e66ee0b3cf99f44255686

 zhitan-vue/src/views/modelconfiguration/businessmodel/businessModel.vue

@@ -6,8 +6,12 @@
                    <!-- <CardHeader class="mb20">数据模型管理</CardHeader> -->
                    <div class="select-box mb20">
                        <el-select v-model="modelData" placeholder="请选择模型" filterable @change="changeModel">
                            <el-option v-for="model in modelInfoOptions" :key="model.modelCode" :label="model.modelName"
                                :value="model.modelCode" />
              <el-option
                v-for="model in modelInfoOptions"
                :key="model.modelCode"
                :label="model.modelName"
                :value="model.modelCode"
              />
                        </el-select>
                        <el-icon @click="handleModel">
                            <Setting />
@@ -15,29 +19,43 @@
                    </div>
                    <!-- <el-input v-model="filterText" style="width: 240px" placeholder="输入关键字进行过滤" class="mb10" /> -->
                    <div class="tree-box" v-loading="treeLoading">
                        <el-link icon="el-icon-plus" style="margin-top: 8px;width:100%" @click="addNode"
                            v-if="treeData.length === 0">添加根节点
            <el-link
              icon="el-icon-plus"
              style="margin-top: 8px; width: 100%"
              @click="addNode"
              v-if="treeData.length === 0"
              >添加根节点
                        </el-link>
                        <template v-else>
                            <el-tree ref="treeRef" :props="defaultProps" :data="treeData" node-key="id"
                                highlight-current :filter-node-method="filterNode"
                                :default-expanded-keys="treeExpandData" :expand-on-click-node="false"
                                @node-click="changeNode" accordion>
              <el-tree
                ref="treeRef"
                :props="defaultProps"
                :data="treeData"
                node-key="id"
                highlight-current
                :filter-node-method="filterNode"
                :default-expanded-keys="treeExpandData"
                :expand-on-click-node="false"
                @node-click="changeNode"
                accordion
              >
                                <template #default="{ node, data }">
                                    <span>
                                        <el-tooltip v-if="node.label.length > 6" class="item" effect="dark"
                                            :content="node.label" placement="top-end">
                    <el-tooltip
                      v-if="node.label.length > 6"
                      class="item"
                      effect="dark"
                      :content="node.label"
                      placement="top-end"
                    >
                                            <span>{{ node.label.slice(0, 6) + "..." }}</span>
                                        </el-tooltip>
                                        <span v-else id="b">{{ node.label }}</span>
                                    </span>
                                    <span class="node-opt">
                                        <el-link title="新增下级节点" icon="Plus" @click="() => addNode(node, data)">
                                        </el-link>
                                        <el-link title="修改节点" icon="EditPen" @click="() => editNode(node, data)">
                                        </el-link>
                                        <el-link title="删除节点" icon="Delete" @click="() => delNode(node, data)">
                                        </el-link>
                    <el-link title="新增下级节点" icon="Plus" @click="() => addNode(node, data)"> </el-link>
                    <el-link title="修改节点" icon="EditPen" @click="() => editNode(node, data)"> </el-link>
                    <el-link title="删除节点" icon="Delete" @click="() => delNode(node, data)"> </el-link>
                                    </span>
                                </template>
                            </el-tree>
@@ -46,16 +64,10 @@
                </div>
            </div>
            <div class="page-container-right">
                <div class="mb20 mt20 ml20 tab-box">
                    <div class="tab-li" :class="tab == 1 ? 'is-tab' : ''" @click="handleTab('1')">
                        计量器具配置信息
                    </div>
                    <div class="tab-li" :class="tab == 2 ? 'is-tab' : ''" @click="handleTab('2')">
                        统计指标
                    </div>
                    <div class="tab-li" :class="tab == 3 ? 'is-tab' : ''" @click="handleTab('3')">
                        采集指标
                    </div>
        <div class="tab-box">
          <div class="tab-li" :class="tab == 1 ? 'is-tab' : ''" @click="handleTab('1')">计量器具配置信息</div>
          <div class="tab-li" :class="tab == 2 ? 'is-tab' : ''" @click="handleTab('2')">统计指标</div>
          <div class="tab-li" :class="tab == 3 ? 'is-tab' : ''" @click="handleTab('3')">采集指标</div>
                    <!-- <el-radio-group v-model="tab">
                                <el-radio-button label="1" @click="handleTab('1')"> 设备配置</el-radio-button>
                                <el-radio-button label="2" @click="handleTab('2')"> 采集指标</el-radio-button>
@@ -64,35 +76,39 @@
                <BaseCard :title="currentNode ? currentNode.label + '--节点配置' : '暂无节点配置'">
                    <div>
                        <div class="content-box" v-if="tab == '1'">
                            <deviceConfig ref='deviceConfigRef' />
              <deviceConfig ref="deviceConfigRef" />
                        </div>
                        <div class="content-box" v-if="tab == '2'">
                            <statisticalIndicators ref='statisticalIndicatorsRef' />
              <statisticalIndicators ref="statisticalIndicatorsRef" />
                        </div>
                        <div class="content-box" v-if="tab == '3'">
                            <collectIndicators ref='collectIndicatorsRef' />
              <collectIndicators ref="collectIndicatorsRef" />
                        </div>
                    </div>
                </BaseCard>
            </div>
        </div>

        <treeNodeModal ref="treeNodeModalRef" @getList="getTreeList" :modelCode="modelData"
            @addTreeList="addTreeList" @addTreeSelectList="addTreeSelectList" />
    <treeNodeModal
      ref="treeNodeModalRef"
      @getList="getTreeList"
      :modelCode="modelData"
      @addTreeList="addTreeList"
      @addTreeSelectList="addTreeSelectList"
    />
        <modelManagementModal ref="modelManagementModalRef" @selectTreeFun="searchList" />

    </div>
</template>

<script setup>
import treeNodeModal from './components/TreeNodeModal.vue'
import modelManagementModal from './components/modelManagement/modelManagement'
import { listModel } from '@/api/modelConfiguration/businessModel'
import { treeList, delModelNode, hasEnergyIndex, } from '@/api/modelConfiguration/indexWarehouse'
import deviceConfig from './components/deviceConfig/DeviceConfig.vue'
import collectIndicators from './components/collectIndicators/CollectIndicators.vue'
import statisticalIndicators from './components/statisticalIndicators/statisticalIndicators.vue'
import { nextTick } from 'vue';
import treeNodeModal from "./components/TreeNodeModal.vue"
import modelManagementModal from "./components/modelManagement/modelManagement"
import { listModel } from "@/api/modelConfiguration/businessModel"
import { treeList, delModelNode, hasEnergyIndex } from "@/api/modelConfiguration/indexWarehouse"
import deviceConfig from "./components/deviceConfig/DeviceConfig.vue"
import collectIndicators from "./components/collectIndicators/CollectIndicators.vue"
import statisticalIndicators from "./components/statisticalIndicators/statisticalIndicators.vue"
import { nextTick } from "vue"
let { proxy } = getCurrentInstance()
let modelManagementModalRef = ref(null)
let treeLoading = ref(true)
@@ -106,19 +122,18 @@
let modelInfoOptions = ref([]) //下拉列表
//获取下拉列表
function searchList(flag) {
    listModel({ isShow: 1 }).then(response => {
        modelInfoOptions.value = response.data;
  listModel({ isShow: 1 }).then((response) => {
    modelInfoOptions.value = response.data
        if (flag) {
            if (modelInfoOptions.value.length > 0) {
                modelData.value = modelInfoOptions.value[0].modelCode;
        modelData.value = modelInfoOptions.value[0].modelCode
                getTreeList(modelData.value)
            }
        }
    });
  })
}

searchList(true)


//下拉选中触发树列表
function changeModel(item) {
@@ -130,12 +145,12 @@
let treeData = ref([])

const defaultProps = ref({
    children: 'children',
    label: 'label',
  children: "children",
  label: "label",
})

//检索树
let filterText = ref('')
let filterText = ref("")

const filterNode = (value, data) => {
    if (!value) return true
@@ -143,16 +158,14 @@
}
watch(filterText, (val) => {
    // 检查treeRef.value是否是一个有效的ElTree实例
    if (treeRef.value && typeof treeRef.value.filter === 'function') {
  if (treeRef.value && typeof treeRef.value.filter === "function") {
        // 调用filter方法
        treeRef.value.filter(val);
    treeRef.value.filter(val)
    } else {
        // treeRef.value无效，处理错误
        console.error('error');
    console.error("error")
    }
});


})

let currentNode = ref(null)
let treeExpandData = ref([])
@@ -164,25 +177,25 @@
//获取树列表
function getTreeList(modelCode) {
    treeLoading.value = true
    treeList({ modelCode }).then(res => {
  treeList({ modelCode }).then((res) => {
        treeLoading.value = false
        let { data } = res
        treeData.value = data;
        let chooseNode = null;
    treeData.value = data
    let chooseNode = null
        if (data.length > 0) {
            if (data[0].children && data[0].children.length !== 0 && isFirstLeafNode.value) {
                if (data[0].children[0].children && data[0].children[0].children.length !== 0) {
                    chooseNode = data[0].children[0].children[0];
          chooseNode = data[0].children[0].children[0]
                } else {
                    chooseNode = data[0].children[0];
          chooseNode = data[0].children[0]
                }
            } else {
                chooseNode = data[0];
        chooseNode = data[0]
            }
            currentNode.value = chooseNode;
            treeExpandData.value.push(chooseNode.id);
      currentNode.value = chooseNode
      treeExpandData.value.push(chooseNode.id)
            nextTick(() => {
                treeRef.value.setCurrentKey(chooseNode.id);
        treeRef.value.setCurrentKey(chooseNode.id)
                if (tab.value == 1 && deviceConfigRef.value) {
                    deviceConfigRef.value.getList(chooseNode)
                }
@@ -192,7 +205,7 @@
                if (tab.value == 3 && collectIndicatorsRef.value) {
                    collectIndicatorsRef.value.getList(chooseNode)
                }
            });
      })
        }
    })
}
@@ -205,7 +218,7 @@
    treeExpandData.value.push(addedNode.nodeId)
    nextTick(() => {
        treeRef.value.setCurrentNode(newChild)
        currentNode.value = newChild;
    currentNode.value = newChild
        if (tab.value == 1) {
            if (deviceConfigRef.value) {
                deviceConfigRef.value.getList(newChild)
@@ -217,18 +230,16 @@
            }
        }
        if (tab.value == 3) {

            if (collectIndicatorsRef.value) {
                collectIndicatorsRef.value.getList(newChild)
            }
        }
    })

}
//树点击
function changeNode(data, node, ev) {
    console.log('树点击', data)
    currentNode.value = data;
  console.log("树点击", data)
  currentNode.value = data
    if (tab.value == 1) {
        if (deviceConfigRef.value) {
            deviceConfigRef.value.getList(data)
@@ -249,7 +260,7 @@
let treeNodeModalRef = ref(null)
function addNode(node, data) {
    if (treeNodeModalRef.value) {
        console.log('treeNodeModalRef', node, data)
    console.log("treeNodeModalRef", node, data)
        treeNodeModalRef.value.handleOpen(node, data, true)
    }
}
@@ -261,18 +272,19 @@

function delNode(node, data) {
    if (data.children && data.children.length > 0) {
        proxy.$modal.msgWarning('包含子节点，不能进行删除！')
    proxy.$modal.msgWarning("包含子节点，不能进行删除！")
        return
    }

    hasEnergyIndex(data.id).then(response => {
  hasEnergyIndex(data.id).then((response) => {
        if (response.data) {
            proxy.$modal.msgWarning('当前节点下存在指标，不能进行删除！')
      proxy.$modal.msgWarning("当前节点下存在指标，不能进行删除！")
        } else {
            proxy.$modal.confirm('是否确认删除名为"' + data.label + '"的节点?', '警告', {
                confirmButtonText: '确定',
                cancelButtonText: '取消',
                type: 'warning'
      proxy.$modal
        .confirm('是否确认删除名为"' + data.label + '"的节点?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning",
            })
                .then(function () {
                    return delModelNode(data.id)
@@ -280,7 +292,7 @@
                .then(() => {
                    let parent = node.parent
                    let children = parent.data.children || parent.data
                    let index = children.findIndex(d => d.id === data.id)
          let index = children.findIndex((d) => d.id === data.id)
                    children.splice(index, 1)

                    nextTick(() => {
@@ -290,15 +302,14 @@
                            changeNode(null)
                        }
                    })
                    proxy.$modal.msgSuccess('删除成功')
          proxy.$modal.msgSuccess("删除成功")
                })
                .catch(function () {
                })
        .catch(function () {})
        }
    })
}

let tab = ref('1')
let tab = ref("1")
function handleTab(value) {
    tab.value = value
    nextTick(() => {
@@ -311,8 +322,7 @@
        if (value == 3 && collectIndicatorsRef.value) {
            collectIndicatorsRef.value.getList(currentNode.value)
        }
    });

  })
}
</script>

@@ -351,8 +361,6 @@
            margin-right: 5px;
        }
    }


}

:deep .el-tabs__nav-wrap:after {
@@ -374,23 +382,36 @@
    display: flex;
    align-items: center;
    color: #fff;
    border-bottom: 1px solid #3371EB;
  border-bottom: 1px solid #3371eb;
    margin-right: 20px;
  margin-left: 15px;
  font-size: 15px;

    .tab-li {
        cursor: pointer;
        border: 1px solid #3371EB;
        padding: 10px 25px;
    border: 1px solid #3371eb;
    padding: 8px 20px;
        border-radius: 5px 5px 0 0;
    }

    .is-tab {
        background: #3371EB;
    background: #3371eb;
    color: #fff;
  }
}
.themeDark {
  .tab-box {
    color: #fff;
  }
}

.themeLight {
  .tab-box {
    color: #333;
    }
}

.content-box {
    height: calc(100vh - 306px) !important;

}
</style>