diff --git a/src/api/ipAddress.js b/src/api/ipAddress.js index 8a7f707..2b1bc55 100644 --- a/src/api/ipAddress.js +++ b/src/api/ipAddress.js @@ -1,6 +1,3 @@ -// export const ip = 'http://localhost:8103' // 刘路加 -export const ip = 'http://localhost:8051' // 姜福壮的 -// export const ip = 'http://123.56.95.229:8102' // 云的 -// export const ip = 'http://192.168.8.124:8001' // 大柴现场的的 -// export const ip = 'http://127.0.0.1:8004' // 大柴现场的 +export const ip = 'http://localhost:8051' +// export const ip = 'http://124.220.15.242:8153' // 福田 diff --git a/src/assets/img/MESWORK.png b/src/assets/img/MESWORK.png new file mode 100644 index 0000000..b256955 Binary files /dev/null and b/src/assets/img/MESWORK.png differ diff --git a/src/views/BasicDataMaintenance/AlarmVariableMaintenance/index.vue b/src/views/BasicDataMaintenance/AlarmVariableMaintenance/index.vue index f131b9a..fe9e671 100644 --- a/src/views/BasicDataMaintenance/AlarmVariableMaintenance/index.vue +++ b/src/views/BasicDataMaintenance/AlarmVariableMaintenance/index.vue @@ -19,6 +19,7 @@ 查询 + 复制 - - + + + + + + - + + + + + + @@ -86,11 +96,13 @@ - + + + 确定 + + + + + + + + + + @@ -130,7 +160,16 @@ export default { } ], valueTypeValue: '9', + alarmType: [], + alarmTypeValue: '', dialogFormVisible: false, + dialogFormVisible4: false, + form4: { + engineTypeValue: '' + }, + rules4: { // 订单下发验证 + engineTypeValue: [{ required: true, message: '请选择', trigger: 'blur' }] + }, title: '', form: { tagID: '', @@ -148,7 +187,7 @@ export default { }, created() { this.getNumber() - this.searchTable() + this.getAlarmType() }, methods: { // 初始化获取产品型号 @@ -163,6 +202,7 @@ export default { } }).then(response => { if (response.data.length) { + this.dataTypeValue = response.data[0].工位号 for (let i = 0; i < response.data.length; i++) { this.dataType.push({ label: response.data[i].工位号, @@ -170,6 +210,29 @@ export default { }) } } + }).then(() => { + this.searchTable() + }) + }, // 初始化获取报警类型 + getAlarmType() { + this.alarmType = [] + request({ + url: '', + method: 'post', + data: { + type: '3', + name: `SELECT [ID], [报警类型] FROM [dbo].[MES_基本变量_报警类型]` + } + }).then(response => { + if (response.data.length) { + // console.log(response.data, 'response.data') + for (let i = 0; i < response.data.length; i++) { + this.alarmType.push({ + label: response.data[i].报警类型, + value: response.data[i].ID + }) + } + } }) }, searchTable() { @@ -238,6 +301,42 @@ export default { callOff() { this.dialogFormVisible = false }, + copyData(formName) { + if (this.tableData.length) { + if (this.$refs[formName] !== undefined) { + this.$refs[formName].resetFields() + } + this.dialogFormVisible4 = true + } else { + this.$message({ + message: '暂无可复制的数据!', + type: 'error' + }) + } + }, + callOff4() { + this.dialogFormVisible4 = false + }, + submitAdd4() { + var param = [] + param[0] = ['原始工位号', this.dataTypeValue] + param[1] = ['复制工位号', this.form4.engineTypeValue] + var Data = this.CreateData('12', '基础数据_报警变量维护_复制', param) + this.ExecDatabase(Data).then(response => { + if (response.data[0].result === '1') { + this.$message({ + message: '修改成功', + type: 'success' + }) + this.dataTypeValue = this.form4.engineTypeValue + this.searchTable() + this.dialogFormVisible4 = false + } else { + this.$message.error('修改失败!') + } + }) + this.dialogFormVisible = false + }, // 分页 handleSizeChange(val) { this.pageCurrent = 1 diff --git a/src/views/EquipmentOperationAnalysis/EquipmentMaintenanceContent/index.vue b/src/views/EquipmentOperationAnalysis/EquipmentMaintenanceContent/index.vue index 95b97eb..4aad77b 100644 --- a/src/views/EquipmentOperationAnalysis/EquipmentMaintenanceContent/index.vue +++ b/src/views/EquipmentOperationAnalysis/EquipmentMaintenanceContent/index.vue @@ -11,15 +11,15 @@ :value="item.value" size="mini"/> - 保养类型: - - - + + + + + + + + + 查询 增加 图片 @@ -40,7 +40,11 @@ style="width: 100%;max-height: 700px" border size="mini"> - + + +