From accebdce93486d3b4f26e55ffdea047549cce20c Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 28 七月 2025 21:12:38 +0800
Subject: [PATCH] Merge branch 'master' of http://125.76.225.53:18448/r/xhj/vue_mdc_xhj
---
src/views/mdc/base/EquipmentList.vue | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index 6cc55f5..ae5950e 100644
--- a/src/views/mdc/base/EquipmentList.vue
+++ b/src/views/mdc/base/EquipmentList.vue
@@ -27,20 +27,6 @@
</a-col>
<a-col :md="4" :sm="4">
- <a-form-item label="璁惧绾у埆">
- <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绾у埆" dictCode="device_level" v-model="queryParam.deviceLevel"
- allow-clear/>
- </a-form-item>
- </a-col>
-
- <a-col :md="4" :sm="4">
- <a-form-item label="璁惧绉嶇被">
- <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绉嶇被" dictCode="device_category" v-model="queryParam.deviceCategory"
- allow-clear/>
- </a-form-item>
- </a-col>
-
- <a-col :md="4" :sm="4">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
</a-col>
@@ -121,7 +107,7 @@
<script>
import UserModal from './modules/EquipmentList/UserModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import { queryProductionTreeList } from '@/api/api'
+ import { queryProductionTreeListByMdc } from '@/api/api'
import { mapActions } from 'vuex'
export default {
@@ -266,8 +252,15 @@
{
title: '璁惧鍚嶇О',
align: 'center',
+ dataIndex: 'equipmentName',
+ width: 200
+ // sorter: true
+ },
+ {
+ title: '瀹夎浣嶇疆',
+ align: 'center',
width: 200,
- dataIndex: 'equipmentName'
+ dataIndex: 'equipmentAddress'
},
{
title: '杞﹂棿',
@@ -413,7 +406,7 @@
* 璋冪敤鎺ュ彛鑾峰彇鏌ヨ鍖哄煙杞﹂棿鏍戝垪琛�
*/
getWorkshopListByApi() {
- queryProductionTreeList().then(res => {
+ queryProductionTreeListByMdc().then(res => {
if (res.success) {
this.workshopTreeData = res.result
this.treeDefaultExpandedKeys = [...res.result].map(item => item.key)
--
Gitblit v1.9.3