Merge remote-tracking branch 'origin/master'

cuilei

5 天以前 ba77fdc6a30c9ad0941e40319f8c4f6fe6fdf9f1

 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)