设备OEE

.env.development

@@ -5,4 +5,4 @@ ENV = 'development'
 # 这里修改成api服务器地址
 VUE_APP_BASE_API = '/api'
 VUE_APP_VIEW_PIC = 'http://tft.mes.picaiba.com/api/common/attachment/downloadFile?type=0&attachmentId='
-VUE_APP_REPORT_DESIGN_URL = 'http://hfxny.mes.picaiba.com/ureport/designer'
+VUE_APP_REPORT_DESIGN_URL = 'http://tft.mes.picaiba.com/ureport/designer'

.env.production

@@ -5,4 +5,4 @@ ENV = 'production'
 # 这里修改成api服务器地址
 VUE_APP_BASE_API = '/api'
 VUE_APP_VIEW_PIC = 'http://tft.mes.picaiba.com/api/common/attachment/downloadFile?type=0&attachmentId='
-VUE_APP_REPORT_DESIGN_URL = 'http://hfxny.mes.picaiba.com/ureport/designer'
+VUE_APP_REPORT_DESIGN_URL = 'http://tft.mes.picaiba.com/ureport/designer'

src/api/deviceManagement.js

@@ -16,6 +16,13 @@ export function performanceAnalysisPlan(data) {
     data
   })
 }
+export function performanceUpdatePlan(data) {
+  return request({
+    url: '/equipment/PerformanceAnalysis/updatePlan',
+    method: 'post',
+    data
+  })
+}
 // 托盘指标分析
 export function palletIndicatorAnalysisPage(data) {
   return request({
@@ -24,6 +31,13 @@ export function palletIndicatorAnalysisPage(data) {
     data
   })
 }
+export function palletIndicatorGetType(data) {
+  return request({
+    url: '/equipment/PalletIndicatorAnalysis/getType',
+    method: 'post',
+    data
+  })
+}
 
 // 托盘指标分析
 export function palletIndicatorAnalysisType(data) {

src/views/basicConfig/reportManagement/reportDesign.vue

@@ -8,10 +8,7 @@ export default {
   name: 'ReportDesign',
   data() {
     return {
-      // url: ''
+      url: process.env.VUE_APP_REPORT_DESIGN_URL
-      // url: process.env.VUE_APP_REPORT_DESIGN_URL
-      // url: 'http://hfxny.mes.picaiba.com/ureport/designer'
-      url: 'http://tft.mes.picaiba.com/ureport/designer'
     }
   },
   mounted() {

src/views/deviceManagement/components/deviceOeeLine.vue

@@ -14,6 +14,15 @@ import resize from '@/utils/chartMixins/resize'
 export default {
   name: 'deviceOeeLine',
   mixins: [resize],
+  props: {
+    chartMsg: {
+      type: Array,
+      required: true,
+      default: () => {
+        return []
+      }
+    }
+  },
   data() {
     return {
       chartDom: '',
@@ -22,15 +31,48 @@ export default {
     }
   },
   mounted() {
-    this.chartDom = document.getElementById('main')
+    this.$nextTick(() => {
-    this.chart = echarts.init(this.chartDom)
       this.getChart()
+    })
     window.addEventListener('resize', () => {
       this.chartHeight = tableHeight(214) / 2 - 35
     })
   },
+  watch: {
+    chartMsg: function () {
+      this.getChart()
+    }
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
   methods: {
     getChart() {
+      if (
+        this.chart !== null &&
+        this.chart !== '' &&
+        this.chart !== undefined
+      ) {
+        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
+      }
+      this.chartDom = document.getElementById('main')
+      this.chart = echarts.init(this.chartDom)
+      let dateList = []
+      let activationList = []
+      let performanceList = []
+      let failurePercentList = []
+      let combinedEfficiencyList = []
+      for (let i = 0; i < this.chartMsg.length; i++) {
+        dateList.push(new Date(this.chartMsg[i].date).getDate())
+        activationList.push(this.chartMsg[i].activation)
+        performanceList.push(this.chartMsg[i].performance)
+        failurePercentList.push(this.chartMsg[i].failurePercent)
+        combinedEfficiencyList.push(this.chartMsg[i].combinedEfficiency)
+      }
       var option = {
         color: ['#5B8FF9', '#5AD8A6', '#5D7092', '#F6BD16'],
         tooltip: {
@@ -49,7 +91,7 @@ export default {
         xAxis: {
           type: 'category',
           boundaryGap: false,
-          data: ['1', '2', '3', '4', '5', '6', '7']
+          data: dateList
         },
         yAxis: {
           type: 'value'
@@ -59,25 +101,25 @@ export default {
             name: '时间开动率',
             type: 'line',
             stack: 'Total',
-            data: [120, 132, 101, 134, 90, 230, 210]
+            data: activationList
           },
           {
             name: '性能开动率',
             type: 'line',
             stack: 'Total',
-            data: [220, 182, 191, 234, 290, 330, 310]
+            data: performanceList
           },
           {
             name: '设备故障率',
             type: 'line',
             stack: 'Total',
-            data: [150, 232, 201, 154, 190, 330, 410]
+            data: failurePercentList
           },
           {
             name: '综合效率',
             type: 'line',
             stack: 'Total',
-            data: [320, 332, 301, 334, 390, 330, 320]
+            data: combinedEfficiencyList
           }
         ]
       }

src/views/deviceManagement/components/productPowerEdit.vue

@@ -1,98 +1,168 @@
 <template>
-  <el-form ref="form" :rules="rules" label-width="110px" :model="form">
+  <el-form ref="form" label-width="110px" :model="form">
     <el-row :gutter="20">
       <el-col :span="12">
-        <el-form-item label="1月" prop="a">
+        <el-form-item label="1月" prop="january">
-          <el-input v-model="form.a" placeholder="请输入计划产能"></el-input>
+          <el-input-number
+            v-model="form.january"
+            :min="0"
+            style="width: 300px"
+          ></el-input-number>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="2月" prop="b">
+        <el-form-item label="2月" prop="february">
-          <el-input v-model="form.b" placeholder="请输入计划产能"></el-input>
+          <el-input-number
+            v-model="form.february"
+            :min="0"
+            style="width: 300px"
+          ></el-input-number>
         </el-form-item>
       </el-col>
     </el-row>
     <el-row :gutter="20">
       <el-col :span="12">
-        <el-form-item label="3月" prop="c">
+        <el-form-item label="3月" prop="march">
-          <el-input v-model="form.c" placeholder="请输入计划产能"></el-input>
+          <el-input-number
+            v-model="form.march"
+            :min="0"
+            style="width: 300px"
+          ></el-input-number>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="4月" prop="d">
+        <el-form-item label="4月" prop="april">
-          <el-input v-model="form.d" placeholder="请输入计划产能"></el-input>
+          <el-input-number
+            v-model="form.april"
+            :min="0"
+            style="width: 300px"
+          ></el-input-number>
         </el-form-item>
       </el-col>
     </el-row>
     <el-row :gutter="20">
       <el-col :span="12">
-        <el-form-item label="5月" prop="e">
+        <el-form-item label="5月" prop="may">
-          <el-input v-model="form.e" placeholder="请输入计划产能"></el-input>
+          <el-input-number
+            v-model="form.may"
+            :min="0"
+            style="width: 300px"
+          ></el-input-number>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="6月" prop="f">
+        <el-form-item label="6月" prop="june">
-          <el-input v-model="form.f" placeholder="请输入计划产能"></el-input>
+          <el-input-number
+            v-model="form.june"
+            :min="0"
+            style="width: 300px"
+          ></el-input-number>
         </el-form-item>
       </el-col>
     </el-row>
     <el-row :gutter="20">
       <el-col :span="12">
-        <el-form-item label="7月" prop="g">
+        <el-form-item label="7月" prop="july">
-          <el-input v-model="form.g" placeholder="请输入计划产能"></el-input>
+          <el-input-number
+            v-model="form.july"
+            :min="0"
+            style="width: 300px"
+          ></el-input-number>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="8月" prop="h">
+        <el-form-item label="8月" prop="august">
-          <el-input v-model="form.h" placeholder="请输入计划产能"></el-input>
+          <el-input-number
+            v-model="form.august"
+            :min="0"
+            style="width: 300px"
+          ></el-input-number>
         </el-form-item>
       </el-col>
     </el-row>
     <el-row :gutter="20">
       <el-col :span="12">
-        <el-form-item label="9月" prop="i">
+        <el-form-item label="9月" prop="september">
-          <el-input v-model="form.i" placeholder="请输入计划产能"></el-input>
+          <el-input-number
+            v-model="form.september"
+            :min="0"
+            style="width: 300px"
+          ></el-input-number>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="10月" prop="j">
+        <el-form-item label="10月" prop="october">
-          <el-input v-model="form.j" placeholder="请输入计划产能"></el-input>
+          <el-input-number
+            v-model="form.october"
+            :min="0"
+            style="width: 300px"
+          ></el-input-number>
         </el-form-item>
       </el-col>
     </el-row>
     <el-row :gutter="20">
       <el-col :span="12">
-        <el-form-item label="11月" prop="k">
+        <el-form-item label="11月" prop="november">
-          <el-input v-model="form.k" placeholder="请输入计划产能"></el-input>
+          <el-input-number
+            v-model="form.november"
+            :min="0"
+            style="width: 300px"
+          ></el-input-number>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="12月" prop="l">
+        <el-form-item label="12月" prop="december">
-          <el-input v-model="form.l" placeholder="请输入计划产能"></el-input>
+          <el-input-number
+            v-model="form.december"
+            :min="0"
+            style="width: 300px"
+          ></el-input-number>
         </el-form-item>
       </el-col>
     </el-row>
   </el-form>
 </template>
 <script>
+import {
+  performanceAnalysisPlan,
+  performanceUpdatePlan
+} from '@/api/deviceManagement'
 export default {
   name: 'productPowerEdit',
   data() {
     return {
-      form: {
+      form: {}
-        a: '',
-        b: '',
-        c: '',
-        d: '',
-        e: '',
-        f: '',
-        g: '',
-        h: '',
-        i: '',
-        j: '',
-        k: '',
-        l: ''
     }
+  },
+  mounted() {},
+  methods: {
+    init(param) {
+      let date = new Date(param.timePosition)
+      let year = date.getFullYear()
+      performanceAnalysisPlan({
+        name: param.name,
+        year: year
+      }).then((res) => {
+        console.log(res)
+        if (res.code === 0 && !!res.data) {
+          this.form = res.data
+        }
+      })
+    },
+    submitForm() {
+      performanceUpdatePlan({ ...this.form }).then((res) => {
+        if (res.code === 0) {
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500
+          })
+          this.$emit('successSubmit')
+        }
+      })
+    },
+    formClear() {
+      this.$refs.form.resetFields()
     }
   }
 }

src/views/deviceManagement/performanceAnalysis/devicePage.vue

@@ -5,10 +5,12 @@
         <div class="left-box">
           <el-tree
             :data="treeData"
-            node-key="id"
+            node-key="name"
             :props="defaultTime"
             default-expand-all
+            :highlight-current="true"
             @node-click="clickDevice"
+            ref="deviceTree"
           >
           </el-tree>
         </div>
@@ -38,7 +40,7 @@
               <el-col :span="6">
                 <div class="top-right">
                   <div>
-                    <span class="title">xx单元计划产能</span>
+                    <span class="title">{{ unitName }}单元计划产能</span>
                     <svg-icon
                       icon-class="device_edit"
                       class="icon-style"
@@ -69,7 +71,7 @@
         <el-row :gutter="10">
           <el-col :span="24">
             <div class="right-bottom">
-              <device-oee-line />
+              <device-oee-line ref="oeeLine" :chartMsg="tableData" />
             </div>
           </el-col>
         </el-row>
@@ -83,13 +85,13 @@
       @confirm="handleConfirm"
       :before-close="handleCancel"
     >
-      <product-power-edit ref="product-power" @successSubmit="successSubmit" />
+      <product-power-edit ref="productPower" @successSubmit="successSubmit" />
     </base-dialog>
   </div>
 </template>
 <script>
 import { getTreeData } from '@/api/app'
-import { tableHeight } from '@/utils/index'
+import { tableHeight, timeFormatter } from '@/utils/index'
 import {
   performanceAnalysisGet,
   performanceAnalysisPlan
@@ -98,64 +100,65 @@ import productPowerEdit from './../components/productPowerEdit.vue'
 import deviceOeeLine from './../components/deviceOeeLine.vue'
 const tableProps = [
   {
-    prop: 'startTime',
+    prop: 'date',
     label: '时间',
-    minWidth: 90
+    minWidth: 160,
+    filter: timeFormatter
   },
   {
-    prop: 'endTime',
+    prop: 'operationHours',
     label: '开动时长(h)',
     minWidth: 100
   },
   {
-    prop: 'inputNum',
+    prop: 'loadHours',
     label: '负荷时长(h)',
     minWidth: 100
   },
   {
-    prop: 'outputNum7',
+    prop: 'actualCapacity',
     label: '实际产能',
     minWidth: 90
   },
   {
-    prop: 'lossesNum6',
+    prop: 'planCountDay',
     label: '设计产能',
     minWidth: 90
   },
   {
-    prop: 'lossesNum5',
+    prop: 'activation',
     label: '时间开动率',
     minWidth: 100
   },
   {
-    prop: 'lossesNum4',
+    prop: 'performance',
     label: '性能开动率',
     minWidth: 100
   },
   {
-    prop: 'lossesNum3',
+    prop: 'combinedEfficiency',
     label: '综合效率OEE',
     minWidth: 110
   },
   {
-    prop: 'lossesNum2',
+    prop: 'failureHours',
     label: '故障时长',
     minWidth: 90
   },
   {
-    prop: 'lossesNum1',
+    prop: 'failurePercent',
     label: '设备故障率',
     minWidth: 100
   }
 ]
 const tableProps2 = [
   {
-    prop: 'startTime',
+    prop: 'month',
     label: '月份',
-    width: 50
+    width: 60
   },
   {
-    prop: 'endTime',
+    prop: 'value',
     label: '设计产能',
     minWidth: 80
   }
@@ -169,6 +172,7 @@ export default {
         children: 'children',
         label: 'name'
       },
+      unitName: '',
       chooseMonth: '',
       formConfig: [
         {
@@ -178,7 +182,8 @@ export default {
           format: 'yyyy-MM',
           valueFormat: 'yyyy-MM',
           placeholder: '月份选择',
-          param: 'testTime',
+          param: 'timePosition',
+          defaultSelect: '',
           width: 200
         },
         {
@@ -190,7 +195,9 @@ export default {
       ],
       listQuery: {
         current: 1,
-        size: 500
+        size: 500,
+        timePosition: '',
+        name: ''
       },
       tableProps,
       tableData: [],
@@ -206,61 +213,106 @@ export default {
     window.addEventListener('resize', () => {
       this.tableH = tableHeight(214) / 2 - 75
     })
+    this.setDefaultVal()
     this.getTree()
-    this.getList()
-    for (let i = 0; i < 30; i++) {
-      let obj = {}
-      obj.startTime = i
-      this.tableData.push(obj)
-    }
-    let arr = []
-    for (let i = 1; i < 13; i++) {
-      let obj = {}
-      obj.endTime = i
-      arr.push(obj)
-    }
-    this.tableData2 = arr.slice(0, 6)
-    this.tableData3 = arr.slice(6, 12)
   },
   methods: {
+    setDefaultVal() {
+      let date = new Date()
+      let year = date.getFullYear()
+      let month =
+        date.getMonth() + 1 < 10
+          ? '0' + (date.getMonth() + 1)
+          : date.getMonth() + 1
+      this.formConfig[0].defaultSelect = year + '-' + month
+      this.listQuery.timePosition = year + '-' + month
+    },
     getTree() {
       getTreeData().then((res) => {
         this.treeData = res.data
+        this.unitName = res.data[0].children[0].name
+        this.listQuery.name = this.unitName
+        setTimeout(() => {
+          this.$refs.deviceTree.setCurrentKey(this.unitName)
+        }, 100)
+        this.getList()
+        this.getPlan()
       })
     },
     getList() {
       // 获取设备OEE
       performanceAnalysisGet({ ...this.listQuery }).then((res) => {
-        console.log(res)
+        if (res.code === 0) {
+          this.tableData = res.data
+        }
       })
+      this.$refs.oeeLine.getChart()
     },
     buttonClick(val) {
-      console.log(val)
+      if (val.btnName === 'search') {
+        this.listQuery.timePosition = val.timePosition
+        this.getList()
+        this.getPlan()
+      }
     },
     getPlan() {
       // 获取计划产能
-      performanceAnalysisPlan({ name: '精切磨边', year: '2022' }).then(
+      let date = new Date(this.listQuery.timePosition)
+      let year = date.getFullYear()
+      performanceAnalysisPlan({ name: this.unitName, year: year }).then(
         (res) => {
           console.log(res)
+          if (res.code === 0 && !!res.data) {
+            let obj = res.data
+            let arr = [
+              { month: '1月', value: '', type: 'january' },
+              { month: '2月', value: '', type: 'february' },
+              { month: '3月', value: '', type: 'march' },
+              { month: '4月', value: '', type: 'april' },
+              { month: '5月', value: '', type: 'may' },
+              { month: '6月', value: '', type: 'june' },
+              { month: '7月', value: '', type: 'july' },
+              { month: '8月', value: '', type: 'august' },
+              { month: '9月', value: '', type: 'september' },
+              { month: '10月', value: '', type: 'october' },
+              { month: '11月', value: '', type: 'november' },
+              { month: '12月', value: '', type: 'december' }
+            ]
+            for (let i = 0; i < arr.length; i++) {
+              arr[i].value = obj[arr[i].type]
+            }
+            this.tableData2 = arr.slice(0, 6)
+            this.tableData3 = arr.slice(6, 12)
+          }
         }
       )
     },
     clickDevice(val) {
-      console.log(val)
+      if (val.children && val.parent) {
-      if (!val.children) {
+        // 单元
-        console.log(val.children)
+        this.listQuery.name = val.name
+        this.unitName = val.name
+        this.getList()
+        this.getPlan()
       }
     },
     editPower() {
       this.centervisible = true
+      this.$nextTick(() => {
+        this.$refs.productPower.init(this.listQuery)
+      })
     },
     handleCancel() {
+      this.$refs.productPower.formClear()
       this.centervisible = false
     },
     handleConfirm() {
-      this.centervisible = false
+      this.$refs.productPower.submitForm()
     },
-    successSubmit() {}
+    successSubmit() {
+      this.handleCancel()
+      this.getPlan()
+    }
   }
 }
 </script>
@@ -268,7 +320,11 @@ export default {
 .main-box {
   width: 100%;
   padding: 0px 6px 0 16px;
-  .left-box,
+  .left-box {
+    padding-top: 16px;
+    border-radius: 8px;
+    background-color: #fff;
+  }
   .top-left,
   .top-right,
   .right-bottom {

vue.config.js

@@ -11,7 +11,7 @@ module.exports = defineConfig({
     proxy: {
       '/api': {
         target: 'http://tft.mes.picaiba.com/api',
-        // target: 'http://192.168.1.94:8080/api',
+        // target: 'http://192.168.1.22:8080/api',
         ws: true,
         changeOrigin: true,
         pathRewrite: {