Lius
2024-08-14 3ce2d50102929e6e245249ce61bbadd300f3e24e
设备维护校验调整
OEE列表间距调整
已修改2个文件
60 ■■■■■ 文件已修改
src/views/mdc/base/modules/EquipmentList/UserModal.vue 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -29,8 +29,8 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disSeach" :readOnly="disableSubmit" allow-clear placeholder="请输入设备名称"
            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentName">
              <a-input :disabled="disSeach" allow-clear placeholder="请输入设备名称"
                       v-model="model.equipmentName"/>
            </a-form-model-item>
          </a-col>
@@ -109,8 +109,8 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="设备型号" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="true" :readOnly="disableSubmit" allow-clear placeholder="请输入设备型号"
            <a-form-model-item label="设备型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentModel">
              <a-input :disabled="disSeach" allow-clear placeholder="请输入设备型号"
                       v-model="model.equipmentModel"/>
            </a-form-model-item>
          </a-col>
@@ -222,12 +222,19 @@
              {
              required: true, message: '请选择设备编号!'
              },
              // {
              // validator: this.validatequipmentId
              // }
            ],
            // trigger: 'blur' // 触发方式
          equipmentName:
            [
              {
                required: true, message: '请输入设备名称!'
              },
            ],
          equipmentModel:
            [
              {
                required: true, message: '请输入设备型号!'
              },
            ],
          selectedProduction:
            [
              {
@@ -330,6 +337,7 @@
      getDeviceRows(val) {
        console.log(val)
        if(val.equipmentid ){
          this.removeValidate()
          this.model.equipmentId = val.equipmentid
          this.model.equipmentName = val.equipmentname
            this.model.equipmentModel = val.equipmentmodel
src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
@@ -163,7 +163,7 @@
            title: '序号',
            dataIndex: '',
            key: 'rowIndex',
            width: 70,
            width: 60,
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
@@ -173,10 +173,10 @@
            title: '车间',
            align: 'center',
            dataIndex: 'productionName',
            width: 200
            width: 110
          },
          {
            title: '设备统一编号',
            title: '设备编号',
            align: 'center',
            dataIndex: 'equipmentId',
            width: 120
@@ -184,13 +184,13 @@
          {
            title: '设备名称',
            align: 'center',
            width: 200,
            width: 120,
            dataIndex: 'equipmentName'
          },
          {
            title: '设备型号',
            align: 'center',
            width: 200,
            width: 120,
            dataIndex: 'equipmentModel',
            scopedSlots: { customRender: 'equipmentModel' }
          },
@@ -203,32 +203,32 @@
          {
            title: '班次',
            align: 'center',
            width: 300,
            width: 100,
            dataIndex: 'shift'
          },
          {
            title: '每班小时',
            dataIndex: 'shiftTimeCount',
            align: 'center',
            width: 110
            width: 100
          },
          {
            title: '加班时间(分钟)',
            dataIndex: 'overtime',
            align: 'center',
            width: 110
            width: 100
          },
          {
            title: '实际班产天数',
            dataIndex: 'actualWorkDayCount',
            align: 'center',
            width: 120
            width: 100
          },
          {
            title: '月度实际班产总时间(分钟)',
            dataIndex: 'monthActualWorkDayTimeCount',
            align: 'center',
            width: 110
            width: 100
          },
          {
            title: '非计划停机损失(分钟)(一个月)',
@@ -255,7 +255,7 @@
                title: '计划等任务',
                dataIndex: 'plannedTaskDuration',
                align: 'center',
                width: 110
                width: 100
              },
              {
                title: '检验',
@@ -284,26 +284,26 @@
                title: '会议/培训',
                dataIndex: 'conferenceTrainingDuration',
                align: 'center',
                width: 110
                width: 100
              },
              {
                title: '其他休息等',
                dataIndex: 'otherRestDuration',
                align: 'center',
                width: 110
                width: 100
              }]
          },
          {
            title: '负荷时间(小时)',
            dataIndex: 'loadTime',
            align: 'center',
            width: 110
            width: 100
          },
          {
            title: '时间开动率',
            dataIndex: 'timeActuationRate',
            align: 'center',
            width: 110,
            width: 100,
            customRender: text => text != 0 ? parseFloat((text * 100).toFixed(2)) + '%' : 0
          },
          // {
@@ -322,7 +322,7 @@
            title: '性能开动率',
            dataIndex: 'performanceRate',
            align: 'center',
            width: 110,
            width: 100,
            customRender: text => text != 0 ? parseFloat((text * 100).toFixed(2)) + '%' : 0
          },
          {
@@ -342,7 +342,7 @@
            title: '设备综合效率',
            dataIndex: 'overallEquipmentEfficiency',
            align: 'center',
            width: 120,
            width: 100,
            customRender: text => text != 0 ? parseFloat((text * 100).toFixed(2)) + '%' : 0
          }
        ],