meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liushuai
2020-03-16 17:58:33 +08:00
parent 325f8deb57 35cd5c3966
commit a588a6d9e6
13 changed files with 90 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
View File

@@ -84,7 +84,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME136" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME136" :title="tooltip" style="position: relative;left:159px;top:395px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME136" :title="tooltip" style="position: relative;left:199px;top:395px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME136+fang" class="fang"/>-->
<div :id="OPNAME136+circle" class="circle" style="margin-left: 11px;"/>
@@ -504,31 +504,31 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME146" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME146" :title="tooltip" style="position: relative;left:1460px;top:-1167px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME146" :title="tooltip" style="position: relative;left:1450px;top:-1167px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME135+fang" class="fang"/>-->
<!--<div :id="OPNAME146+circle" class="circle" style="margin-left: 13px"/>-->
<div :id="OPNAME146+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME146 }}</div>
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME148" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME148" :title="tooltip" style="position: relative;left:1578px;top:-1195px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME148" :title="tooltip" style="position: relative;left:1568px;top:-1195px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME135+fang" class="fang"/>-->
<!--<div :id="OPNAME148+circle" class="circle" style="margin-left: 13px"/>-->
<div :id="OPNAME148+circle" class="circle" style="margin-left: 13px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME148 }}</div>
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME147" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :title="tooltip" style="position: relative;left:1346px;top:-548px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :title="tooltip" style="position: relative;left:1330px;top:-660px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME147 }}</div>
<!--<div :id="OPNAME147+circle" class="circle"/>-->
<!--<div :id="OPNAME117+fang" class="fang" style="margin-left: 9px"/>-->
<div :id="OPNAME147+circle" class="circle" style="margin-left: 4px"/>
</el-row>
</div>
</el-tooltip>
@@ -553,6 +553,9 @@
</div>
</div>
</div>
<div style="position: absolute;margin-top: -825px;margin-left: 20px;height: 30px;width: 120px;font-weight: bold;font-size: 20px;color: black;z-index: 999;">
{{ nowdate }}
</div>
<!-- <el-card style="position: absolute;background: #ffffff;margin-top: -825px;margin-left: 1540px;height: 130px;width: 120px">-->
<!-- <div style="margin-top: 6px">-->
<!-- <div class="circle4" style="margin-top: 3px"/>-->
@@ -642,9 +645,10 @@ export default {
tooltip1: '',
tooltip2: '',
tooltip3: '',
nowdate: '',
socketConnect: true,
机床总装: '机床总装',
部件装配: '部件装配',
机床总装: '总装机床',
部件装配: '装配部件',
OPNAME101: 'OP1010',
OPNAME102: 'OP1020',
OPNAME103: 'OP1030',
@@ -713,6 +717,16 @@ export default {
}
},
mounted() {
// 获取时间
var date = new Date()
var y = date.getFullYear()
var m = date.getMonth() + 1
m = m < 10 ? '0' + m : m
var d = date.getDate()
d = d < 10 ? ('0' + d) : d
var time1 = y + '-' + m + '-' + d
this.nowdate = time1
// 获取时间
this.connect()
// this.getwork_state()
this.getOP_state()

98
src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
View File

@@ -46,20 +46,8 @@
</div>
</el-card>
<el-card>
<el-table
v-loading="listLoading"
:data="tableData"
:row-class-name="tableRowClassName"
border
stripe
style="max-height: 400px;margin-top:10px"
height="400"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
align="center"
width="50"/>
<el-table v-loading="listLoading" :data="tableData" :row-class-name="tableRowClassName" border stripe style="max-height: 400px;margin-top:10px" height="400" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50"/>
<el-table-column label="零件图号" prop="零件图号" align="center" width="200">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -90,42 +78,6 @@
{{ scope.row.工序数量 }}
</template>
</el-table-column>
<!--<el-table-column label="是否超负荷" align="center" width="100">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.是否超负荷 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="外协" width="100" align="center">-->
<!--<template slot-scope="scope">-->
<!--<el-checkbox v-model="scope.row.是否预计外协" @change="table1Out(scope.row)">外协</el-checkbox>-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="加工件合格" align="center" width="230">-->
<!--<template slot-scope="scope">-->
<!--<el-date-picker-->
<!--v-model="tableData[scope.$index].加工件合格时间"-->
<!--size="mini"-->
<!--type="date"-->
<!--value-format="yyyy-MM-dd"-->
<!--placeholder="选择加工件合格时间"-->
<!--@change="timeChange(scope.row)"/>-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="板焊结束" width="150" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.板焊 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="操作" width="200px" align="center" fixed="right">-->
<!--<template slot-scope="scope" align="center">-->
<!--<el-button-->
<!--size="mini"-->
<!--type="primary"-->
<!--class="el-icon-edit"-->
<!--@click="PlateWelding(scope.$index, scope.row, 'form1')">板焊</el-button>-->
<!--&lt;!&ndash;<el-button size="mini" type="primary" @click="inBatches">分批</el-button>&ndash;&gt;-->
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<div v-if="是否扫描 === false" class="block" style="margin-top: 10px;">
<el-pagination
@@ -159,14 +111,7 @@
<el-card>
<div>
<el-table
v-loading="listLoading1"
:data="tableData1"
class="table"
borde
stripe
style="max-height: 500px"
height="500">
<el-table v-loading="listLoading1" :data="tableData1" class="table" borde stripe style="max-height: 500px" height="500">
<el-table-column label="零件图号" align="center" min-width="160">
<template slot-scope="scope">
{{ 零件图号[scope.$index] }}
@@ -192,11 +137,6 @@
{{ 机加工结束时间[scope.$index] }}
</template>
</el-table-column>
<!--<el-table-column label="是否预计外协" align="center" width="110">-->
<!--<template slot-scope="scope">-->
<!--{{ 预计外协[scope.$index] }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="零件加工计划进度（工艺名称、计划日期、工序工时）" align="">
<el-table-column label="[1]" align="center" width="120px">
<template slot-scope="scope">
@@ -465,11 +405,7 @@
</div>
</el-dialog>
<el-dialog
v-el-drag-dialog
:visible.sync="dialogTableVisible520"
title="调整工序计划"
width="45%">
<el-dialog v-el-drag-dialog :visible.sync="dialogTableVisible520" title="调整工序计划" width="45%">
<div style="overflow: auto;max-height: 450px;">
<el-row v-if="false">
<span>开始时间:</span>
@@ -491,12 +427,7 @@
<el-button size="mini" type="success" icon="el-icon-search" style="margin: 10px 0 10px 10px" @click="searchChart1">查询</el-button>
</el-row>
<div v-if="false" id="myChart1" style="width: 58%;height: 300px;display: inline-block"/>
<el-table
v-if="false"
:data="tableData01"
border
style="max-height: 300px;width:40%;display: inline-block"
height="300">
<el-table v-if="false" :data="tableData01" border style="max-height: 300px;width:40%;display: inline-block" height="300">
<el-table-column label="名称" align="center">
<template slot-scope="scope">
{{ scope.row.设备名称 }}
@@ -536,7 +467,9 @@
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>～<el-select v-model="month2" size="mini" style="width:60px" placeholder="月">
</el-select>
～
<el-select v-model="month2" size="mini" style="width:60px" placeholder="月">
<el-option
v-for="item in months"
:key="item.value"
@@ -550,7 +483,9 @@
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>～<el-select v-model="week2" size="mini" style="width:60px" placeholder="周">
</el-select>
～
<el-select v-model="week2" size="mini" style="width:60px" placeholder="周">
<el-option
v-for="item in weeks"
:key="item.value"
@@ -562,13 +497,7 @@
<span>零件类型：</span>{{ partType }}
</el-row>
<div v-if="false" id="myChart2" style="width: 58%;height: 300px;display: inline-block"/>
<!--@row-click="rowClick"-->
<el-table
:data="tableData02"
:row-class-name="rowClassName"
border
style="max-height: 300px;display: inline-block"
height="300">
<el-table :data="tableData02" :row-class-name="rowClassName" border style="max-height: 300px;display: inline-block" height="300">
<el-table-column label="工序顺序" align="center" width="80" type="index">
<template slot-scope="scope">
{{ 工序顺序[scope.$index] }}
@@ -602,9 +531,6 @@
</template>
</el-table-column>
</el-table>
<!--<div slot="footer" class="dialog-footer" style="margin-right: 20px;float:right">-->
<!--<el-button size="mini" type="primary" @click="refreshTable" icon="el-icon-refresh" style="margin-left: 750px">确定</el-button>-->
<!--</div>-->
</div>
</el-dialog>

12
src/views/ManufacturingCenter/StatusQuery/index.vue
View File

@@ -172,15 +172,15 @@ export default {
if (this.partTypeValue) { check5 = 1 } else { check5 = 0 }
this.loading0 = true
searchTable(check1, this.machineToolValue, check2, this.groupNumberValue, check3, this.partNumber, check4, this.partStateValue, check5, this.partTypeValue, this.pageCurrent, this.pageSize).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
response.data.rows[i].传递时间 = response.data.rows[i].传递时间.split(' ', 2)[0]
for (let i = 0; i < response.data.result.length; i++) {
response.data.result[i].考核状态 = parseInt(response.data.result[i].考核状态) - 2
if (response.data.result[i].传递时间 !== undefined || response.data.result[i].hasOwnProperty('传递时间')) {
response.data.result[i].传递时间 = response.data.result[i].传递时间.split(' ', 2)[0]
}
}
this.loading0 = false
this.total = response.data.total
this.tableData = response.data.rows
this.total = parseInt(response.data.output[0].ItemCount)
this.tableData = response.data.result
})
},
handleSizeChange(val) {