From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-vue/src/views/modelconfiguration/businessmodel/components/collectIndicators/CollectIndicators.vue | 145 ++++++++++++++++++++++++-----------------------
1 files changed, 74 insertions(+), 71 deletions(-)
diff --git a/zhitan-vue/src/views/modelconfiguration/businessmodel/components/collectIndicators/CollectIndicators.vue b/zhitan-vue/src/views/modelconfiguration/businessmodel/components/collectIndicators/CollectIndicators.vue
index aa288e9..31b195f 100644
--- a/zhitan-vue/src/views/modelconfiguration/businessmodel/components/collectIndicators/CollectIndicators.vue
+++ b/zhitan-vue/src/views/modelconfiguration/businessmodel/components/collectIndicators/CollectIndicators.vue
@@ -1,69 +1,70 @@
<template>
- <div class="table-box">
- <el-button class="mb20 " type="primary" icon="Plus" @click="handleAdd">
- 鏂板
- </el-button>
- <el-button class="mb20 " icon="Delete" :disabled="multiple" @click="handleDel">
- 鎵归噺鍒犻櫎
- </el-button>
- <el-table v-loading="loading" :data="tableData" height="calc(100vh - 370px)"
- @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" show-overflow-tooltip />
- <el-table-column label="鎸囨爣缂栫爜" prop="code" show-overflow-tooltip align="center" />
- <el-table-column label="鎸囨爣鍚嶇О" prop="name" show-overflow-tooltip align="center" />
- <el-table-column label="鎿嶄綔" align="center">
- <template #default="scope">
- <el-button link type="primary" icon="Delete" @click="handleDel(scope.row)">
- 鍒犻櫎
- </el-button>
- </template>
- </el-table-column>
- </el-table>
- <collectModal ref="collectModalRef" @selectedCollect='selectedCollect' />
+ <div class="table-box">
+ <div style="width: 100%; text-align: right; padding: 20px 20px 0 0">
+ <el-button class="mb20" type="primary" icon="Plus" @click="handleAdd"> 鏂板 </el-button>
+ <el-button class="mb20" icon="Delete" :disabled="multiple" @click="handleDel"> 鎵归噺鍒犻櫎 </el-button>
</div>
+
+ <el-table
+ v-loading="loading"
+ :data="tableData"
+ height="calc(100vh - 370px)"
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column type="selection" width="55" align="center" show-overflow-tooltip />
+ <el-table-column label="鎸囨爣缂栫爜" prop="code" show-overflow-tooltip align="center" />
+ <el-table-column label="鎸囨爣鍚嶇О" prop="name" show-overflow-tooltip align="center" />
+ <el-table-column label="鎿嶄綔" align="center">
+ <template #default="scope">
+ <el-button link type="primary" icon="Delete" @click="handleDel(scope.row)"> 鍒犻櫎 </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <collectModal ref="collectModalRef" @selectedCollect="selectedCollect" />
+ </div>
</template>
<script setup>
let { proxy } = getCurrentInstance()
-import { getSettingIndex, setNodeToIndex, delIndex } from '@/api/modelConfiguration/businessModel'
-import collectModal from './CollectModal.vue'
+import { getSettingIndex, setNodeToIndex, delIndex } from "@/api/modelConfiguration/businessModel"
+import collectModal from "./CollectModal.vue"
let tableData = ref([])
let loading = ref(false)
let currentNode = ref(null)
function getList(modelNode) {
- if (!modelNode) {
- tableData.value = []
- return
+ if (!modelNode) {
+ tableData.value = []
+ return
+ }
+ currentNode.value = modelNode
+ loading.value = true
+ getSettingIndex(modelNode.id).then((response) => {
+ if (response.code === 200) {
+ let result = response.data
+ tableData.value = result.filter((f) => f.indexType === "COLLECT")
+ loading.value = false
+ } else {
+ proxy.$modal.msgError(response.msg)
}
- currentNode.value = modelNode
- loading.value = true;
- getSettingIndex(modelNode.id).then(response => {
- if (response.code === 200) {
- let result = response.data;
- tableData.value = result.filter(f => f.indexType === 'COLLECT');
- loading.value = false
- } else {
- proxy.$modal.msgError(response.msg);
- }
- this.deviceLoading = false;
- });
+ this.deviceLoading = false
+ })
}
let collectModalRef = ref(null)
function handleAdd() {
- if (collectModalRef.value) {
- collectModalRef.value.currentNode = currentNode.value
- collectModalRef.value.handleOpen(tableData.value)
- }
+ if (collectModalRef.value) {
+ collectModalRef.value.currentNode = currentNode.value
+ collectModalRef.value.handleOpen(tableData.value)
+ }
}
function selectedCollect(selectedIndex) {
- tableData.value = selectedIndex
- let indexIds = selectedIndex.map(item => item.indexId)
- setNodeToIndex(currentNode.value.id, indexIds, 'COLLECT').then((response) => {
- if (response.code !== 200) {
- proxy.$modal.msgError(response.msg)
- }
- })
+ tableData.value = selectedIndex
+ let indexIds = selectedIndex.map((item) => item.indexId)
+ setNodeToIndex(currentNode.value.id, indexIds, "COLLECT").then((response) => {
+ if (response.code !== 200) {
+ proxy.$modal.msgError(response.msg)
+ }
+ })
}
// 閫変腑鏁扮粍
let ids = ref([])
@@ -71,33 +72,35 @@
// 闈炲涓鐢�
let multiple = ref(true)
function handleDel(row) {
- const indexIds = row && row.indexId ? [row.indexId] : ids.value
- const indexNames = row.name || names.value
- proxy.$modal.confirm('鏄惁纭鍒犻櫎鎸囨爣鍚嶄负"' + indexNames + '"鐨勬暟鎹」?', '璀﹀憡').then(function () {
- return delIndex(currentNode.value.id, indexIds);
- }).then((response) => {
- if (response.code === 200) {
- // 鍒犻櫎鎴愬姛锛屾洿鏂拌〃鏍兼暟鎹�
- getList(currentNode.value)
- // tableData.value = tableData.value.filter(f => f.indexId !== row.indexId)
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- } else {
- // 鍒犻櫎澶辫触锛屾樉绀洪敊璇秷鎭�
- proxy.$modal.msgError(response.msg);
- }
- }).catch(() => {
- });
+ const indexIds = row && row.indexId ? [row.indexId] : ids.value
+ const indexNames = row.name || names.value
+ proxy.$modal
+ .confirm('鏄惁纭鍒犻櫎鎸囨爣鍚嶄负"' + indexNames + '"鐨勬暟鎹」?', "璀﹀憡")
+ .then(function () {
+ return delIndex(currentNode.value.id, indexIds)
+ })
+ .then((response) => {
+ if (response.code === 200) {
+ // 鍒犻櫎鎴愬姛锛屾洿鏂拌〃鏍兼暟鎹�
+ getList(currentNode.value)
+ // tableData.value = tableData.value.filter(f => f.indexId !== row.indexId)
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ } else {
+ // 鍒犻櫎澶辫触锛屾樉绀洪敊璇秷鎭�
+ proxy.$modal.msgError(response.msg)
+ }
+ })
+ .catch(() => {})
}
-
function handleSelectionChange(selection) {
- ids.value = selection.map(item => item.indexId);
- names.value = selection.map(item => item.name);
- multiple.value = !selection.length
+ ids.value = selection.map((item) => item.indexId)
+ names.value = selection.map((item) => item.name)
+ multiple.value = !selection.length
}
defineExpose({
- getList
-});
+ getList,
+})
</script>
<style scoped lang="scss">
--
Gitblit v1.9.3