1、全局车间层级以及部门层级树默认展开 2、车间看板页面设备详情弹窗背景透明度改为不透明 3、所有含有车间层级树页面新增弹窗中的选择设备弹窗内容由表格...

zhuzhuanzhuan

2023-12-13 a04b8970aa94f80c4c4937706c787391759aded7

 src/views/system/modules/SelectDeviceModal.vue

@@ -1,12 +1,11 @@
<template>
  <div>
    <a-modal
    <a-drawer
      :title="title"
      :visible="visible"
      width="650"
      @ok="handleOk"
      @cancel="handleCancel"
      cancelText="关闭"
      centered
      @close="handleCancel"
    >

      <!--&lt;!&ndash; 查询区域 &ndash;&gt;-->
@@ -52,47 +51,41 @@
          <a-form-item label="车间层级：">
            <a-tree showLine ref="tree" :expandedKeys.sync="expandedKeys"
                    :treeData="treeDataSource" checkable @check="onCheck" v-model="checkedKeys"
                    :autoExpandParent="autoExpandParent" @expand="onExpand">
                    @expand="onExpand">
            </a-tree>
          </a-form-item>
        </a-form>

      </a-spin>

      <template slot="footer">
        <div>
          <div>
            <a-dropdown
              style="float: left"
              :trigger="['click']"
              placement="topCenter"
            >
              <a-menu slot="overlay">
                <a-menu-item key="1" @click="expandAll">展开所有</a-menu-item>
                <a-menu-item key="2" @click="closeAll">合并所有</a-menu-item>
                <a-menu-item key="3" @click="refreshTree">刷新</a-menu-item>
              </a-menu>
              <a-button>
                树操作
                <a-icon type="up"/>
              </a-button>
            </a-dropdown>
          </div>
          <a-space>
            <a-button
              @click="handleCancel"
            >关闭
            </a-button>
            <a-button
              @click="handleOk"
              type="primary"
            >确定
            </a-button>
          </a-space>
        </div>
      </template>

    </a-modal>
      <div class="drawer-bottom-button">
        <a-dropdown
          style="float: left"
          :trigger="['click']"
          placement="topCenter"
        >
          <a-menu slot="overlay">
            <a-menu-item key="1" @click="expandAll">展开所有</a-menu-item>
            <a-menu-item key="2" @click="closeAll">合并所有</a-menu-item>
            <a-menu-item key="3" @click="refreshTree">刷新</a-menu-item>
          </a-menu>
          <a-button>
            树操作
            <a-icon type="up"/>
          </a-button>
        </a-dropdown>
        <a-popconfirm title="确定放弃编辑？" @confirm="handleCancel" okText="确定" cancelText="取消">
          <a-button style="margin-right: .8rem">关闭</a-button>
        </a-popconfirm>
        <a-button
          @click="handleOk"
          type="primary"
        >确定
        </a-button>
      </div>

    </a-drawer>
  </div>
</template>

@@ -119,11 +112,13 @@
        default() {
          return true
        }
      },
      title: {
        type: String
      }
    },
    data() {
      return {
        title: '添加已有设备',
        cardLoading: false,
        loading: false,
        treeDataSource: [],
@@ -133,8 +128,6 @@
          getBaseTree: '/mdc/mdcEquipment/queryTreeListByProduction'
        },
        dataList: [],
        autoExpandParent: true,
        checkStrictly: true,
        allTreeKeys: [],
        visible: false,
        dataSource: []
@@ -230,6 +223,7 @@
            this.treeDataSource = res.result
            this.generateList(this.treeDataSource)
            console.log('treeDataSource', this.treeDataSource)
            this.expandedKeys = this.allTreeKeys
          } else {
            this.$message.warn(res.message)
          }
@@ -273,19 +267,19 @@
      refreshTree() {
        this.queryTreeData()
      },
      onCheck(value) {
      onCheck(value, obj) {
        this.checkedKeys = value
        console.log('obj,', obj)
        this.deviceNodes = obj.checkedNodes.filter(item => item.data.props.equipmentId).map(item => item.data.props.equipmentId)
        console.log(this.deviceNodes)
      },
      handleCancel() {
        this.visible = false
      },
      handleOk() {
        if (this.checkedKeys.length > 0) {
          this.$emit('selectFinished', this.checkedKeys)
        }
        this.$emit('selectFinished', this.deviceNodes)
        this.visible = false
      }


      // add() {
      //   this.visible = true
@@ -401,7 +395,7 @@
    overflow-y: hidden
  }

  .drawer-bootom-button {
  .drawer-bottom-button {
    position: absolute;
    bottom: 0;
    width: 100%;