Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web

lzhe

2024-05-15 55900c9b6519dbe3d0f02f914a1cb2b2be22a6a9

 src/views/mdc/station-live.vue

@@ -2,7 +2,7 @@
 * @Author: lzhe lzhe@example.com
 * @Date: 2024-03-26 10:28:33
 * @LastEditors: lzhe lzhe@example.com
 * @LastEditTime: 2024-04-23 17:08:42
 * @LastEditTime: 2024-05-15 09:44:50
 * @FilePath: /smart-web/src/views/master/person/main/index.vue
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -86,7 +86,7 @@
                        <el-table-column prop="temdata" label="待机"></el-table-column>
                        <el-table-column prop="temdata" label="报警"></el-table-column>
                        <el-table-column prop="temdata" label="运行"></el-table-column>
                        <el-table-column prop="perdata" label="稼动率%"></el-table-column>
                        <el-table-column prop="oee" label="稼动率%"></el-table-column>
                        <el-table-column prop="perdata" label="报警率%"></el-table-column>
                     </el-table>
                  </div>
@@ -116,6 +116,7 @@
   <save-dialog v-if="dialog.save" ref="saveDialog"  @success="addfeedbackSuccess" :workstationId="lastLevelId" @closed="dialog.save=false"></save-dialog>
</template>
<script>
   import moment from 'moment'
   import * as echarts from 'echarts';
   import saveDialog from './add-station-status'
   export default {
@@ -233,7 +234,7 @@
               },
               xAxis: {
                  type: 'category',
                  data: ['00:00:00', '02:00:00', '04:00:00', '06:00:00', '08:00:00', '10:00:00', '12:00:00', '14:00:00', '18:00:00'],  
                  data: [],  
               },
               yAxis: {
                  type: 'category',
@@ -364,6 +365,24 @@
                     item.value = 0;
                  })
                  this.wcsOptionLog.series[0].data = res.data;
                  //计算时间
                  var startOfDay = moment().startOf('day'); //00:00:00
                  var now = moment();  //当前时间
                  var diffInMilliseconds = now.diff(startOfDay);  //时间差
                  var diffInHours = Math.floor(diffInMilliseconds / (1000 * 60 * 60));  //时间差转换成小时
                  //分割
                  var everTime = Math.ceil(diffInHours/8);
                  var arrData = [];
                  for(var i=0;i<=diffInHours;i+=everTime) {
                     if(i<=10) {
                        var num = '0' + i;
                     }else {
                        var num = i;
                     }
                     arrData.push(num + ':00:00');
                  }
                  //计算时间结束
                  this.wcsOptionLog.xAxis.data = [...arrData,moment().format("HH:mm:ss")];
                  myChart.setOption(this.wcsOptionLog);
               }
            })
@@ -458,7 +477,6 @@
            this.$HTTP.get(`/api/blade-cps/workstation/get-dmp-variables?machineId=${machineId}&workstationId=${lastLevelId}`).then(res=> {
               if(res.code == 200) {
                  this.dmpList = res.data;
                  console.log(this.dmpList,1)
               }
            })
         },