设备调拨功能调整

Lius

3 天以前 a284da4c7af8db0004b9779753f7d1effaf6254e

设备调拨功能调整

 src/views/eam/dispose/EamEquipmentLeanOutList.vue

@@ -8,25 +8,15 @@
        @keyup.enter.native="searchQuery"
      >
        <a-row :gutter="24">
          <a-col
            :xl="4"
            :lg="7"
            :md="8"
            :sm="24"
          >
            <a-form-item label="设备编号1">
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label="设备编号">
              <lx-search-equipment-select
                placeholder="请输入设备编号或名称搜索"
                v-model="queryParam.equipmentId"
              ></lx-search-equipment-select>
            </a-form-item>
          </a-col>
          <a-col
            :xl="4"
            :lg="7"
            :md="8"
            :sm="24"
          >
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label="单据号">
              <a-input
                placeholder="请输入单据号"
@@ -34,12 +24,13 @@
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col
            :xl="6"
            :lg="7"
            :md="8"
            :sm="24"
          >
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label="借用状态">
              <j-dict-select-tag placeholder="请选择借用状态" dictCode="equipment_lean_out_status" v-model="queryParam.leanStatus"
                                 allow-clear/>
            </a-form-item>
          </a-col>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"

 src/views/eam/dispose/EamEquipmentScrapList.vue

@@ -6,42 +6,27 @@
      <a-form layout='inline' @keyup.enter.native='searchQuery'>
        <a-row :gutter='24'>

          <a-col :lg='7' :md='8' :sm='24' :xl='6'>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label='设备编号'>
              <lx-search-equipment-select v-model='queryParam.equipmentId'
                                          placeholder='请输入设备编号或名称搜索'></lx-search-equipment-select>
            </a-form-item>
          </a-col>
          <a-col :lg='7' :md='8' :sm='24' :xl='6'>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label='单据号'>
              <a-input v-model='queryParam.code' placeholder='请输入单据号'></a-input>
            </a-form-item>
          </a-col>
          <template v-if='toggleSearchStatus'>
            <a-col :lg='7' :md='8' :sm='24' :xl='6'>
              <a-form-item label='设备ID'>
                <a-input v-model='queryParam.equipmentId' placeholder='请输入设备ID'></a-input>
              </a-form-item>
            </a-col>
            <a-col :lg='7' :md='8' :sm='24' :xl='6'>
              <a-form-item label='转让/报废'>
                <a-input v-model='queryParam.scrapType' placeholder='请输入转让/报废'></a-input>
              </a-form-item>
            </a-col>
            <a-col :lg='7' :md='8' :sm='24' :xl='6'>
              <a-form-item label='申请人'>
                <a-input v-model='queryParam.reportUser' placeholder='请输入申请人'></a-input>
              </a-form-item>
            </a-col>
          </template>
          <a-col :lg='7' :md='8' :sm='24' :xl='6'>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label="处置状态">
              <j-dict-select-tag placeholder="请选择处置状态" dictCode="equipment_scrap_status" v-model="queryParam.scrapStatus"
                                 allow-clear/>
            </a-form-item>
          </a-col>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <span class='table-page-search-submitButtons' style='float: left;overflow: hidden;'>
              <a-button icon='search' type='primary' @click='searchQuery'>查询</a-button>
              <a-button icon='reload' style='margin-left: 8px' type='primary' @click='searchReset'>重置</a-button>
              <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
              <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
              <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
              <!--              </a>-->
            </span>
          </a-col>


 src/views/eam/dispose/EamEquipmentSealUpList.vue

@@ -16,6 +16,12 @@
              <a-input v-model='queryParam.code' placeholder='请输入单据号'></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label="封存状态">
              <j-dict-select-tag placeholder="请选择封存状态" dictCode="equipment_seal_up_status" v-model="queryParam.sealStatus"
                                 allow-clear/>
            </a-form-item>
          </a-col>
          <a-col :lg='7' :md='8' :sm='24' :xl='6'>
            <span class='table-page-search-submitButtons' style='float: left;overflow: hidden;'>
              <a-button icon='search' type='primary' @click='searchQuery'>查询</a-button>

 src/views/eam/dispose/EamEquipmentTransferList.vue

@@ -6,31 +6,36 @@
      <a-form layout='inline' @keyup.enter.native='searchQuery'>
        <a-row :gutter='24'>

          <a-col :lg='7' :md='8' :sm='24' :xl='6'>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label='设备编号'>
              <lx-search-equipment-select v-model='queryParam.equipmentId'
                                          placeholder='请输入设备编号或名称搜索'></lx-search-equipment-select>
            </a-form-item>

          </a-col>
          <a-col :lg='7' :md='8' :sm='24' :xl='6'>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label='单据号'>
              <a-input v-model='queryParam.code' placeholder='请输入单据号'></a-input>
            </a-form-item>
          </a-col>
          <template v-if='toggleSearchStatus'>
            <a-col :lg='7' :md='8' :sm='24' :xl='6'>
              <a-form-item label='调出部门'>
                <a-input v-model='queryParam.oldDepartId' placeholder='请输入调出部门'></a-input>
              </a-form-item>
            </a-col>
            <a-col :lg='7' :md='8' :sm='24' :xl='6'>
              <a-form-item label='调入部门'>
                <a-input v-model='queryParam.newDepartId' placeholder='请输入调入部门'></a-input>
              </a-form-item>
            </a-col>
          </template>
          <a-col :lg='7' :md='8' :sm='24' :xl='6'>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label="变动状态">
              <j-dict-select-tag placeholder="请选择变动状态" dictCode="equipment_transfer_status" v-model="queryParam.transferStatus"
                                 allow-clear/>
            </a-form-item>
          </a-col>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label='调出部门'>
              <a-input v-model='queryParam.oldDepartId' placeholder='请输入调出部门'></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label='调入部门'>
              <a-input v-model='queryParam.newDepartId' placeholder='请输入调入部门'></a-input>
            </a-form-item>
          </a-col>

          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <span class='table-page-search-submitButtons' style='float: left;overflow: hidden;'>
              <a-button icon='search' type='primary' @click='searchQuery'>查询</a-button>
              <a-button icon='reload' style='margin-left: 8px' type='primary' @click='searchReset'>重置</a-button>
@@ -201,19 +206,79 @@
          dataIndex: 'transferTime'
        },
        {
          title: '审核人',
          title: '使用单位领导',
          align: 'center',
          dataIndex: 'approvalUser_dictText'
          dataIndex: 'useLeader_dictText'
        },
        {
          title: '审核意见',
          title: '使用单位领导审核类型',
          align: 'center',
          dataIndex: 'approvalComment'
          dataIndex: 'useLeaderApprovalDealType_dictText'
        },
        {
          title: '审核时间',
          title: '使用单位领导审核意见',
          align: 'center',
          dataIndex: 'approvalTime'
          dataIndex: 'useLeaderApprovalComment'
        },
        {
          title: '使用单位领导审核时间',
          align: 'center',
          dataIndex: 'useLeaderApprovalTime'
        },
        {
          title: '调入单位领导',
          align: 'center',
          dataIndex: 'transferLeader_dictText'
        },
        {
          title: '调入单位领导审核类型',
          align: 'center',
          dataIndex: 'transferLeaderApprovalDealType_dictText'
        },
        {
          title: '调入单位领导审核意见',
          align: 'center',
          dataIndex: 'transferLeaderApprovalComment'
        },
        {
          title: '调入单位领导审核时间',
          align: 'center',
          dataIndex: 'transferLeaderApprovalTime'
        },
        {
          title: '机动办确认人',
          align: 'center',
          dataIndex: 'externalConfirm_dictText'
        },
        {
          title: '机动办确认时间',
          align: 'center',
          dataIndex: 'externalConfirmTime'
        },
        {
          title: '是否需要公司领导审批',
          align: 'center',
          dataIndex: 'companyLeaderCheck_dictText'
        },
        {
          title: '公司领导',
          align: 'center',
          dataIndex: 'companyLeader_dictText'
        },
        {
          title: '公司领导审核类型',
          align: 'center',
          dataIndex: 'companyLeaderApprovalDealType_dictText'
        },
        {
          title: '公司领导审核意见',
          align: 'center',
          dataIndex: 'companyLeaderApprovalComment'
        },
        {
          title: '公司领导审核时间',
          align: 'center',
          dataIndex: 'companyLeaderApprovalTime'
        },
        {
          title: '备注',

 src/views/eam/dispose/modules/EamEquipmentLeanOutModal.vue

@@ -24,7 +24,7 @@
          <a-tree-select v-model="model.leanDepartId"
                         :disabled="disableSubmit"
                         style="width: 100%"
                         :tree-data="treeData"
                         :tree-data="treeDataAlias"
                         :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                         placeholder="请选择借入车间"
                         allow-clear
@@ -67,6 +67,7 @@
        },
        confirmLoading: false,
        treeData: [],
        treeDataAlias: [],
        validatorRules:{
          equipmentId: [
            { required: true, message: '请选择设备！' }
@@ -147,12 +148,43 @@
        getAction(this.url.loadProductionOptions).then(res => {
          if (res.success) {
            this.treeData = [...res.result]
            this.treeDataAlias = this.deepCopyAndModify(res.result)
          }else {
            that.$message.warning(res.message)
          }
        })
      },
      deepCopyAndModify(arr) {
        // 如果当前元素不是数组或对象，直接返回
        if (!Array.isArray(arr) && typeof arr !== 'object' || arr === null || arr.length === 0) {
          return arr;
        }

        // 如果是数组，创建一个新数组并递归处理每个元素
        if (Array.isArray(arr)) {
          const newArray = [];
          for (let i = 0; i < arr.length; i++) {
            newArray.push(this.deepCopyAndModify(arr[i]));
          }
          return newArray;
        }

        // 如果是对象，创建一个新对象并递归处理每个属性
        const newObj = {};
        for (const key in arr) {
          if (arr.hasOwnProperty(key)) {
            if(key === 'selectable') {
              newObj[key] = true;
            } else if(key === 'children') {
              newObj[key] = this.deepCopyAndModify(arr[key]);
            }else {
              newObj[key] = arr[key];
            }

          }
        }
        return newObj;
      }
    }
  }
</script>

 src/views/eam/dispose/modules/EamEquipmentTransferModal.vue

@@ -19,18 +19,15 @@
          <lx-search-equipment-select placeholder="请输入设备编号或名称搜索"
                                      v-model="model.equipmentId"  :disabled="disableSubmit"></lx-search-equipment-select>
        </a-form-model-item>
<!--        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldDepartId" label="调出部门">-->
<!--          <a-input placeholder="请输入调出部门" v-model="model.oldDepartId" />-->
<!--        </a-form-model-item>-->
          <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="newDepartId" label="调入车间">
            <a-tree-select v-model="model.newDepartId"
                           style="width: 100%"
                           :tree-data="treeData"
                           :tree-data="treeDataAlias"
                           :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                           placeholder="请选择调入车间"
                           allow-clear
                           tree-default-expand-all
                           :disabled="editable || disableSubmit"
                           :disabled="disableSubmit"
            >
            </a-tree-select>
          </a-form-model-item>
@@ -74,7 +71,9 @@
          xs: { span: 24 },
          sm: { span: 18 }
        },
        disableSubmit: false,
        treeData: [],
        treeDataAlias: [],
        confirmLoading: false,
        validatorRules:{
          newDepartId: [
@@ -103,6 +102,7 @@
        getAction(this.url.loadProductionOptions).then(res => {
          if (res.success) {
            this.treeData = [...res.result]
            this.treeDataAlias = this.deepCopyAndModify(res.result)
          }else {
            that.$message.warning(res.message)
          }
@@ -156,7 +156,37 @@
      handleCancel () {
        this.close()
      },
      deepCopyAndModify(arr) {
        // 如果当前元素不是数组或对象，直接返回
        if (!Array.isArray(arr) && typeof arr !== 'object' || arr === null || arr.length === 0) {
          return arr;
        }

        // 如果是数组，创建一个新数组并递归处理每个元素
        if (Array.isArray(arr)) {
          const newArray = [];
          for (let i = 0; i < arr.length; i++) {
            newArray.push(this.deepCopyAndModify(arr[i]));
          }
          return newArray;
        }

        // 如果是对象，创建一个新对象并递归处理每个属性
        const newObj = {};
        for (const key in arr) {
          if (arr.hasOwnProperty(key)) {
            if(key === 'selectable') {
              newObj[key] = true;
            } else if(key === 'children') {
              newObj[key] = this.deepCopyAndModify(arr[key]);
            }else {
              newObj[key] = arr[key];
            }

          }
        }
        return newObj;
      }

    }
  }

 src/views/eam/equipment/modules/EamEquipmentModal.vue

@@ -197,7 +197,7 @@
            <a-form-model-item prop="orgId" label="使用车间">
              <a-tree-select v-model="model.orgId"
                             style="width: 100%"
                             :tree-data="treeData"
                             :tree-data="treeDataAlias"
                             :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                             placeholder="请选择使用车间"
                             allow-clear
@@ -303,6 +303,7 @@
        loadProductionOptions:'/mdc/mdcProduction/loadProductionTreeOptions'
      },
      treeData: [],
      treeDataAlias: []
    }
  },
  created() {
@@ -364,11 +365,43 @@
      getAction(this.url.loadProductionOptions).then(res => {
        if (res.success) {
          this.treeData = [...res.result]
          this.treeDataAlias = this.deepCopyAndModify(res.result)
        }else {
          that.$message.warning(res.message)
        }
      })
    },
    deepCopyAndModify(arr) {
      // 如果当前元素不是数组或对象，直接返回
      if (!Array.isArray(arr) && typeof arr !== 'object' || arr === null || arr.length === 0) {
        return arr;
      }

      // 如果是数组，创建一个新数组并递归处理每个元素
      if (Array.isArray(arr)) {
        const newArray = [];
        for (let i = 0; i < arr.length; i++) {
          newArray.push(this.deepCopyAndModify(arr[i]));
        }
        return newArray;
      }

      // 如果是对象，创建一个新对象并递归处理每个属性
      const newObj = {};
      for (const key in arr) {
        if (arr.hasOwnProperty(key)) {
          if(key === 'selectable') {
            newObj[key] = true;
          } else if(key === 'children') {
            newObj[key] = this.deepCopyAndModify(arr[key]);
          }else {
            newObj[key] = arr[key];
          }

        }
      }
      return newObj;
    }
  }
}
</script>

 src/views/eam/repair/EamRepairOrderList.vue

@@ -164,7 +164,7 @@
          {
            title: '维修负责人',
            align: 'center',
            dataIndex: 'repairer',
            dataIndex: 'repairer_dictText',
            width: 100
          },
          {

 src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue

@@ -21,7 +21,7 @@
        <a-divider
          orientation="center"
          style="font-size: large;font-style: italic;color: #66aeed;"
        > 归属信息
        > 调拨信息
        </a-divider>
        <a-row :gutter="24">
          <a-col :span="12">
@@ -123,26 +123,26 @@
            </a-form-model-item>
          </a-col>
        </a-row>
        <div v-if="approvalDisable">
        <div v-if="useApprovalDisable">
          <a-divider
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
          > 管理员封存审核
          > 使用单位领导审批
          </a-divider>
          <a-row :gutter="24">
            <a-col :span="12">
              <a-form-model-item
                :labelCol="labelCol"
                :wrapperCol="wrapperCol"
                prop="approvalDealType"
                prop="useLeaderApprovalDealType"
                label="审批类型"
              >
                <j-dict-select-tag
                  type="radio"
                  v-model="model.approvalDealType"
                  v-model="model.useLeaderApprovalDealType"
                  dictCode="approved_rejected"
                  placeholder="请选择处理类型"
                  :disabled="disableSubmit || initialAcceptanceDisable"
                  :disabled="disableSubmit || leanOutApprovalDisable"
                />
              </a-form-model-item>
            </a-col>
@@ -150,13 +150,116 @@
              <a-form-model-item
                :labelCol="labelCol"
                :wrapperCol="wrapperCol"
                prop="approvalComment"
                prop="useLeaderApprovalComment"
                label="审批意见"
              >
                <a-textarea
                  placeholder="请输入意见"
                  v-model="model.approvalComment"
                  :disabled="disableSubmit || returnDisable"
                  v-model="model.useLeaderApprovalComment"
                  :disabled="disableSubmit || leanOutApprovalDisable"
                />
              </a-form-model-item>
            </a-col>
          </a-row>
        </div>
        <div v-if="leanOutApprovalDisable">
          <a-divider
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
          > 调入单位领导审批
          </a-divider>
          <a-row :gutter="24">
            <a-col :span="12">
              <a-form-model-item
                :labelCol="labelCol"
                :wrapperCol="wrapperCol"
                prop="transferLeaderApprovalDealType"
                label="审批类型"
              >
                <j-dict-select-tag
                  type="radio"
                  v-model="model.transferLeaderApprovalDealType"
                  dictCode="approved_rejected"
                  placeholder="请选择处理类型"
                  :disabled="disableSubmit || externalConfirmDisable"
                />
              </a-form-model-item>
            </a-col>
            <a-col :span="12">
              <a-form-model-item
                :labelCol="labelCol"
                :wrapperCol="wrapperCol"
                prop="transferLeaderApprovalComment"
                label="审批意见"
              >
                <a-textarea
                  placeholder="请输入意见"
                  v-model="model.transferLeaderApprovalComment"
                  :disabled="disableSubmit || externalConfirmDisable"
                />
              </a-form-model-item>
            </a-col>
          </a-row>
        </div>
        <div v-if="externalConfirmDisable">
          <a-divider
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
          > 机动办确认
          </a-divider>
          <a-row :gutter="24">
            <a-col :span="24">
              <a-form-model-item
                :labelCol="labelCol"
                :wrapperCol="wrapperCol"
                prop="companyLeaderCheck"
                label="是否需要公司领导审批"
              >
                <j-dict-select-tag
                  type="radio"
                  v-model="model.companyLeaderCheck"
                  dictCode="yn"
                  placeholder="请选择是否"
                  :disabled="disableSubmit || companyApprovalDisable"
                />
              </a-form-model-item>
            </a-col>
          </a-row>
        </div>
        <div v-if="companyApprovalDisable">
          <a-divider
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
          > 公司领导审批
          </a-divider>
          <a-row :gutter="24">
            <a-col :span="12">
              <a-form-model-item
                :labelCol="labelCol"
                :wrapperCol="wrapperCol"
                prop="companyLeaderApprovalDealType"
                label="审批类型"
              >
                <j-dict-select-tag
                  type="radio"
                  v-model="model.companyLeaderApprovalDealType"
                  dictCode="approved_rejected"
                  placeholder="请选择处理类型"
                  :disabled="disableSubmit"
                />
              </a-form-model-item>
            </a-col>
            <a-col :span="12">
              <a-form-model-item
                :labelCol="labelCol"
                :wrapperCol="wrapperCol"
                prop="companyLeaderApprovalComment"
                label="审批意见"
              >
                <a-textarea
                  placeholder="请输入意见"
                  v-model="model.companyLeaderApprovalComment"
                  :disabled="disableSubmit"
                />
              </a-form-model-item>
            </a-col>
@@ -208,23 +311,26 @@
      spinning: false,
      imageSrc: null,
      validatorRules: {
        approvalDealType: [
        useLeaderApprovalDealType: [
          { required: true, message: '请选择通过或驳回!' }
        ],
        unsealApprovalDealType: [
        transferLeaderApprovalDealType: [
          { required: true, message: '请选择通过或驳回!' }
        ],
        approvalComment: [
        companyLeaderCheck: [
          { required: true, message: '请选择是或否!' }
        ],
        companyLeaderApprovalDealType: [
          { required: true, message: '请选择通过或驳回!' }
        ],
        useLeaderApprovalComment: [
          { required: true, message: '请输入审批意见!' }
        ],
        unsealApprovalComment: [
        transferLeaderApprovalComment: [
          { required: true, message: '请输入审批意见!' }
        ],
        returnComment: [
          { required: true, message: '请输入归还备注!' }
        ],
        confirmComment: [
          { required: true, message: '请输入确认意见!' }
        companyLeaderApprovalComment: [
          { required: true, message: '请输入审批意见!' }
        ]
      },
      url: {
@@ -239,8 +345,21 @@
    this.loadAllProductionTree()
  },
  computed: {
    approvalDisable: function () {
      return ['WAIT_SUBMIT', 'WAIT_APPROVAL', 'WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE',].includes(this.model.transferStatus)
    //使用单位领导审批
    useApprovalDisable: function () {
      return ['WAIT_SUBMIT', 'WAIT_USE_LEADER_CHECK', 'WAIT_TRANSFER_LEADER_CHECK', 'WAIT_EXTERNAL_CONFIRM', 'WAIT_COMPANY_LEADER_CHECK', 'REJECT', 'COMPLETE'].includes(this.model.transferStatus)
    },
    //调入单位领导审批WAIT_USE_LEADER_CHECK
    leanOutApprovalDisable: function () {
      return ['WAIT_TRANSFER_LEADER_CHECK', 'WAIT_EXTERNAL_CONFIRM', 'WAIT_COMPANY_LEADER_CHECK', 'REJECT', 'COMPLETE'].includes(this.model.transferStatus)
    },
    //机动办确认
    externalConfirmDisable: function () {
      return ['WAIT_EXTERNAL_CONFIRM', 'WAIT_COMPANY_LEADER_CHECK', 'REJECT', 'COMPLETE'].includes(this.model.transferStatus)
    },
    // 公司领导审批
    companyApprovalDisable: function () {
      return ['WAIT_COMPANY_LEADER_CHECK', 'REJECT', 'COMPLETE'].includes(this.model.transferStatus)
    },
  },
  methods: {

 src/views/mdc/base/modules/GroupUtilizationRateChart/ChartComponent.vue

@@ -118,7 +118,7 @@
          top: 'center',
          right: 0,
          itemGap: 20,
          data: ['24小时', '24小时（去除故障设备）', '白班', '晚班', '16小时', '累计运行时间(h)']
          data: ['24小时', '24小时（去除故障设备）', '一班', '二班', '16小时', '累计运行时间(h)']
        },
        tooltip: {
          show: true,
@@ -173,6 +173,22 @@
            data: [54, 34, 12, 56, 64, 32, 90, 12, 56, 64, 32, 90]
          },
          {
            type: 'line',
            name: '一班',
            symbol: 'triangle',
            yAxisIndex: 0,
            symbolSize: 10,
            data: [23, 45, 43, 65, 13, 23, 80, 21, 65, 46, 23, 70]
          },
          {
            type: 'line',
            name: '二班',
            symbol: 'triangle',
            yAxisIndex: 0,
            symbolSize: 10,
            data: [9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9]
          },
          {
            type: 'bar',
            name: '累计运行时间(h)',
            yAxisIndex: 1,