Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-03 dae8cdecc05c1d64189d261364ce7fda9c4f505b

 src/components/RightToolbar/index.vue

@@ -7,14 +7,14 @@
      <el-tooltip class="item" effect="dark" content="刷新" placement="top">
        <el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />
      </el-tooltip>
      <el-tooltip class="item" effect="dark" content="自定义列" placement="top">
      <el-tooltip v-show="$route.path.includes('equipment')" class="item" effect="dark" content="自定义列" placement="top">
        <el-button size="mini" circle icon="el-icon-collection-tag" @click="addDynamicColumn()" />
      </el-tooltip>
      <el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="columns">
        <el-button size="mini" circle icon="el-icon-menu" @click="showColumn()" v-if="showColumnsType == 'transfer'"/>
        <el-dropdown trigger="click" :hide-on-click="false" style="padding-left: 12px" v-if="showColumnsType == 'checkbox'">
          <el-button size="mini" circle icon="el-icon-menu" />
          <el-dropdown-menu slot="dropdown">
          <el-dropdown-menu slot="dropdown" style="max-height: 650px;overflow-y: auto">
            <template v-for="item in columns">
              <el-dropdown-item :key="item.key">
                <el-checkbox :checked="item.visible" @change="checkboxChange($event, item.label)" :label="item.label" />
@@ -115,7 +115,7 @@
    }
  },
  created() {
    if (this.$route.path.concat("equipment")) {
    if (this.$route.path.includes("equipment")) {
      this.getDyColumn()
    }
    if (this.showColumnsType == 'transfer') {