1.修改分页bug

loulijun2021

2022-08-31 d105bd9dd591264a7b1f79f1fdbbf0e764ff073e

 src/views/sbgl/sbqd.vue

@@ -1,7 +1,18 @@
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div style="padding: 10px 5px 0 0">

      <div class="bodyTopButtonGroup" style="justify-content: space-between">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <div style="display: flex">
          <el-button icon="el-icon-c-scale-to-original" @click="deviceTypeButton">设备类型</el-button>
          <el-button icon="el-icon-document-copy" @click="deviceGroupButton">设备组</el-button>
        </div>

        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
      </div>

      <div class="bodyTopFormGroup">
        <el-form
          ref="form"
          :model="form"
@@ -92,21 +103,14 @@
          </div>
        </el-form>
      </div>
      <el-divider />
      <div style="margin-left: 10px;display: flex">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button type="primary" icon="el-icon-c-scale-to-original" @click="deviceTypeButton">设备类型</el-button>
        <el-button type="primary" icon="el-icon-document-copy" @click="deviceGroupButton">设备组</el-button>
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
      </div>
      <el-divider />

      <div class="elTableDiv">
        <el-table
          :data="tableData"
          border
          :height="tableHeight+'px'"
          stripe
          highlight-current-row
          :row-class-name="tableRowClassName"
          :style="{width: 100+'%',height:(tableHeight-50)+'px'}"
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
@@ -120,25 +124,30 @@
            prop="RowNum"
            width="50"
            label="序号"
            fixed
          />
          <el-table-column
            prop="code"
            label="设备编码"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="name"
            label="设备名称"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="eqptype_name"
            label="设备类型"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="eqpgroup_name"
            label="设备组"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
@@ -148,8 +157,8 @@
            width="120"
          >
            <template slot-scope="{row}">
              <div v-if="row.enable==='Y'">是</div>
              <div v-if="row.enable==='N'">否</div>
              <div v-if="row.enable==='Y'"><svg-icon icon-class="circleYes" style="margin-right: 2px" />是</div>
              <div v-if="row.enable==='N'"><svg-icon icon-class="circleNo" style="margin-right: 2px" />否</div>
            </template>
          </el-table-column>
          <el-table-column
@@ -166,6 +175,7 @@
            prop="wksp_name"
            label="生产车间"
            sortable="custom"
            min-width="120"
          />
          <!--          <el-table-column-->
          <!--            prop="Line_name"-->
@@ -179,7 +189,8 @@
            width="100"
          >
            <template slot-scope="{row}">
              <div>{{ row.operation_ration }}%</div>
              <div v-if=" parseFloat(row.operation_ration)===0">/</div>
              <div v-else>{{ row.operation_ration }}%</div>
            </template>
          </el-table-column>
          <el-table-column
@@ -190,17 +201,23 @@
          />
          <el-table-column
            prop="lm_date"
            width="160"
            label="创建时间"
            sortable="custom"
          />
          <el-table-column
            label="操作"
            width="100"
            fixed="right"
            width="120"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
                <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                  <i class="el-icon-edit-outline" @click="edit('edit',row)" />
                </el-tooltip>
                <el-tooltip v-del-tab-index class="item" effect="dark" content="删除" placement="top">
                  <i class="el-icon-delete" @click="del(row)" />
                </el-tooltip>
              </div>
            </template>
          </el-table-column>
@@ -208,12 +225,11 @@
      </div>
      <!--分页-->
      <pagination
        v-show="total>0"
        :total="total"
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="prev, pager, next,sizes"
        layout="total,prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getDeviceMangerSearch"
      />
@@ -331,7 +347,7 @@
          </el-select>
        </el-form-item>
        <el-form-item label="稼动率" prop="ratio">
          <el-input v-model="dialogForm.ratio" style="width: 195px" />
          <el-input v-model="dialogForm.ratio" style="width: 175px" />
          <span style="margin-left: 10px">%</span>
        </el-form-item>

@@ -359,10 +375,12 @@
        <!--        <el-button type="primary" icon="el-icon-delete" @click="delSetting">删除</el-button>-->
      </div>
      <el-table
        ref="DeviceTypeArray"
        :data="DeviceTypeArray"
        border
        height="300"
        highlight-current-row
        :row-class-name="tableRowClassName"
        :header-cell-style="this.$headerCellStyle"
        :cell-style="this.$cellStyle"
        @sort-change="sortChangeOfDeviceType"
@@ -371,6 +389,7 @@
          width="50"
          label="序号"
          prop="RowNum"
          fixed
        />
        <el-table-column
          prop="code"
@@ -414,12 +433,12 @@
      </el-table>
      <!--分页-->
      <pagination
        v-show="DeviceTypeTotal>0"
        :total="DeviceTypeTotal"
        :page.sync="formDeviceType.page"
        :limit.sync="formDeviceType.rows"
        align="right"
        layout="prev, pager, next,sizes"
        style="margin-top: 10px"
        layout="total,prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getDeviceTypeSearchDialog"
      />
@@ -438,6 +457,7 @@
      width="800px"
      :close-on-click-modal="false"
      top="15vh"

      class="DeviceTypeDialogVisible"
      @close="handleCloseDeviceGroup"
    >
@@ -445,10 +465,12 @@
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addDeviceGroup">新增</el-button>
      </div>
      <el-table
        ref="DeviceGroupArray"
        :data="DeviceGroupArray"
        border
        highlight-current-row
        height="300"
        :row-class-name="tableRowClassName"
        :header-cell-style="this.$headerCellStyle"
        :cell-style="this.$cellStyle"
        @sort-change="sortChangeOfDeviceGroup"
@@ -456,6 +478,7 @@
        <el-table-column
          width="50"
          label="序号"
          fixed
          prop="RowNum"
        />
        <el-table-column
@@ -523,12 +546,12 @@
      </el-table>
      <!--分页-->
      <pagination
        v-show="DeviceGroupTotal>0"
        :total="DeviceGroupTotal"
        :page.sync="formDeviceGroup.page"
        :limit.sync="formDeviceGroup.rows"
        align="right"
        layout="prev, pager, next,sizes"
        style="margin-top: 10px"
        layout="total, prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getDeviceGroupSearchDialog"
      />
@@ -547,10 +570,9 @@

<script>
import Pagination from '@/components/Pagination'
import { getCookie } from '@/utils/auth'
import {
  AddUpdateDeviceGroup, AddUpdateDeviceManger,
  AddUpdateDeviceType, DeleteDeviceManger, DeleteDeviceType,
  AddUpdateDeviceType, DeleteDeviceGroup, DeleteDeviceManger, DeleteDeviceType,
  DeviceGroupSearch,
  DeviceMangerSearch,
  DeviceTypeSearch,
@@ -609,10 +631,10 @@
        devicename: '',
        devicetypecode: '',
        devicegroupcode: '',
        importdate: '',
        importdate: handleDatetime(new Date()),
        workshopcode: '',
        linecode: '',
        status: '',
        status: 'Y',
        ratio: ''
      },
      DeviceGroupDialogArr: [], // 设备组数组
@@ -665,23 +687,30 @@
    }
  },
  created() {
    // 获取设备清单列表
    this.getDeviceMangerSearch()
    // 获取设备类型下拉
    this.getDeviceTypeSelect()
    // 获取所属车间下拉
    this.getWorkShopSelect()
    this.handleRequest()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    handleRequest() {
      // 获取设备清单列表
      this.getDeviceMangerSearch().then(res => {
        if (res.code === '200') {
          // 获取设备类型下拉
          this.getDeviceTypeSelect()
          // 获取所属车间下拉
          this.getWorkShopSelect()
        }
      })
    },
    // 获取设备清单列表
    async getDeviceMangerSearch() {
      const res = await DeviceMangerSearch(this.form)
      this.tableData = res.data
      this.total = res.count
      return { code: res.code }
    },
    // 获取所属车间下拉
    async getWorkShopSelect() {
@@ -767,6 +796,9 @@
        DeleteDeviceManger({ devicecode: row.code }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            if (this.form.page > 1 && this.tableData.length === 1) {
              this.form.page--
            }
            this.getDeviceMangerSearch()
          }
        })
@@ -781,10 +813,10 @@
      this.dialogForm.devicename = ''
      this.dialogForm.devicetypecode = ''
      this.dialogForm.devicegroupcode = ''
      this.dialogForm.importdate = ''
      this.dialogForm.importdate = handleDatetime(new Date())
      this.dialogForm.workshopcode = ''
      // this.dialogForm.linecode = ''
      this.dialogForm.status = ''
      this.dialogForm.status = 'Y'
      this.dialogForm.ratio = ''
      this.$refs.dialogForm.clearValidate()
    },
@@ -837,11 +869,11 @@
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        if (window.innerHeight < 800) {
          this.tableHeight = this.tableHeight - 50
        }
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 240
        // if (window.innerHeight < 769) {
        //   this.tableHeight = this.tableHeight - 50
        // }
      })
    },

@@ -850,6 +882,9 @@
    deviceTypeButton() {
      this.DeviceTypeDialogVisible = true
      this.getDeviceTypeSearchDialog()
      this.$nextTick(() => {
        this.$refs.DeviceTypeArray.doLayout()
      })
    },
    async getDeviceTypeSearchDialog() {
      const res = await DeviceTypeSearch(this.formDeviceType)
@@ -897,6 +932,9 @@
        DeleteDeviceType({ devicetypecode: row.code }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            if (this.formDeviceType.page > 1 && this.DeviceTypeArray.length === 1) {
              this.formDeviceType.page--
            }
            this.getDeviceTypeSearchDialog()
          }
        })
@@ -912,9 +950,9 @@
      if (row.name.trim().length < 1) {
        return this.$message.info('类型名称不能为空！')
      }
      if (row.remark.trim().length < 1) {
        return this.$message.info('类型描述不能为空！')
      }
      // if (row.remark.trim().length < 1) {
      //   return this.$message.info('类型描述不能为空！')
      // }
      const data = {
        'code': row.code,
        'name': row.name,
@@ -945,6 +983,9 @@
    deviceGroupButton() {
      this.DeviceGroupDialogVisible = true
      this.getDeviceGroupSearchDialog()
      this.$nextTick(() => {
        this.$refs.DeviceGroupArray.doLayout()
      })
    },
    // 设备组对话框关闭事件
    handleCloseDeviceGroup() {
@@ -1008,6 +1049,9 @@
        DeleteDeviceGroup({ devicegroupcode: row.code }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            if (this.formDeviceGroup.page > 1 && this.DeviceGroupArray.length === 1) {
              this.formDeviceGroup.page--
            }
            this.getDeviceGroupSearchDialog()
          }
        })
@@ -1026,9 +1070,9 @@
      if (row.eqptype_code.trim().length < 1) {
        return this.$message.info('所属设备类型不能为空！')
      }
      if (row.remark.trim().length < 1) {
        return this.$message.info('分组描述不能为空！')
      }
      // if (row.remark.trim().length < 1) {
      //   return this.$message.info('分组描述不能为空！')
      // }
      const data = {
        'code': row.code,
        'name': row.name,
@@ -1048,37 +1092,66 @@
          this.DeviceGroupArray.splice(index, 1)
        }
      })
    },
    tableRowClassName({ row, rowIndex }) {
      return 'custom-row'
    }
  }
}
</script>
<style lang="scss" scoped>
::v-deep .DeviceTypeDialogVisible .el-dialog__body {
  padding: 20px 20px !important;
}
</style>

<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
::v-deep .el-button--text{
  font-size: 14px ;
  cursor: pointer ;
}
.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
  color: $main_color;
  cursor: pointer;
}
.el-icon-edit-outline{
  margin-right: 15px;
}

::v-deep .el-button--primary, .el-button--default, .el-button--info {
  height: 34px;
  display: flex;
  align-items: center;
  padding: 0 15px;
}

::v-deep .el-button--primary {
  background-color: $main_color !important;
  height: 30px;
  display: flex;
  align-items: center;
  //border: 1px solid $main_color;
  border: none;
  padding: 0 20px;
}

::v-deep .el-button--primary:hover {
  border: none;
}

::v-deep .el-button--info {
  //background-color: $main_color !important;
  height: 30px;
  display: flex;
  align-items: center;
  padding: 0 20px;
}

::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
  background-color: $main_color !important;
::v-deep .el-button--default {
  background-color: #f8f8fa;
  border: none;
}

::v-deep .el-input__inner {
  height: 34px;
  line-height: 34px;
  //color: #a7a7a7;
}

::v-deep .el-dialog__body {
  padding: 20px 100px !important;
}

::v-deep .dialogVisibleRoles .el-dialog__body {
  padding: 20px 20px !important;
}

::v-deep .importPickerClass .el-dialog__body {
  padding: 20px 20px !important;
}

::v-deep .el-dialog__footer {
@@ -1086,116 +1159,30 @@
  justify-content: flex-end;
}

.footerButton {
  display: flex;
  justify-content: end;
}

::v-deep .el-button--default {
  background-color: #ffffff !important;
  height: 30px;
  display: flex;
  align-items: center;
  padding: 0 20px;
}

::v-deep .el-button--default:hover {
  color: #606266;
}

::v-deep .el-dialog__body {
  padding: 20px 100px !important;
}

.DeviceTypeDialogVisible {
  ::v-deep .el-dialog__body {
    padding: 20px 20px !important;
  }

  ::v-deep .el-select .el-input .el-select__caret {
    display: flex;
    align-items: center;
    justify-content: center;
  }

}

::v-deep .el-radio__input.is-checked .el-radio__inner {
  background-color: $main_color;
  border-color: $main_color;
}

::v-deep .el-radio__input.is-checked + .el-radio__label {
  color: $main_color !important;
}

::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
  border-color: $main_color;
  background-color: $main_color;
}

::v-deep .el-input__inner {
  height: 30px;
  line-height: 30px;
}

::v-deep .el-table .caret-wrapper {
  //float: right;
  transform: scale(0.8);
}

::v-deep .cell {
  display: flex !important;
  align-items: center !important;
  justify-content: space-between !important;
}

::v-deep .el-button--text {
  color: $main_color;
  font-size: 14px;
  cursor: pointer;
}

.operationClass {
  height: 23px;
  display: flex;
  justify-content: space-between;
  align-items: center;
  justify-content: space-between;
}

.el-icon-share {
  color: $main_color;
  cursor: pointer;
::v-deep .el-table::before {
  height: 0;
}

.el-checkbox.is-bordered.is-checked {
  border-color: $main_color;
::v-deep .el-table__body-wrapper {
  background-color: #f8f8fa;
}

::v-deep .el-radio__input.is-checked .el-radio__inner {
  border-color: $main_color;
  background: $main_color;
::v-deep .el-table__body .el-table__row.hover-row td{
  background-color: #eaecef ;
}

::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
  border-color: $main_color;
  background: $main_color;
}

::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
  color: $main_color !important;
}

::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
  margin: 10px 30px 0px 0;
}

::v-deep .el-radio__input.is-checked + .el-radio__label {
  color: $main_color;
}

::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
  margin: 10px 30px 0px 0;
::v-deep .el-form--inline .el-form-item__label {
  color: #a7a7a7;
}

.body ::v-deep .el-divider {
@@ -1207,23 +1194,18 @@
.body ::v-deep .el-form-item {
  margin-bottom: 0;
}

::v-deep .el-input__inner:focus {
  border-color: $main_color;
.userDialogVisible ::v-deep .el-form-item {
  margin-bottom: 0;
}

::v-deep .el-select .el-input__inner:focus {
  border-color: $main_color;
}

::v-deep .el-select-dropdown__item.selected {
  color: $main_color;
::v-deep .el-select__caret{
  display: flex;
  justify-content: center;
  align-items: center;
}
</style>
<style lang="scss">
.dateStyle {
  .el-date-table td.today span {
    color: #42b983;
  }
<style>

.el-table .custom-row {
  background: #f8f8fa;
}
</style>