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 @@
查询
+ 复制
-
-
+
- {{ scope.row.TagID }}
+ {{ scope.row.序号 }}
+
+
+
+
+
{{ scope.row.TagName }}
@@ -45,14 +50,19 @@
{{ scope.row.工位号 }}
-
+
- {{ scope.row.测量位置 }}
+ {{ scope.row.变量类型 }} {{ scope.row.变量地址 }}
+
+
+
+
+
- {{ scope.row.测量项目 }}
+ {{ scope.row.报警类型 }}
@@ -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">
-
+
+
+ {{ scope.row.序号 }}
+
+
{{ scope.row.设备编号 }}
@@ -48,12 +52,12 @@
- {{ scope.row.设备名称 }}
+ {{ scope.row.机床名称 }}
-
+
- {{ scope.row.点检表类型名称 }}
+ {{ scope.row.设备维护内容 }}
@@ -80,7 +84,7 @@
-
+
-
+
+
+
+
+
+
+
-
+
{{ scope.row.工位号 }}
-
-
- {{ scope.row.设备名称 }}
-
-
-
-
- {{ scope.row.设备编号 }}
-
-
+
+
+
+
+
+
+
+
+
+
@@ -44,6 +44,11 @@
+
+
+ {{ scope.row.操作时间 }}
+
+
@@ -766,14 +771,14 @@ export default {
}
#dianjianbiao {
/*.el-table td, .el-table th.is-leaf,.el-table--border, .el-table--group{*/
- /*border-color: black !important;*/
+ /*border-color: black !important;*/
/*}*/
/*.el-table--border::after, .el-table--group::after, .el-table::before{*/
- /*background-color: black !important;*/
+ /*background-color: black !important;*/
/*}*/
/*th {*/
- /*background: white !important;*/
- /*color: black !important;*/
+ /*background: white !important;*/
+ /*color: black !important;*/
/*}*/
}
diff --git a/src/views/QualityAssurance/AssemblyQualitydataQuery/index.vue b/src/views/QualityAssurance/AssemblyQualitydataQuery/index.vue
index ab4ca95..6ff6e27 100644
--- a/src/views/QualityAssurance/AssemblyQualitydataQuery/index.vue
+++ b/src/views/QualityAssurance/AssemblyQualitydataQuery/index.vue
@@ -249,7 +249,7 @@ export default {
value: 2
}
], // 是否合格
- isQualifiedValue: 1, // 是否合格
+ isQualifiedValue: '', // 是否合格
dateTime: '', // 时间
loading: false, // 时间
tableData: [], // 时间
@@ -331,8 +331,10 @@ export default {
isQualifiedValue = this.isQualifiedValue
}
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['合格标志', isQualifiedValue]
var Data = this.CreateData('11', '测量数据合格索引_订单号_查询 ', param)
this.ExecDatabase(Data).then(response => {
@@ -352,8 +354,10 @@ export default {
this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -377,8 +381,10 @@ export default {
this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -398,8 +404,10 @@ export default {
getBatchBarcode() {
this.batchBarcode = []
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['工位号', this.stationNumberValue]
var Data = this.CreateData('11', '物料数据_视图_物料条码批次号_查询 ', param)
this.ExecDatabase(Data).then(response => {
@@ -498,8 +506,10 @@ export default {
this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
diff --git a/src/views/QualityAssurance/InquiryTransitInformation/index.vue b/src/views/QualityAssurance/InquiryTransitInformation/index.vue
index c66ec26..c18616a 100644
--- a/src/views/QualityAssurance/InquiryTransitInformation/index.vue
+++ b/src/views/QualityAssurance/InquiryTransitInformation/index.vue
@@ -252,8 +252,10 @@ export default {
getOrderNumber() {
this.orderNumber = []
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
var Data = this.CreateData('11', '测量数据发动机在线状态_订单号_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.orderNumberValue = response.data[0].订单号 }
@@ -270,8 +272,10 @@ export default {
var orderNumberValue_check
this.orderNumberValue ? orderNumberValue_check = 1 : orderNumberValue_check = 0
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['订单号_ischeck', orderNumberValue_check]
param[3] = ['订单号', this.orderNumberValue]
var Data = this.CreateData('11', '测量数据发动机在线状态_发动机号_查询 ', param)
@@ -294,8 +298,10 @@ export default {
this.stationNumberValueN ? stationNumberValueN_check = 1 : (stationNumberValueN_check = 0, this.stationNumberValueN = '')
this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['工位号N_ischeck', stationNumberValueN_check]
param[3] = ['工位号N', this.stationNumberValueN]
param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
@@ -326,8 +332,10 @@ export default {
this.stationNumberValueN ? stationNumberValueN_check = 1 : (stationNumberValueN_check = 0, this.stationNumberValueN = '')
this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['工位号N_ischeck', stationNumberValueN_check]
param[3] = ['工位号N', this.stationNumberValueN]
param[4] = ['发动机号_check', assemblyNumberValue_check]
diff --git a/src/views/QualityAssurance/LineItemQuery/index.vue b/src/views/QualityAssurance/LineItemQuery/index.vue
index fcdac02..b94a71a 100644
--- a/src/views/QualityAssurance/LineItemQuery/index.vue
+++ b/src/views/QualityAssurance/LineItemQuery/index.vue
@@ -317,8 +317,10 @@ export default {
this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -365,8 +367,10 @@ export default {
getBatchBarcode() {
this.batchBarcode = []
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['工位号', this.stationNumberValue]
console.log(param, 'param')
var Data = this.CreateData('11', '物料数据分线_视图_物料条码批次号_查询 ', param)
@@ -406,8 +410,10 @@ export default {
this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
@@ -444,8 +450,10 @@ export default {
this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
diff --git a/src/views/QualityAssurance/LineQualityQuery/index.vue b/src/views/QualityAssurance/LineQualityQuery/index.vue
index 2701a18..0708363 100644
--- a/src/views/QualityAssurance/LineQualityQuery/index.vue
+++ b/src/views/QualityAssurance/LineQualityQuery/index.vue
@@ -325,8 +325,10 @@ export default {
getOrderNumber() {
this.orderNumber = []
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
var Data = this.CreateData('11', '测量数据发动机在线状态_订单号_查询 ', param)
this.ExecDatabase(Data).then(response => {
if (response.data.length) { this.orderNumberValue = response.data[0].订单号 }
@@ -345,8 +347,10 @@ export default {
this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -370,8 +374,10 @@ export default {
this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -391,16 +397,18 @@ export default {
getBatchBarcode() {
this.batchBarcode = []
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['工位号', this.stationNumberValue]
var Data = this.CreateData('11', '物料数据分线_视图_物料条码批次号_查询 ', param)
this.ExecDatabase(Data).then(response => {
- if (response.data.length) { this.batchBarcodeValue = response.data[0].物料条码 }
+ if (response.data.length) { this.batchBarcodeValue = response.data[0].物料条码批次 }
for (let i = 0; i < response.data.length; i++) {
this.batchBarcode.push({
- label: response.data[i].物料条码,
- value: response.data[i].物料条码
+ label: response.data[i].物料条码批次,
+ value: response.data[i].物料条码批次
})
}
})
@@ -449,8 +457,10 @@ export default {
this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
@@ -491,8 +501,10 @@ export default {
this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
diff --git a/src/views/QualityAssurance/MaterialDataQuery/index.vue b/src/views/QualityAssurance/MaterialDataQuery/index.vue
index 4da5e47..5cdc8d2 100644
--- a/src/views/QualityAssurance/MaterialDataQuery/index.vue
+++ b/src/views/QualityAssurance/MaterialDataQuery/index.vue
@@ -307,8 +307,10 @@ export default {
this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -332,8 +334,10 @@ export default {
this.engineTypeValue ? engineTypeValue_check = 1 : engineTypeValue_check = 0
this.stationNumberValue ? stationNumberValue_check = 1 : stationNumberValue_check = 0
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['工位号_ischeck', stationNumberValue_check]
@@ -353,8 +357,10 @@ export default {
getBatchBarcode() {
this.batchBarcode = []
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['工位号', this.stationNumberValue]
var Data = this.CreateData('11', '物料数据_视图_物料条码批次号_查询 ', param)
this.ExecDatabase(Data).then(response => {
@@ -410,8 +416,10 @@ export default {
this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
@@ -448,8 +456,10 @@ export default {
this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
this.batchBarcodeValue ? batchBarcodeValue_check = 1 : (batchBarcodeValue_check = 0, this.batchBarcodeValue = '')
var param = []
- param[0] = ['开始时间', this.dateTime[0]]
- param[1] = ['结束时间', this.dateTime[1]]
+ param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
+ param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
+ // param[0] = ['开始时间', this.dateTime[0]]
+ // param[1] = ['结束时间', this.dateTime[1]]
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['发动机号_ischeck', assemblyNumberValue_check]
@@ -462,7 +472,7 @@ export default {
param[11] = ['二维码', this.traceabilityCode]
param[12] = ['物料条码批次_ischeck', batchBarcodeValue_check]
param[13] = ['物料条码批次', this.batchBarcodeValue]
- var Data = this.CreateData('2001', '物料数据查询_报表新', param)
+ var Data = this.CreateData('2001', '物料数据查询_报表', param)
this.exportExcel_NPOI(Data)
} else {
this.$message.warning('暂无数据')
diff --git a/src/views/RecipeManagement/ElectricalComponentParameters/index.vue b/src/views/RecipeManagement/ElectricalComponentParameters/index.vue
index e7a2902..c4e2d8c 100644
--- a/src/views/RecipeManagement/ElectricalComponentParameters/index.vue
+++ b/src/views/RecipeManagement/ElectricalComponentParameters/index.vue
@@ -9,7 +9,7 @@
:label="item.label"
:value="item.value"/>
- 查询
+ 查询
新增
导入
+
+
+ {{ scope.row.recipe_id }}
+
+
{{ scope.row.MachineName }}
@@ -83,6 +88,9 @@
:value="item.value"/>
+
+
+
@@ -147,6 +155,7 @@ export default {
dataTypeValue: '',
dataType: [],
tableData: [],
+ tableData1: [],
activeValue: '',
active: [{
label: '启用',
@@ -164,6 +173,7 @@ export default {
comments: '',
ID: '',
active: '',
+ recipe_id: '',
dataTypeValue: ''
},
rules: { // 表单验证规则
@@ -179,6 +189,7 @@ export default {
created() {
this.getNumber()
this.searchTable()
+ this.searchTable1()
},
methods: {
getNumber() {
@@ -231,6 +242,26 @@ export default {
console.log(this.tableData, 'this.tableData')
})
},
+ searchTable1() {
+ this.tableData1 = []
+ var param = []
+ var Data = this.CreateData('11', 'Recipe_Machine_Query_NEW', param)
+ this.ExecDatabase(Data).then(response => {
+ console.log(response, 66)
+ if (response.data.length !== 0) {
+ this.tableData1 = response.data
+ }
+ console.log(this.tableData1, 'this.tableData1')
+ })
+ },
+ checkData(val) {
+ for (let i = 0; i < this.tableData1.length; i++) {
+ if (Number(this.tableData1[i].recipe_id) === Number(val)) {
+ this.$message.error('数据已存在,请不要输入重复数据!')
+ this.form.recipe_id = ''
+ }
+ }
+ },
addShiftTable(formName) {
if (this.$refs[formName] !== undefined) {
this.$refs[formName].resetFields()
@@ -242,6 +273,7 @@ export default {
this.form.comments = ''
this.form.dataTypeValue = ''
this.form.active = ''
+ this.form.recipe_id = ''
this.dialogFormVisible = true
},
submitAdd(formName) {
@@ -253,6 +285,7 @@ export default {
param[2] = ['num', this.form.value]
param[3] = ['descript', this.form.descript]
param[4] = ['comments', this.form.comments]
+ param[5] = ['recipe_id', this.form.recipe_id]
var Data = this.CreateData('12', 'Recipe_Machine_Add', param)
this.ExecDatabase(Data).then(response => {
console.log(response)
@@ -263,6 +296,7 @@ export default {
})
this.dialogFormVisible = false
this.searchTable()
+ this.searchTable1()
} else {
this.$message.error('增加失败!')
}
@@ -289,6 +323,7 @@ export default {
this.form.comments = row.Comments
this.form.ID = row.id
this.form.dataTypeValue = row.MachineNo
+ this.form.recipe_id = row.recipe_id
this.title = '编辑'
this.dialogFormVisible = true
},
@@ -303,6 +338,7 @@ export default {
param[4] = ['comments', this.form.comments]
param[5] = ['id', this.form.ID]
param[6] = ['active', this.form.active]
+ param[7] = ['recipe_id', this.form.recipe_id]
var Data = this.CreateData('12', 'Recipe_Machine_Update_NEW', param)
this.ExecDatabase(Data).then(response => {
if (response.data[0].result === '1') {
@@ -311,6 +347,7 @@ export default {
type: 'success'
})
this.searchTable()
+ this.searchTable1()
} else {
this.$message.error('修改失败!')
}
@@ -338,6 +375,7 @@ export default {
if (response.data[0].result === '1') {
this.$message.success('删除成功')
this.searchTable()
+ this.searchTable1()
} else {
this.$message.error('删除失败')
}
@@ -380,20 +418,22 @@ export default {
let name,
value,
descript,
- comments
+ comments,
+ recipe_id
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 : ''
+ recipe_id = this.worksheet[j][`E${attr}`] ? this.worksheet[j][`E${attr}`].v : ''
console.log(name, value, descript, comments)
if (!name) {
break
} else {
if (name) {
await sleep(50)
- await this.insertToSQL(name, value, descript, comments)
+ await this.insertToSQL(name, value, descript, comments, recipe_id)
} else {
this.loading = false
this.$notify.error(`请确认导入文件是否正确`)
@@ -407,6 +447,7 @@ export default {
}
this.loading = false
this.searchTable()
+ this.searchTable1()
} catch (e) {
this.err++
this.loading = false
@@ -414,13 +455,14 @@ export default {
console.log(`导入数据错误${e}`)
}
},
- async insertToSQL(name, value, descript, comments) {
+ async insertToSQL(name, value, descript, comments, recipe_id) {
try {
var param = []
param[0] = ['name', name]
param[1] = ['num', value]
param[2] = ['descript', descript]
param[3] = ['comments', comments]
+ param[4] = ['recipe_id', recipe_id]
var Data = this.CreateData('12', 'Recipe_Machine_Excel', param)
const response = await this.ExecDatabase(Data)
if (response.data[0].result === '1') {
diff --git a/src/views/RecipeManagement/RecipeManagementNew/index.vue b/src/views/RecipeManagement/RecipeManagementNew/index.vue
new file mode 100644
index 0000000..4f6c5e5
--- /dev/null
+++ b/src/views/RecipeManagement/RecipeManagementNew/index.vue
@@ -0,0 +1,1998 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 配方增加
+ 配方调整
+ 配方拷贝
+
+
+
+ {{ scope.row.plant }}
+
+
+
+
+ {{ scope.row.work_center }}
+
+
+
+
+ {{ scope.row.op_no }}
+
+
+
+
+ {{ scope.row.recipe_no }}
+
+
+
+
+ {{ scope.row.seq_no }}
+
+
+
+
+ {{ scope.row.para_name }}
+
+
+
+
+ {{ scope.row.para_value }}
+
+
+
+
+ {{ scope.row.para_comments }}
+
+
+
+
+ {{ scope.row.create_user }}
+
+
+
+
+ {{ scope.row.create_date }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 序号
+ 动作流程
+ 动作参数
+ 参数说明
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 2
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 4
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 5
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 6
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 7
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 8
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 9
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 10
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+ 序号
+ 动作流程
+ 动作参数
+ 参数说明
+
+
+
+ 11
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 12
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 13
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 14
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 15
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 16
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 17
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 18
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 19
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+ 20
+
+
+
+
+
+
+
+
+
+ {{ item.value }}
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 全选
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/WorkOrderManagement/ReleaseOfProductionPlan/index.vue b/src/views/WorkOrderManagement/ReleaseOfProductionPlan/index.vue
index a302047..df95ba8 100644
--- a/src/views/WorkOrderManagement/ReleaseOfProductionPlan/index.vue
+++ b/src/views/WorkOrderManagement/ReleaseOfProductionPlan/index.vue
@@ -79,15 +79,15 @@
{{ scope.row.完成数量 }}
-
-
- 已结束
- 生产中
- 未上线
- 未完成
- 已超额
-
-
+
+
+
+
+
+
+
+
+
{{ scope.row.计划开始时间 }}
@@ -101,23 +101,29 @@
修改
删除
订单下发
+ 取消下达
@@ -158,13 +164,6 @@
size="small"
placeholder="请输入计划数量"/>
-
-
-
-
-
-
${row.订单号}
吗?`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ dangerouslyUseHTMLString: true
+ }).then(() => {
+ var param = []
+ param[0] = ['MID', row.MID]
+ var Data = this.CreateData('12', 'MES_计划BOM_发动机订单计划_订单下发取消', param)
+ this.ExecDatabase(Data).then(response => {
+ if (response.data[0].result === '1') {
+ this.$message({
+ message: '订单下发取消成功!',
+ type: 'success'
+ })
+ this.pageCurrent = 1
+ this.pageSize = 15
+ this.searchOrder()
+ } else {
+ this.$message.error('订单下发取消失败!')
+ }
+ })
+ })
+ },
handleAdd() {
if (this.tableData.length === 0) {
this.$message.error('内容为空')
diff --git a/src/views/WorkOrderManagement/ScheduleStatusChange/index.vue b/src/views/WorkOrderManagement/ScheduleStatusChange/index.vue
index 77726ac..2e1f319 100644
--- a/src/views/WorkOrderManagement/ScheduleStatusChange/index.vue
+++ b/src/views/WorkOrderManagement/ScheduleStatusChange/index.vue
@@ -93,11 +93,7 @@
- 已结束
- 生产中
- 未上线
- 未完成
- 已超额
+ {{ scope.row.订单状态名称 }}
@@ -191,15 +187,6 @@ export default {
this.searchOrder()
},
methods: {
- // 表格颜色变化
- tableRowClassName({ row, rowIndex }) {
- // console.log(row, rowIndex)
- if (rowIndex % 2 === 0) {
- return 'black'
- } else {
- return 'red'
- }
- },
// handleSelectionChange(val) {
// if (val.length > 0) {
// if (val.length > 1) {
@@ -398,6 +385,20 @@ export default {
this.$message.warning('暂无数据')
}
},
+ tableRowClassName({ row, rowIndex }) {
+ if (row.订单状态 === 2) {
+ return 'no-accept'
+ } else if (row.订单状态 === 1) {
+ return 'assembly'
+ } else if (row.订单状态 === 0) {
+ return 'complete'
+ } else if (row.订单状态 === 3) {
+ return 'suspend'
+ }
+ if (Number(row.订单状态) === 4) {
+ return 'is-group'
+ }
+ },
// 分页
handleSizeChange(val) {
this.pageCurrent = 1
@@ -411,7 +412,23 @@ export default {
}
}
-
+
diff --git a/src/views/layout_HL/components/AppMain.vue b/src/views/layout_HL/components/AppMain.vue
new file mode 100644
index 0000000..63ad836
--- /dev/null
+++ b/src/views/layout_HL/components/AppMain.vue
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/layout_HL/components/Navbar.vue b/src/views/layout_HL/components/Navbar.vue
new file mode 100644
index 0000000..55de4c3
--- /dev/null
+++ b/src/views/layout_HL/components/Navbar.vue
@@ -0,0 +1,455 @@
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+ 主页
+
+
+
+ 退出
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/layout_HL/components/Sidebar/Item.vue b/src/views/layout_HL/components/Sidebar/Item.vue
new file mode 100644
index 0000000..b515f61
--- /dev/null
+++ b/src/views/layout_HL/components/Sidebar/Item.vue
@@ -0,0 +1,29 @@
+
diff --git a/src/views/layout_HL/components/Sidebar/SidebarItem.vue b/src/views/layout_HL/components/Sidebar/SidebarItem.vue
new file mode 100644
index 0000000..ab3b050
--- /dev/null
+++ b/src/views/layout_HL/components/Sidebar/SidebarItem.vue
@@ -0,0 +1,104 @@
+
+
+
+
+
diff --git a/src/views/layout_HL/components/Sidebar/SidebarItem2.vue b/src/views/layout_HL/components/Sidebar/SidebarItem2.vue
new file mode 100644
index 0000000..51de583
--- /dev/null
+++ b/src/views/layout_HL/components/Sidebar/SidebarItem2.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
diff --git a/src/views/layout_HL/components/Sidebar/index.vue b/src/views/layout_HL/components/Sidebar/index.vue
new file mode 100644
index 0000000..99467dc
--- /dev/null
+++ b/src/views/layout_HL/components/Sidebar/index.vue
@@ -0,0 +1,69 @@
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/layout_HL/components/TagsView.vue b/src/views/layout_HL/components/TagsView.vue
new file mode 100644
index 0000000..511a536
--- /dev/null
+++ b/src/views/layout_HL/components/TagsView.vue
@@ -0,0 +1,334 @@
+
+
+
+
+ {{ tag.title }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/layout_HL/components/index.js b/src/views/layout_HL/components/index.js
new file mode 100644
index 0000000..9fc98d6
--- /dev/null
+++ b/src/views/layout_HL/components/index.js
@@ -0,0 +1,4 @@
+export { default as Navbar } from './Navbar'
+export { default as Sidebar } from './Sidebar'
+export { default as AppMain } from './AppMain'
+export { default as TagsView } from './TagsView'
diff --git a/src/views/layout_HL/mixin/ResizeHandler.js b/src/views/layout_HL/mixin/ResizeHandler.js
new file mode 100644
index 0000000..7bd91b7
--- /dev/null
+++ b/src/views/layout_HL/mixin/ResizeHandler.js
@@ -0,0 +1,52 @@
+import store from '@/store'
+
+const { body } = document
+const WIDTH = 1024
+const RATIO = 3
+
+export default {
+ watch: {
+ $route(route) {
+ if (this.device === 'mobile' && this.sidebar.opened) {
+ store.dispatch('CloseSideBar', { withoutAnimation: false })
+ }
+ }
+ },
+ beforeMount() {
+ window.addEventListener('resize', this.resizeHandler)
+ },
+ mounted() {
+ const isMobile = this.isMobile()
+ const isSmallDesktop = this.isSmallDesktop()
+ if (isSmallDesktop) {
+ store.dispatch('CloseSideBar', { withoutAnimation: false })
+ }
+ if (isMobile) {
+ store.dispatch('ToggleDevice', 'mobile')
+ store.dispatch('CloseSideBar', { withoutAnimation: true })
+ }
+ },
+ methods: {
+ isMobile() {
+ const rect = body.getBoundingClientRect()
+ return rect.width - RATIO < WIDTH
+ },
+ isSmallDesktop() {
+ const rect = body.getBoundingClientRect()
+ return rect.width - RATIO < 1300
+ },
+ resizeHandler() {
+ if (!document.hidden) {
+ const isMobile = this.isMobile()
+ const isSmallDesktop = this.isSmallDesktop()
+ store.dispatch('ToggleDevice', isMobile ? 'mobile' : 'desktop')
+ if (isSmallDesktop) {
+ store.dispatch('CloseSideBar', { withoutAnimation: false })
+ }
+ if (isMobile) {
+ store.dispatch('CloseSideBar', { withoutAnimation: true })
+ }
+ }
+ }
+ }
+}
diff --git a/static/MESWORK.png b/static/MESWORK.png
new file mode 100644
index 0000000..b256955
Binary files /dev/null and b/static/MESWORK.png differ
diff --git a/static/config.js b/static/config.js
index f409adf..1e18063 100644
--- a/static/config.js
+++ b/static/config.js
@@ -4,8 +4,8 @@ export const name1_config = `OP1000`
export const name3_config = `OP2000`
export const name4_config = `OP9999`
-// var url = `http://192.168.1.27:8010`
var url = `http://localhost:8100`
+// var url = `http://124.220.15.242:8104`
export const readFile_config = url + `/webpage/file/` // invoice
export const readImg_config = url + `/webpage/img/` // delivery/MS/performancebond