+
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/src/views/databoard/wholePlant/YieldRate.vue b/src/views/databoard/wholePlant/YieldRate.vue
index 6c82ae63..fcf68e55 100644
--- a/src/views/databoard/wholePlant/YieldRate.vue
+++ b/src/views/databoard/wholePlant/YieldRate.vue
@@ -1,45 +1,133 @@
-
-
\ No newline at end of file
diff --git a/src/views/databoard/wholePlant/index.vue b/src/views/databoard/wholePlant/index.vue
index dd9cdf37..6591c61b 100644
--- a/src/views/databoard/wholePlant/index.vue
+++ b/src/views/databoard/wholePlant/index.vue
@@ -107,7 +107,7 @@ export default {
screenfull.toggle(this.$refs.wholePlantContainerB)
},
resetSize() {
- let wholePlantContainerBox = document.querySelector('#wholePlantContainer')
+ let wholePlantContainerBox = document.getElementById('wholePlantContainer')
let rw = parseFloat(window.innerWidth)
let rh = parseFloat(window.innerHeight)
let bw = parseFloat(wholePlantContainerBox.style.width)
@@ -123,10 +123,10 @@ export default {
console.log('非全屏')
console.log(this.$store.state.app.sidebar.opened)
if (this.$store.state.app.sidebar.opened) {
- wx = (rw-264) / bw
+ wx = (rw-280) / bw
hx = (rh-116) / bh
}else{
- wx = (rw-78) / bw
+ wx = (rw-85) / bw
hx = (rh-116) / bh
}
}
diff --git a/src/views/energy/base/energyQuantityManual/components/InputArea.vue b/src/views/energy/base/energyQuantityManual/components/InputArea.vue
new file mode 100644
index 00000000..0a3a83fc
--- /dev/null
+++ b/src/views/energy/base/energyQuantityManual/components/InputArea.vue
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/energy/base/energyQuantityManual/components/SelectArea.vue b/src/views/energy/base/energyQuantityManual/components/SelectArea.vue
new file mode 100644
index 00000000..2f573d6d
--- /dev/null
+++ b/src/views/energy/base/energyQuantityManual/components/SelectArea.vue
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue b/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
index 1dda33d5..d211ed01 100644
--- a/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
+++ b/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
@@ -13,33 +13,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue b/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
index 59b9c492..89956b44 100644
--- a/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
+++ b/src/views/quality/base/basicData/qualityInspectionBoxBtn/index.vue
@@ -104,7 +104,7 @@ export default {
label: '工段',
},
{
- prop: 'inspectionDetContent',
+ prop: 'inspectionInfoList',
label: '检测内容',
}
],
@@ -133,17 +133,23 @@ export default {
// this.getList();
},
methods: {
- /** 查询列表 */
- // getList() {
- // this.loading = true;
- // // 执行查询
- // getQualityInspectionBoxBtnPage(this.listQuery).then((response) => {
- // this.list = response.data.list;
- // this.total = response.data.total;
- // this.loading = false;
- // });
- // },
- /** 表单重置 */
+ getDataList() {
+ this.dataListLoading = true;
+ this.urlOptions.getDataListURL(this.listQuery).then(response => {
+ this.tableData = response.data.map((item) => {
+ // console.log(item);
+ return {
+ inspectionInfoList: item.inspectionInfoList.toString(),
+ productionLineId:item.productionLineId,
+ productionLineName:item.productionLineName,
+ sectionId: item.sectionId,
+ sectionName: item.sectionName
+ }
+ })
+ this.listQuery.total = response.data.total;
+ this.dataListLoading = false;
+ });
+ },
reset() {
this.form = {
id: null,
@@ -156,6 +162,26 @@ export default {
};
this.resetForm('form');
},
+ deleteHandle(id, name, index, data) {
+ this.$confirm(`确认要删除产线名为${data.productionLineName}的数据项?`, "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.urlOptions.deleteURL(id).then(({ data }) => {
+ this.$message({
+ message: "操作成功",
+ type: "success",
+ duration: 1500,
+ onClose: () => {
+ this.getDataList();
+ },
+ });
+ });
+ })
+ .catch(() => { });
+ },
buttonClick(val) {
switch (val.btnName) {
case 'search':
diff --git a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
index 774bd37f..a7959590 100644
--- a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
+++ b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
@@ -1,13 +1,13 @@
-
-
+
+
{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
@@ -90,6 +90,18 @@
+
+
+
+
+
+
+
+
+
+
@@ -245,6 +257,7 @@ export default {
methods: {
judgeValue(val, minValue, maxValue, index) {
if (val >= minValue && val <= maxValue) {
+ console.log(val)
this.dataForm.checkValueList[index].showIcon = true
this.dataForm.checkValueList[index].isStandard = true
} else {
@@ -252,6 +265,10 @@ export default {
this.dataForm.checkValueList[index].isStandard = false
}
},
+ handleClose() {
+ this.ingredientList = undefined
+ console.log(222222222);
+ },
dataFormSubmit() {
this.$refs["dataForm"].validate((valid) => {
if (!valid) {
@@ -288,7 +305,9 @@ export default {
Promise.all(array).then(res => {
console.log(res)
this.visible = false;
+ this.$modal.msgSuccess("修改成功");
this.$emit("refreshDataList");
+ this.ingredientList = []
}).catch(error => {
// 如果任何一个请求失败，将会进入这个 catch 块
console.log(error)
@@ -326,6 +345,7 @@ export default {
Promise.all(array).then(res => {
this.$modal.msgSuccess("新增成功");
this.visible = false;
+ this.ingredientList= []
this.$emit("refreshDataList");
}).catch(error => {
// 如果任何一个请求失败，将会进入这个 catch 块
@@ -434,6 +454,7 @@ export default {
init(id, isdetail) {
this.initData()
this.getDict()
+ this.ingredientList = []
this.isdetail = isdetail || false;
this.dataForm.id = id || undefined;
this.visible = true;
@@ -445,7 +466,6 @@ export default {
this.$nextTick(() => {
this.$refs['dataForm'].resetFields();
-
if (this.dataForm.id) {
// 获取产品详情
let valueList = []
@@ -455,37 +475,59 @@ export default {
materialId: response.data.materialId
}).then((res) => {
console.log(res.data);
- this.ingredientList = res.data
- valueList = this.ingredientList.map((ele) => {
+ let arr = res.data
+ valueList = arr.map((ele) => {
// console.log(ele)
return {
+ checkDetId:ele.id,
maxValue: ele.maxValue,
minValue: ele.minValue
}
})
+ console.log(valueList);
getQualityHotMaterialDetList({
mainId: response.data.id
}).then((result) => {
+ this.ingredientList = result.data.map((ele) => {
+ return {
+ name: ele.checkName,
+ id: ele.id,
+ checkDetId: ele.checkDetId,
+ checkValue: ele.checkValue,
+ maxValue:null,
+ minValue: null
+ }
+ })
+ console.log(this.ingredientList);
this.dataForm.checkValueList = result.data.map((ele) => {
return {
mainId: ele.mainId,
id: ele.id,
- checkDetId: ele.id,
+ checkDetId: ele.checkDetId,
checkValue: ele.checkValue,
isStandard: true,
showIcon: false,
}
})
- valueList.forEach((ele,index) => {
- console.log(ele);
- if (this.dataForm.checkValueList[index].checkValue >= ele.minValue && this.dataForm.checkValueList[index].checkValue <= ele.maxValue) {
- this.dataForm.checkValueList[index].showIcon = true
- this.dataForm.checkValueList[index].isStandard = true
- } else {
- this.dataForm.checkValueList[index].showIcon = true
- this.dataForm.checkValueList[index].isStandard = false
+ this.ingredientList.forEach((ele, i) => {
+ valueList.forEach((item, index) => {
+ if (ele.checkDetId == item.checkDetId) {
+ this.ingredientList[i].minValue = item.minValue
+ this.ingredientList[i].maxValue = item.maxValue
}
- // })
+ })
+ })
+ valueList.forEach((ele, index) => {
+ this.dataForm.checkValueList.forEach((item, i) => {
+ if (ele.checkDetId == item.checkDetId && item.checkValue >= ele.minValue && item.checkValue <= ele.maxValue) {
+ console.log(1111)
+ item.showIcon = true
+ item.isStandard = true
+ } else {
+ item.showIcon = true
+ item.isStandard = false
+ }
+ })
})
})
});
@@ -501,7 +543,8 @@ export default {
},
goback() {
this.$emit('refreshDataList');
- this.visible = false;
+ this.visible = false
+ this.ingredientList = []
// this.initData();
},
goEdit() {
diff --git a/src/views/quality/base/qualityHotMaterial/index.vue b/src/views/quality/base/qualityHotMaterial/index.vue
index b3d29c8e..554aaedb 100644
--- a/src/views/quality/base/qualityHotMaterial/index.vue
+++ b/src/views/quality/base/qualityHotMaterial/index.vue
@@ -53,8 +53,9 @@ const tableProps = [
label: '取样人'
},
{
- prop: 'appearance',
- label: '是否合格'
+ prop: 'checkResult',
+ label: '是否合格',
+ filter: (val) => val == false ? '不合格' : '合格' ,
},
{
prop: 'materialGrade',
@@ -157,6 +158,26 @@ export default {
this.dataListLoading = false;
});
},
+ deleteHandle(id, name, index, data) {
+ this.$confirm(`确认要删除序号为${index}的数据项?`, "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.urlOptions.deleteURL(id).then(({ data }) => {
+ this.$message({
+ message: "操作成功",
+ type: "success",
+ duration: 1500,
+ onClose: () => {
+ this.getDataList();
+ },
+ });
+ });
+ })
+ .catch(() => { });
+ },
async getDict() {
// 物料列表
const res = await getHotMaterialAllList();
diff --git a/src/views/quality/base/qualityScrapDet/index.vue b/src/views/quality/base/qualityScrapDet/index.vue
index 6e9276aa..d8eb27d6 100644
--- a/src/views/quality/base/qualityScrapDet/index.vue
+++ b/src/views/quality/base/qualityScrapDet/index.vue
@@ -150,6 +150,26 @@ export default {
// 物料列表
const res = await getList();
this.formConfig[1].selectOptions = res.data;
+ },
+ deleteHandle(id, name, index,data) {
+ this.$confirm(`确认要删除报废原因名为${data.content}的数据项?`, "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.urlOptions.deleteURL(id).then(({ data }) => {
+ this.$message({
+ message: "操作成功",
+ type: "success",
+ duration: 1500,
+ onClose: () => {
+ this.getDataList();
+ },
+ });
+ });
+ })
+ .catch(() => { });
},
buttonClick(val) {
switch (val.btnName) {
diff --git a/src/views/quality/base/qualityScrapLog/basic-page.js b/src/views/quality/base/qualityScrapLog/basic-page.js
new file mode 100644
index 00000000..a7c9f3fa
--- /dev/null
+++ b/src/views/quality/base/qualityScrapLog/basic-page.js
@@ -0,0 +1,175 @@
+/*
+ * @Author: zhp
+ * @Date: 2024-01-17 16:59:30
+ * @LastEditTime: 2024-01-17 16:59:30
+ * @LastEditors: zhp
+ * @Description:
+ */
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: zhp
+ * @LastEditTime: 2024-01-10 10:29:29
+ * @Description:
+ */
+export default {
+ data() {
+ /* eslint-disable */
+ return {
+ urlOptions: {
+ getDataListURL: '',
+ deleteURL: '',
+ statusUrl: '',
+ exportURL: ''
+ },
+ tableData: [],
+ listQuery: {
+ pageSize: 10,
+ pageNo: 1,
+ total: 1,
+ },
+ exportLoading: false,
+ dataListLoading: false,
+ addOrEditTitle: '',
+ addOrUpdateVisible: false,
+ }
+ },
+ created() {
+ },
+ mounted() {
+ // this.getDataList()
+ },
+ methods: {
+ // 获取数据列表
+ getDataList() {
+ this.dataListLoading = true;
+ this.urlOptions.getDataListURL(this.listQuery).then(response => {
+ this.tableData = response.data.list;
+ this.listQuery.total = response.data.total;
+ this.dataListLoading = false;
+ });
+ },
+ // 每页数
+ sizeChangeHandle(val) {
+ this.listQuery.pageSize = val;
+ this.listQuery.pageNo = 1;
+ this.getDataList();
+ },
+ // 当前页
+ currentChangeHandle(val) {
+ this.listQuery.pageNo = val;
+ this.getDataList();
+ },
+ // 新增 / 修改
+ addOrUpdateHandle(id) {
+ this.addOrUpdateVisible = true;
+ this.$nextTick(() => {
+ this.$refs.addOrUpdate.init(id);
+ });
+ },
+ cancel(id) {
+ this.$refs["popover-" + id].showPopper = false;
+ },
+ //改变状态
+ changeStatus(id) {
+ this.$http
+ .post(this.urlOptions.statusUrl, { id })
+ .then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg);
+ }
+ this.$refs["popover-" + id].showPopper = false;
+ this.$message({
+ message: this.$t("prompt.success"),
+ type: "success",
+ duration: 500,
+ onClose: () => {
+ this.getDataList();
+ },
+ });
+ })
+ .catch(() => { });
+ },
+ //tableBtn点击
+ handleClick(val) {
+ if (val.type === "edit") {
+ this.addOrUpdateVisible = true;
+ this.addOrEditTitle = "编辑";
+ this.$nextTick(() => {
+ this.$refs.addOrUpdate.init(val.data.id);
+ });
+ } else if (val.type === "delete") {
+ this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex,val.data)
+ } else if (val.type === "change") {
+ this.changeStatus(val.data.id)
+ } else {
+ this.otherMethods(val)
+ }
+ },
+ // 删除
+ deleteHandle(id, name, index) {
+ this.$confirm(`确定对${name ? '[名称=' + name + ']' : '[序号=' + index + ']'}进行删除操作?`, "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.urlOptions.deleteURL(id).then(({ data }) => {
+ this.$message({
+ message: "操作成功",
+ type: "success",
+ duration: 1500,
+ onClose: () => {
+ this.getDataList();
+ },
+ });
+ });
+ })
+ .catch(() => { });
+ },
+ //search-bar点击
+ buttonClick(val) {
+ switch (val.btnName) {
+ case "search":
+ this.listQuery.xm1 = val.xm1;
+ this.listQuery.xm2 = val.xm2;
+ this.listQuery.pageNo = 1;
+ this.getDataList();
+ break;
+ case "add":
+ this.addOrEditTitle = '新增'
+ this.addOrUpdateVisible = true;
+ this.addOrUpdateHandle()
+ break;
+ default:
+ console.log(val)
+ }
+ },
+ handleCancel() {
+ this.$refs.addOrUpdate.formClear()
+ this.addOrUpdateVisible = false
+ this.addOrEditTitle = ''
+ },
+ handleConfirm() {
+ this.$refs.addOrUpdate.dataFormSubmit()
+ },
+ successSubmit() {
+ this.handleCancel()
+ this.getDataList()
+ },
+ /** 导出按钮操作 */
+ handleExport() {
+ // 处理查询参数
+ let params = { ...this.queryParams };
+ params.pageNo = undefined;
+ params.pageSize = undefined;
+ this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+ this.exportLoading = true;
+ return this.urlOptions.exportURL(params);
+ }).then(response => {
+ this.$download.excel(response, '工厂.xls');
+ this.exportLoading = false;
+ }).catch(() => { });
+ }
+ }
+}
diff --git a/src/views/quality/base/qualityScrapLog/index.vue b/src/views/quality/base/qualityScrapLog/index.vue
index b88d1891..7f1a37ea 100644
--- a/src/views/quality/base/qualityScrapLog/index.vue
+++ b/src/views/quality/base/qualityScrapLog/index.vue
@@ -20,7 +20,7 @@
import AddOrUpdate from './add-or-updata';
import DetailOrUpdate from './detail-or-updata';
-import basicPage from '../../../core/mixins/basic-page';
+import basicPage from './basic-page';
import { parseTime } from '../../../core/mixins/code-filter';
import {
getQualityScrapLogPage,
@@ -143,6 +143,26 @@ export default {
});
}
},
+ deleteHandle(id, name, index, data) {
+ this.$confirm(`确认要删除序号为${index}的数据项?`, "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.urlOptions.deleteURL(id).then(({ data }) => {
+ this.$message({
+ message: "操作成功",
+ type: "success",
+ duration: 1500,
+ onClose: () => {
+ this.getDataList();
+ },
+ });
+ });
+ })
+ .catch(() => { });
+ },
// 获取数据列表
getDict() {
getWorkOrderList().then((res) => {
diff --git a/src/views/quality/base/qualityScrapType/index.vue b/src/views/quality/base/qualityScrapType/index.vue
index 6d638e83..fdcbc1b5 100644
--- a/src/views/quality/base/qualityScrapType/index.vue
+++ b/src/views/quality/base/qualityScrapType/index.vue
@@ -134,6 +134,26 @@ export default {
this.listQuery.total = response.data.total;
this.dataListLoading = false;
});
+ },
+ deleteHandle(id, name, index) {
+ this.$confirm(`确认要删除报废类型名为${name}的数据项?`, "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.urlOptions.deleteURL(id).then(({ data }) => {
+ this.$message({
+ message: "操作成功",
+ type: "success",
+ duration: 1500,
+ onClose: () => {
+ this.getDataList();
+ },
+ });
+ });
+ })
+ .catch(() => { });
},
buttonClick(val) {
switch (val.btnName) {
diff --git a/src/views/quality/monitoring/qualityInspectionRecord/index.vue b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
index 38650b71..552926d9 100644
--- a/src/views/quality/monitoring/qualityInspectionRecord/index.vue
+++ b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
@@ -310,7 +310,27 @@ export default {
// },
},
methods: {
- /** 获取搜索栏的产线列表 */
+ /** 获取搜索栏的产线列表 */
+ deleteHandle(id, name, index, data) {
+ this.$confirm(`确认要删除序号为${index}的数据项?`, "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ this.urlOptions.deleteURL(id).then(({ data }) => {
+ this.$message({
+ message: "操作成功",
+ type: "success",
+ duration: 1500,
+ onClose: () => {
+ this.getDataList();
+ },
+ });
+ });
+ })
+ .catch(() => { });
+ },
getProductLineList() {
this.$axios('/base/core-work-order/listbyfilter').then((response) => {
this.searchBarFormConfig[0].selectOptions = response.data.map(
diff --git a/src/views/report/glass/day.vue b/src/views/report/glass/day.vue
new file mode 100644
index 00000000..33621499
--- /dev/null
+++ b/src/views/report/glass/day.vue
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 导出
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/report/productionDayReport/index.vue b/src/views/report/productionDayReport/index.vue
new file mode 100644
index 00000000..71b69624
--- /dev/null
+++ b/src/views/report/productionDayReport/index.vue
@@ -0,0 +1,570 @@
+
+
+
+
+
+
+
+
+ 查询
+ 导出
+
+
+ 编辑
+ 保存
+
+
+
+
+
+
+ {{ scope.row.lineId }}
+
+
+
+
+
+
+ {{ scope.row.inputNow }}
+
+
+
+
+
+ {{ scope.row.inputHis }}
+
+
+
+
+
+ {{ scope.row.inputTrend }}
+
+
+
+
+
+
+
+
+ {{ scope.row.goodProductNow }}
+
+
+
+
+
+
+ {{ scope.row.goodProductHis }}
+
+
+
+
+
+
+ {{ scope.row.goodProductTrend }}
+
+
+
+
+
+
+
+ {{ scope.row.missCheckNow }}
+
+
+
+
+
+ {{ scope.row.missCheckHis }}
+
+
+
+
+
+
+ {{ scope.row.missCheckTrend }}
+
+
+
+
+
+
+
+
+ {{ scope.row.goodProductPassNow }}
+
+
+
+
+
+
+ {{ scope.row.goodProductPassHis }}
+
+
+
+
+
+
+ {{ scope.row.goodProductPassTrend }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/report/productionMonthReport/index.vue b/src/views/report/productionMonthReport/index.vue
index 2ed51a56..c32f9bd2 100644
--- a/src/views/report/productionMonthReport/index.vue
+++ b/src/views/report/productionMonthReport/index.vue
@@ -1,7 +1,7 @@
@@ -15,15 +15,18 @@
查询
- 编辑
- 保存
-
+ 导出
+
+ 编辑
+ 保存
+
-
+
@@ -144,7 +147,8 @@
import {
getProductionDataList,
updateProductionDataList,
- updateSumProductionDataList
+ updateSumProductionDataList,
+ exportProductExcel
} from '@/api/report/production';
// import Editor from '@/components/Editor';
import moment from 'moment';
@@ -251,9 +255,9 @@ export default {
monthValue:[],
// dynamicProps: [],
tableProps,
- // dataForm: {
- // reportTime:undefined
- // },
+ urlOptions: {
+ exportURL: exportProductExcel
+ },
isSave:false,
disabled: true,
sumArr: [],
@@ -420,6 +424,19 @@ export default {
this.getDataList()
},
methods: {
+ handleExport() {
+ // 处理查询参数
+ let params = { ...this.dataForm };
+ params.pageNo = undefined;
+ params.pageSize = undefined;
+ this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+ this.exportLoading = true;
+ return this.urlOptions.exportURL(params);
+ }).then(response => {
+ this.$download.excel(response, '成品生产月报.xls');
+ this.exportLoading = false;
+ }).catch(() => { });
+ },
timeSelect() {
// switch (this.queryParams.timeDim) {
// case '1':
diff --git a/src/views/report/productionShipmentsReport/index.vue b/src/views/report/productionShipmentsReport/index.vue
index 61420ce4..84c846fe 100644
--- a/src/views/report/productionShipmentsReport/index.vue
+++ b/src/views/report/productionShipmentsReport/index.vue
@@ -1,7 +1,7 @@
@@ -15,10 +15,13 @@
查询
- 编辑
- 保存
-
+
+
+ 编辑
+ 保存
+
+
+
+
+
diff --git a/src/views/report/productionWeekReport copy/index.vue b/src/views/report/productionWeekReport copy/index.vue
new file mode 100644
index 00000000..5e37fb94
--- /dev/null
+++ b/src/views/report/productionWeekReport copy/index.vue
@@ -0,0 +1,468 @@
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 导出
+
+
+ 编辑
+ 保存
+
+
+
+
+
+
+ {{ scope.row.lineId }}
+
+
+
+
+
+
+ {{ scope.row.inputNow }}
+
+
+
+
+
+ {{ scope.row.inputHis }}
+
+
+
+
+
+ {{ scope.row.inputTrend }}
+
+
+
+
+
+
+
+
+ {{ scope.row.goodProductNow }}
+
+
+
+
+
+
+ {{ scope.row.goodProductHis }}
+
+
+
+
+
+
+ {{ scope.row.goodProductTrend }}
+
+
+
+
+
+
+
+ {{ scope.row.missCheckNow }}
+
+
+
+
+
+ {{ scope.row.missCheckHis }}
+
+
+
+
+
+
+ {{ scope.row.missCheckTrend }}
+
+
+
+
+
+
+
+
+ {{ scope.row.goodProductPassNow }}
+
+
+
+
+
+
+ {{ scope.row.goodProductPassHis }}
+
+
+
+
+
+
+ {{ scope.row.goodProductPassTrend }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/report/productionWeekReport/index.vue b/src/views/report/productionWeekReport/index.vue
index b45443c7..f14bb47a 100644
--- a/src/views/report/productionWeekReport/index.vue
+++ b/src/views/report/productionWeekReport/index.vue
@@ -1,7 +1,7 @@
@@ -17,10 +17,14 @@
查询
-
编辑
-
保存
-
+
+
导出
+
+ 编辑
+ 保存
+
查询
- 编辑
- 保存
-
+ 导出
+
+
+ 编辑
+ 保存
+
{
diff --git a/src/websocket/wsInterface.js b/src/websocket/wsInterface.js
index 6e2d708b..355c39ae 100644
--- a/src/websocket/wsInterface.js
+++ b/src/websocket/wsInterface.js
@@ -6,7 +6,7 @@ import store from "@/store";
const timestr = new Date().getTime()
const dcsConn = new WsConnect(
// websocket地址
- 'ws://10.70.180.10:8081/xc-screen/websocket/dcsmsg'+timestr,
+ process.env.VUE_APP_Socket_Dcs_API + '/xc-screen/websocket/dcsmsg'+timestr,
// 传递给后台的数据
'',
(data) => {
@@ -39,7 +39,7 @@ const dcsConn = new WsConnect(
)
// ISRA
const mesIsra = new WsConnect(
- 'ws://10.70.2.2:8080/websocket/message?userId=KILN'+timestr,
+ process.env.VUE_APP_Socket_API + '/websocket/message?userId=KILN'+timestr,
'',
(data) => {
// console.log('mes ISRA成功的回调函数, 接收到的data数据: ', data)
@@ -51,10 +51,6 @@ const mesIsra = new WsConnect(
store.dispatch({type: "websocket/setIsraKiln", payload:msgData.detData.dayStatistic})
break;
}
- // case "KilnInfo": {
- // // store.dispatch({type: "websocket/setKilnInfo", payload: msgData.data.kilnInfo})
- // break;
- // }
default:
}
},
@@ -65,7 +61,7 @@ const mesIsra = new WsConnect(
// 原料 MA
const mesMA = new WsConnect(
- 'ws://10.70.2.2:8080/websocket/message?userId=MA'+timestr,
+ process.env.VUE_APP_Socket_API + '/websocket/message?userId=MA'+timestr,
'',
(data) => {
// console.log('mes 原料成功的回调函数, 接收到的data数据: ', data)
@@ -76,10 +72,6 @@ const mesMA = new WsConnect(
store.dispatch({type: "websocket/setMaterial", payload:msgData.data})
break;
}
- // case "KilnInfo": {
- // // store.dispatch({type: "websocket/setKilnInfo", payload: msgData.data.kilnInfo})
- // break;
- // }
default:
}
},
@@ -90,7 +82,7 @@ const mesMA = new WsConnect(
// 能耗 EN
const mesEN = new WsConnect(
// websocket地址
- 'ws://10.70.2.2:8080/websocket/message?userId=ENERGY'+timestr,
+ process.env.VUE_APP_Socket_API + '/websocket/message?userId=ENERGY'+timestr,
// 传递给后台的数据
'',
// 成功拿到后台返回的数据的回调函数
@@ -122,7 +114,7 @@ const mesEN = new WsConnect(
// 烟气 GAS
const mesGAS = new WsConnect(
// websocket地址
- 'ws://10.70.2.2:8080/websocket/message?userId=GAS'+timestr,
+ process.env.VUE_APP_Socket_API + '/websocket/message?userId=GAS'+timestr,
// 传递给后台的数据
'',
// 成功拿到后台返回的数据的回调函数
@@ -153,7 +145,7 @@ const mesGAS = new WsConnect(
// 缺陷分类/统计 IS
const mesIS = new WsConnect(
// websocket地址
- 'ws://10.70.2.2:8080/websocket/message?userId=IS'+timestr,
+ process.env.VUE_APP_Socket_API + '/websocket/message?userId=IS'+timestr,
// 传递给后台的数据
'',
// 成功拿到后台返回的数据的回调函数
@@ -164,6 +156,7 @@ const mesIS = new WsConnect(
switch (msgData?.type) {
case "isra": {
store.dispatch({type: "websocket/setDefectChart", payload:{
+ checkType: msgData.detData.checkType,
dayStatistic: msgData.detData.dayStatistic,
weekStatistic: msgData.detData.weekStatistic,
monthStatistic: msgData.detData.monthStatistic,
@@ -183,9 +176,7 @@ const mesIS = new WsConnect(
// 深加工生产运行驾驶舱（除能源） SJG
const mesSJG = new WsConnect(
// websocket地址
- // 'ws://10.70.2.2:8080/websocket/message?userId=SJG'+timestr,
- // 'ws://192.168.0.33:48082/websocket/message?userId=SJG'+timestr,
- 'ws://192.168.1.62:48082/websocket/message?userId=SJG'+timestr,
+ process.env.VUE_APP_Socket_API + '/websocket/message?userId=SJG'+timestr,
// 传递给后台的数据
'',
// 成功拿到后台返回的数据的回调函数
@@ -202,6 +193,14 @@ const mesSJG = new WsConnect(
store.dispatch({type: "websocket/setSJGEq", payload:msgData.detData})
break;
}
+ case "order": {
+ store.dispatch({type: "websocket/setWorkOrder", payload:msgData.detData})
+ break;
+ }
+ case "defectSum": {
+ store.dispatch({type: "websocket/setDefectSum", payload:msgData.detData})
+ break;
+ }
default:
}
},
@@ -211,6 +210,76 @@ const mesSJG = new WsConnect(
}
)
+// 订单完成情况 OV
+const mesOV = new WsConnect(
+ // websocket地址
+ process.env.VUE_APP_Socket_API + '/websocket/message?userId=OV'+timestr,
+ // 'ws://192.168.0.33:48082/websocket/message?userId=OV'+timestr,
+ // 传递给后台的数据
+ '',
+ // 成功拿到后台返回的数据的回调函数
+ (data) => {
+ // console.log('mes 产线产量及良品率成功的回调函数, 接收到的data数据: ', data)
+ let msgData = JSON.parse(data)
+ if (msgData == null) return;
+ switch (msgData?.type) {
+ case "order": {
+ store.dispatch({type: "websocket/setOrder", payload:msgData.detData})
+ break;
+ }
+ default:
+ }
+ },
+ // websocket连接失败的回调函数
+ (err) => {
+ console.log('失败的回调函数', err)
+ }
+)
+
+// 本日生产良品率 CUTTING
+const mesCUTTING = new WsConnect(
+ // websocket地址
+ process.env.VUE_APP_Socket_API + '/websocket/message?userId=CUTTING'+timestr,
+ // 传递给后台的数据
+ '',
+ // 成功拿到后台返回的数据的回调函数
+ (data) => {
+ // console.log('mes 产线产量及良品率成功的回调函数, 接收到的data数据: ', data)
+ let msgData = JSON.parse(data)
+ if (msgData == null) return;
+ console.log(msgData)
+ switch (msgData?.type) {
+ case "cutting": {
+ if (msgData?.name === 'table') {
+ store.dispatch({type: "websocket/setYieldRateTable", payload:msgData.data})
+ return
+ }
+ if (msgData?.dateType === 'day') {
+ store.dispatch({type: "websocket/setCutChartDay", payload:msgData.detData})
+ return
+ }
+ if (msgData?.dateType === 'weekly') {
+ store.dispatch({type: "websocket/setCutChartWeek", payload:msgData.detData})
+ return
+ }
+ if (msgData?.dateType === 'month') {
+ store.dispatch({type: "websocket/setCutChartMonth", payload:msgData.detData})
+ return
+ }
+ if (msgData?.dateType === 'year') {
+ store.dispatch({type: "websocket/setCutChartYear", payload:msgData.detData})
+ return
+ }
+ break;
+ }
+ default:
+ }
+ },
+ // websocket连接失败的回调函数
+ (err) => {
+ console.log('失败的回调函数', err)
+ }
+)
export const getDcsMsg = () => {
dcsConn.createWebSoket()
@@ -220,6 +289,8 @@ export const getDcsMsg = () => {
mesGAS.createWebSoket()
mesIS.createWebSoket()
mesSJG.createWebSoket()
+ mesOV.createWebSoket()
+ mesCUTTING.createWebSoket()
}
export const closeDcsMsg = () => {
dcsConn.closeWebsocket()
@@ -229,4 +300,6 @@ export const closeDcsMsg = () => {
mesGAS.closeWebsocket()
mesIS.closeWebsocket()
mesSJG.closeWebsocket()
+ mesOV.closeWebsocket()
+ mesCUTTING.closeWebsocket()
}
\ No newline at end of file
许昌安彩AGV原片周转看板
-