1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrd...

zhuzhuanzhuan

2023-11-29 f8668b057747f2982afafcc1ce9a2842a4abd50c

1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标
2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder
3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示
4、大屏车间管理页面左右两侧卡片区域布局保持一致
5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱

 src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue

@@ -118,21 +118,21 @@
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            },
            fixed: 'left'
            // fixed: 'left'
          },
          {
            title: '设备统一编号',
            align: 'center',
            dataIndex: 'equipmentId',
            width: 120,
            fixed: 'left'
            // fixed: 'left'
          },
          {
            title: '设备名称',
            align: 'center',
            width: 150,
            dataIndex: 'equipmentName',
            fixed: 'left'
            // fixed: 'left'
          },
          {
            title: '设备型号',

 src/views/system/ProductionManager.vue

@@ -8,12 +8,15 @@
          <a-button @click="handleAdd(1)" type="primary">添加车间</a-button>
          <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
          <a-button type="primary" icon="download" @click="handleExportXls('车间信息')">导出</a-button>
          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
                    :action="importExcelUrl" @change="handleImportExcel">
            <a-button type="primary" icon="import">导入</a-button>
          </a-upload>
          <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
          <a-button @click="handleDelete" v-if="selectedKeys.length>0">删除</a-button>
          <a-button title="删除多条数据" @click="batchDel" v-if="checkedKeys.length>0">批量删除</a-button>
          <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
        </a-row>
        `
        <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
          <a-alert type="info" :showIcon="true">
            <div slot="message">
@@ -24,9 +27,32 @@
          <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入车间名称"/>
          <!-- 树-->
          <a-col :md="10" :sm="24">
            <template>
              <a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">
               <span style="user-select: none">
            <!--<template>-->
            <!--<a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">-->
            <!--<span style="user-select: none">-->
            <!--<a-tree-->
            <!--checkable-->
            <!--multiple-->
            <!--@select="onSelect"-->
            <!--@check="onCheck"-->
            <!--@rightClick="rightHandle"-->
            <!--:selectedKeys="selectedKeys"-->
            <!--:checkedKeys="checkedKeys"-->
            <!--:treeData="departTree"-->
            <!--:checkStrictly="checkStrictly"-->
            <!--:expandedKeys="iExpandedKeys"-->
            <!--:autoExpandParent="autoExpandParent"-->
            <!--@expand="onExpand"/>-->
            <!--</span>-->
            <!--&lt;!&ndash;新增右键点击事件,和增加添加和删除功能&ndash;&gt;-->

            <!--<a-menu slot="overlay">-->
            <!--<a-menu-item @click="handleAdd(3)" key="1">添加</a-menu-item>-->
            <!--<a-menu-item @click="handleDelete" key="2">删除</a-menu-item>-->
            <!--<a-menu-item @click="closeDrop" key="3">取消</a-menu-item>-->
            <!--</a-menu>-->
            <!--</a-dropdown>-->
            <!--</template>-->
            <a-tree
              checkable
              multiple
@@ -40,15 +66,6 @@
              :expandedKeys="iExpandedKeys"
              :autoExpandParent="autoExpandParent"
              @expand="onExpand"/>
                </span>
                <!--新增右键点击事件,和增加添加和删除功能-->
                <a-menu slot="overlay">
                  <a-menu-item @click="handleAdd(3)" key="1">添加</a-menu-item>
                  <a-menu-item @click="handleDelete" key="2">删除</a-menu-item>
                  <a-menu-item @click="closeDrop" key="3">取消</a-menu-item>
                </a-menu>
              </a-dropdown>
            </template>
          </a-col>
        </div>
      </a-card>
@@ -64,7 +81,8 @@
            <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
          </a-menu>
          <a-button>
            树操作 <a-icon type="up" />
            树操作
            <a-icon type="up"/>
          </a-button>
        </a-dropdown>
      </div>
@@ -72,11 +90,11 @@
    </a-col>
    <a-col :md="12" :sm="24">
      <a-tabs defaultActiveKey="1">
        <a-tab-pane tab="基本信息" key="1" >
        <a-tab-pane tab="基本信息" key="1">
          <a-card :bordered="false" v-if="selectedKeys.length>0">
            <a-form-model ref="form" :model="model" :rules="validatorRules">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionName" label="车间名称">
                <a-input placeholder="请输入产线/车间名称" v-model="model.productionName" />
                <a-input placeholder="请输入产线/车间名称" v-model="model.productionName"/>
              </a-form-model-item>
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级车间">
                <a-tree-select
@@ -89,7 +107,7 @@
                </a-tree-select>
              </a-form-model-item>
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
                <a-input-number v-model="model.departOrder" />
                <a-input-number v-model="model.productionOrder"/>
              </a-form-model-item>
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
                <a-textarea placeholder="请输入备注" v-model="model.memo"/>
@@ -100,7 +118,7 @@
              <a-button @click="submitCurrForm" type="primary" htmlType="button" icon="form">保存</a-button>
            </div>
          </a-card>
          <a-card v-else >
          <a-card v-else>
            <a-empty>
              <span slot="description"> 请先选择一个车间! </span>
            </a-empty>
@@ -111,65 +129,27 @@
        <!--</a-tab-pane>-->
        <a-tab-pane tab="设备列表" key="2" forceRender>
          <!--<depart-auth-modal/>-->
          <production-equipment  ref="departAuth"></production-equipment>
          <production-equipment ref="departAuth"></production-equipment>
        </a-tab-pane>
      </a-tabs>

    </a-col>
    <production-modal  ref="departModal" @ok="loadTree"></production-modal>
    <production-modal ref="departModal" @ok="loadTree"></production-modal>
  </a-row>
</template>
<script>
  import ProductionEquipment from './modules/ProductionManager/ProductionEquipment'
  import {queryProductionTreeList, searchByKeywords, deleteByProduction} from '@/api/api'
  import {httpAction, deleteAction} from '@/api/manage'
  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
  import { queryProductionTreeList, searchByKeywords, deleteByProduction } from '@/api/api'
  import { httpAction, deleteAction } from '@/api/manage'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import ProductionModal from './modules/ProductionManager/ProductionModal'
  // 表头
  const columns = [
    {
      title: '机构名称',
      dataIndex: 'departName'
    },
    {
      title: '机构类型',
      align: 'center',
      dataIndex: 'orgType'
    },
    {
      title: '机构编码',
      dataIndex: 'orgCode',
    },
    {
      title: '手机号',
      dataIndex: 'mobile'
    },
    {
      title: '传真',
      dataIndex: 'fax'
    },
    {
      title: '地址',
      dataIndex: 'address'
    },
    {
      title: '排序',
      align: 'center',
      dataIndex: 'departOrder'
    },
    {
      title: '操作',
      align: 'center',
      dataIndex: 'action',
      scopedSlots: {customRender: 'action'}
    }
  ]

  export default {
    name: 'ProductionManager',
    mixins: [JeecgListMixin],
    components: {
      ProductionEquipment,
      ProductionModal,
      ProductionModal
    },
    data() {
      return {
@@ -188,47 +168,47 @@
        model: {},
        dropTrigger: '',
        depart: {},
        columns: columns,
        disableSubmit: false,
        checkedKeys: [],
        selectedKeys: [],
        autoIncr: 1,
        currSelected: {},
        allTreeKeys:[],
        allTreeKeys: [],
        checkStrictly: true,
        labelCol: {
          xs: {span: 24},
          sm: {span: 5}
          xs: { span: 24 },
          sm: { span: 5 }
        },
        wrapperCol: {
          xs: {span: 24},
          sm: {span: 16}
          xs: { span: 24 },
          sm: { span: 16 }
        },
        graphDatasource: {
          nodes: [],
          edges: []
        },
        validatorRules: {
          productionName: [{required: true, message: '请输入产线/车间名称!'}],
          productionName: [{ required: true, message: '请输入产线/车间名称!' }]
        },
        url: {
          delete: '/mdc/mdcProduction/delete',
          edit: '/mdc/mdcProduction/edit',
          deleteBatch: '/mdc/mdcProduction/deleteBatch',
          exportXlsUrl: "/mdc/mdcProduction/exportXls",
          importExcelUrl: "/mdc/mdcProduction/importExcel",
          exportXlsUrl: '/mdc/mdcProduction/exportXls',
          importExcelUrl: '/mdc/mdcProduction/importExcel'
        },
        orgCategoryDisabled:false,
        orgCategoryDisabled: false,
        isIncludesNotLeaf: false
      }
    },
    computed: {
      importExcelUrl: function () {
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
      importExcelUrl: function() {
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
      }
    },
    methods: {
      loadData() {
        this.refresh();
        this.refresh()
      },
      loadTree() {
        var that = this
@@ -237,13 +217,13 @@
        queryProductionTreeList().then((res) => {
          if (res.success) {
            //部门全选后，再添加部门，选中数量增多
            this.allTreeKeys = [];
            this.allTreeKeys = []
            for (let i = 0; i < res.result.length; i++) {
              let temp = res.result[i]
              that.treeData.push(temp)
              that.departTree.push(temp)
              that.setThisExpandedKeys(temp)
              that.getAllKeys(temp);
              that.getAllKeys(temp)
              // console.log(temp.id)
            }
            this.loading = false
@@ -263,11 +243,12 @@
        this.loadTree()
      },
      // 右键操作方法
      rightHandle(node) {
      rightHandle({ event, node }) {
        this.dropTrigger = 'contextmenu'
        console.log(node.node.eventKey)
        this.rightClickSelectedKey = node.node.eventKey
        this.rightClickSelectedOrgCode = node.node.dataRef.orgCode
        const record = node.dataRef
        this.rightClickSelectedKey = record.id
        this.rightClickSelected = record
        this.rightClickSelectedOrgCode = record.orgCode
      },
      onExpand(expandedKeys) {
        console.log('onExpand', expandedKeys)
@@ -290,49 +271,71 @@
      addRootNode() {
        this.$refs.nodeModal.add(this.currFlowId, '')
      },
      batchDel: function () {
      batchDel: function() {
        console.log(this.checkedKeys)
        if (this.checkedKeys.length <= 0) {
          // this.$message.warning('请选择一条记录！')
          this.$notification.warning({
            message:'消息',
            description:"请选择一条记录"
          });
        } else {
          var ids = ''
          for (var a = 0; a < this.checkedKeys.length; a++) {
            ids += this.checkedKeys[a] + ','
          }
          var that = this
          this.$confirm({
            title: '确认删除',
            content: '确定要删除所选中的 ' + this.checkedKeys.length + ' 条数据，以及子节点数据吗?',
            onOk: function () {
              deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
                if (res.success) {
                  // that.$message.success(res.message)
                  that.$notification.warning({
                    message:'消息',
                    description:res.message
                  });
                  that.loadTree()
                  that.onClearSelected()
                } else {
                  // that.$message.warning(res.message)
                  that.$notification.warning({
                    message:'消息',
                    description:res.message
                  });
                }
              })
        this.isIncludesNotLeaf = false
        this.includesNotLeaf(this.departTree)
        console.log('isIncludesNotLeaf', this.isIncludesNotLeaf)

        // 为true则表示选中项包含非叶子结点 false则表示选中项均为叶子结点
        if (!this.isIncludesNotLeaf) {
          if (this.checkedKeys.length <= 0) {
            // this.$message.warning('请选择一条记录！')
            this.$notification.warning({
              message: '消息',
              description: '请选择一条记录'
            })
          } else {
            var ids = ''
            for (var a = 0; a < this.checkedKeys.length; a++) {
              ids += this.checkedKeys[a] + ','
            }
            var that = this
            this.$confirm({
              title: '确认删除',
              content: '确定要删除所选中的 ' + this.checkedKeys.length + ' 条数据?',
              onOk: function() {
                deleteAction(that.url.deleteBatch, { ids: ids }).then((res) => {
                  if (res.success) {
                    // that.$message.success(res.message)
                    that.$notification.success({
                      message: '消息',
                      description: res.message
                    })
                    that.loadTree()
                    that.onClearSelected()
                  } else {
                    // that.$message.warning(res.message)
                    that.$notification.warning({
                      message: '消息',
                      description: res.message
                    })
                  }
                })
              }
            })
          }
        } else {
          this.$notification.warning({
            message: '消息',
            description: '选中项包含已挂载子节点车间'
          })
        }
      },
      includesNotLeaf(treeData) {
        for (let i = 0; i < treeData.length; i++) {
          if (!treeData[i].leaf) {
            this.includesNotLeaf(treeData[i].children)
          }
          if (this.checkedKeys.includes(treeData[i].id) && !treeData[i].leaf) {
            this.isIncludesNotLeaf = true
          }
        }
      },
      onSearch(value) {
        let that = this
        if (value) {
          searchByKeywords({keyWord: value}).then((res) => {
          searchByKeywords({ keyWord: value }).then((res) => {
            if (res.success) {
              that.departTree = []
              for (let i = 0; i < res.result.length; i++) {
@@ -342,9 +345,9 @@
            } else {
              // that.$message.warning(res.message)
              that.$notification.warning({
                message:'消息',
                description:res.message
              });
                message: '消息',
                description: res.message
              })
            }
          })
        } else {
@@ -365,9 +368,9 @@
        console.log('onCheck', checkedKeys, info)
        this.hiding = false
        //---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------
        if(this.checkStrictly){
          this.checkedKeys = checkedKeys.checked;
        }else{
        if (this.checkStrictly) {
          this.checkedKeys = checkedKeys.checked
        } else {
          this.checkedKeys = checkedKeys
        }
        //---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------
@@ -375,6 +378,7 @@
      onSelect(selectedKeys, e) {
        console.log('selected', selectedKeys, e)
        this.hiding = false
        this.deleteTrigger = 'leftClick'
        let record = e.node.dataRef
        console.log('onSelect-record', record)
        this.currSelected = Object.assign({}, record)
@@ -382,15 +386,14 @@
        this.selectedKeys = [record.key]
        this.model.parentId = record.parentId
        this.setValuesToForm(record)
        this.$refs.departAuth.show(record.id);

        this.$refs.departAuth.show(record.id)
      },
      // 触发onSelect事件时,为部门树右侧的form表单赋值
      setValuesToForm(record) {
        if(record.orgCategory == '1'){
          this.orgCategoryDisabled = true;
        }else{
          this.orgCategoryDisabled = false;
        if (record.orgCategory == '1') {
          this.orgCategoryDisabled = true
        } else {
          this.orgCategoryDisabled = false
        }
      },
      getCurrSelectedTitle() {
@@ -418,34 +421,34 @@
            if (!this.currSelected.id) {
              // this.$message.warning('请点击选择要修改车间!')
              this.$notification.warning({
                message:'消息',
                description:"请点击选择要修改车间！"
              });
                message: '消息',
                description: '请点击选择要修改车间！'
              })
              return
            }

            httpAction(this.url.edit, this.currSelected, 'put').then((res) => {
              if (res.success) {
                // this.$message.success('保存成功!')
                this.$notification.warning({
                  message:'消息',
                  description:"保存成功"
                });
                this.$notification.success({
                  message: '消息',
                  description: '保存成功'
                })
                this.loadTree()
              } else {
                // this.$message.error(res.message)
                this.$notification.warning({
                  message:'消息',
                  description:res.message
                });
                  message: '消息',
                  description: res.message
                })
              }
            })
          }
        })
      },
      emptyCurrForm() {
        this.$refs.form.resetFields();
        this.model={}
        this.$refs.form.resetFields()
        this.model = {}
      },
      nodeSettingFormSubmit() {
        this.$refs.form.validate(valid => {
@@ -467,9 +470,9 @@
          if (!key) {
            // this.$message.warning('请先点击选中上级车间！')
            this.$notification.warning({
              message:'消息',
              description:"请先点击选中上级车间！"
            });
              message: '消息',
              description: '请先点击选中上级车间！'
            })
            return false
          }
          this.$refs.departModal.add(this.selectedKeys)
@@ -481,39 +484,47 @@
      },
      handleDelete() {
        var that = this
        this.$confirm({
          title: '确认删除',
          content: '确定要删除此车间以及子节点数据吗?',
          onOk: function () {
            deleteByProduction({id: that.rightClickSelectedKey}).then((resp) => {
              if (resp.success) {
                //删除成功后，去除已选中中的数据
                that.checkedKeys.splice(that.checkedKeys.findIndex(key => key === that.rightClickSelectedKey), 1);
                // that.$message.success('删除成功!')
                that.$notification.success({
                  message:'消息',
                  description:"删除成功"
                });
                that.loadTree()
                //删除后同步清空右侧基本信息内容
                // let orgCode=that.model.orgCode;
                // if(orgCode && orgCode === that.rightClickSelectedOrgCode){
        if (this.currSelected.leaf) {
          this.$confirm({
            title: '确认删除',
            content: `确定要删除 ${that.currSelected.productionName} 吗?`,
            onOk: function() {
              deleteByProduction({ id: that.currSelected.id }).then((resp) => {
                if (resp.success) {
                  //删除成功后，去除已选中中的数据
                  // that.checkedKeys.splice(that.checkedKeys.findIndex(key => key === that.rightClickSelectedKey), 1)
                  // that.$message.success('删除成功!')
                  that.$notification.success({
                    message: '消息',
                    description: '删除成功'
                  })
                  that.loadTree()
                  //删除后同步清空右侧基本信息内容
                  // let orgCode=that.model.orgCode;
                  // if(orgCode && orgCode === that.rightClickSelectedOrgCode){
                  that.onClearSelected()
                // }
              } else {
                // that.$message.warning('删除失败!')
                that.$notification.warning({
                  message:'消息',
                  description:"删除失败"
                });
              }
            })
          }
        })
                  // }
                } else {
                  // that.$message.warning('删除失败!')
                  that.$notification.warning({
                    message: '消息',
                    description: '删除失败'
                  })
                }
              })
            }
          })
        } else {
          this.$notification.warning({
            message: '消息',
            description: '此车间已挂载子节点'
          })
        }
        console.log('deletedRecord', deletedRecord)
      },
      selectDirectiveOk(record) {
        console.log('选中指令数据', record)
        this.nodeSettingForm.setFieldsValue({directiveCode: record.directiveCode})
        this.nodeSettingForm.setFieldsValue({ directiveCode: record.directiveCode })
        this.currSelected.sysCode = record.sysCode
      },
      getFlowGraphData(node) {
@@ -533,24 +544,24 @@
        }
      },
      //---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------
      expandAll () {
      expandAll() {
        this.iExpandedKeys = this.allTreeKeys
      },
      closeAll () {
      closeAll() {
        this.iExpandedKeys = []
      },
      checkALL () {
      checkALL() {
        this.checkStriccheckStrictlytly = false
        this.checkedKeys = this.allTreeKeys
      },
      cancelCheckALL () {
      cancelCheckALL() {
        //this.checkedKeys = this.defaultCheckedKeys
        this.checkedKeys = []
      },
      switchCheckStrictly (v) {
        if(v==1){
      switchCheckStrictly(v) {
        if (v == 1) {
          this.checkStrictly = false
        }else if(v==2){
        } else if (v == 2) {
          this.checkStrictly = true
        }
      },
@@ -570,7 +581,7 @@
      this.currFlowId = this.$route.params.id
      this.currFlowName = this.$route.params.name
      // this.loadTree()
    },
    }

  }
</script>

 src/views/system/WorkshopSignageManagement.vue

@@ -74,8 +74,8 @@
    </a-col>
    <a-col :md="rightColMd" :sm="24" v-if="this.rightcolval == 1">
      <a-card :bordered="false">
        <div style="text-align: right">
          <a-icon type="close-circle" @click="hideUserList" />
        <div @click="hideUserList" class="close-circle">
          <a-icon type="close-circle"/>
        </div>
        <!-- 查询区域 -->
        <div class="table-page-search-wrapper">
@@ -97,7 +97,7 @@
        </div>
        <!-- 操作按钮区域 -->
        <div class="table-operator" :md="24" :sm="24">
          <a-button @click="handleAddDeviceInWorkshop" type="primary" icon="plus" style="margin-top: 16px"
          <a-button @click="handleAddDeviceInWorkshop" type="primary" icon="plus"  style="margin: 5px 0 10px 2px"
            >已有设备
          </a-button>

@@ -114,6 +114,7 @@
            </a-button>
          </a-dropdown>
        </div>

        <!-- table区域-begin -->
        <div>
          <div class="ant-alert ant-alert-info" style="margin-bottom: 16px">
@@ -505,4 +506,11 @@
.ant-btn {
  margin-left: 8px;
}
  .close-circle{
    position: absolute;
    z-index: 9999;
    right: 15px;
    top: 15px;
    cursor: pointer;
  }
</style>

 src/views/system/modules/ProductionManager/ProductionModal.vue

@@ -137,7 +137,7 @@
            httpAction(this.url.add,this.model,"post").then((res)=>{
              if(res.success){
                // that.$message.success(res.message);
                that.$notification.warning({
                that.$notification.success({
                  message:'消息',
                  description:res.message
                });