commit 20220819
This commit is contained in:
2
src/icons/svg/BasicVariableMaintenance.svg
Normal file
2
src/icons/svg/BasicVariableMaintenance.svg
Normal file
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660698025637" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2094" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
|
||||
</style></defs><path d="M973.236849 450.006064c-9.705036 0-17.573237 7.868201-17.573237 17.573237l0 521.275247L35.270295 988.854549 35.270295 68.459185l564.896744 0c9.705036 0 17.573237-7.868201 17.573237-17.573237 0-9.705036-7.868201-17.573237-17.573237-17.573237L17.697057 33.31271 0.12382 33.31271l0 17.573237 0 955.540815 0 17.573237 17.573237 0L973.236849 1024l17.573237 0 0-17.573237L990.810087 467.579301C990.810087 457.873242 982.942909 450.006064 973.236849 450.006064z" p-id="2095"></path><path d="M1016.510422 126.234029 872.256994 10.860349c-7.573489-6.056949-18.622126-4.834098-24.688285 2.733251L634.57571 279.317567c-1.670036 2.083451-2.842745 4.519943-3.430122 7.124258l-38.934754 172.627662c-2.920516 12.94994 9.021467 24.338315 21.818935 20.805862l177.323615-48.947805c3.572362-0.986467 6.742565-3.077082 9.055237-5.973038l218.857567-274.031167C1025.319042 143.344732 1024.085958 132.293025 1016.510422 126.234029zM776.504186 398.566508l-143.555533 39.626509 31.589462-140.058896L864.013239 49.272193l116.829845 93.440136L776.504186 398.566508z" p-id="2096"></path><path d="M416.399665 675.296133l-11.400654-10.006911-11.564383 9.816576L197.432605 841.483106c-7.399527 6.281053-8.306176 17.370623-2.025123 24.769127 6.281053 7.399527 17.370623 8.305153 24.769127 2.025123l184.437639-156.560732 196.315154 172.312484 12.374842 10.862395 11.643178-11.643178 169.606863-169.606863 26.316366-26.316366-37.042661-3.599991-136.867204-13.301957c-9.660011-0.938372-18.251689 6.130627-19.190061 15.790638-0.938372 9.660011 6.130627 18.251689 15.790638 19.191084l99.824543 9.701966L611.738585 846.753133 416.399665 675.296133z" p-id="2097"></path><path d="M176.954201 418.824901l191.107549 0c9.705036 0 17.573237-7.868201 17.573237-17.573237 0-9.705036-7.868201-17.573237-17.573237-17.573237L176.954201 383.678426c-9.705036 0-17.573237 7.868201-17.573237 17.573237C159.380964 410.956699 167.248142 418.824901 176.954201 418.824901z" p-id="2098"></path><path d="M176.954201 291.419186l191.107549 0c9.705036 0 17.573237-7.868201 17.573237-17.573237 0-9.705036-7.868201-17.573237-17.573237-17.573237L176.954201 256.272711c-9.705036 0-17.573237 7.868201-17.573237 17.573237C159.380964 283.550984 167.248142 291.419186 176.954201 291.419186z" p-id="2099"></path><path d="M176.954201 546.229592l191.107549 0c9.705036 0 17.573237-7.868201 17.573237-17.573237 0-9.705036-7.868201-17.573237-17.573237-17.573237L176.954201 511.083118c-9.705036 0-17.573237 7.868201-17.573237 17.573237C159.380964 538.362414 167.248142 546.229592 176.954201 546.229592z" p-id="2100"></path></svg>
|
||||
|
After Width: | Height: | Size: 3.2 KiB |
@@ -50,6 +50,7 @@ export default {
|
||||
obj[0].param = param_Str
|
||||
obj[0].pageSize = pageSize
|
||||
obj[0].pageList = pageList
|
||||
// console.log(obj[0], 'obj[0]')
|
||||
var numn = JSON.stringify(obj[0])
|
||||
return numn
|
||||
}
|
||||
|
||||
@@ -57,7 +57,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
height="750px"
|
||||
|
||||
@@ -57,7 +57,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
height="450px"
|
||||
|
||||
@@ -57,7 +57,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
height="750px"
|
||||
|
||||
@@ -57,7 +57,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
height="450px"
|
||||
|
||||
@@ -57,7 +57,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
height="750px"
|
||||
|
||||
@@ -57,7 +57,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
height="450px"
|
||||
|
||||
@@ -10,16 +10,19 @@
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 15px" plain @click="searchTable()">查询</el-button>
|
||||
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" @click="addShiftTable('form')">新增</el-button>
|
||||
<el-button type="info" plain size="small" icon="el-icon-upload2" @click="importOrder('form')">导入</el-button>
|
||||
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" @click="writeVariable1()">写入变量</el-button>
|
||||
<!-- <el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" @click="addShiftTable('form')">新增</el-button>-->
|
||||
<!-- <el-button type="info" plain size="small" icon="el-icon-upload2" @click="importOrder('form')">导入</el-button>-->
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="tableData"
|
||||
border
|
||||
stripe
|
||||
size="mini"
|
||||
height="800"
|
||||
center
|
||||
style="width: 100%">
|
||||
style="width: 100%"
|
||||
@selection-change="handleSelectionChange">
|
||||
<el-table-column :selectable="selectable" type="selection" width="45" align="center"/>
|
||||
<el-table-column label="工位代码" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.工位代码 }}
|
||||
@@ -30,307 +33,22 @@
|
||||
{{ scope.row.工位号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="指南工位号" align="center">
|
||||
<el-table-column label="IP" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.指南工位号 }}
|
||||
{{ scope.row.IP }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column disabled label="机床类型" align="center">
|
||||
<el-table-column disabled label="报警数" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床类型 }}
|
||||
{{ scope.row.报警数 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="线体类型" align="center">
|
||||
<el-table-column label="质量组数" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.线体类型 }}
|
||||
{{ 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="PC" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.PC }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工控机名称" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.工控机名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工控机IP" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.工控机IP }}
|
||||
</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="PLC" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.PLC }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="PLC代码" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.PLC代码 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="PLC加工状态" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.PLC加工状态 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="PLC代码加工状态" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.PLC代码加工状态 }}
|
||||
</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">
|
||||
<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">
|
||||
<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="OpcServer" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.OpcServer }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="OpcServer_MIS" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.OpcServer_MIS }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="OpcServer_OPNAME" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.OpcServer_OPNAME }}
|
||||
</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">
|
||||
<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="大屏幕显示Andon大屏幕代码" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.大屏幕显示Andon大屏幕代码 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="大屏幕显示Andon端口" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.大屏幕显示Andon端口 }}
|
||||
</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">
|
||||
<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="是否启用MES" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.是否启用MES }}
|
||||
</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">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.工步属性 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="MesServerCode" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.MesServerCode }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="MesDll" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.MesDll }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="MesWebCode" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.MesWebCode }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="订单选择权限" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.订单选择权限 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="服务器IP" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.服务器IP }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="Bar版本号" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.Bar版本号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="监控属性代码" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.监控属性代码 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" width="150" align="center">
|
||||
<el-table-column label="操作" width="100" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
@@ -338,58 +56,33 @@
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
@click="editShiftTable(scope.row)">编辑</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
<el-dialog :visible.sync="dialogFormVisible" :title="title" center style="min-height: 200px;" width="400px">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="110px">
|
||||
<el-form-item label="电气元器件" prop="dataTypeValue" style="display: inline-block">
|
||||
<el-select v-model="form.dataTypeValue" placeholder="电气元器件" clearable size="small" style="width:200px" @change="changeName(form.dataTypeValue)">
|
||||
<el-option
|
||||
v-for="item in dataType"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-form-item label="IP" prop="IP" style="display: inline-block">
|
||||
<el-input v-model="form.IP" clearable size="small" placeholder="IP"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="编号" prop="value" style="display: inline-block">
|
||||
<el-input v-model="form.value" clearable size="small" placeholder="序号"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="描述" prop="descript" style="display: inline-block">
|
||||
<el-form-item label="报警数" prop="numberAlarms" style="display: inline-block">
|
||||
<el-input
|
||||
v-model="form.descript"
|
||||
v-model="form.numberAlarms"
|
||||
clearable
|
||||
size="small"
|
||||
placeholder="描述"/>
|
||||
placeholder="报警数"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否禁用" prop="active" style="display: inline-block">
|
||||
<el-select v-model="form.active" placeholder="是否禁用" clearable size="small" style="width:200px">
|
||||
<el-option
|
||||
v-for="item in active"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="comments" style="display: inline-block">
|
||||
<el-form-item label="质量组数" prop="massNumber" style="display: inline-block">
|
||||
<el-input
|
||||
v-model="form.comments"
|
||||
v-model="form.massNumber"
|
||||
clearable
|
||||
size="small"
|
||||
placeholder="备注"/>
|
||||
placeholder="质量组数"/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button size="small" @click="callOff('form')">取消</el-button>
|
||||
<el-button v-if="title === '增加'" type="primary" size="small" @click="submitAdd('form')">确定</el-button>
|
||||
<el-button v-if="title === '编辑'" type="primary" size="small" @click="submitAdd1('form')">确定</el-button>
|
||||
<el-button type="primary" size="small" @click="submitAdd1('form')">确定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog :visible.sync="dialogFormVisible3" title="导入" center style="min-height: 200px" width="900px">
|
||||
@@ -424,6 +117,8 @@ export default {
|
||||
dataType: [],
|
||||
tableData: [],
|
||||
activeValue: '',
|
||||
multipleSelection: '',
|
||||
multipleSelection_variable: '',
|
||||
active: [{
|
||||
label: '启用',
|
||||
value: 1
|
||||
@@ -434,17 +129,13 @@ export default {
|
||||
dialogFormVisible: false,
|
||||
dialogFormVisible3: false,
|
||||
form: {
|
||||
name: '',
|
||||
value: '',
|
||||
descript: '',
|
||||
comments: '',
|
||||
ID: '',
|
||||
active: '',
|
||||
dataTypeValue: ''
|
||||
IP: '',
|
||||
numberAlarms: '',
|
||||
massNumber: '',
|
||||
stationNo: '',
|
||||
fourNumber: ''
|
||||
},
|
||||
rules: { // 表单验证规则
|
||||
dataTypeValue: [{ required: true, message: '请选择', trigger: 'change' }],
|
||||
name: [{ required: true, message: '请输入', trigger: 'blur' }]
|
||||
},
|
||||
title: '',
|
||||
pageCurrent: 1,
|
||||
@@ -457,6 +148,62 @@ export default {
|
||||
this.searchTable()
|
||||
},
|
||||
methods: {
|
||||
handleSelectionChange(val) {
|
||||
this.multipleSelection = val
|
||||
console.log(this.multipleSelection, 'this.multipleSelection')
|
||||
},
|
||||
writeVariable1() {
|
||||
if (!this.multipleSelection.length) {
|
||||
this.$message.error('请选择工位号!')
|
||||
} else {
|
||||
this.$confirm('是否写入?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
this.writeVariable()
|
||||
})
|
||||
}
|
||||
},
|
||||
async writeVariable() {
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
let ip, numberAlarms, massNumber, stationNo, fourNumber
|
||||
this.multipleSelection_variable = this.multipleSelection
|
||||
this.multipleSelection = []
|
||||
for (let i = 0; i < this.multipleSelection_variable.length; i++) {
|
||||
stationNo = this.multipleSelection_variable[i].工位号
|
||||
fourNumber = this.multipleSelection_variable[i].工位代码
|
||||
ip = this.multipleSelection_variable[i].IP
|
||||
numberAlarms = this.multipleSelection_variable[i].报警数
|
||||
massNumber = this.multipleSelection_variable[i].质量组数
|
||||
await this.writeVariableDetermine(ip, numberAlarms, massNumber, stationNo, fourNumber)
|
||||
console.log(ip, numberAlarms, massNumber, stationNo, fourNumber, 'ip, numberAlarms, massNumber, stationNo, fourNumber')
|
||||
}
|
||||
this.$message.success(`写入完成!`)
|
||||
},
|
||||
async writeVariableDetermine(ip, numberAlarms, massNumber, stationNo, fourNumber) {
|
||||
var param = []
|
||||
param[0] = ['IP', ip]
|
||||
param[1] = ['工位号', stationNo]
|
||||
param[2] = ['工位代码', fourNumber]
|
||||
param[3] = ['报警个数', numberAlarms]
|
||||
param[4] = ['质量组数', massNumber]
|
||||
var Data = this.CreateData('12', 'MES_基本变量数据_增加', param)
|
||||
return new Promise((resolve, reject) => {
|
||||
this.ExecDatabase(Data).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
console.log('1')
|
||||
resolve(1)
|
||||
} else {
|
||||
console.log('0')
|
||||
reject(2)
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
selectable(row) {
|
||||
return row.IP && row.报警数 && row.质量组数
|
||||
},
|
||||
getNumber() {
|
||||
this.dataType = []
|
||||
request({
|
||||
@@ -486,6 +233,7 @@ export default {
|
||||
}
|
||||
},
|
||||
searchTable() {
|
||||
this.loading = true
|
||||
this.tableData = []
|
||||
let dataTypeValue_check
|
||||
this.dataTypeValue ? dataTypeValue_check = 1 : dataTypeValue_check = 0
|
||||
@@ -548,18 +296,11 @@ export default {
|
||||
if (this.$refs['form'] !== undefined) {
|
||||
this.$refs['form'].resetFields()
|
||||
}
|
||||
if (row.Active === '启用') {
|
||||
this.form.active = 1
|
||||
} else if (row.Active === '禁用') {
|
||||
this.form.active = 0
|
||||
} else {
|
||||
this.form.active = ''
|
||||
}
|
||||
this.form.value = row.MachineNum
|
||||
this.form.descript = row.Described
|
||||
this.form.comments = row.Comments
|
||||
this.form.ID = row.id
|
||||
this.form.dataTypeValue = row.MachineNo
|
||||
this.form.IP = row.IP
|
||||
this.form.numberAlarms = row.报警数
|
||||
this.form.massNumber = row.质量组数
|
||||
this.form.stationNo = row.工位号
|
||||
this.form.fourNumber = row.工位代码
|
||||
this.title = '编辑'
|
||||
this.dialogFormVisible = true
|
||||
},
|
||||
@@ -567,14 +308,12 @@ export default {
|
||||
this.$refs['form'].validate((valid) => {
|
||||
if (valid) {
|
||||
var param = []
|
||||
param[0] = ['name', this.form.name]
|
||||
param[1] = ['type', this.form.dataTypeValue]
|
||||
param[2] = ['num', this.form.value]
|
||||
param[3] = ['descript', this.form.descript]
|
||||
param[4] = ['comments', this.form.comments]
|
||||
param[5] = ['id', this.form.ID]
|
||||
param[6] = ['active', this.form.active]
|
||||
var Data = this.CreateData('12', 'Recipe_Machine_Update_NEW', param)
|
||||
param[0] = ['IP', this.form.IP]
|
||||
param[1] = ['工位号', this.form.stationNo]
|
||||
param[2] = ['工位代码', this.form.fourNumber]
|
||||
param[3] = ['报警数', this.form.numberAlarms]
|
||||
param[4] = ['质量组数', this.form.massNumber]
|
||||
var Data = this.CreateData('12', '基础数据_工位信息维护_编辑', param)
|
||||
this.ExecDatabase(Data).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
this.$message({
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -18,7 +18,6 @@
|
||||
:data="tableData"
|
||||
:header-cell-style="{background:'#eef1f6',color:'#606266'}"
|
||||
:cell-class-name="tableRowClassName"
|
||||
stripe
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
|
||||
@@ -56,7 +56,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
height="750px"
|
||||
|
||||
@@ -167,7 +167,6 @@
|
||||
:data="tableData1"
|
||||
:header-cell-style="{background:'#eef1f6',color:'#606266'}"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;max-height: 700px"
|
||||
|
||||
@@ -39,7 +39,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;max-height: 700px"
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;max-height: 700px"
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;max-height: 700px"
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
:data="tableData"
|
||||
:header-cell-style="{background:'#eef1f6',color:'#606266'}"
|
||||
:cell-class-name="tableRowClassName"
|
||||
stripe
|
||||
height="770px"
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
:data="tableData"
|
||||
:header-cell-style="{background:'#eef1f6',color:'#606266'}"
|
||||
:cell-class-name="tableRowClassName"
|
||||
stripe
|
||||
height="770px"
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;max-height: 700px"
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
:data="tableData"
|
||||
:header-cell-style="{background:'#eef1f6',color:'#606266'}"
|
||||
:cell-class-name="tableRowClassName"
|
||||
stripe
|
||||
height="770px"
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
:data="tableData"
|
||||
:header-cell-style="{background:'#eef1f6',color:'#606266'}"
|
||||
:cell-class-name="tableRowClassName"
|
||||
stripe
|
||||
height="770px"
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
|
||||
@@ -79,9 +79,9 @@
|
||||
<el-button type="info" plain size="small" @click="clearAll()">全部清除</el-button>
|
||||
</el-col>
|
||||
<el-col style="width: 1000px">
|
||||
<div style="border: 1px solid black;width: 500px;height: 500px;margin-top: 10px">
|
||||
<div style="border: 1px solid black;width: 772px;height: 642px;margin-top: 10px">
|
||||
<div v-for="(url, key) in urls" :key="key" style="position: absolute;z-index: 1;" @click="getMouseXY($event)">
|
||||
<img :key="url.url" :src="url.url" :preview-src-list="urls1" lazy style="width: 498px; height:498px">
|
||||
<img :key="url.url" :src="url.url" :preview-src-list="urls1" lazy style="width: 770px; height:640px">
|
||||
</div>
|
||||
<div v-for="(item, index) in tableData" v-show="allowView" :key="item + index" style="position: absolute;z-index: 2;">
|
||||
<img
|
||||
@@ -129,7 +129,7 @@
|
||||
height="300px"
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
style="width: 850px"
|
||||
style="width: 1122px"
|
||||
border
|
||||
size="mini"
|
||||
@row-click="rowClick">
|
||||
@@ -574,7 +574,7 @@ export default {
|
||||
}
|
||||
|
||||
/deep/.el-form-item{
|
||||
margin-bottom: 10px!important;
|
||||
margin-bottom: 20px!important;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
:data="tableData"
|
||||
:header-cell-style="{background:'#eef1f6',color:'#606266'}"
|
||||
:cell-class-name="tableRowClassName"
|
||||
stripe
|
||||
height="770px"
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
:data="tableData"
|
||||
:header-cell-style="{background:'#eef1f6',color:'#606266'}"
|
||||
:cell-class-name="tableRowClassName"
|
||||
stripe
|
||||
height="770px"
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
:data="tableData"
|
||||
:header-cell-style="{background:'#eef1f6',color:'#606266'}"
|
||||
:cell-class-name="tableRowClassName"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;max-height: 700px"
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
</el-badge>
|
||||
<!-- <el-button type="success" plain icon="el-icon-download" size="small" style="margin-left: 760px" @click="exportExcel()">导出</el-button>-->
|
||||
</div>
|
||||
<el-table v-loading="loading" :data="tableData" highlight-current-row border stripe size="mini" style="width:1661px; margin-top: 10px" height="380" @sort-change="sortChange" @row-click="getMaterial">
|
||||
<el-table v-loading="loading" :data="tableData" highlight-current-row border size="mini" style="width:1661px; margin-top: 10px" height="380" @sort-change="sortChange" @row-click="getMaterial">
|
||||
<el-table-column width="55px" label="选入" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button :disabled="Number(scope.row.是否确认) === 0 || checked" type="text" icon="el-icon-bottom" size="mini" @click="selectIn(scope.row)"/>
|
||||
|
||||
@@ -47,7 +47,6 @@
|
||||
highlight-current-row
|
||||
show-summary
|
||||
border
|
||||
stripe
|
||||
size="small"
|
||||
style="width: 1681px"
|
||||
height="740px"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<el-checkbox v-model="checked" style="margin-left: 10px">合作密度</el-checkbox>
|
||||
</div>
|
||||
<div style="margin-top: 10px;width: 851px">
|
||||
<el-table v-loading="loading" :data="tableData" highlight-current-row border stripe size="small" style="width: 100%" height="750px">
|
||||
<el-table v-loading="loading" :data="tableData" highlight-current-row border size="small" style="width: 100%" height="750px">
|
||||
<el-table-column :width="setColumnWidth('序号')" label="序号" type="index" align="center"/>
|
||||
<el-table-column label="供应商名称" align="center" prop="供应商名称">
|
||||
<template slot-scope="scope">
|
||||
|
||||
@@ -122,7 +122,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
height="660px"
|
||||
|
||||
@@ -76,7 +76,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
height="760px"
|
||||
|
||||
@@ -93,7 +93,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
height="660px"
|
||||
|
||||
@@ -122,7 +122,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
height="660px"
|
||||
|
||||
@@ -86,7 +86,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
height="660px"
|
||||
|
||||
@@ -58,7 +58,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
height="350px"
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
<el-table
|
||||
:data="tableData"
|
||||
border
|
||||
stripe
|
||||
size="mini"
|
||||
height="750"
|
||||
center
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
<el-table
|
||||
:data="tableData"
|
||||
border
|
||||
stripe
|
||||
size="mini"
|
||||
height="750"
|
||||
center
|
||||
|
||||
@@ -58,7 +58,6 @@
|
||||
:data="tableData"
|
||||
border
|
||||
element-loading-text="Loading"
|
||||
stripe
|
||||
fit
|
||||
class="main"
|
||||
height="350px"
|
||||
|
||||
@@ -72,7 +72,6 @@
|
||||
:data="tableData"
|
||||
border
|
||||
element-loading-text="Loading"
|
||||
stripe
|
||||
fit
|
||||
class="main"
|
||||
height="350px"
|
||||
|
||||
@@ -72,7 +72,6 @@
|
||||
:data="tableData"
|
||||
border
|
||||
element-loading-text="Loading"
|
||||
stripe
|
||||
fit
|
||||
class="main"
|
||||
height="350px"
|
||||
|
||||
@@ -72,7 +72,6 @@
|
||||
:data="tableData"
|
||||
border
|
||||
element-loading-text="Loading"
|
||||
stripe
|
||||
fit
|
||||
class="main"
|
||||
height="350px"
|
||||
|
||||
@@ -72,7 +72,6 @@
|
||||
:data="tableData"
|
||||
border
|
||||
element-loading-text="Loading"
|
||||
stripe
|
||||
fit
|
||||
class="main"
|
||||
height="350px"
|
||||
|
||||
@@ -48,7 +48,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;max-height: 700px"
|
||||
|
||||
@@ -60,7 +60,6 @@
|
||||
element-loading-text="数据加载中"
|
||||
element-loading-spinner="el-icon-loading"
|
||||
element-loading-background="rgba(0, 0, 0, 0.2)"
|
||||
stripe
|
||||
class="main"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;max-height: 700px"
|
||||
|
||||
Reference in New Issue
Block a user