diff --git a/src/icons/svg/BasicVariableMaintenance.svg b/src/icons/svg/BasicVariableMaintenance.svg new file mode 100644 index 0000000..4d151d6 --- /dev/null +++ b/src/icons/svg/BasicVariableMaintenance.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/utils/curd.js b/src/utils/curd.js index be57d0a..e0c97db 100644 --- a/src/utils/curd.js +++ b/src/utils/curd.js @@ -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 } diff --git a/src/views/AndonSystem/equipmentAndon/index.vue b/src/views/AndonSystem/equipmentAndon/index.vue index 4e43375..9f92124 100644 --- a/src/views/AndonSystem/equipmentAndon/index.vue +++ b/src/views/AndonSystem/equipmentAndon/index.vue @@ -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" diff --git a/src/views/AndonSystem/equipmentAndonStatistics/index.vue b/src/views/AndonSystem/equipmentAndonStatistics/index.vue index d68b3d3..000c037 100644 --- a/src/views/AndonSystem/equipmentAndonStatistics/index.vue +++ b/src/views/AndonSystem/equipmentAndonStatistics/index.vue @@ -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" diff --git a/src/views/AndonSystem/materialAndon/index.vue b/src/views/AndonSystem/materialAndon/index.vue index c38ac5f..05a08b0 100644 --- a/src/views/AndonSystem/materialAndon/index.vue +++ b/src/views/AndonSystem/materialAndon/index.vue @@ -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" diff --git a/src/views/AndonSystem/materialAndonStatistics/index.vue b/src/views/AndonSystem/materialAndonStatistics/index.vue index e44b112..5c33269 100644 --- a/src/views/AndonSystem/materialAndonStatistics/index.vue +++ b/src/views/AndonSystem/materialAndonStatistics/index.vue @@ -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" diff --git a/src/views/AndonSystem/qualityAndon/index.vue b/src/views/AndonSystem/qualityAndon/index.vue index a3b1835..ffd764e 100644 --- a/src/views/AndonSystem/qualityAndon/index.vue +++ b/src/views/AndonSystem/qualityAndon/index.vue @@ -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" diff --git a/src/views/AndonSystem/qualityAndonStatistics/index.vue b/src/views/AndonSystem/qualityAndonStatistics/index.vue index 91f5984..b4f8f06 100644 --- a/src/views/AndonSystem/qualityAndonStatistics/index.vue +++ b/src/views/AndonSystem/qualityAndonStatistics/index.vue @@ -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" diff --git a/src/views/BasicDataMaintenance/BasicVariableMaintenance/index.vue b/src/views/BasicDataMaintenance/BasicVariableMaintenance/index.vue index 01398a7..a920387 100644 --- a/src/views/BasicDataMaintenance/BasicVariableMaintenance/index.vue +++ b/src/views/BasicDataMaintenance/BasicVariableMaintenance/index.vue @@ -10,16 +10,19 @@ :value="item.value"/> 查询 - 新增 - 导入 + 写入变量 + + + style="width: 100%" + @selection-change="handleSelectionChange"> + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + - - - - + + placeholder="报警数"/> - - - - - - + + placeholder="质量组数"/>
取消 - 确定 - 确定 + 确定
@@ -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({ diff --git a/src/views/BasicDataMaintenance/StationInformationMaintenance/index.vue b/src/views/BasicDataMaintenance/StationInformationMaintenance/index.vue index 1b381bf..cf74449 100644 --- a/src/views/BasicDataMaintenance/StationInformationMaintenance/index.vue +++ b/src/views/BasicDataMaintenance/StationInformationMaintenance/index.vue @@ -10,45 +10,455 @@ :value="item.value"/> 查询 - 写入变量 - - + 新增 + 复制 + 导入 + Excel - + @row-click="rowClick"> - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + + + + + + + + + + + + + +
+ 取消 + 确定 + 确定 +
+ + + + + + + + + + + + + placeholder="描述"/> + + + + + + + +
取消 - 确定 + 确定 + 确定
@@ -109,6 +756,8 @@ export default { components: { UploadExcelComponent }, data() { return { + drawer: false, + direction: 'rtl', loading: true, worksheet: [], itemFile: [], @@ -117,8 +766,6 @@ export default { dataType: [], tableData: [], activeValue: '', - multipleSelection: '', - multipleSelection_variable: '', active: [{ label: '启用', value: 1 @@ -129,13 +776,86 @@ export default { dialogFormVisible: false, dialogFormVisible3: false, form: { - IP: '', - numberAlarms: '', - massNumber: '', - stationNo: '', - fourNumber: '' + name: '', + value: '', + descript: '', + comments: '', + ID: '', + active: '', + dataTypeValue: '' }, rules: { // 表单验证规则 + dataTypeValue: [{ required: true, message: '请选择', trigger: 'change' }], + name: [{ required: true, message: '请输入', trigger: 'blur' }] + }, + formData: { + ID: '', // ID + stationCode: '', // 工位代码 + stationNumber: '', // 工位号 + guideStationNumber: '', // 指南工位号 + machineType: '', // 机床类型 + stationName: '', // 工位名称 + lineType: '', // 线体类型 + QRcodeScannGun: '', // 二维码扫描枪 + fixedBarcodeScannGun: '', // 固定条形码扫描枪 + handheldBarcodeScannGun: '', // 手持条形码扫描枪 + PC: '', + nameIndustrialComputer: '', // 工控机名称 + ipIndustrialComputer: '', // 工控机IP + communicationPort: '', // 通讯端口 + fileName: '', // 文件名称 + PLC: '', + PLCCode: '', // PLC代码 + PLCState: '', // PLC加工状态 + PLCCodeState: '', // PLC代码加工状态 + engineModelCodeSynthesis: '', // 发动机型号代码合成 + dailyPlannedOutput: '', // 日计划产量 + preparationTime: '', // 准备时间 + machineTime: '', // 机器时间 + laborTime: '', // 人工时间 + technicalDifficultyCoefficient: '', // 技术难度系数 + whetherLineHead: '', // 是否线首 + branchMaterialTrackingStation: '', // 分线物料追踪工位 + busOnlineStation: '', // 总线上线工位 + busMonitoredStation: '', // 总线被监测工位 + scanningGunType: '', // 扫描枪类型 + stationType: '', // 工位类型 + DFCBMTS: '', // 分线物料追踪工位数据文件连接 + BOSDFC: '', // 总线上线工位数据文件连接 + OpcServer: '', + OpcServer_MIS: '', + OpcServer_OPNAME: '', + TargetCycleTime: '', // 目标循环时间 + WorkpieceType: '', // 工件类型 + basicOperationInstructionsStation: '', // 工位基本操作指导 + stationBasicGuidePicture: '', // 工位基本指导图片 + stationUpperLowerLineType: '', // 工位上下线类型 + largeScreenCode: '', // 大屏幕代码 + largeScreenDisplayOutputPort: '', // 大屏幕显示产量端口 + AndonCode: '', // 大屏幕显示Andon大屏幕代码 + AndonPort: '', // 大屏幕显示Andon端口 + isTherePrinter: '', // 是否有打印机 + printerPort: '', // 打印机通讯端口 + processNo: '', // 工序号 + processName: '', // 工序名称 + isThereComputer: '', // 是否有工位计算机 + isThereData: '', // 是否有测量数据 + enableMES: '', // 是否启用MES + onlineStatus: '', // 在线状态 + whetherSaveData: '', // 是否通过监控系统保存数据 + whetherMonitor: '', // 是否监控 + repairStationNo: '', // 返修工位号 + workStepAttribute: '', // 工步属性 + MesServerCode: '', + MesDll: '', + MesWebCode: '', + orderSelectionPermission: '', // 订单选择权限 + theServerIP: '', // 服务器IP + BarVersion: '', // Bar版本号 + monitoringAttributeCode: '', // 监控属性代码 + IP: '', + numberAlarms: '', // + numberQualityGroups: '' }, title: '', pageCurrent: 1, @@ -148,61 +868,12 @@ export default { this.searchTable() }, methods: { - handleSelectionChange(val) { - this.multipleSelection = val - console.log(this.multipleSelection, 'this.multipleSelection') - }, - writeVariable1() { - this.$confirm('是否投产?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - this.writeVariable() - }) - }, - async writeVariable() { - if (!this.multipleSelection.length) { - this.$message.error('请选择工位号！') - } else { - // 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) - } + handleClose(done) { + this.$confirm('确认关闭？') + .then(_ => { + done() }) - }) - }, - selectable(row) { - return row.IP && row.报警数 && row.质量组数 + .catch(_ => {}) }, getNumber() { this.dataType = [] @@ -233,6 +904,7 @@ export default { } }, searchTable() { + this.loading = true this.tableData = [] let dataTypeValue_check this.dataTypeValue ? dataTypeValue_check = 1 : dataTypeValue_check = 0 @@ -241,78 +913,555 @@ export default { param[1] = ['type', this.dataTypeValue] var Data = this.CreateData('11', '基础数据_工位信息维护_查询', param) this.ExecDatabase(Data).then(response => { - console.log(response, 66) if (response.data.length !== 0) { - this.tableData = response.data + for (let i = 0; i < response.data.length; i++) { + this.tableData.push({ + ID: response.data[i].ID, + 工位代码: response.data[i].工位代码, + 工位号: response.data[i].工位号, + 指南工位号: response.data[i].指南工位号, + 机床类型: response.data[i].机床类型, + 工位名称: response.data[i].工位名称, + 线体类型: response.data[i].线体类型, + 二维码扫描枪: response.data[i].二维码扫描枪, + 固定条形码扫描枪: response.data[i].固定条形码扫描枪, + 手持条形码扫描枪: response.data[i].手持条形码扫描枪, + PC: response.data[i].PC, + 工控机名称: response.data[i].工控机名称, + 工控机IP: response.data[i].工控机IP, + 通讯端口: response.data[i].通讯端口, + 文件名称: response.data[i].文件名称, + PLC: response.data[i].PLC, + PLC代码: response.data[i].PLC代码, + PLC加工状态: response.data[i].PLC加工状态, + PLC代码加工状态: response.data[i].PLC代码加工状态, + 发动机型号代码合成: response.data[i].发动机型号代码合成, + 日计划产量: response.data[i].日计划产量, + 准备时间: response.data[i].准备时间, + 机器时间: response.data[i].机器时间, + 人工时间: response.data[i].人工时间, + 技术难度系数: response.data[i].技术难度系数, + 是否线首: response.data[i].是否线首, + 分线物料追踪工位: response.data[i].分线物料追踪工位, + 总线上线工位: response.data[i].总线上线工位, + 总线被监测工位: response.data[i].总线被监测工位, + 扫描枪类型: response.data[i].扫描枪类型, + 工位类型: response.data[i].工位类型, + 分线物料追踪工位数据文件连接: response.data[i].分线物料追踪工位数据文件连接, + 总线上线工位数据文件连接: response.data[i].总线上线工位数据文件连接, + OpcServer: response.data[i].OpcServer, + OpcServer_MIS: response.data[i].OpcServer_MIS, + OpcServer_OPNAME: response.data[i].OpcServer_OPNAME, + 目标循环时间: response.data[i].目标循环时间, + 工件类型: response.data[i].工件类型, + 工位基本操作指导: response.data[i].工位基本操作指导, + 工位基本指导图片: response.data[i].工位基本指导图片, + 工位上下线类型: response.data[i].工位上下线类型, + 大屏幕代码: response.data[i].大屏幕代码, + 大屏幕显示产量端口: response.data[i].大屏幕显示产量端口, + 大屏幕显示Andon大屏幕代码: response.data[i].大屏幕显示Andon大屏幕代码, + 大屏幕显示Andon端口: response.data[i].大屏幕显示Andon端口, + 是否有打印机: response.data[i].是否有打印机, + 打印机通讯端口: response.data[i].打印机通讯端口, + 工序号: response.data[i].工序号, + 工序名称: response.data[i].工序名称, + 是否有工位计算机: response.data[i].是否有工位计算机, + 是否有测量数据: response.data[i].是否有测量数据, + 是否启用MES: response.data[i].是否启用MES, + 在线状态: response.data[i].在线状态, + 是否通过监控系统保存数据: response.data[i].是否通过监控系统保存数据, + 是否监控: response.data[i].是否监控, + 返修工位号: response.data[i].返修工位号, + 工步属性: response.data[i].工步属性, + MesServerCode: response.data[i].MesServerCode, + MesDll: response.data[i].MesDll, + MesWebCode: response.data[i].MesWebCode, + 订单选择权限: response.data[i].订单选择权限, + 服务器IP: response.data[i].服务器IP, + Bar版本号: response.data[i].Bar版本号, + 监控属性代码: response.data[i].监控属性代码, + IP: response.data[i].IP, + 报警数: response.data[i].报警数, + 质量组数: response.data[i].质量组数, + edit: false + }) + } } this.loading = false console.log(this.tableData, 'this.tableData') }) }, + exportExcel() { + if (this.tableData.length !== 0) { + let dataTypeValue_check + this.dataTypeValue ? dataTypeValue_check = 1 : dataTypeValue_check = 0 + var param = [] + param[0] = ['type_ischeck', dataTypeValue_check] + param[1] = ['type', this.dataTypeValue] + var Data = this.CreateData('2001', '基础数据_工位信息维护_导出', param) + this.exportExcel_NPOI(Data) + } else { + this.$message.warning('暂无数据') + } + }, addShiftTable(formName) { if (this.$refs[formName] !== undefined) { this.$refs[formName].resetFields() } - this.title = '增加' - this.form.name = '' - this.form.value = '' - this.form.descript = '' - this.form.comments = '' - this.form.dataTypeValue = '' - this.form.active = '' - this.dialogFormVisible = true + this.title = '添加工位信息' + this.formData.stationCode = '' // 工位代码 + this.formData.stationNumber = '' // 工位号 + this.formData.guideStationNumber = '' // 指南工位号 + this.formData.machineType = '' // 机床类型 + this.formData.stationName = '' // 工位名称 + this.formData.lineType = '' // 线体类型 + this.formData.QRcodeScannGun = '' // 二维码扫描枪 + this.formData.fixedBarcodeScannGun = '' // 固定条形码扫描枪 + this.formData.handheldBarcodeScannGun = '' // 手持条形码扫描枪 + this.formData.PC = '' + this.formData.nameIndustrialComputer = '' // 工控机名称 + this.formData.ipIndustrialComputer = '' // 工控机IP + this.formData.communicationPort = '' // 通讯端口 + this.formData.fileName = '' // 文件名称 + this.formData.PLC = '' + this.formData.PLCCode = '' // PLC代码 + this.formData.PLCState = '' // PLC加工状态 + this.formData.PLCCodeState = '' // PLC代码加工状态 + this.formData.engineModelCodeSynthesis = '' // 发动机型号代码合成 + this.formData.dailyPlannedOutput = '' // 日计划产量 + this.formData.preparationTime = '' // 准备时间 + this.formData.machineTime = '' // 机器时间 + this.formData.laborTime = '' // 人工时间 + this.formData.technicalDifficultyCoefficient = '' // 技术难度系数 + this.formData.whetherLineHead = '' // 是否线首 + this.formData.branchMaterialTrackingStation = '' // 分线物料追踪工位 + this.formData.busOnlineStation = '' // 总线上线工位 + this.formData.busMonitoredStation = '' // 总线被监测工位 + this.formData.scanningGunType = '' // 扫描枪类型 + this.formData.stationType = '' // 工位类型 + this.formData.DFCBMTS = '' // 分线物料追踪工位数据文件连接 + this.formData.BOSDFC = '' // 总线上线工位数据文件连接 + this.formData.OpcServer = '' + this.formData.OpcServer_MIS = '' + this.formData.OpcServer_OPNAME = '' + this.formData.TargetCycleTime = '' // 目标循环时间 + this.formData.WorkpieceType = '' // 工件类型 + this.formData.basicOperationInstructionsStation = '' // 工位基本操作指导 + this.formData.stationBasicGuidePicture = '' // 工位基本指导图片 + this.formData.stationUpperLowerLineType = '' // 工位上下线类型 + this.formData.largeScreenCode = '' // 大屏幕代码 + this.formData.largeScreenDisplayOutputPort = '' // 大屏幕显示产量端口 + this.formData.AndonCode = '' // 大屏幕显示Andon大屏幕代码 + this.formData.AndonPort = '' // 大屏幕显示Andon端口 + this.formData.isTherePrinter = '' // 是否有打印机 + this.formData.printerPort = '' // 打印机通讯端口 + this.formData.processNo = '' // 工序号 + this.formData.processName = '' // 工序名称 + this.formData.isThereComputer = '' // 是否有工位计算机 + this.formData.isThereData = '' // 是否有测量数据 + this.formData.enableMES = '' // 是否启用MES + this.formData.onlineStatus = '' // 在线状态 + this.formData.whetherSaveData = '' // 是否通过监控系统保存数据 + this.formData.whetherMonitor = '' // 是否监控 + this.formData.repairStationNo = '' // 返修工位号 + this.formData.workStepAttribute = '' // 工步属性 + this.formData.MesServerCode = '' + this.formData.MesDll = '' + this.formData.MesWebCode = '' + this.formData.orderSelectionPermission = '' // 订单选择权限 + this.formData.theServerIP = '' // 服务器IP + this.formData.BarVersion = '' // Bar版本号 + this.formData.monitoringAttributeCode = '' // 监控属性代码 + this.formData.IP = '' + this.formData.numberAlarms = '' // + this.formData.numberQualityGroups = '' + this.drawer = true }, - submitAdd(formName) { - this.$refs[formName].validate((valid) => { - if (valid) { - var param = [] - param[0] = ['active', this.form.active] - param[1] = ['type', this.form.dataTypeValue] - param[2] = ['num', this.form.value] - param[3] = ['descript', this.form.descript] - param[4] = ['comments', this.form.comments] - var Data = this.CreateData('12', 'Recipe_Machine_Add', param) - this.ExecDatabase(Data).then(response => { - console.log(response) - if (response.data[0].result === '1') { - this.$message({ - message: '增加成功', - type: 'success' - }) - this.dialogFormVisible = false - this.searchTable() - } else { - this.$message.error('增加失败！') - } + submitAdd() { + var param = [] + param[0] = ['工位代码', this.formData.stationCode] + param[1] = ['工位号', this.formData.stationNumber] + param[2] = ['指南工位号', this.formData.guideStationNumber] + param[3] = ['机床类型', this.formData.machineType] + param[4] = ['工位名称', this.formData.stationName] + param[5] = ['线体类型', this.formData.lineType] + param[6] = ['二维码扫描枪', this.formData.QRcodeScannGun] + param[7] = ['固定条形码扫描枪', this.formData.fixedBarcodeScannGun] + param[8] = ['手持条形码扫描枪', this.formData.handheldBarcodeScannGun] + param[9] = ['PC', this.formData.PC] + param[10] = ['工控机名称', this.formData.nameIndustrialComputer] + param[11] = ['工控机IP', this.formData.ipIndustrialComputer] + param[12] = ['通讯端口', this.formData.communicationPort] + param[13] = ['文件名称', this.formData.fileName] + param[14] = ['PLC', this.formData.PLC] + param[15] = ['PLC代码', this.formData.PLCCode] + param[16] = ['PLC加工状态', this.formData.PLCState] + param[17] = ['PLC代码加工状态', this.formData.PLCCodeState] + param[18] = ['发动机型号代码合成', this.formData.engineModelCodeSynthesis] + param[19] = ['日计划产量', this.formData.dailyPlannedOutput] + param[20] = ['准备时间', this.formData.preparationTime] + param[21] = ['机器时间', this.formData.machineTime] + param[22] = ['人工时间', this.formData.laborTime] + param[23] = ['技术难度系数', this.formData.technicalDifficultyCoefficient] + param[24] = ['是否线首', this.formData.whetherLineHead] + param[25] = ['分线物料追踪工位', this.formData.branchMaterialTrackingStation] + param[26] = ['总线上线工位', this.formData.busOnlineStation] + param[27] = ['总线被监测工位', this.formData.busMonitoredStation] + param[28] = ['扫描枪类型', this.formData.scanningGunType] + param[29] = ['工位类型', this.formData.stationType] + param[30] = ['分线物料追踪工位数据文件连接', this.formData.DFCBMTS] + param[31] = ['总线上线工位数据文件连接', this.formData.BOSDFC] + param[32] = ['OpcServer', this.formData.OpcServer] + param[33] = ['OpcServer_MIS', this.formData.OpcServer_MIS] + param[34] = ['OpcServer_OPNAME', this.formData.OpcServer_OPNAME] + param[35] = ['目标循环时间', this.formData.TargetCycleTime] + param[36] = ['工件类型', this.formData.WorkpieceType] + param[37] = ['工位基本操作指导', this.formData.basicOperationInstructionsStation] + param[38] = ['工位基本指导图片', null] + param[39] = ['工位上下线类型', this.formData.stationUpperLowerLineType] + param[40] = ['大屏幕代码', this.formData.largeScreenCode] + param[41] = ['大屏幕显示产量端口', this.formData.largeScreenDisplayOutputPort] + param[42] = ['大屏幕显示Andon大屏幕代码', this.formData.AndonCode] + param[43] = ['大屏幕显示Andon端口', this.formData.AndonPort] + param[44] = ['是否有打印机', this.formData.isTherePrinter] + param[45] = ['打印机通讯端口', this.formData.printerPort] + param[46] = ['工序号', this.formData.processNo] + param[47] = ['工序名称', this.formData.processName] + param[48] = ['是否有工位计算机', this.formData.isThereComputer] + param[49] = ['是否有测量数据', this.formData.isThereData] + param[50] = ['是否启用MES', this.formData.enableMES] + param[51] = ['在线状态', this.formData.onlineStatus] + param[52] = ['是否通过监控系统保存数据', this.formData.whetherSaveData] + param[53] = ['是否监控', this.formData.whetherMonitor] + param[54] = ['返修工位号', this.formData.repairStationNo] + param[55] = ['工步属性', this.formData.workStepAttribute] + param[56] = ['MesServerCode', this.formData.MesServerCode] + param[57] = ['MesDll', this.formData.MesDll] + param[58] = ['MesWebCode', this.formData.MesWebCode] + param[59] = ['订单选择权限', this.formData.orderSelectionPermission] + param[60] = ['服务器IP', this.formData.theServerIP] + param[61] = ['Bar版本号', this.formData.BarVersion] + param[62] = ['监控属性代码', this.formData.monitoringAttributeCode] + param[63] = ['IP', this.formData.IP] + param[64] = ['报警数', this.formData.numberAlarms] + param[65] = ['质量组数', this.formData.numberQualityGroups] + console.log(param, 'param') + var Data = this.CreateData('12', '基础数据_工位信息维护_增加', param) + this.ExecDatabase(Data).then(response => { + console.log(response) + if (response.data[0].result === '1') { + this.$message({ + message: '增加成功', + type: 'success' }) this.dialogFormVisible = false + this.searchTable() } else { - return false + this.$message.error('增加失败！') } }) + this.drawer = false }, editShiftTable(row) { - if (this.$refs['form'] !== undefined) { - this.$refs['form'].resetFields() + this.title = '编辑工位信息' + this.formData.ID = row.ID // ID + this.formData.stationCode = row.工位代码 // 工位代码 + this.formData.stationNumber = row.工位号 // 工位号 + this.formData.guideStationNumber = row.指南工位号 // 指南工位号 + this.formData.machineType = row.机床类型 // 机床类型 + this.formData.stationName = row.工位名称 // 工位名称 + this.formData.lineType = row.线体类型 // 线体类型 + this.formData.QRcodeScannGun = row.二维码扫描枪 // 二维码扫描枪 + this.formData.fixedBarcodeScannGun = row.固定条形码扫描枪 // 固定条形码扫描枪 + this.formData.handheldBarcodeScannGun = row.手持条形码扫描枪 // 手持条形码扫描枪 + this.formData.PC = row.PC + this.formData.nameIndustrialComputer = row.工控机名称 // 工控机名称 + this.formData.ipIndustrialComputer = row.工控机IP // 工控机IP + this.formData.communicationPort = row.通讯端口 // 通讯端口 + this.formData.fileName = row.文件名称 // 文件名称 + this.formData.PLC = row.PLC + this.formData.PLCCode = row.PLC代码 // PLC代码 + this.formData.PLCState = row.PLC加工状态 // PLC加工状态 + this.formData.PLCCodeState = row.PLC代码加工状态 // PLC代码加工状态 + this.formData.engineModelCodeSynthesis = row.发动机型号代码合成 // 发动机型号代码合成 + this.formData.dailyPlannedOutput = row.日计划产量 // 日计划产量 + this.formData.preparationTime = row.准备时间 // 准备时间 + this.formData.machineTime = row.机器时间 // 机器时间 + this.formData.laborTime = row.人工时间 // 人工时间 + this.formData.technicalDifficultyCoefficient = row.技术难度系数 // 技术难度系数 + this.formData.whetherLineHead = row.是否线首 // 是否线首 + this.formData.branchMaterialTrackingStation = row.分线物料追踪工位 // 分线物料追踪工位 + this.formData.busOnlineStation = row.总线上线工位 // 总线上线工位 + this.formData.busMonitoredStation = row.总线被监测工位 // 总线被监测工位 + this.formData.scanningGunType = row.扫描枪类型 // 扫描枪类型 + this.formData.stationType = row.工位类型 // 工位类型 + this.formData.DFCBMTS = row.分线物料追踪工位数据文件连接 // 分线物料追踪工位数据文件连接 + this.formData.BOSDFC = row.总线上线工位数据文件连接 // 总线上线工位数据文件连接 + this.formData.OpcServer = row.OpcServer + this.formData.OpcServer_MIS = row.OpcServer_MIS + this.formData.OpcServer_OPNAME = row.OpcServer_OPNAME + this.formData.TargetCycleTime = row.目标循环时间 // 目标循环时间 + this.formData.WorkpieceType = row.工件类型 // 工件类型 + this.formData.basicOperationInstructionsStation = row.工位基本操作指导 // 工位基本操作指导 + this.formData.stationBasicGuidePicture = row.工位基本指导图片 // 工位基本指导图片 + this.formData.stationUpperLowerLineType = row.工位上下线类型 // 工位上下线类型 + this.formData.largeScreenCode = row.大屏幕代码 // 大屏幕代码 + this.formData.largeScreenDisplayOutputPort = row.大屏幕显示产量端口 // 大屏幕显示产量端口 + this.formData.AndonCode = row.大屏幕显示Andon大屏幕代码 // 大屏幕显示Andon大屏幕代码 + this.formData.AndonPort = row.大屏幕显示Andon端口 // 大屏幕显示Andon端口 + this.formData.isTherePrinter = row.是否有打印机 // 是否有打印机 + this.formData.printerPort = row.打印机通讯端口 // 打印机通讯端口 + this.formData.processNo = row.工序号 // 工序号 + this.formData.processName = row.工序名称 // 工序名称 + this.formData.isThereComputer = row.是否有工位计算机 // 是否有工位计算机 + this.formData.isThereData = row.是否有测量数据 // 是否有测量数据 + this.formData.enableMES = row.是否启用MES // 是否启用MES + this.formData.onlineStatus = row.在线状态 // 在线状态 + this.formData.whetherSaveData = row.是否通过监控系统保存数据 // 是否通过监控系统保存数据 + this.formData.whetherMonitor = row.是否监控 // 是否监控 + this.formData.repairStationNo = row.返修工位号 // 返修工位号 + this.formData.workStepAttribute = row.工步属性 // 工步属性 + this.formData.MesServerCode = row.MesServerCode + this.formData.MesDll = row.MesDll + this.formData.MesWebCode = row.MesWebCode + this.formData.orderSelectionPermission = row.订单选择权限 // 订单选择权限 + this.formData.theServerIP = row.服务器IP // 服务器IP + this.formData.BarVersion = row.Bar版本号 // Bar版本号 + this.formData.monitoringAttributeCode = row.监控属性代码 // 监控属性代码 + this.formData.IP = row.IP + this.formData.numberAlarms = row.报警数 // 报警数 + this.formData.numberQualityGroups = row.质量组数 + this.drawer = true + }, + rowClick(row) { + this.formData.stationCode = row.工位代码 // 工位代码 + this.formData.stationNumber = row.工位号 // 工位号 + this.formData.guideStationNumber = row.指南工位号 // 指南工位号 + this.formData.machineType = row.机床类型 // 机床类型 + this.formData.stationName = row.工位名称 // 工位名称 + this.formData.lineType = row.线体类型 // 线体类型 + this.formData.QRcodeScannGun = row.二维码扫描枪 // 二维码扫描枪 + this.formData.fixedBarcodeScannGun = row.固定条形码扫描枪 // 固定条形码扫描枪 + this.formData.handheldBarcodeScannGun = row.手持条形码扫描枪 // 手持条形码扫描枪 + this.formData.PC = row.PC + this.formData.nameIndustrialComputer = row.工控机名称 // 工控机名称 + this.formData.ipIndustrialComputer = row.工控机IP // 工控机IP + this.formData.communicationPort = row.通讯端口 // 通讯端口 + this.formData.fileName = row.文件名称 // 文件名称 + this.formData.PLC = row.PLC + this.formData.PLCCode = row.PLC代码 // PLC代码 + this.formData.PLCState = row.PLC加工状态 // PLC加工状态 + this.formData.PLCCodeState = row.PLC代码加工状态 // PLC代码加工状态 + this.formData.engineModelCodeSynthesis = row.发动机型号代码合成 // 发动机型号代码合成 + this.formData.dailyPlannedOutput = row.日计划产量 // 日计划产量 + this.formData.preparationTime = row.准备时间 // 准备时间 + this.formData.machineTime = row.机器时间 // 机器时间 + this.formData.laborTime = row.人工时间 // 人工时间 + this.formData.technicalDifficultyCoefficient = row.技术难度系数 // 技术难度系数 + this.formData.whetherLineHead = row.是否线首 // 是否线首 + this.formData.branchMaterialTrackingStation = row.分线物料追踪工位 // 分线物料追踪工位 + this.formData.busOnlineStation = row.总线上线工位 // 总线上线工位 + this.formData.busMonitoredStation = row.总线被监测工位 // 总线被监测工位 + this.formData.scanningGunType = row.扫描枪类型 // 扫描枪类型 + this.formData.stationType = row.工位类型 // 工位类型 + this.formData.DFCBMTS = row.分线物料追踪工位数据文件连接 // 分线物料追踪工位数据文件连接 + this.formData.BOSDFC = row.总线上线工位数据文件连接 // 总线上线工位数据文件连接 + this.formData.OpcServer = row.OpcServer + this.formData.OpcServer_MIS = row.OpcServer_MIS + this.formData.OpcServer_OPNAME = row.OpcServer_OPNAME + this.formData.TargetCycleTime = row.目标循环时间 // 目标循环时间 + this.formData.WorkpieceType = row.工件类型 // 工件类型 + this.formData.basicOperationInstructionsStation = row.工位基本操作指导 // 工位基本操作指导 + this.formData.stationBasicGuidePicture = row.工位基本指导图片 // 工位基本指导图片 + this.formData.stationUpperLowerLineType = row.工位上下线类型 // 工位上下线类型 + this.formData.largeScreenCode = row.大屏幕代码 // 大屏幕代码 + this.formData.largeScreenDisplayOutputPort = row.大屏幕显示产量端口 // 大屏幕显示产量端口 + this.formData.AndonCode = row.大屏幕显示Andon大屏幕代码 // 大屏幕显示Andon大屏幕代码 + this.formData.AndonPort = row.大屏幕显示Andon端口 // 大屏幕显示Andon端口 + this.formData.isTherePrinter = row.是否有打印机 // 是否有打印机 + this.formData.printerPort = row.打印机通讯端口 // 打印机通讯端口 + this.formData.processNo = row.工序号 // 工序号 + this.formData.processName = row.工序名称 // 工序名称 + this.formData.isThereComputer = row.是否有工位计算机 // 是否有工位计算机 + this.formData.isThereData = row.是否有测量数据 // 是否有测量数据 + this.formData.enableMES = row.是否启用MES // 是否启用MES + this.formData.onlineStatus = row.在线状态 // 在线状态 + this.formData.whetherSaveData = row.是否通过监控系统保存数据 // 是否通过监控系统保存数据 + this.formData.whetherMonitor = row.是否监控 // 是否监控 + this.formData.repairStationNo = row.返修工位号 // 返修工位号 + this.formData.workStepAttribute = row.工步属性 // 工步属性 + this.formData.MesServerCode = row.MesServerCode + this.formData.MesDll = row.MesDll + this.formData.MesWebCode = row.MesWebCode + this.formData.orderSelectionPermission = row.订单选择权限 // 订单选择权限 + this.formData.theServerIP = row.服务器IP // 服务器IP + this.formData.BarVersion = row.Bar版本号 // Bar版本号 + this.formData.monitoringAttributeCode = row.监控属性代码 // 监控属性代码 + this.formData.IP = row.IP + this.formData.numberAlarms = row.报警数 // 报警数 + this.formData.numberQualityGroups = row.质量组数 + }, + copyData() { + if (this.formData.stationNumber) { + var param = [] + param[0] = ['工位代码', 'copeData'] + param[1] = ['工位号', 'copeData'] + param[2] = ['指南工位号', this.formData.guideStationNumber] + param[3] = ['机床类型', this.formData.machineType] + param[4] = ['工位名称', this.formData.stationName] + param[5] = ['线体类型', this.formData.lineType] + param[6] = ['二维码扫描枪', this.formData.QRcodeScannGun] + param[7] = ['固定条形码扫描枪', this.formData.fixedBarcodeScannGun] + param[8] = ['手持条形码扫描枪', this.formData.handheldBarcodeScannGun] + param[9] = ['PC', this.formData.PC] + param[10] = ['工控机名称', this.formData.nameIndustrialComputer] + param[11] = ['工控机IP', this.formData.ipIndustrialComputer] + param[12] = ['通讯端口', this.formData.communicationPort] + param[13] = ['文件名称', this.formData.fileName] + param[14] = ['PLC', this.formData.PLC] + param[15] = ['PLC代码', this.formData.PLCCode] + param[16] = ['PLC加工状态', this.formData.PLCState] + param[17] = ['PLC代码加工状态', this.formData.PLCCodeState] + param[18] = ['发动机型号代码合成', this.formData.engineModelCodeSynthesis] + param[19] = ['日计划产量', this.formData.dailyPlannedOutput] + param[20] = ['准备时间', this.formData.preparationTime] + param[21] = ['机器时间', this.formData.machineTime] + param[22] = ['人工时间', this.formData.laborTime] + param[23] = ['技术难度系数', this.formData.technicalDifficultyCoefficient] + param[24] = ['是否线首', this.formData.whetherLineHead] + param[25] = ['分线物料追踪工位', this.formData.branchMaterialTrackingStation] + param[26] = ['总线上线工位', this.formData.busOnlineStation] + param[27] = ['总线被监测工位', this.formData.busMonitoredStation] + param[28] = ['扫描枪类型', this.formData.scanningGunType] + param[29] = ['工位类型', this.formData.stationType] + param[30] = ['分线物料追踪工位数据文件连接', this.formData.DFCBMTS] + param[31] = ['总线上线工位数据文件连接', this.formData.BOSDFC] + param[32] = ['OpcServer', this.formData.OpcServer] + param[33] = ['OpcServer_MIS', this.formData.OpcServer_MIS] + param[34] = ['OpcServer_OPNAME', this.formData.OpcServer_OPNAME] + param[35] = ['目标循环时间', this.formData.TargetCycleTime] + param[36] = ['工件类型', this.formData.WorkpieceType] + param[37] = ['工位基本操作指导', this.formData.basicOperationInstructionsStation] + param[38] = ['工位基本指导图片', null] + param[39] = ['工位上下线类型', this.formData.stationUpperLowerLineType] + param[40] = ['大屏幕代码', this.formData.largeScreenCode] + param[41] = ['大屏幕显示产量端口', this.formData.largeScreenDisplayOutputPort] + param[42] = ['大屏幕显示Andon大屏幕代码', this.formData.AndonCode] + param[43] = ['大屏幕显示Andon端口', this.formData.AndonPort] + param[44] = ['是否有打印机', this.formData.isTherePrinter] + param[45] = ['打印机通讯端口', this.formData.printerPort] + param[46] = ['工序号', this.formData.processNo] + param[47] = ['工序名称', this.formData.processName] + param[48] = ['是否有工位计算机', this.formData.isThereComputer] + param[49] = ['是否有测量数据', this.formData.isThereData] + param[50] = ['是否启用MES', this.formData.enableMES] + param[51] = ['在线状态', this.formData.onlineStatus] + param[52] = ['是否通过监控系统保存数据', this.formData.whetherSaveData] + param[53] = ['是否监控', this.formData.whetherMonitor] + param[54] = ['返修工位号', this.formData.repairStationNo] + param[55] = ['工步属性', this.formData.workStepAttribute] + param[56] = ['MesServerCode', this.formData.MesServerCode] + param[57] = ['MesDll', this.formData.MesDll] + param[58] = ['MesWebCode', this.formData.MesWebCode] + param[59] = ['订单选择权限', this.formData.orderSelectionPermission] + param[60] = ['服务器IP', this.formData.theServerIP] + param[61] = ['Bar版本号', this.formData.BarVersion] + param[62] = ['监控属性代码', this.formData.monitoringAttributeCode] + param[63] = ['IP', this.formData.IP] + param[64] = ['报警数', this.formData.numberAlarms] + param[65] = ['质量组数', this.formData.numberQualityGroups] + console.log(param, 'param') + var Data = this.CreateData('12', '基础数据_工位信息维护_增加', param) + this.ExecDatabase(Data).then(response => { + console.log(response) + if (response.data[0].result === '1') { + this.$message({ + message: '增加成功', + type: 'success' + }) + this.dialogFormVisible = false + this.searchTable() + } else { + this.$message.error('增加失败！') + } + }) + } else { + this.$message.error('请选中一行信息进行复制！') } - 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 }, submitAdd1() { - this.$refs['form'].validate((valid) => { + this.$refs['formData'].validate((valid) => { if (valid) { var 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) + param[0] = ['工位代码', this.formData.stationCode] + param[1] = ['工位号', this.formData.stationNumber] + param[2] = ['指南工位号', this.formData.guideStationNumber] + param[3] = ['机床类型', this.formData.machineType] + param[4] = ['工位名称', this.formData.stationName] + param[5] = ['线体类型', this.formData.lineType] + param[6] = ['二维码扫描枪', this.formData.QRcodeScannGun] + param[7] = ['固定条形码扫描枪', this.formData.fixedBarcodeScannGun] + param[8] = ['手持条形码扫描枪', this.formData.handheldBarcodeScannGun] + param[9] = ['PC', this.formData.PC] + param[10] = ['工控机名称', this.formData.nameIndustrialComputer] + param[11] = ['工控机IP', this.formData.ipIndustrialComputer] + param[12] = ['通讯端口', this.formData.communicationPort] + param[13] = ['文件名称', this.formData.fileName] + param[14] = ['PLC', this.formData.PLC] + param[15] = ['PLC代码', this.formData.PLCCode] + param[16] = ['PLC加工状态', this.formData.PLCState] + param[17] = ['PLC代码加工状态', this.formData.PLCCodeState] + param[18] = ['发动机型号代码合成', this.formData.engineModelCodeSynthesis] + param[19] = ['日计划产量', this.formData.dailyPlannedOutput] + param[20] = ['准备时间', this.formData.preparationTime] + param[21] = ['机器时间', this.formData.machineTime] + param[22] = ['人工时间', this.formData.laborTime] + param[23] = ['技术难度系数', this.formData.technicalDifficultyCoefficient] + param[24] = ['是否线首', this.formData.whetherLineHead] + param[25] = ['分线物料追踪工位', this.formData.branchMaterialTrackingStation] + param[26] = ['总线上线工位', this.formData.busOnlineStation] + param[27] = ['总线被监测工位', this.formData.busMonitoredStation] + param[28] = ['扫描枪类型', this.formData.scanningGunType] + param[29] = ['工位类型', this.formData.stationType] + param[30] = ['分线物料追踪工位数据文件连接', this.formData.DFCBMTS] + param[31] = ['总线上线工位数据文件连接', this.formData.BOSDFC] + param[32] = ['OpcServer', this.formData.OpcServer] + param[33] = ['OpcServer_MIS', this.formData.OpcServer_MIS] + param[34] = ['OpcServer_OPNAME', this.formData.OpcServer_OPNAME] + param[35] = ['目标循环时间', this.formData.TargetCycleTime] + param[36] = ['工件类型', this.formData.WorkpieceType] + param[37] = ['工位基本操作指导', this.formData.basicOperationInstructionsStation] + param[38] = ['工位基本指导图片', null] + param[39] = ['工位上下线类型', this.formData.stationUpperLowerLineType] + param[40] = ['大屏幕代码', this.formData.largeScreenCode] + param[41] = ['大屏幕显示产量端口', this.formData.largeScreenDisplayOutputPort] + param[42] = ['大屏幕显示Andon大屏幕代码', this.formData.AndonCode] + param[43] = ['大屏幕显示Andon端口', this.formData.AndonPort] + param[44] = ['是否有打印机', this.formData.isTherePrinter] + param[45] = ['打印机通讯端口', this.formData.printerPort] + param[46] = ['工序号', this.formData.processNo] + param[47] = ['工序名称', this.formData.processName] + param[48] = ['是否有工位计算机', this.formData.isThereComputer] + param[49] = ['是否有测量数据', this.formData.isThereData] + param[50] = ['是否启用MES', this.formData.enableMES] + param[51] = ['在线状态', this.formData.onlineStatus] + param[52] = ['是否通过监控系统保存数据', this.formData.whetherSaveData] + param[53] = ['是否监控', this.formData.whetherMonitor] + param[54] = ['返修工位号', this.formData.repairStationNo] + param[55] = ['工步属性', this.formData.workStepAttribute] + param[56] = ['MesServerCode', this.formData.MesServerCode] + param[57] = ['MesDll', this.formData.MesDll] + param[58] = ['MesWebCode', this.formData.MesWebCode] + param[59] = ['订单选择权限', this.formData.orderSelectionPermission] + param[60] = ['服务器IP', this.formData.theServerIP] + param[61] = ['Bar版本号', this.formData.BarVersion] + param[62] = ['监控属性代码', this.formData.monitoringAttributeCode] + param[63] = ['IP', this.formData.IP] + param[64] = ['报警数', this.formData.numberAlarms] + param[65] = ['质量组数', this.formData.numberQualityGroups] + param[66] = ['ID', this.formData.ID] + console.log(param, 'param') + var Data = this.CreateData('12', '基础数据_工位信息维护_修改', param) this.ExecDatabase(Data).then(response => { if (response.data[0].result === '1') { this.$message({ @@ -324,42 +1473,41 @@ export default { this.$message.error('修改失败！') } }) - this.dialogFormVisible = false + this.drawer = false } else { return false } }) }, handleDelete(row) { - this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', { + this.$confirm('此操作将永久删除该行, 是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - request({ - url: '', - method: 'post', - data: { - type: '4', - name: `delete from Recipe_Machine where id = ${row.id}` - } - }).then(response => { + var param = [] + param[0] = ['ID', row.ID] + var Data = this.CreateData('12', '基础数据_工位信息维护_删除', param) + this.ExecDatabase(Data).then(response => { if (response.data[0].result === '1') { - this.$message.success('删除成功') + this.$message({ + message: '删除成功', + type: 'success' + }) this.searchTable() } else { - this.$message.error('删除失败') + this.$message.error('删除失败！') } }) }).catch(() => { this.$message({ type: 'info', - message: '取消删除' + message: '已取消删除' }) }) }, callOff() { - this.dialogFormVisible = false + this.drawer = false }, importOrder() { this.dialogFormVisible3 = true @@ -386,33 +1534,300 @@ export default { this.loading = true this.err = 0 for (let j = this.worksheet.length - 1; j >= 0; j--) { - let name, - value, - descript, - comments - for (let i = 0; i < 999; i++) { - const attr = i + 2 - name = this.worksheet[j][`A${attr}`] ? this.worksheet[j][`A${attr}`].v : '' - value = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : '' - descript = this.worksheet[j][`C${attr}`] ? this.worksheet[j][`C${attr}`].v : '' - comments = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : '' - console.log(name, value, descript, comments) - if (!name) { - break - } else { - if (name) { - await sleep(50) - await this.insertToSQL(name, value, descript, comments) + let stationCode, + stationNumber, + guideStationNumber, + machineType, + stationName, + lineType, + QRcodeScannGun, + fixedBarcodeScannGun, + handheldBarcodeScannGun, + PC, + nameIndustrialComputer, + ipIndustrialComputer, + communicationPort, + fileName, + PLC, + PLCCode, + PLCState, + PLCCodeState, + engineModelCodeSynthesis, + dailyPlannedOutput, + preparationTime, + machineTime, + laborTime, + technicalDifficultyCoefficient, + whetherLineHead, + branchMaterialTrackingStation, + busOnlineStation, + busMonitoredStation, + scanningGunType, + stationType, + DFCBMTS, + BOSDFC, + OpcServer, + OpcServer_MIS, + OpcServer_OPNAME, + TargetCycleTime, + WorkpieceType, + basicOperationInstructionsStation, + stationUpperLowerLineType, + largeScreenCode, + largeScreenDisplayOutputPort, + AndonCode, + AndonPort, + isTherePrinter, + printerPort, + processNo, + processName, + isThereComputer, + isThereData, + enableMES, + onlineStatus, + whetherSaveData, + whetherMonitor, + repairStationNo, + workStepAttribute, + MesServerCode, + MesDll, + MesWebCode, + orderSelectionPermission, + theServerIP, + BarVersion, + monitoringAttributeCode, + IP, + numberAlarms, + numberQualityGroups + var param = [] + param[0] = ['工位号', this.worksheet[j].B2.v] + console.log('工位号', this.worksheet[j].B2.v) + var Data = this.CreateData('11', '基础数据_工位信息维护_导入校验', param) + const response = await this.ExecDatabase(Data) + const res = response.data + if (res[0].Column1 !== 0) { + this.$notify.error(`${this.worksheet[j].B2.v}已经存在，请确认文件是否正确`) + this.loading = false + this.disabled = false + return + } else { + for (let i = 0; i < 999; i++) { + const attr = i + 2 + stationCode = this.worksheet[j][`A${attr}`] ? this.worksheet[j][`A${attr}`].v : '' + stationNumber = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : '' + guideStationNumber = this.worksheet[j][`C${attr}`] ? this.worksheet[j][`C${attr}`].v : '' + machineType = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : '' + stationName = this.worksheet[j][`E${attr}`] ? this.worksheet[j][`E${attr}`].v : '' + lineType = this.worksheet[j][`F${attr}`] ? this.worksheet[j][`F${attr}`].v : '' + QRcodeScannGun = this.worksheet[j][`G${attr}`] ? this.worksheet[j][`G${attr}`].v : '' + fixedBarcodeScannGun = this.worksheet[j][`H${attr}`] ? this.worksheet[j][`H${attr}`].v : '' + handheldBarcodeScannGun = this.worksheet[j][`I${attr}`] ? this.worksheet[j][`I${attr}`].v : '' + PC = this.worksheet[j][`J${attr}`] ? this.worksheet[j][`J${attr}`].v : '' + nameIndustrialComputer = this.worksheet[j][`K${attr}`] ? this.worksheet[j][`K${attr}`].v : '' + ipIndustrialComputer = this.worksheet[j][`L${attr}`] ? this.worksheet[j][`L${attr}`].v : '' + communicationPort = this.worksheet[j][`M${attr}`] ? this.worksheet[j][`M${attr}`].v : '' + fileName = this.worksheet[j][`N${attr}`] ? this.worksheet[j][`N${attr}`].v : '' + PLC = this.worksheet[j][`O${attr}`] ? this.worksheet[j][`O${attr}`].v : '' + PLCCode = this.worksheet[j][`P${attr}`] ? this.worksheet[j][`P${attr}`].v : '' + PLCState = this.worksheet[j][`Q${attr}`] ? this.worksheet[j][`Q${attr}`].v : '' + PLCCodeState = this.worksheet[j][`R${attr}`] ? this.worksheet[j][`R${attr}`].v : '' + engineModelCodeSynthesis = this.worksheet[j][`S${attr}`] ? this.worksheet[j][`S${attr}`].v : '' + dailyPlannedOutput = this.worksheet[j][`T${attr}`] ? this.worksheet[j][`T${attr}`].v : '' + preparationTime = this.worksheet[j][`U${attr}`] ? this.worksheet[j][`U${attr}`].v : '' + machineTime = this.worksheet[j][`V${attr}`] ? this.worksheet[j][`V${attr}`].v : '' + laborTime = this.worksheet[j][`W${attr}`] ? this.worksheet[j][`W${attr}`].v : '' + technicalDifficultyCoefficient = this.worksheet[j][`X${attr}`] ? this.worksheet[j][`X${attr}`].v : '' + whetherLineHead = this.worksheet[j][`Y${attr}`] ? this.worksheet[j][`Y${attr}`].v : '' + branchMaterialTrackingStation = this.worksheet[j][`Z${attr}`] ? this.worksheet[j][`Z${attr}`].v : '' + busOnlineStation = this.worksheet[j][`AA${attr}`] ? this.worksheet[j][`AA${attr}`].v : '' + busMonitoredStation = this.worksheet[j][`AB${attr}`] ? this.worksheet[j][`AB${attr}`].v : '' + scanningGunType = this.worksheet[j][`AC${attr}`] ? this.worksheet[j][`AC${attr}`].v : '' + stationType = this.worksheet[j][`AD${attr}`] ? this.worksheet[j][`AD${attr}`].v : '' + DFCBMTS = this.worksheet[j][`AE${attr}`] ? this.worksheet[j][`AE${attr}`].v : '' + BOSDFC = this.worksheet[j][`AF${attr}`] ? this.worksheet[j][`AF${attr}`].v : '' + OpcServer = this.worksheet[j][`AG${attr}`] ? this.worksheet[j][`AG${attr}`].v : '' + OpcServer_MIS = this.worksheet[j][`AH${attr}`] ? this.worksheet[j][`AH${attr}`].v : '' + OpcServer_OPNAME = this.worksheet[j][`AI${attr}`] ? this.worksheet[j][`AI${attr}`].v : '' + TargetCycleTime = this.worksheet[j][`AJ${attr}`] ? this.worksheet[j][`AJ${attr}`].v : '' + WorkpieceType = this.worksheet[j][`AK${attr}`] ? this.worksheet[j][`AK${attr}`].v : '' + basicOperationInstructionsStation = this.worksheet[j][`AL${attr}`] ? this.worksheet[j][`AL${attr}`].v : '' + stationUpperLowerLineType = this.worksheet[j][`AM${attr}`] ? this.worksheet[j][`AM${attr}`].v : '' + largeScreenCode = this.worksheet[j][`AN${attr}`] ? this.worksheet[j][`AN${attr}`].v : '' + largeScreenDisplayOutputPort = this.worksheet[j][`AO${attr}`] ? this.worksheet[j][`AO${attr}`].v : '' + AndonCode = this.worksheet[j][`AP${attr}`] ? this.worksheet[j][`AP${attr}`].v : '' + AndonPort = this.worksheet[j][`AQ${attr}`] ? this.worksheet[j][`AQ${attr}`].v : '' + isTherePrinter = this.worksheet[j][`AR${attr}`] ? this.worksheet[j][`AR${attr}`].v : '' + printerPort = this.worksheet[j][`AS${attr}`] ? this.worksheet[j][`AS${attr}`].v : '' + processNo = this.worksheet[j][`AT${attr}`] ? this.worksheet[j][`AT${attr}`].v : '' + processName = this.worksheet[j][`AU${attr}`] ? this.worksheet[j][`AU${attr}`].v : '' + isThereComputer = this.worksheet[j][`AV${attr}`] ? this.worksheet[j][`AV${attr}`].v : '' + isThereData = this.worksheet[j][`AW${attr}`] ? this.worksheet[j][`AW${attr}`].v : '' + enableMES = this.worksheet[j][`AX${attr}`] ? this.worksheet[j][`AX${attr}`].v : '' + onlineStatus = this.worksheet[j][`AY${attr}`] ? this.worksheet[j][`AY${attr}`].v : '' + whetherSaveData = this.worksheet[j][`AZ${attr}`] ? this.worksheet[j][`AZ${attr}`].v : '' + whetherMonitor = this.worksheet[j][`BA${attr}`] ? this.worksheet[j][`BA${attr}`].v : '' + repairStationNo = this.worksheet[j][`BB${attr}`] ? this.worksheet[j][`BB${attr}`].v : '' + workStepAttribute = this.worksheet[j][`BC${attr}`] ? this.worksheet[j][`BC${attr}`].v : '' + MesServerCode = this.worksheet[j][`BD${attr}`] ? this.worksheet[j][`BD${attr}`].v : '' + MesDll = this.worksheet[j][`BE${attr}`] ? this.worksheet[j][`BE${attr}`].v : '' + MesWebCode = this.worksheet[j][`BF${attr}`] ? this.worksheet[j][`BF${attr}`].v : '' + orderSelectionPermission = this.worksheet[j][`BG${attr}`] ? this.worksheet[j][`BG${attr}`].v : '' + theServerIP = this.worksheet[j][`BH${attr}`] ? this.worksheet[j][`BH${attr}`].v : '' + BarVersion = this.worksheet[j][`BI${attr}`] ? this.worksheet[j][`BI${attr}`].v : '' + monitoringAttributeCode = this.worksheet[j][`BJ${attr}`] ? this.worksheet[j][`BJ${attr}`].v : '' + IP = this.worksheet[j][`BK${attr}`] ? this.worksheet[j][`BK${attr}`].v : '' + numberAlarms = this.worksheet[j][`BL${attr}`] ? this.worksheet[j][`BL${attr}`].v : '' + numberQualityGroups = this.worksheet[j][`BM${attr}`] ? this.worksheet[j][`BM${attr}`].v : '' + console.log(stationCode, + stationNumber, + guideStationNumber, + machineType, + stationName, + lineType, + QRcodeScannGun, + fixedBarcodeScannGun, + handheldBarcodeScannGun, + PC, + nameIndustrialComputer, + ipIndustrialComputer, + communicationPort, + fileName, + PLC, + PLCCode, + PLCState, + PLCCodeState, + engineModelCodeSynthesis, + dailyPlannedOutput, + preparationTime, + machineTime, + laborTime, + technicalDifficultyCoefficient, + whetherLineHead, + branchMaterialTrackingStation, + busOnlineStation, + busMonitoredStation, + scanningGunType, + stationType, + DFCBMTS, + BOSDFC, + OpcServer, + OpcServer_MIS, + OpcServer_OPNAME, + TargetCycleTime, + WorkpieceType, + basicOperationInstructionsStation, + stationUpperLowerLineType, + largeScreenCode, + largeScreenDisplayOutputPort, + AndonCode, + AndonPort, + isTherePrinter, + printerPort, + processNo, + processName, + isThereComputer, + isThereData, + enableMES, + onlineStatus, + whetherSaveData, + whetherMonitor, + repairStationNo, + workStepAttribute, + MesServerCode, + MesDll, + MesWebCode, + orderSelectionPermission, + theServerIP, + BarVersion, + monitoringAttributeCode, + IP, + numberAlarms, + numberQualityGroups) + if (!stationCode && !stationNumber && !guideStationNumber && !machineType && !stationName && !lineType) { + break + } else if (!stationNumber) { // 名称不能为空 + this.$notify.error(`工位号不能为空`) + break } else { - this.loading = false - this.$notify.error(`请确认导入文件是否正确`) - return + if (stationNumber) { + await sleep(50) + await this.insertToSQL(stationCode, + stationNumber, + guideStationNumber, + machineType, + stationName, + lineType, + QRcodeScannGun, + fixedBarcodeScannGun, + handheldBarcodeScannGun, + PC, + nameIndustrialComputer, + ipIndustrialComputer, + communicationPort, + fileName, + PLC, + PLCCode, + PLCState, + PLCCodeState, + engineModelCodeSynthesis, + dailyPlannedOutput, + preparationTime, + machineTime, + laborTime, + technicalDifficultyCoefficient, + whetherLineHead, + branchMaterialTrackingStation, + busOnlineStation, + busMonitoredStation, + scanningGunType, + stationType, + DFCBMTS, + BOSDFC, + OpcServer, + OpcServer_MIS, + OpcServer_OPNAME, + TargetCycleTime, + WorkpieceType, + basicOperationInstructionsStation, + stationUpperLowerLineType, + largeScreenCode, + largeScreenDisplayOutputPort, + AndonCode, + AndonPort, + isTherePrinter, + printerPort, + processNo, + processName, + isThereComputer, + isThereData, + enableMES, + onlineStatus, + whetherSaveData, + whetherMonitor, + repairStationNo, + workStepAttribute, + MesServerCode, + MesDll, + MesWebCode, + orderSelectionPermission, + theServerIP, + BarVersion, + monitoringAttributeCode, + IP, + numberAlarms, + numberQualityGroups) + } else { + this.loading = false + this.disabled = false + this.$notify.error(`请确认导入文件是否正确`) + return + } } } } this.itemFile.splice(j, 1) this.worksheet.splice(j, 1) - this.err === 0 ? this.$message.success(`导入完成`) : this.$message.error(`导入失败个数为${this.err}，请检查文件是否正确`) + this.err === 0 ? this.$message.success(`导入完成`) : this.$message.error(`导入失败零件个数为${this.err}，请检查文件是否正确`) } this.loading = false this.searchTable() @@ -423,19 +1838,154 @@ export default { console.log(`导入数据错误${e}`) } }, - async insertToSQL(name, value, descript, comments) { + async insertToSQL(stationCode, + stationNumber, + guideStationNumber, + machineType, + stationName, + lineType, + QRcodeScannGun, + fixedBarcodeScannGun, + handheldBarcodeScannGun, + PC, + nameIndustrialComputer, + ipIndustrialComputer, + communicationPort, + fileName, + PLC, + PLCCode, + PLCState, + PLCCodeState, + engineModelCodeSynthesis, + dailyPlannedOutput, + preparationTime, + machineTime, + laborTime, + technicalDifficultyCoefficient, + whetherLineHead, + branchMaterialTrackingStation, + busOnlineStation, + busMonitoredStation, + scanningGunType, + stationType, + DFCBMTS, + BOSDFC, + OpcServer, + OpcServer_MIS, + OpcServer_OPNAME, + TargetCycleTime, + WorkpieceType, + basicOperationInstructionsStation, + stationUpperLowerLineType, + largeScreenCode, + largeScreenDisplayOutputPort, + AndonCode, + AndonPort, + isTherePrinter, + printerPort, + processNo, + processName, + isThereComputer, + isThereData, + enableMES, + onlineStatus, + whetherSaveData, + whetherMonitor, + repairStationNo, + workStepAttribute, + MesServerCode, + MesDll, + MesWebCode, + orderSelectionPermission, + theServerIP, + BarVersion, + monitoringAttributeCode, + IP, + numberAlarms, + numberQualityGroups) { try { var param = [] - param[0] = ['name', name] - param[1] = ['num', value] - param[2] = ['descript', descript] - param[3] = ['comments', comments] - var Data = this.CreateData('12', 'Recipe_Machine_Excel', param) + param[0] = ['工位代码', stationCode] + param[1] = ['工位号', stationNumber] + param[2] = ['指南工位号', guideStationNumber] + param[3] = ['机床类型', machineType] + param[4] = ['工位名称', stationName] + param[5] = ['线体类型', lineType] + param[6] = ['二维码扫描枪', QRcodeScannGun] + param[7] = ['固定条形码扫描枪', fixedBarcodeScannGun] + param[8] = ['手持条形码扫描枪', handheldBarcodeScannGun] + param[9] = ['PC', PC] + param[10] = ['工控机名称', nameIndustrialComputer] + param[11] = ['工控机IP', ipIndustrialComputer] + param[12] = ['通讯端口', communicationPort] + param[13] = ['文件名称', fileName] + param[14] = ['PLC', PLC] + param[15] = ['PLC代码', PLCCode] + param[16] = ['PLC加工状态', PLCState] + param[17] = ['PLC代码加工状态', PLCCodeState] + param[18] = ['发动机型号代码合成', engineModelCodeSynthesis] + param[19] = ['日计划产量', dailyPlannedOutput] + param[20] = ['准备时间', preparationTime] + param[21] = ['机器时间', machineTime] + param[22] = ['人工时间', laborTime] + param[23] = ['技术难度系数', technicalDifficultyCoefficient] + param[24] = ['是否线首', whetherLineHead] + param[25] = ['分线物料追踪工位', branchMaterialTrackingStation] + param[26] = ['总线上线工位', busOnlineStation] + param[27] = ['总线被监测工位', busMonitoredStation] + param[28] = ['扫描枪类型', scanningGunType] + param[29] = ['工位类型', stationType] + param[30] = ['分线物料追踪工位数据文件连接', DFCBMTS] + param[31] = ['总线上线工位数据文件连接', BOSDFC] + param[32] = ['OpcServer', OpcServer] + param[33] = ['OpcServer_MIS', OpcServer_MIS] + param[34] = ['OpcServer_OPNAME', OpcServer_OPNAME] + param[35] = ['目标循环时间', TargetCycleTime] + param[36] = ['工件类型', WorkpieceType] + param[37] = ['工位基本操作指导', basicOperationInstructionsStation] + param[38] = ['工位基本指导图片', null] + param[39] = ['工位上下线类型', stationUpperLowerLineType] + param[40] = ['大屏幕代码', largeScreenCode] + param[41] = ['大屏幕显示产量端口', largeScreenDisplayOutputPort] + param[42] = ['大屏幕显示Andon大屏幕代码', AndonCode] + param[43] = ['大屏幕显示Andon端口', AndonPort] + param[44] = ['是否有打印机', isTherePrinter] + param[45] = ['打印机通讯端口', printerPort] + param[46] = ['工序号', processNo] + param[47] = ['工序名称', processName] + param[48] = ['是否有工位计算机', isThereComputer] + param[49] = ['是否有测量数据', isThereData] + param[50] = ['是否启用MES', enableMES] + param[51] = ['在线状态', onlineStatus] + param[52] = ['是否通过监控系统保存数据', whetherSaveData] + param[53] = ['是否监控', whetherMonitor] + param[54] = ['返修工位号', repairStationNo] + param[55] = ['工步属性', workStepAttribute] + param[56] = ['MesServerCode', MesServerCode] + param[57] = ['MesDll', MesDll] + param[58] = ['MesWebCode', MesWebCode] + param[59] = ['订单选择权限', orderSelectionPermission] + param[60] = ['服务器IP', theServerIP] + param[61] = ['Bar版本号', BarVersion] + param[62] = ['监控属性代码', monitoringAttributeCode] + param[63] = ['IP', IP] + param[64] = ['报警数', numberAlarms] + param[65] = ['质量组数', numberQualityGroups] + param[66] = ['导入类型', '1', 'int', '1'] + var Data = this.CreateData('12', '基础数据_工位信息维护_导入', param) const response = await this.ExecDatabase(Data) - if (response.data[0].result === '1') { - this.$notify.success(`${name}导入成功`) + const res = response.data + if (res.hasOwnProperty('output') === false) { + if (res[0].result === '0') { + this.$notify.error(`${stationNumber}导入失败`) + } } else { - this.$notify.error(`${name}导入失败`) + if (res.result[0].result === '0') { + this.$notify.error(`${stationNumber}导入失败`) + } + if (res.output[0].导入类型 === '2') { + this.$notify.warning(`${stationNumber}存在重复数据`) + } } } catch (e) { this.err++ @@ -457,5 +2007,24 @@ export default { diff --git a/src/views/EquipmentOperationAnalysis/CurrentEquipmentMaintenancePlan/index.vue b/src/views/EquipmentOperationAnalysis/CurrentEquipmentMaintenancePlan/index.vue index 1800c08..e90bd3f 100644 --- a/src/views/EquipmentOperationAnalysis/CurrentEquipmentMaintenancePlan/index.vue +++ b/src/views/EquipmentOperationAnalysis/CurrentEquipmentMaintenancePlan/index.vue @@ -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" diff --git a/src/views/EquipmentOperationAnalysis/EquipmentAlarmStatistics/index.vue b/src/views/EquipmentOperationAnalysis/EquipmentAlarmStatistics/index.vue index e8a5a67..f6bb7ec 100644 --- a/src/views/EquipmentOperationAnalysis/EquipmentAlarmStatistics/index.vue +++ b/src/views/EquipmentOperationAnalysis/EquipmentAlarmStatistics/index.vue @@ -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" diff --git a/src/views/EquipmentOperationAnalysis/EquipmentMaintenanceContent/index.vue b/src/views/EquipmentOperationAnalysis/EquipmentMaintenanceContent/index.vue index ebc7d57..478296d 100644 --- a/src/views/EquipmentOperationAnalysis/EquipmentMaintenanceContent/index.vue +++ b/src/views/EquipmentOperationAnalysis/EquipmentMaintenanceContent/index.vue @@ -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" diff --git a/src/views/EquipmentOperationAnalysis/EquipmentMaintenanceRecordManagement/index.vue b/src/views/EquipmentOperationAnalysis/EquipmentMaintenanceRecordManagement/index.vue index 91fdac5..54bc60c 100644 --- a/src/views/EquipmentOperationAnalysis/EquipmentMaintenanceRecordManagement/index.vue +++ b/src/views/EquipmentOperationAnalysis/EquipmentMaintenanceRecordManagement/index.vue @@ -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" diff --git a/src/views/EquipmentOperationAnalysis/Maintenancebasicequipmentinformation/index.vue b/src/views/EquipmentOperationAnalysis/Maintenancebasicequipmentinformation/index.vue index e1a4ba0..8e37937 100644 --- a/src/views/EquipmentOperationAnalysis/Maintenancebasicequipmentinformation/index.vue +++ b/src/views/EquipmentOperationAnalysis/Maintenancebasicequipmentinformation/index.vue @@ -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" diff --git a/src/views/ProcessManagement/AndonMaintenance/index.vue b/src/views/ProcessManagement/AndonMaintenance/index.vue index eef992b..003f2de 100644 --- a/src/views/ProcessManagement/AndonMaintenance/index.vue +++ b/src/views/ProcessManagement/AndonMaintenance/index.vue @@ -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" diff --git a/src/views/ProcessManagement/InterfaceModuleMaintenance/index.vue b/src/views/ProcessManagement/InterfaceModuleMaintenance/index.vue index dacc734..23ce1db 100644 --- a/src/views/ProcessManagement/InterfaceModuleMaintenance/index.vue +++ b/src/views/ProcessManagement/InterfaceModuleMaintenance/index.vue @@ -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" diff --git a/src/views/ProcessManagement/LabelLanguageMaintenance/index.vue b/src/views/ProcessManagement/LabelLanguageMaintenance/index.vue index 08e714e..dcf653c 100644 --- a/src/views/ProcessManagement/LabelLanguageMaintenance/index.vue +++ b/src/views/ProcessManagement/LabelLanguageMaintenance/index.vue @@ -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" diff --git a/src/views/ProcessManagement/MaterialVerificationMaintenance/index.vue b/src/views/ProcessManagement/MaterialVerificationMaintenance/index.vue index 1c5a6aa..3dffe6f 100644 --- a/src/views/ProcessManagement/MaterialVerificationMaintenance/index.vue +++ b/src/views/ProcessManagement/MaterialVerificationMaintenance/index.vue @@ -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" diff --git a/src/views/ProcessManagement/MessageMaintenance/index.vue b/src/views/ProcessManagement/MessageMaintenance/index.vue index aab6365..5486b85 100644 --- a/src/views/ProcessManagement/MessageMaintenance/index.vue +++ b/src/views/ProcessManagement/MessageMaintenance/index.vue @@ -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" diff --git a/src/views/ProcessManagement/StepContentMaintenance/index.vue b/src/views/ProcessManagement/StepContentMaintenance/index.vue index 8dae7aa..6dd855f 100644 --- a/src/views/ProcessManagement/StepContentMaintenance/index.vue +++ b/src/views/ProcessManagement/StepContentMaintenance/index.vue @@ -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" diff --git a/src/views/ProcessParameterMaintenance/MaintenanceTighteningPosition/index.vue b/src/views/ProcessParameterMaintenance/MaintenanceTighteningPosition/index.vue index 11f2b65..a82c48c 100644 --- a/src/views/ProcessParameterMaintenance/MaintenanceTighteningPosition/index.vue +++ b/src/views/ProcessParameterMaintenance/MaintenanceTighteningPosition/index.vue @@ -79,9 +79,9 @@ 全部清除 -
+
- +
@@ -574,7 +574,7 @@ export default { } /deep/.el-form-item{ - margin-bottom: 10px!important; + margin-bottom: 20px!important; margin-left: 10px; } diff --git a/src/views/ProcessParameterMaintenance/MeasurementRangeMaintenance/index.vue b/src/views/ProcessParameterMaintenance/MeasurementRangeMaintenance/index.vue index 92c8e99..5188c9d 100644 --- a/src/views/ProcessParameterMaintenance/MeasurementRangeMaintenance/index.vue +++ b/src/views/ProcessParameterMaintenance/MeasurementRangeMaintenance/index.vue @@ -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" diff --git a/src/views/ProcessParameterMaintenance/ProcessBeatMaintenance/index.vue b/src/views/ProcessParameterMaintenance/ProcessBeatMaintenance/index.vue index bc5565c..60843da 100644 --- a/src/views/ProcessParameterMaintenance/ProcessBeatMaintenance/index.vue +++ b/src/views/ProcessParameterMaintenance/ProcessBeatMaintenance/index.vue @@ -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" diff --git a/src/views/ProcessParameterMaintenance/VerificationMmaintenanceLine/index.vue b/src/views/ProcessParameterMaintenance/VerificationMmaintenanceLine/index.vue index 75bce54..75f11ec 100644 --- a/src/views/ProcessParameterMaintenance/VerificationMmaintenanceLine/index.vue +++ b/src/views/ProcessParameterMaintenance/VerificationMmaintenanceLine/index.vue @@ -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" diff --git a/src/views/PurchasingManagement/PurchaseOrder/index.vue b/src/views/PurchasingManagement/PurchaseOrder/index.vue index 679c56f..60af6a2 100644 --- a/src/views/PurchasingManagement/PurchaseOrder/index.vue +++ b/src/views/PurchasingManagement/PurchaseOrder/index.vue @@ -28,7 +28,7 @@
- +