diff --git a/src/api/quality/aql.js b/src/api/quality/aql.js new file mode 100644 index 00000000..722f2a43 --- /dev/null +++ b/src/api/quality/aql.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询抽样规则-接收质量限列表 +export function listAql(query) { + return request({ + url: '/quality/aql/list', + method: 'get', + params: query + }); +} + +// 查询抽样规则-接收质量限详细 +export function getAql(id) { + return request({ + url: '/quality/aql/' + id, + method: 'get' + }); +} + +// 新增抽样规则-接收质量限 +export function addAql(data) { + return request({ + url: '/quality/aql', + method: 'post', + data: data + }); +} + +// 修改抽样规则-接收质量限 +export function updateAql(data) { + return request({ + url: '/quality/aql', + method: 'put', + data: data + }); +} + +// 删除抽样规则-接收质量限 +export function delAql(id) { + return request({ + url: '/quality/aql/' + id, + method: 'delete' + }); +} diff --git a/src/api/quality/code.js b/src/api/quality/code.js new file mode 100644 index 00000000..bdef6f23 --- /dev/null +++ b/src/api/quality/code.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询抽样规则-样品量字码列表 +export function listCode(query) { + return request({ + url: '/quality/code/list', + method: 'get', + params: query + }); +} + +// 查询抽样规则-样品量字码详细 +export function getCode(id) { + return request({ + url: '/quality/code/' + id, + method: 'get' + }); +} + +// 新增抽样规则-样品量字码 +export function addCode(data) { + return request({ + url: '/quality/code', + method: 'post', + data: data + }); +} + +// 修改抽样规则-样品量字码 +export function updateCode(data) { + return request({ + url: '/quality/code', + method: 'put', + data: data + }); +} + +// 删除抽样规则-样品量字码 +export function delCode(id) { + return request({ + url: '/quality/code/' + id, + method: 'delete' + }); +} diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 7b44fded..a4381608 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -313,12 +313,14 @@ export default { setInterval(() => this.getAlarmData(), 1000 * 60); this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST")); this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT"); + /** //先执行一次 this.getUnReadList(); // 实现轮询 this.timer = setInterval(() => { setTimeout(this.getUnReadList(), 30000); }, 30000); + **/ }, components: { Breadcrumb, diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 801e9612..15858ccd 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -385,7 +385,7 @@ - + - --> +
diff --git a/src/views/quality/aql/codeContent.vue b/src/views/quality/aql/codeContent.vue new file mode 100644 index 00000000..b5151741 --- /dev/null +++ b/src/views/quality/aql/codeContent.vue @@ -0,0 +1,265 @@ + + + diff --git a/src/views/quality/aql/index.vue b/src/views/quality/aql/index.vue new file mode 100644 index 00000000..8d279584 --- /dev/null +++ b/src/views/quality/aql/index.vue @@ -0,0 +1,440 @@ + + + diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue index abe68092..7a28404a 100644 --- a/src/views/quality/produceReport/index.vue +++ b/src/views/quality/produceReport/index.vue @@ -1066,30 +1066,7 @@ export default { }); }, objectSpanMethod({ row, column, rowIndex, columnIndex }) { - console.log("rowIndex", rowIndex); - // 准备在第二列进行合并操作 - // if (columnIndex == 1) { - // // 从第0行进行合并 - // if (rowIndex == 0) { - // return { - // rowspan: 3, // 合并3行 - // colspan: 1, // 合并1列(当前列) - // }; - // } - // if (rowIndex == 3) { - // return { - // rowspan: 2, // 合并2行 - // colspan: 1, // 合并1列 - // }; - // } - // if (rowIndex == 5) { - // return { - // rowspan: 2, // 合并1行 - // colspan: 1, // 合并1列 - // }; - // } - // } - /** + /** if (columnIndex === 0) { const _row = this.spanArr[rowIndex]; const _col = _row > 0 ? 1 : 0; @@ -1107,7 +1084,6 @@ export default { colspan: _col, }; } - }, } };