${item.lineName || ''}
+ ${item.lineName || ''}
`,
- `${this.formatTime(item.time) || ''}`,
- `${this.getSize(item.size) || ''}`,
- `${item.productArea + '㎡' || ''}`,
- `${item.wasteArea + '㎡' || ''}`,
- `${(item.product * 100).toFixed(2) + '%' || ''}
+ `${this.formatTime(item.time) || ''}`,
+ `${this.getSize(item.size) || ''}`,
+ `${item.productArea + '㎡' || ''}`,
+ `${item.wasteArea + '㎡' || ''}`,
+ `${(item.product * 100).toFixed(2) + '%' || ''}
${(item.product * 100).toFixed(2) + '%' || ''}
`
])
this.cutConfig.data = cutArr
@@ -981,7 +981,7 @@ background: linear-gradient(to bottom,rgba(60,
height: 290px;
width: 1px;
position: absolute;
- left: 66.2%;
+ left: 66.3%;
top: 12%;
background: linear-gradient(to bottom, rgba(60,
231,
diff --git a/src/views/OperationalOverview/components/ISRAChart.vue b/src/views/OperationalOverview/components/ISRAChart.vue
index de4cb347..a42dc068 100644
--- a/src/views/OperationalOverview/components/ISRAChart.vue
+++ b/src/views/OperationalOverview/components/ISRAChart.vue
@@ -1,7 +1,7 @@
@@ -85,11 +85,11 @@ export default {
},
},
legend: {
- bottom: '2%',
+ bottom: '10%',
left: 'center',
- itemWidth: 18,
- itemHeight:18,
- icon: 'circle',
+ itemWidth: 20,
+ itemHeight:12,
+ icon: 'rect',
textStyle: {
color: '#fff'
},
diff --git a/src/views/OperationalOverview/components/baseContainer/index.vue b/src/views/OperationalOverview/components/baseContainer/index.vue
index 9f4cde20..3902a089 100644
--- a/src/views/OperationalOverview/components/baseContainer/index.vue
+++ b/src/views/OperationalOverview/components/baseContainer/index.vue
@@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-01-19 15:58:17
* @LastEditors: zhp
- * @LastEditTime: 2024-02-01 15:25:14
+ * @LastEditTime: 2024-02-20 15:25:02
* @Description: file content
* @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseContainer\index.vue
-->
@@ -162,6 +162,8 @@ export default {
width: 100%;
// background-color: rgba($color: #061027, $alpha: 0.15);
position: relative;
+ // filter: blur(.5px);
+ opacity: calc(.8);
// border: 2px solid;
// background: url('../../../../assets/img/energy.png') no-repeat;
// background-size: 100% 100%;
@@ -272,4 +274,9 @@ export default {
border: none;
}
}
+// .base-container::after{
+// z-index: -1;
+// width: 100%;
+// filter: blur(2px);
+// }
diff --git a/src/views/OperationalOverview/components/pileBarChart.vue b/src/views/OperationalOverview/components/pileBarChart.vue
index ac9656b6..9d2a06d9 100644
--- a/src/views/OperationalOverview/components/pileBarChart.vue
+++ b/src/views/OperationalOverview/components/pileBarChart.vue
@@ -1,7 +1,7 @@
@@ -91,43 +91,78 @@ export default {
},
methods: {
initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
+ let rawData = []
+ rawData.push(passRateList,wasteList)
// console.log(1)
+ const totalData = [];
+ for (let i = 0; i < rawData[0].length; ++i) {
+ let sum = 0;
+ for (let j = 0; j < rawData.length; ++j) {
+ sum += rawData[j][i];
+ }
+ totalData.push(sum);
+ }
+ let colors = ['#0fdedb', '#2359ec' ]
+ console.log('total', totalData);
this.chart = echarts.init(document.getElementById(this.id))
- let series = [
- {
- // 辅助系列
- name: '良品',
+ const series = [
+ '良品',
+ '废品',
+ // 'Affiliate Ad',
+ // 'Video Ad',
+ // 'Search Engine'
+ ].map((name, sid) => {
+ // console.log(sid)
+ return {
+ name,
type: 'bar',
stack: 'total',
- // silent: true,
- // itemStyle: {
- color: '#0fdedb',
- // },
- // barCategoryGap: '10%',
barWidth: 10,
- data: passRateList
- },
- {
- type: 'bar',
- stack: 'total',
- name: '废品',
- // barCategoryGap: '10%',
- data: wasteList,
- // barWidth: 10,
- // barWidth: 15,
- // label: {
- // position: [10, 10],
- // normal: {
- // position: [800, -24],
- // show: true,
- // textStyle: {
- // color: '#2359ec',
- // fontSize: 16,
- // },
- // },
- // },
- }
- ]
+ label: {
+ show: true,
+ formatter: (params) => Math.round(params.value * 1000) / 10 + '%'
+ },
+ color:colors[sid],
+ data: rawData[sid].map((d, did) =>
+ totalData[did] <= 0 ? 0 : d / totalData[did]
+ )
+ };
+ });
+ // let series = [
+ // {
+ // // 辅助系列
+ // name: '良品',
+ // type: 'bar',
+ // stack: 'total',
+ // // silent: true,
+ // // itemStyle: {
+ // color: '#0fdedb',
+ // // },
+ // // barCategoryGap: '10%',
+ // barWidth: 10,
+ // data: passRateList
+ // },
+ // {
+ // type: 'bar',
+ // stack: 'total',
+ // name: '废品',
+ // // barCategoryGap: '10%',
+ // data: wasteList,
+ // // barWidth: 10,
+ // // barWidth: 15,
+ // // label: {
+ // // position: [10, 10],
+ // // normal: {
+ // // position: [800, -24],
+ // // show: true,
+ // // textStyle: {
+ // // color: '#2359ec',
+ // // fontSize: 16,
+ // // },
+ // // },
+ // // },
+ // }
+ // ]
// for (i = 0; i < 5; i++) {
// series.push({
@@ -137,6 +172,7 @@ export default {
legend: {
// top: '2.5%',
// right: '20px',
+ icon: 'rect',
textStyle: {
color: '#ffffff'
}
diff --git a/src/views/quality/base/qualityScrapLog/add-or-updata.vue b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
index bcfc9530..0370339e 100644
--- a/src/views/quality/base/qualityScrapLog/add-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
@@ -1,7 +1,7 @@
@@ -102,11 +102,11 @@ export default {
sourceList: [
{
id: 1,
- name: '手动',
+ name: '平板端',
},
{
id: 2,
- name: '自动',
+ name: '网页端',
}
],
dataForm: {
diff --git a/src/views/quality/base/qualityScrapLog/index.vue b/src/views/quality/base/qualityScrapLog/index.vue
index 7f1a37ea..d1be26a5 100644
--- a/src/views/quality/base/qualityScrapLog/index.vue
+++ b/src/views/quality/base/qualityScrapLog/index.vue
@@ -130,8 +130,9 @@ export default {
AddOrUpdate,
DetailOrUpdate
},
- created() {
+ mounted() {
this.getDict()
+ this.getDataList()
},
methods: {
otherMethods(val) {
@@ -214,7 +215,7 @@ export default {
pageNo: 1,
total: 1,
};
- this.getDataList();
+ this.getDataList()
break;
case 'add':
this.addOrEditTitle = '新增';
diff --git a/src/views/quality/monitoring/originalGlassRetrace/index.vue b/src/views/quality/monitoring/originalGlassRetrace/index.vue
index 4b0d12a0..4f76c8ca 100644
--- a/src/views/quality/monitoring/originalGlassRetrace/index.vue
+++ b/src/views/quality/monitoring/originalGlassRetrace/index.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-08-01 14:55:51
* @LastEditors: zhp
- * @LastEditTime: 2023-12-06 14:08:00
+ * @LastEditTime: 2024-02-20 08:46:05
* @Description:
-->
@@ -69,6 +69,11 @@ const tableProps = [
prop: 'productionOutputTime',
label: '深加工下片时间',
filter: parseTime
+ },
+ {
+ prop: 'scrapDetail',
+ label: '详情',
+ filter: parseTime
}
];
@@ -83,18 +88,20 @@ export default {
// },
tableProps,
// tableBtn: [
- // this.$auth.hasPermi(`base:packaging-print-log:update`)
- // ? {
+ // // this.$auth.hasPermi(`base:packaging-print-log:update`)
+ // // ?
+ // {
// type: 'edit',
// btnName: '编辑',
- // }
- // : undefined,
- // this.$auth.hasPermi(`base:packaging-print-log:delete`)
- // ? {
+ // },
+ // // : undefined,
+ // // this.$auth.hasPermi(`base:packaging-print-log:delete`)
+ // // ?
+ // {
// type: 'delete',
// btnName: '删除',
// }
- // : undefined,
+ // // : undefined,
// ].filter((v) => v),
list: [],
diff --git a/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue b/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
index c25e4690..563b9ad5 100644
--- a/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
+++ b/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
@@ -47,8 +47,10 @@
-
+
+
+
@@ -65,8 +67,8 @@
@@ -104,13 +106,14 @@ export default {
inspectionDetList: [],
productionLineList: [],
sectionList: [],
+ userList:[],
workOrderList:[],
innerDataForm: {},
cacheInspectionDetList: null,
};
},
mounted() {
- Promise.all([this.getProductLineList(), this.getInspectionDetList(), this.getWorkOrderList()]).then(
+ Promise.all([this.getProductLineList(), this.getInspectionDetList(), this.getWorkOrderList(),this.getUserList()]).then(
() => {
this.formLoading = false;
}
@@ -180,6 +183,17 @@ export default {
value: item.id,
}));
},
+ async getUserList() {
+ const response = await this.$axios('base/quality-inspection-box-btn-auth/getUserList', {
+ pageNo: 1,
+ pageSize: 999
+ })
+ console.log(response);
+ this.userList = response.data.map((item) => ({
+ label: item.username,
+ value: item.id,
+ }));
+ },
// 获取检测内容列表
async getInspectionDetList() {
diff --git a/src/views/quality/monitoring/qualityInspectionRecord/index.vue b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
index 552926d9..b8369be3 100644
--- a/src/views/quality/monitoring/qualityInspectionRecord/index.vue
+++ b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
@@ -155,7 +155,16 @@ export default {
selectOptions: [],
param: 'inspectionDetContent',
filterable: true
- },
+ },
+ {
+ type: 'select',
+ label: '检测人员',
+ placeholder: '请选择检测人员',
+ selectOptions: [],
+ param: 'checkPerson',
+ filterable: true,
+ multiple:true,
+ },
{
type: 'datePicker',
label: '时间段',
@@ -217,17 +226,27 @@ export default {
// width: 128,
prop: 'workOrderName',
label: '工单名称',
+ },
+ {
+ // width: 128,
+ prop: 'productionLineName',
+ label: '产线',
+ },
+ {
+ // width: 128,
+ prop: 'sectionName',
+ label: '工段',
},
{
// width: 128,
prop: 'inspectionDetContent',
label: '检测内容',
},
- {
- // width: 128,
- prop: 'productionLineName',
- label: '产线',
- },
+ // {
+ // // width: 128,
+ // prop: 'productionLineName',
+ // label: '产线',
+ // },
{
// width: 128,
prop: 'checkPerson',
@@ -244,11 +263,11 @@ export default {
width: 90,
prop: 'source',
label: '来源',
- filter: (val) => ['未知', '手动', '自动'][val],
+ filter: (val) => ['平板端', '网页端'][val],
},
],
// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
- searchBarKeys: ['inspectionDetContent', 'checkTime', 'workOrderId'],
+ searchBarKeys: ['inspectionDetContent', 'checkTime', 'workOrderId','checkPerson'],
form: {
id: undefined,
// workOrderId:undefined,
@@ -269,7 +288,8 @@ export default {
pageSize: 10,
workOrderId:null,
inspectionDetContent: null,
- checkTime: [],
+ checkTime: [],
+ checkPerson:undefined,
// productionLineId: null,
},
};
@@ -351,12 +371,24 @@ export default {
};
}
);
- });
+ })
+ this.$axios('base/quality-inspection-box-btn-auth/getUserList', {
+ pageNo: 1,
+ pageSize: 999
+ }).then((res) => {
+ // console.log(response);
+ this.searchBarFormConfig[2].selectOptions = res.data.map((item) => ({
+ name: item.username,
+ id: item.username,
+ }));
+ })
},
/** 查询列表 */
getList() {
this.loading = true;
- // 执行查询
+ // 执行查询
+ let str = this.queryParams.checkPerson ? this.queryParams.checkPerson.join() :undefined
+ this.queryParams.checkPerson = str
getQualityInspectionRecordPage(this.queryParams).then((response) => {
this.list = response.data.list;
this.total = response.data.total;
@@ -424,7 +456,9 @@ export default {
if (!valid) {
return;
}
- // 修改的提交
+ // 修改的提交
+ let str = this.form.checkPerson.join()
+ this.form.checkPerson = str
if (this.form.id != null) {
updateQualityInspectionRecord(this.form).then((response) => {
this.$modal.msgSuccess('修改成功');