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-05-18 19:12:29 +08:00
parent 05bd8992a8 d21bf3ca03
commit e071997498
10 changed files with 279 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

339
src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
View File

@@ -1,25 +1,7 @@
<template>
<div class="app-container">
<el-card style="width: 1255px">
<el-card>
<el-row>
<!--<span>项目名称:</span>-->
<!--<el-select-->
<!--v-model="entryNameValue"-->
<!--:remote-method="remoteMethod"-->
<!--placeholder="项目名称"-->
<!--style="margin-right: 10px; width: 150px"-->
<!--size="small"-->
<!--clearable-->
<!--filterable-->
<!--remote-->
<!--@change="projectChange"-->
<!--@focus="projectInit">-->
<!--<el-option-->
<!--v-for="item in entryName"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-select v-model="machineNameValue" placeholder="机床图号" style="width: 150px" size="small" filterable clearable @change="machineChange">
<el-option
v-for="item in machineName"
@@ -41,173 +23,156 @@
<el-button v-positive="'loading'" :disabled="false" type="success" icon="el-icon-download" size="small" plain style="margin-left: 10px" @click="exportExcel()">导出</el-button>
</el-row>
</el-card>
<el-row>
<el-col style="width: 825px">
<el-card style="margin-top: 15px;width: 825px">
<el-table
v-loading="listLoading"
:data="tableData"
style="width: 100%"
stripe
size="small"
height="590"
highlight-current-row
border
@row-click="fetchTableData2">
<el-table-column align="center" label="机床图号" width="120px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="50px" fixed>
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" width="173px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件名称" width="129px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废数" width="70px">
<template slot-scope="scope">
{{ scope.row.报废数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废时间" width="85px">
<template slot-scope="scope">
{{ scope.row.报废时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废人" width="85px">
<template slot-scope="scope">
{{ scope.row.报废人 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废工序" width="85px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废原因" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.报废原因 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作工人" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作工 === '超级管理员' ? '' : scope.row.操作工 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废备注" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column align="center" label="质检员" width="85px">
<template slot-scope="scope">
{{ scope.row.质检人 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废工时(分)" width="105px">
<template slot-scope="scope">
{{ scope.row.报废工时 }}
</template>
</el-table-column>
<el-table-column align="center" label="补投时间" width="85px">
<template slot-scope="scope">
{{ scope.row.补投时间 ? scope.row.补投时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column align="center" label="补投人" width="85px">
<template slot-scope="scope">
{{ scope.row.补投人 }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
</el-col>
<el-col style="width: 430px">
<el-card>
<el-table
:data="tableData2"
element-loading-text="拼命加载中"
element-loading-spinner="el-icon-loading"
element-loading-background="rgba(226,223,223,1)"
height="630"
border
style="width: 430px">
<el-table-column
width="50px"
prop="province1"
label="顺序"
align="center"
>
<template slot-scope="scope">{{ scope.row.工序顺序 }}</template>
</el-table-column>
<el-table-column
width="80px"
prop="province2"
label="工艺名称"
align="center"
>
<template slot-scope="scope">{{ scope.row.工艺名称 }}</template>
</el-table-column>
<el-table-column
prop="province4"
label="工艺要求"
align="center"
width="80px"
show-overflow-tooltip
>
<template slot-scope="scope">{{ scope.row.工艺要求 }}</template>
</el-table-column>
<el-table-column
width="60px"
prop="province5"
label="单件定额"
align="center"
>
<template slot-scope="scope">{{ scope.row.单件定额工时 }}</template>
</el-table-column>
<el-table-column
width="60px"
prop="province6"
label="准结定额"
align="center"
>
<template slot-scope="scope">{{ scope.row.准结定额工时 }}</template>
</el-table-column>
<el-table-column
width="77px"
prop="province7"
label="完成状态"
align="center"
>
<template slot-scope="scope">
<div v-if="scope.row.工序状态 === 4"><div style="width: 12px;height: 12px;border-radius: 50%;background-color: rgb(103, 194, 58);display: inline-block;margin:0px 5px 0 0"/>完成</div>
<div v-else ><div style="width: 12px;height: 12px;border-radius: 50%;background-color: red;display: inline-block;margin:0px 5px 0 0"/>未完</div>
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
</el-row>
<el-card style="margin-top: 15px">
<el-table v-loading="listLoading" :data="tableData" style="width: 100%" stripe size="small" height="590" highlight-current-row border>
<el-table-column align="center" label="机床图号" width="80px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="50px" fixed>
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" width="140px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件名称" width="100px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废数" width="70px">
<template slot-scope="scope">
{{ scope.row.报废数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废时间" width="85px">
<template slot-scope="scope">
{{ scope.row.报废时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废人" width="80px">
<template slot-scope="scope">
{{ scope.row.报废人 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废工序" width="80px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废原因" width="80px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.报废原因 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作工人" width="80px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作工 === '超级管理员' ? '' : scope.row.操作工 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废备注" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column align="center" label="质检员" width="85px">
<template slot-scope="scope">
{{ scope.row.质检人 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废工时(分)" width="80px">
<template slot-scope="scope">
{{ scope.row.报废工时 }}
</template>
</el-table-column>
<el-table-column align="center" label="补投时间" width="85px">
<template slot-scope="scope">
{{ scope.row.补投时间 ? scope.row.补投时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column align="center" label="补投人" width="80px">
<template slot-scope="scope">
{{ scope.row.补投人 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="80px">
<template slot-scope="scope">
<el-button type="text" plain size="small" @click="fetchTableData2(scope.row)">加工过程</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-dialog :visible.sync="dialogVisible" title="离线合同请款" center style="min-height: 300px" width="1000px">
<el-table :data="tableData2" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(226,223,223,1)" height="630" border style="width: 430px">
<el-table-column
width="50px"
prop="province1"
label="顺序"
align="center"
>
<template slot-scope="scope">{{ scope.row.工序顺序 }}</template>
</el-table-column>
<el-table-column
width="80px"
prop="province2"
label="工艺名称"
align="center"
>
<template slot-scope="scope">{{ scope.row.工艺名称 }}</template>
</el-table-column>
<el-table-column
prop="province4"
label="工艺要求"
align="center"
width="80px"
show-overflow-tooltip
>
<template slot-scope="scope">{{ scope.row.工艺要求 }}</template>
</el-table-column>
<el-table-column
width="60px"
prop="province5"
label="单件定额"
align="center"
>
<template slot-scope="scope">{{ scope.row.单件定额工时 }}</template>
</el-table-column>
<el-table-column
width="60px"
prop="province6"
label="准结定额"
align="center"
>
<template slot-scope="scope">{{ scope.row.准结定额工时 }}</template>
</el-table-column>
<el-table-column
width="77px"
prop="province7"
label="完成状态"
align="center"
>
<template slot-scope="scope">
<div v-if="scope.row.工序状态 === 4"><div style="width: 12px;height: 12px;border-radius: 50%;background-color: rgb(103, 194, 58);display: inline-block;margin:0px 5px 0 0"/>完成</div>
<div v-else ><div style="width: 12px;height: 12px;border-radius: 50%;background-color: red;display: inline-block;margin:0px 5px 0 0"/>未完</div>
</template>
</el-table-column>
</el-table>
</el-dialog>
</div>
</template>
@@ -216,6 +181,7 @@ import { searchMachine, searchTable1, searchTable2, TableDta2Select } from '@/ap
export default {
data() {
return {
dialogVisible: false,
pageCurrent: 1,
pageSize: 20,
total: 0,
@@ -282,6 +248,7 @@ export default {
fetchTableData2(row) {
TableDta2Select(row.补投流水号).then(response => {
this.tableData2 = response.data
this.dialogVisible = true
})
},
exportExcel() {

10
src/views/ManufacturingCenter/MachiningParts/index.vue
View File

@@ -164,9 +164,6 @@
<span v-if="parseInt(scope.row.工序状态)===4" style="color: #67C23A">已完</span>
<span v-if="parseInt(scope.row.工序状态)===5" style="color: #E6A23C">报废</span>
<span v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" style="color: #409EFF">未完</span>
<!--<el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完</el-tag>-->
</template>
</el-table-column>
<el-table-column align="center" label="质检数" width="65">
@@ -179,13 +176,6 @@
{{ scope.row.不合格数量 === null ? 0 : scope.row.不合格数量 }}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="工序质检" width="80">
<template slot-scope="scope">
<span v-if="parseInt(scope.row.是否质检)===1" style="color: #67C23A">合格</span>
<span v-if="parseInt(scope.row.是否质检)===2" style="color: #E6A23C">不合格</span>
<span v-if="parseInt(scope.row.是否质检)!==1 && parseInt(scope.row.是否质检)!==2" style="color: #409EFF">未检</span>
</template>
</el-table-column> -->
</el-table>
</el-dialog>
</div>

8
src/views/ManufacturingCenter/MaterialArrival/index.vue
View File

@@ -140,7 +140,7 @@ export default {
pageCurrent: 1,
pageSize: 50,
total: 0,
Name: 0,
Name: 1,
Partpaint: '',
tableData1: [], // 工序表
radio: '',
@@ -345,7 +345,11 @@ export default {
},
getRow(row) {
this.processSerialNumber = row.工序流水号
row.完成日期 ? this.Name = 1 : this.Name = 0
if (row.工艺名称 === '备料' && !row.完成日期) {
this.Name = 0
} else {
this.Name = 1
}
},
handleSizeChange(val) {
this.pageSize = val

41
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
View File

@@ -1,7 +1,6 @@
<template>
<div>
<el-card>
<!--<el-button :disabled="isShow" type="info" size="small" style="margin: 0px 180px;float: right" @click="EditData">补录完成日期</el-button>-->
<el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 185px;" placeholder="机床号" @change="getGroup">
<el-option
v-for="item in Machines"
@@ -22,11 +21,9 @@
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;margin:0px 10px;"/>
<el-button type="primary" class="el-icon-search" size="small" plain style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
<el-button v-positive="'loading'" :disabled="false" type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
<!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditConfirmNum">修改完成数量</el-button>-->
<!--<el-button :disabled="isDisabled" type="info" size="small" style="margin: 10px 10px;float: right" @click="EditWorkingHours">修补加工工时</el-button>-->
</el-card>
<el-row>
<el-col style="width: 37%">
<el-col style="width: 49%">
<el-card>
<el-table v-loading="loading2" :data="tableData1" :row-class-name="tableRowClassName1" class="table" height="660" style="max-height: 830px" highlight-current-row empty-text=" " border @row-click="getRow">
<el-table-column align="center" label="工序" show-overflow-tooltip width="50">
@@ -34,27 +31,27 @@
{{ scope.row.工序顺序 }}
</template>
</el-table-column>
<el-table-column align="center" label="工艺名" show-overflow-tooltip min-width="70">
<el-table-column align="center" label="工艺名" show-overflow-tooltip width="70">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="投产数" width="80">
<el-table-column align="center" label="投产数" width="65">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="完成数" width="80">
<el-table-column align="center" label="完成数" width="65">
<template slot-scope="scope">
{{ scope.row.完成数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="质检数" width="80">
<el-table-column align="center" label="质检数" width="65">
<template slot-scope="scope">
{{ scope.row.检验数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="不良数" width="80">
<el-table-column align="center" label="不良数" width="65">
<template slot-scope="scope">
{{ scope.row.不合格数量 }}
</template>
@@ -77,7 +74,7 @@
</el-table>
</el-card>
</el-col>
<el-col style="width: 63%">
<el-col style="width: 49%">
<el-card>
<el-table v-loading="loading" ref="singleTable" :data="tableData" :row-class-name="tableRowClassName" class="table" highlight-current-row border height="630" @row-click="getCurrentRow">
<el-table-column align="center" label="跟单号" show-overflow-tooltip width="160">
@@ -100,11 +97,6 @@
{{ scope.row.投产数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废数" width="70">
<template slot-scope="scope">
{{ scope.row.报废数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="质检数" width="70">
<template slot-scope="scope">
{{ scope.row.检验数量 }}
@@ -115,14 +107,29 @@
{{ scope.row.不合格数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废数" width="70">
<template slot-scope="scope">
{{ scope.row.报废数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="加工完成" width="100">
<template slot-scope="scope">
{{ scope.row.机加工实际完成时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="计划完成" width="100">
<el-table-column align="center" label="加工完成" width="100">
<template slot-scope="scope">
{{ scope.row.机加工结束时间 }}
{{ scope.row.机加工实际完成时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="机床图号" width="100">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="100">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="用户名称" show-overflow-tooltip min-width="110">

95
src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
View File

@@ -2,114 +2,42 @@
<div class="app-container">
<el-card style="padding: 3px">
<el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 0px"/>
<!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="pageCurrent = 1;fetchData()">查询</el-button>-->
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 20px" plain @click="PageSize = 10;PageCurrent = 1;fetchData()">查询</el-button>
<el-tooltip effect="dark" content="添加新设备" placement="top">
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">设备</el-button>
<!--<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</el-button>-->
</el-tooltip>
<!-- <span style="margin-left: 40px">有效时间：</span>-->
<!-- <el-date-picker-->
<!-- v-model="time"-->
<!-- type="date"-->
<!-- size="small"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择日期"/>-->
<!-- <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">-->
<!-- &lt;!&ndash;<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="setUp">设定</el-button>&ndash;&gt;-->
<!-- <el-button type="warning" size="small" icon="el-icon-setting" plain style="margin-left:10px" @click="setUp">设定</el-button>-->
<!-- </el-tooltip>-->
<!-- <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">-->
<!-- &lt;!&ndash;<el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="generate">生成设备加工能力</el-button>&ndash;&gt;-->
<!-- <el-button type="primary" size="small" icon="el-icon-edit-outline" plain style="margin-left:10px" @click="generate">生成设备加工能力</el-button>-->
<!-- </el-tooltip>-->
</el-card>
<el-card>
<el-table :data="List" border size="small" stripe highlight-current-row height="700px" style="width: 570px">
<el-table-column label="设备名称" prop="设备名称" align="center" width="120px" >
<el-table :data="List" border size="small" stripe highlight-current-row height="840px" style="width: 750px">
<el-table-column label="设备名称" prop="设备名称" align="center" width="150px" >
<template slot-scope="scope">
{{ scope.row.设备名称 }}
</template>
</el-table-column>
<el-table-column label="设备编号" prop="设备编号" align="center" width="120px" >
<el-table-column label="设备编号" prop="设备编号" align="center">
<template slot-scope="scope">
{{ scope.row.设备编号 }}
</template>
</el-table-column>
<el-table-column label="设备型号" rop="设备型号" align="center" width="120px" >
<el-table-column label="设备型号" rop="设备型号" align="center" width="150px" >
<template slot-scope="scope">
{{ scope.row.设备型号 }}
</template>
</el-table-column>
<!-- <el-table-column label="设备性能指标" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.设备性能指标 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="设备加工能力" align="center" >-->
<!-- <template slot-scope="scope">p-->
<!-- {{ scope.row.设备加工能力工时 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="设备加工工艺" align="center" width="120px">
<el-table-column label="设备加工工艺" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.工艺属性 }}
</template>
</el-table-column>
<!-- <el-table-column label="班次类型" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.班次类型 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="设备工时系数" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.设备工时系数 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="整改工时系数" align="center" >-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.整改工时比例 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="预留工时系数" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.设备预留工时系数 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" align="center" width="70px">
<el-table-column label="操作" align="center" width="100px">
<template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-edit" style="margin-left:5px" @click="handleEdit(scope.row)"/>
<el-button type="text" size="mini" icon="el-icon-delete" style="margin-left:5px" @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize"-->
<!-- :total="total"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange"-->
<!-- @current-change="handleCurrentChange"/>-->
<!-- </div>-->
</el-card>
<!-- <el-card>-->
<!-- <span>有效时间：</span>-->
<!-- <el-date-picker-->
<!-- v-model="time"-->
<!-- type="date"-->
<!-- size="small"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="选择日期"/>-->
<!-- <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">-->
<!-- <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>-->
<!-- </el-tooltip>-->
<!-- <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">-->
<!-- <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>-->
<!-- </el-tooltip>-->
<!-- </el-card>-->
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="110px" class="demo-ruleForm">
@@ -259,7 +187,6 @@ export default {
}
getData(this.check, this.equipmentName, this.pageCurrent, this.pageSize).then(response => {
this.List = response.data
// this.total = response.data.total
})
},
initialization() {
@@ -430,16 +357,6 @@ export default {
.el-card{
margin-bottom: 1px;
}
/*.el-button--success {*/
/* background: #ecf5ff;*/
/* border-color: #2d72d5;*/
/* color: #2d72d5;*/
/*}*/
/*.el-button--primary {*/
/* background: #fdf6ec;*/
/* border-color: #ff9759;*/
/* color: #ff9759;*/
/*}*/
</style>
<style lang="scss">
.button111{