From ba77fdc6a30c9ad0941e40319f8c4f6fe6fdf9f1 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 07 八月 2025 10:30:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/EquipmentList.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index ae5950e..d48afe9 100644
--- a/src/views/mdc/base/EquipmentList.vue
+++ b/src/views/mdc/base/EquipmentList.vue
@@ -107,7 +107,7 @@
<script>
import UserModal from './modules/EquipmentList/UserModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import { queryProductionTreeListByMdc } from '@/api/api'
+ import { queryFactoryTreeList } from '@/api/api'
import { mapActions } from 'vuex'
export default {
@@ -256,12 +256,12 @@
width: 200
// sorter: true
},
- {
- title: '瀹夎浣嶇疆',
- align: 'center',
- width: 200,
- dataIndex: 'equipmentAddress'
- },
+ // {
+ // title: '瀹夎浣嶇疆',
+ // align: 'center',
+ // width: 200,
+ // dataIndex: 'equipmentAddress'
+ // },
{
title: '杞﹂棿',
align: 'center',
@@ -406,7 +406,7 @@
* 璋冪敤鎺ュ彛鑾峰彇鏌ヨ鍖哄煙杞﹂棿鏍戝垪琛�
*/
getWorkshopListByApi() {
- queryProductionTreeListByMdc().then(res => {
+ queryFactoryTreeList().then(res => {
if (res.success) {
this.workshopTreeData = res.result
this.treeDefaultExpandedKeys = [...res.result].map(item => item.key)
--
Gitblit v1.9.3