1.解决两个账号登录，是否被挤掉的问题

loulijun2021

2022-10-29 e713b378b01d189f972cfb5b9eae749ee95a8b51

 src/views/zzmx/jpgj.vue

@@ -2,21 +2,21 @@
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">

      <div class="bodyTopButtonGroup">
      <div class="bodyTopButtonGroup" style="justify-content: space-between">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
        <el-button icon="el-icon-download" @click="upload">导入</el-button>
      </div>

      <div class="bodyTopFormGroup">
        <el-form
          ref="form"
          :model="form"
          label-width="80px"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
        >
          <div class="elForm">
            <el-form-item label="产品名称" style=" display: flex;">
            <el-form-item label-width="70px" label="产品名称" style=" display: flex;">
              <el-select
                v-model="form.partcode"
                filterable
@@ -88,15 +88,20 @@
              </el-select>
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
        </el-form>
        <div
          class="bodyTopFormExpand"
        />
      </div>

      <div class="elTableDiv">
        <el-table
          ref="tableDataRef"
          class="tableFixed"
          :data="tableData"
          :height="tableHeight"
          border
@@ -134,6 +139,7 @@
            label="产品规格"
            min-width="110"
            sortable="custom"
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <div v-if="row.partspec">{{ row.partspec }}</div>
@@ -151,6 +157,7 @@
            label="工艺路线"
            sortable="custom"
            min-width="120"
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="stepname"
@@ -317,6 +324,8 @@
        </div>

        <el-table
          ref="eqpDialogArrRef"
          class="tableFixed"
          :data="eqpDialogArr"
          :height="tableHeight"
          :style="{width: 100+'%',height:tableHeight-50+'px',}"
@@ -453,6 +462,16 @@
        </div>
      </span>
    </el-dialog>

    <!--导入组件-->
    <import-picker
      ref="importPickerFunc"
      class="importPickerClass"
      :shows.sync="shows"
      :title="title_value"
      :colos="colos"
      :code="code"
    />
  </div>
</template>

@@ -466,32 +485,14 @@
  StepSelectEqp,
  StepSelectEqpList
} from '@/api/zzmx'
import ImportPicker from '@/components/ImportPicker'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'JPGJ',
  components: {
    Pagination
    Pagination, ImportPicker
  },
  data() {
    const validateName = (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请输入编码'))
      } else {
        if (SER_HZ.test(value)) {
          return callback(new Error('编码不能为中文'))
        } else {
          callback()
        }
      }
    }
    const validateTypeCode = (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请选择上级'))
      } else {
        callback()
      }
    }
    return {
      isIpad: false,
      mainHeight: 0,
@@ -543,21 +544,18 @@
      editRouteName: '', // 编辑时工艺路线名称
      editStepName: '', // 编辑时加工工序名称
      operation: '',
      dialogFormRules: {
        OrgType: [
          { required: true, message: '请输入选择类型', trigger: ['blur', 'change'] }
        ],
        OrgCode: [
          { required: true, validator: validateName, trigger: ['blur', 'change'] }
        ],
        OrgName: [
          { required: true, message: '请输入名称', trigger: ['blur', 'change'] }
        ],
        SupUnit: [
          { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
        ]
      }
      dialogFormRules: {},

      title_value: '数据导入 / 节拍工价',
      code: '24',
      shows: false
    }
  },
  watch: {
    shows() {
      if (!this.shows) {
        this.getBeatRateSearch()
      }
    }
  },
  created() {
@@ -683,6 +681,7 @@
      this.eqpDialogArr.forEach(item => {
        item.isVisible = 0
      })
      this.$refs.tableDataRef.doLayout()
    },
    // 保存行
    async saveRow(row) {
@@ -809,6 +808,9 @@
        DeleteBeatRate(data).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            if (this.form.page > 1 && this.tableData.length === 1) {
              this.form.page--
            }
            this.getBeatRateSearch()
          }
        })
@@ -860,15 +862,24 @@
    //     }
    //   })
    // },
    // 导入按钮
    upload() {
      this.shows = true
      this.$refs.importPickerFunc.newDataFunc()
    },
    colos() {
      this.shows = false
    },
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 200
        this.tableHeight = this.mainHeight - 195
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 40
        }
        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
        this.$refs.tableDataRef.doLayout()
      })
    }
  }
@@ -967,7 +978,14 @@
.userDialogVisible ::v-deep .el-form-item {
  margin-bottom: 0;
}

.tableFixed{
  ::v-deep .el-table__fixed-right{
    height: 100% !important;
  }
  ::v-deep .el-table__fixed{
    height: 100% !important;
  }
}
</style>
<style>