xhj/vue_mdc_xhj.git

			@@ -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)