1、mdc菜单下除特殊要求外，页面表格最少条数由10条调整为30条，每页最多条数区间由[10,20,30]调整为[30,50,100] 2、OEE基础...

zhuzhuanzhuan

2024-03-18 51b9e548b0e533e8a415ce141808f2bb747b381e

 src/views/mdc/base/EquipmentList.vue

@@ -6,28 +6,41 @@
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">

          <a-col :md="6" :sm="12">
          <a-col :md="4" :sm="4">
            <a-form-item label="设备编号">
              <!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
              <a-input placeholder="请输入设备编号" v-model="queryParam.equipmentId"></a-input>
            </a-form-item>
          </a-col>

          <a-col :md="6" :sm="8">
          <a-col :md="4" :sm="4">
            <a-form-item label="设备名称">
              <!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
              <a-input placeholder="请输入设备名称" v-model="queryParam.equipmentName"></a-input>
            </a-form-item>
          </a-col>

          <a-col :md="6" :sm="8">
          <a-col :md="4" :sm="4">
            <a-form-item label="车间名称">
              <!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
              <a-input placeholder="请输入车间名称" v-model="queryParam.productionName"></a-input>
              <!--<a-input placeholder="请输入车间名称" v-model="queryParam.productionName"></a-input>-->
              <a-tree-select v-model="queryParam.productionName" :treeData="workshopTreeData" placeholder="请选择车间"
                             :treeDefaultExpandedKeys="treeDefaultExpandedKeys"></a-tree-select>
            </a-form-item>
          </a-col>

          <a-col :md="6" :sm="8">
          <a-col :md="4" :sm="4">
            <a-form-item label="设备级别">
              <j-dict-select-tag placeholder="请选择设备级别" dictCode="device_level" v-model="queryParam.deviceLevel"
                                 allow-clear/>
            </a-form-item>
          </a-col>

          <a-col :md="4" :sm="4">
            <a-form-item label="设备种类">
              <j-dict-select-tag placeholder="请选择设备种类" dictCode="device_category" v-model="queryParam.deviceCategory"
                                 allow-clear/>
            </a-form-item>
          </a-col>

          <a-col :md="4" :sm="4">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
          </a-col>
@@ -37,7 +50,8 @@

    <!-- 操作按钮区域 -->
    <div class="table-operator" style="border-top: 5px">
      <a-button @click="handleAdd" type="primary" icon="plus" >添加设备</a-button>
      <a-button @click="handleAdd" type="primary" icon="plus">添加设备</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('设备信息')">导出</a-button>
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay" @click="handleMenuClick">
          <a-menu-item key="1">
@@ -55,7 +69,8 @@
    <!-- table区域-begin -->
    <div>
      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{
        selectedRowKeys.length }}</a>项&nbsp;&nbsp;
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      </div>

@@ -71,17 +86,10 @@
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange">

        <template slot="avatarslot" slot-scope="text, record, index">
          <div class="anty-img-wrap">
            <a-avatar shape="square" :src="getAvatarView(record.avatar)" icon="user"/>
          </div>
        </template>

        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)" >编辑</a>
          <a @click="handleEdit(record)">编辑</a>

          <a-divider type="vertical" />
          <a-divider type="vertical"/>

          <a-dropdown>
            <a class="ant-dropdown-link">
@@ -92,28 +100,11 @@
                <a href="javascript:;" @click="handleDetail(record)">详情</a>
              </a-menu-item>

              <!--<a-menu-item>-->
                <!--<a href="javascript:;" @click="handleChangePassword(record.username)">密码</a>-->
              <!--</a-menu-item>-->

              <a-menu-item>
                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>

              <!--<a-menu-item v-if="record.status==1">-->
                <!--<a-popconfirm title="确定冻结吗?" @confirm="() => handleFrozen(record.id,2,record.username)">-->
                  <!--<a>冻结</a>-->
                <!--</a-popconfirm>-->
              <!--</a-menu-item>-->

              <!--<a-menu-item v-if="record.status==2">-->
                <!--<a-popconfirm title="确定解冻吗?" @confirm="() => handleFrozen(record.id,1,record.username)">-->
                  <!--<a>解冻</a>-->
                <!--</a-popconfirm>-->
              <!--</a-menu-item>-->

            </a-menu>
          </a-dropdown>
        </span>
@@ -124,151 +115,129 @@
    <!-- table区域-end -->

    <user-modal ref="modalForm" @ok="modalFormOk"></user-modal>

    <password-modal ref="passwordmodal" @ok="passwordModalOk"></password-modal>

    <sys-user-agent-modal ref="sysUserAgentModal"></sys-user-agent-modal>

    <!-- 用户回收站 -->
    <user-recycle-bin-modal :visible.sync="recycleBinVisible" @ok="modalFormOk"/>

  </a-card>
</template>

<script>

  import UserModal from './modules/EquipmentList/UserModal'
  import PasswordModal from './modules/EquipmentList/PasswordModal'
  import {putAction,getFileAccessHttpUrl} from '@/api/manage';
  import {frozenBatch} from '@/api/api'
  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
  import SysUserAgentModal from "./modules/EquipmentList/SysUserAgentModal";
  import JInput from '@/components/jeecg/JInput'
  import UserRecycleBinModal from './modules/EquipmentList/UserRecycleBinModal'
  import JSuperQuery from '@/components/jeecg/JSuperQuery'
  import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
  import {mapActions} from 'vuex'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import { queryProductionTreeList } from '@/api/api'
  import { mapActions } from 'vuex'

  export default {
    name: "EquipmentList",
    name: 'EquipmentList',
    mixins: [JeecgListMixin],
    components: {
      JThirdAppButton,
      SysUserAgentModal,
      UserModal,
      PasswordModal,
      JInput,
      UserRecycleBinModal,
      JSuperQuery
      UserModal
    },
    data() {
      return {
        description: '这是设备管理页面',
        queryParam: {},
        recycleBinVisible: false,
        /* 分页参数 */
        ipagination: {
          current: 1,
          pageSize: 30,
          pageSizeOptions: ['30', '50', '100'],
          showTotal: (total, range) => {
            return range[0] + '-' + range[1] + ' 共' + total + '条'
          },
          showQuickJumper: true,
          showSizeChanger: true,
          total: 0
        },
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            key: 'rowIndex',
            width: 60,
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            }
          },
          {
            title: '设备编号',
            align: "center",
            align: 'center',
            dataIndex: 'equipmentId',
            width: 200,
            // sorter: true
            width: 200
          },
          {
            title: '设备名称',
            align: "center",
            align: 'center',
            width: 200,
            dataIndex: 'equipmentName',
            dataIndex: 'equipmentName'
          },
          {
            title: '车间',
            align: "center",
            align: 'center',
            width: 200,
            dataIndex: 'productionName'
          },
          {
            title: '设备类型',
            align: "center",
            align: 'center',
            width: 200,
            dataIndex: 'equipmentType',
            // scopedSlots: {customRender: "avatarslot"}
            dataIndex: 'equipmentType'
          },

          {
            title: '驱动类型',
            align: "center",
            align: 'center',
            width: 200,
            dataIndex: 'driveType',
            // sorter: true
            dataIndex: 'driveType'
          },
          {
            title: '机床IP',
            align: "center",
            align: 'center',
            width: 200,
            dataIndex: 'equipmentIp'
          },
          {
            title: '设备功率',
            align: "center",
            align: 'center',
            width: 200,
            dataIndex: 'devicePower'
          },
          {
            title: '部门',
            align: "center",
            align: 'center',
            width: 200,
            dataIndex: 'orgCodeTxt'
          },

          {
            title: '系统版本',
            align: "center",
            align: 'center',
            width: 200,
            dataIndex: 'systemVersion'
          },
          {
            title: '操作',
            dataIndex: 'action',
            scopedSlots: {customRender: 'action'},
            align: "center",
            scopedSlots: { customRender: 'action' },
            align: 'center',
            width: 150,
            fixed:'right'
            fixed: 'right'
          }

        ],
        // superQueryFieldList: [
        //   { type: 'input', value: 'username', text: '用户账号', },
        //   { type: 'input', value: 'realname', text: '用户姓名', },
        //   { type: 'select', value: 'sex', dbType: 'int', text: '性别', dictCode: 'sex' },
        // ],
        url: {
          syncUser: "/act/process/extActProcess/doSyncUser",
          list: "/mdc/mdcEquipment/list",
          delete: "/mdc/mdcEquipment/delete",
          deleteBatch: "/mdc/mdcEquipment/deleteBatch",
          // exportXlsUrl: "/sys/user/exportXls",
          // importExcelUrl: "sys/user/importExcel",
          list: '/mdc/mdcEquipment/list',
          delete: '/mdc/mdcEquipment/delete',
          deleteBatch: '/mdc/mdcEquipment/deleteBatch',
          exportXlsUrl: '/mdc/mdcEquipment/exportXls'
        },
        isDepartType:''
        isDepartType: '',
        workshopTreeData: [],
        treeDefaultExpandedKeys: []
      }
    },
    computed: {
      // importExcelUrl: function(){
      //   return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
      // }
    },
    created() {
      this.queryTreeData()
      this.getWorkshopListByApi()
    },
    methods: {
      ...mapActions(['QueryDepartTree']),
@@ -276,61 +245,60 @@
        this.QueryDepartTree().then(res => {
          if (res.success) {
            this.isDepartType = res.result[0].value
            if(this.isDepartType == -1){
              this.columns=[
            if (this.isDepartType == -1) {
              this.columns = [
                {
                  title: '#',
                  dataIndex: '',
                  key:'rowIndex',
                  width:60,
                  align:"center",
                  customRender:function (t,r,index) {
                    return parseInt(index)+1;
                  key: 'rowIndex',
                  width: 60,
                  align: 'center',
                  customRender: function(t, r, index) {
                    return parseInt(index) + 1
                  }
                },
                {
                  title: '设备编号',
                  align: "center",
                  align: 'center',
                  dataIndex: 'equipmentId',
                  width: 200,
                  width: 200
                  // sorter: true
                },
                {
                  title: '设备名称',
                  align: "center",
                  align: 'center',
                  width: 200,
                  dataIndex: 'equipmentName',
                  dataIndex: 'equipmentName'
                },
                {
                  title: '车间',
                  align: "center",
                  align: 'center',
                  width: 200,
                  dataIndex: 'productionName'
                },
                {
                  title: '设备类型',
                  align: "center",
                  align: 'center',
                  width: 200,
                  dataIndex: 'equipmentType',
                  // scopedSlots: {customRender: "avatarslot"}
                  dataIndex: 'equipmentType'
                },

                {
                  title: '驱动类型',
                  align: "center",
                  align: 'center',
                  width: 200,
                  dataIndex: 'driveType',
                  dataIndex: 'driveType'
                  // sorter: true
                },
                {
                  title: '机床IP',
                  align: "center",
                  align: 'center',
                  width: 200,
                  dataIndex: 'equipmentIp'
                },
                {
                  title: '设备功率',
                  align: "center",
                  align: 'center',
                  width: 200,
                  dataIndex: 'devicePower'
                },
@@ -343,98 +311,97 @@

                {
                  title: '系统版本',
                  align: "center",
                  align: 'center',
                  width: 200,
                  dataIndex: 'systemVersion'
                },
                {
                  title: '操作',
                  dataIndex: 'action',
                  scopedSlots: {customRender: 'action'},
                  align: "center",
                  scopedSlots: { customRender: 'action' },
                  align: 'center',
                  width: 150,
                  fixed:'right'
                  fixed: 'right'
                }

              ]
            }else{
              this.columns=[
            } else {
              this.columns = [
                {
                  title: '#',
                  dataIndex: '',
                  key:'rowIndex',
                  width:60,
                  align:"center",
                  customRender:function (t,r,index) {
                    return parseInt(index)+1;
                  key: 'rowIndex',
                  width: 60,
                  align: 'center',
                  customRender: function(t, r, index) {
                    return parseInt(index) + 1
                  }
                },
                {
                  title: '设备编号',
                  align: "center",
                  align: 'center',
                  dataIndex: 'equipmentId',
                  width: 200,
                  width: 200
                  // sorter: true
                },
                {
                  title: '设备名称',
                  align: "center",
                  align: 'center',
                  width: 200,
                  dataIndex: 'equipmentName',
                  dataIndex: 'equipmentName'
                },
                {
                  title: '车间',
                  align: "center",
                  align: 'center',
                  width: 200,
                  dataIndex: 'productionName'
                },
                {
                  title: '设备类型',
                  align: "center",
                  align: 'center',
                  width: 200,
                  dataIndex: 'equipmentType',
                  // scopedSlots: {customRender: "avatarslot"}
                  dataIndex: 'equipmentType'
                },

                {
                  title: '驱动类型',
                  align: "center",
                  align: 'center',
                  width: 200,
                  dataIndex: 'driveType',
                  dataIndex: 'driveType'
                  // sorter: true
                },
                {
                  title: '机床IP',
                  align: "center",
                  align: 'center',
                  width: 200,
                  dataIndex: 'equipmentIp'
                },
                {
                  title: '设备功率',
                  align: "center",
                  align: 'center',
                  width: 200,
                  dataIndex: 'devicePower'
                },
                {
                  title: '部门',
                  align: "center",
                  align: 'center',
                  width: 200,
                  dataIndex: 'orgCodeTxt'
                },

                {
                  title: '系统版本',
                  align: "center",
                  align: 'center',
                  width: 200,
                  dataIndex: 'systemVersion'
                },
                {
                  title: '操作',
                  dataIndex: 'action',
                  scopedSlots: {customRender: 'action'},
                  align: "center",
                  scopedSlots: { customRender: 'action' },
                  align: 'center',
                  width: 150,
                  fixed:'right'
                  fixed: 'right'
                }

              ]
@@ -443,119 +410,44 @@
          } else {
            // this.$message.warn(res.message)
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
              message: '消息',
              description: res.message
            })
          }
        }).finally(() =>{
        }).finally(() => {
        })
      },
      handleEdit: function (record) {
        this.$refs.modalForm.edit(record);
        this.$refs.modalForm.title = "编辑";
        this.$refs.modalForm.disableSubmit = false;
        this.$refs.modalForm.disSeach = true;
      /**
       * 调用接口获取查询区域车间树列表
       */
      getWorkshopListByApi() {
        queryProductionTreeList().then(res => {
          if (res.success) {
            this.workshopTreeData = res.result
            this.treeDefaultExpandedKeys = [...res.result].map(item => item.key)
          }
        })
      },
      handleEdit: function(record) {
        this.$refs.modalForm.edit(record)
        this.$refs.modalForm.title = '编辑'
        this.$refs.modalForm.disableSubmit = false
        this.$refs.modalForm.disSeach = true
        // 调用抽屉表单组件中的清除表单验证方法
        this.$refs.modalForm.removeValidate()
      },
      handleAdd: function () {
        this.$refs.modalForm.add();
        this.$refs.modalForm.title = "新增";
        this.$refs.modalForm.disableSubmit = false;
        this.$refs.modalForm.disSeach = false;
      },
      getAvatarView: function (avatar) {
        return getFileAccessHttpUrl(avatar)
      },
      batchFrozen: function (status) {
        if (this.selectedRowKeys.length <= 0) {
          // this.$message.warning('请选择一条记录！');
          this.$notification.warning({
            message:'消息',
            description:"请选择一条记录"
          });
          return false;
        } else {
          let ids = "";
          let that = this;
          let isAdmin = false;
          that.selectionRows.forEach(function (row) {
            if (row.username == 'admin') {
              isAdmin = true;
            }
          });
          if (isAdmin) {
            that.$message.warning('管理员账号不允许此操作,请重新选择！');
            return;
          }
          that.selectedRowKeys.forEach(function (val) {
            ids += val + ",";
          });
          that.$confirm({
            title: "确认操作",
            content: "是否" + (status == 1 ? "解冻" : "冻结") + "选中账号?",
            onOk: function () {
              frozenBatch({ids: ids, status: status}).then((res) => {
                if (res.success) {
                  // that.$message.success(res.message);
                  that.$notification.success({
                    message:'消息',
                    description:res.message
                  });
                  that.loadData();
                  that.onClearSelected();
                } else {
                  // that.$message.warning(res.message);
                  that.$notification.warning({
                    message:'消息',
                    description:res.message
                  });

                }
              });
            }
          });
        }
      handleAdd: function() {
        this.$refs.modalForm.add()
        this.$refs.modalForm.title = '新增'
        this.$refs.modalForm.disableSubmit = false
        this.$refs.modalForm.disSeach = false
      },
      handleMenuClick(e) {
        if (e.key == 1) {
          this.batchDel();
        } else if (e.key == 2) {
          this.batchFrozen(2);
        } else if (e.key == 3) {
          this.batchFrozen(1);
          this.batchDel()
        }
      },
      // handleFrozen: function (id, status, username) {
      //   let that = this;
      //   //TODO 后台校验管理员角色
      //   if ('admin' == username) {
      //     that.$message.warning('管理员账号不允许此操作！');
      //     return;
      //   }
      //   frozenBatch({ids: id, status: status}).then((res) => {
      //     if (res.success) {
      //       that.$message.success(res.message);
      //       that.loadData();
      //     } else {
      //       that.$message.warning(res.message);
      //     }
      //   });
      // },
      // handleChangePassword(username) {
      //   this.$refs.passwordmodal.show(username);
      // },
      passwordModalOk() {
        //TODO 密码修改完成 不需要刷新页面，可以把datasource中的数据更新一下
      },
      onSyncFinally({isToLocal}) {
        // 同步到本地时刷新下数据
        if (isToLocal) {
          this.loadData()
        }
      },
      }
    }

  }
</script>
<style scoped>