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/indexwarehouse/components/statisticalIndicatorManagement/statisticalIndicatorManagement.vue | 239 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 128 insertions(+), 111 deletions(-)
diff --git a/zhitan-vue/src/views/modelconfiguration/indexwarehouse/components/statisticalIndicatorManagement/statisticalIndicatorManagement.vue b/zhitan-vue/src/views/modelconfiguration/indexwarehouse/components/statisticalIndicatorManagement/statisticalIndicatorManagement.vue
index d2e49b8..dfc05cc 100644
--- a/zhitan-vue/src/views/modelconfiguration/indexwarehouse/components/statisticalIndicatorManagement/statisticalIndicatorManagement.vue
+++ b/zhitan-vue/src/views/modelconfiguration/indexwarehouse/components/statisticalIndicatorManagement/statisticalIndicatorManagement.vue
@@ -1,101 +1,116 @@
<template>
- <div class="page-box">
- <div class="form-card">
- <el-form :model="form" ref="queryRef" :inline="true" label-width="70px">
- <el-form-item label="缂栫爜" prop="indexCategory">
- <el-select v-model="form.indexCategory" placeholder="璇烽�夋嫨鎸囨爣鍒嗙被" style="width: 200px">
- <el-option v-for="dict in sys_index_category" :key="dict.value" :label="dict.label"
- :value="dict.value" />
- </el-select>
- </el-form-item>
- <el-form-item label="鍏抽敭瀛�" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ユ寚鏍囧悕绉�/缂栫爜" />
- </el-form-item>
+ <div class="page-box">
+ <div class="form-card">
+ <el-form :model="form" ref="queryRef" :inline="true" label-width="70px">
+ <el-form-item label="鎸囨爣鍒嗙被" prop="indexCategory">
+ <el-select v-model="form.indexCategory" placeholder="璇烽�夋嫨鎸囨爣鍒嗙被" style="width: 200px">
+ <el-option v-for="dict in sys_index_category" :key="dict.value" :label="dict.label" :value="dict.value" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍏抽敭瀛�" prop="name">
+ <el-input v-model="form.name" placeholder="璇疯緭鍏ユ寚鏍囧悕绉�/缂栫爜" />
+ </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
- <el-button icon="Plus" type="primary" @click="handleAdd">鏂板</el-button>
- <el-button icon="Delete" :disabled="multiple" @click="handleDel">鍒犻櫎</el-button>
- </el-form-item>
- </el-form>
- </div>
- <!-- <div class="ml20 mt20 mb20">
+ <el-form-item>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ <el-button icon="Plus" type="primary" @click="handleAdd">鏂板</el-button>
+ <el-button icon="Delete" :disabled="multiple" @click="handleDel">鍒犻櫎</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <!-- <div class="ml20 mt20 mb20">
<el-button icon="Plus" type="primary" @click="handleAdd">鏂板</el-button>
<el-button icon="Delete" :disabled="multiple" @click="handleDel">鍒犻櫎</el-button>
<el-button icon="Upload">瀵煎叆</el-button>
</div> -->
- <div class="table-box">
- <el-table :data="tableData" v-loading="loading" height="calc(100vh - 450px)"
- @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" show-overflow-tooltip />
- <el-table-column prop="code" label="鎸囨爣缂栫爜" align="center" show-overflow-tooltip />
- <el-table-column prop="name" label="鎸囨爣鍚嶇О" align="center" show-overflow-tooltip />
- <el-table-column prop="indexCategory" label="绯荤粺鎸囨爣鍒嗙被" align="center" show-overflow-tooltip
- :formatter="(row, column) => proxy.selectDictLabel(sys_index_category, row.indexCategory)" />
- <el-table-column prop="unitId" label="鍗曚綅" align="center" show-overflow-tooltip
- :formatter="(row, column) => proxy.selectDictLabel(sys_unit, row.unitId)" />
- <el-table-column label="鎿嶄綔" width="230" align="center">
- <template #default="scope">
- <el-button link type="primary" icon="Edit" @click="handleAdd(scope.row)">
- 淇敼
- </el-button>
- <el-button link type="primary" icon="Edit" @click="handleSave(scope.row)">
- 瀛樺偍
- </el-button>
- <el-button link type="primary" icon="Delete" @click="handleDel(scope.row)">
- 鍒犻櫎
- </el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize" @pagination="getList(currentNode)" />
- <edit-modal ref="EditModalRef" :indexType="indexType" :sys_index_category='sys_index_category'
- :sys_unit='sys_unit' @getList="getList(currentNode)" />
- <storageModal ref="storageModalRef" />
-
-
+ <div class="table-box" style="margin-top: 0">
+ <el-table
+ :data="tableData"
+ v-loading="loading"
+ height="calc(100vh - 450px)"
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column type="selection" width="55" align="center" show-overflow-tooltip />
+ <el-table-column prop="code" label="鎸囨爣缂栫爜" align="center" show-overflow-tooltip />
+ <el-table-column prop="name" label="鎸囨爣鍚嶇О" align="center" show-overflow-tooltip />
+ <el-table-column
+ prop="indexCategory"
+ label="绯荤粺鎸囨爣鍒嗙被"
+ align="center"
+ show-overflow-tooltip
+ :formatter="(row, column) => proxy.selectDictLabel(sys_index_category, row.indexCategory)"
+ />
+ <el-table-column
+ prop="unitId"
+ label="鍗曚綅"
+ align="center"
+ show-overflow-tooltip
+ :formatter="(row, column) => proxy.selectDictLabel(sys_unit, row.unitId)"
+ />
+ <el-table-column label="鎿嶄綔" width="230" align="center">
+ <template #default="scope">
+ <el-button link type="primary" icon="Edit" @click="handleAdd(scope.row)"> 淇敼 </el-button>
+ <el-button link type="primary" icon="Edit" @click="handleSave(scope.row)"> 瀛樺偍 </el-button>
+ <el-button link type="primary" icon="Delete" @click="handleDel(scope.row)"> 鍒犻櫎 </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
</div>
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ v-model:page="queryParams.pageNum"
+ v-model:limit="queryParams.pageSize"
+ @pagination="getList(currentNode)"
+ />
+ <edit-modal
+ ref="EditModalRef"
+ :indexType="indexType"
+ :sys_index_category="sys_index_category"
+ :sys_unit="sys_unit"
+ @getList="getList(currentNode)"
+ />
+ <storageModal ref="storageModalRef" />
+ </div>
</template>
<script setup>
-import storageModal from './components/storage/StorageModal.vue';
-import EditModal from './components/EditModal.vue'
-import { listEnergyindex, delEnergyindex } from '@/api/modelConfiguration/indexWarehouse'
+import storageModal from "./components/storage/StorageModal.vue"
+import EditModal from "./components/EditModal.vue"
+import { listEnergyindex, delEnergyindex } from "@/api/modelConfiguration/indexWarehouse"
const { proxy } = getCurrentInstance()
-const { sys_index_category } = proxy.useDict("sys_index_category");
-const { sys_unit } = proxy.useDict("sys_unit");
+const { sys_index_category } = proxy.useDict("sys_index_category")
+const { sys_unit } = proxy.useDict("sys_unit")
-const props = defineProps(['indexType'])
+const props = defineProps(["indexType"])
let loading = ref(false)
let form = ref({
- indexCategory: null,
- name: null
+ indexCategory: null,
+ name: null,
})
let tableData = ref([])
-let total = ref(0);
+let total = ref(0)
let queryParams = ref({
- pageNum: 1,
- pageSize: 10,
+ pageNum: 1,
+ pageSize: 10,
})
let currentNode = ref(null)
function getList(modelNode) {
- currentNode.value = modelNode;
+ currentNode.value = modelNode
- console.log(111, currentNode.value)
- if (modelNode) {
- loading.value = true;
- form.value.nodeId = modelNode.id;
- form.value.indexType = props.indexType;
- listEnergyindex({ ...queryParams.value, ...form.value }).then(response => {
- tableData.value = response.rows;
- total.value = response.total;
- loading.value = false;
- });
- } else {
- tableData.value = [];
- }
+ console.log(111, currentNode.value)
+ if (modelNode) {
+ loading.value = true
+ form.value.nodeId = modelNode.id
+ form.value.indexType = props.indexType
+ listEnergyindex({ ...queryParams.value, ...form.value }).then((response) => {
+ tableData.value = response.rows
+ total.value = response.total
+ loading.value = false
+ })
+ } else {
+ tableData.value = []
+ }
}
// // 鍥炴樉鏁版嵁瀛楀吀
@@ -116,51 +131,54 @@
// 闈炲涓鐢�
let multiple = ref(true)
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
}
function handleQuery() {
- getList(currentNode.value)
+ getList(currentNode.value)
}
function resetQuery() {
- form.value = {
- indexCategory: null,
- name: null
- }
- getList(currentNode.value)
+ form.value = {
+ indexCategory: null,
+ name: null,
+ }
+ getList(currentNode.value)
}
-let EditModalRef = ref('')
+let EditModalRef = ref("")
function handleAdd(row) {
- if (EditModalRef.value) {
- EditModalRef.value.handleOpen(row, currentNode.value)
- }
+ if (EditModalRef.value) {
+ EditModalRef.value.handleOpen(row, currentNode.value)
+ }
}
function handleDel(row) {
- const indexIds = row.indexId || ids.value
- const indexNames = row.name || names.value
- proxy.$modal.confirm('鏄惁纭鍒犻櫎鎸囨爣鍚嶄负"' + indexNames + '"鐨勬暟鎹」?', '璀﹀憡', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- return delEnergyindex(currentNode.value.id, indexIds)
- }).then(() => {
- getList(currentNode.value)
- proxy.$modal.msgError('鍒犻櫎鎴愬姛')
- }).catch(function () {
+ const indexIds = row.indexId || ids.value
+ const indexNames = row.name || names.value
+ proxy.$modal
+ .confirm('鏄惁纭鍒犻櫎鎸囨爣鍚嶄负"' + indexNames + '"鐨勬暟鎹」?', "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
})
+ .then(() => {
+ return delEnergyindex(currentNode.value.id, indexIds)
+ })
+ .then(() => {
+ getList(currentNode.value)
+ proxy.$modal.msgError("鍒犻櫎鎴愬姛")
+ })
+ .catch(function () {})
}
-let storageModalRef = ref('')
+let storageModalRef = ref("")
function handleSave(row) {
- if (storageModalRef.value) {
- storageModalRef.value.handleOpen(row, currentNode.value)
- storageModalRef.value.getIndexStorageFun(row.indexId)
- }
+ if (storageModalRef.value) {
+ storageModalRef.value.handleOpen(row, currentNode.value)
+ storageModalRef.value.getIndexStorageFun(row.indexId)
+ }
}
defineExpose({ getList })
@@ -170,11 +188,10 @@
@import "@/assets/styles/page.scss";
.page-box {
- height: calc(100vh - 115px);
-
+ height: calc(100vh - 115px);
}
.table-box {
- height: calc(100vh - 455px);
+ height: calc(100vh - 455px);
}
</style>
--
Gitblit v1.9.3