#329 projects/mesxc-zhp

Merged
juzi merged 2 commits from projects/mesxc-zhp into projects/mesxc-test 5 months ago
  1. +3
    -3
      src/api/monitoring/statisticalData.js
  2. +1
    -1
      src/views/quality/monitoring/deviceParameters/index.vue
  3. +3
    -3
      src/views/quality/monitoring/equipmentTraceability/index.vue

+ 3
- 3
src/api/monitoring/statisticalData.js View File

@@ -1,7 +1,7 @@
/* /*
* @Author: zhp * @Author: zhp
* @Date: 2023-11-07 14:10:18 * @Date: 2023-11-07 14:10:18
* @LastEditTime: 2024-04-09 09:17:02
* @LastEditTime: 2024-04-11 16:16:05
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
*/ */
@@ -18,14 +18,14 @@ export function getStatisticalDataPage(query) {


export function getWorkOrderList(query) { export function getWorkOrderList(query) {
return request({ return request({
url: 'base/quality-inspection-record/listbyfilter',
url: 'base/core-work-order/listbyfilter',
method: 'get', method: 'get',
params: query, params: query,
}) })
} }
export function getProductList(query) { export function getProductList(query) {
return request({ return request({
url: 'base/statistical-data/listAll',
url: 'base/core-product/listAll',
method: 'get', method: 'get',
params: query, params: query,
}) })


+ 1
- 1
src/views/quality/monitoring/deviceParameters/index.vue View File

@@ -219,7 +219,7 @@ export default {
}, },
{ {
type: this.$auth.hasPermi( type: this.$auth.hasPermi(
'monitoring:device-parameters:query'
'monitoring:equipment:query'
) )
? 'button' ? 'button'
: '', : '',


+ 3
- 3
src/views/quality/monitoring/equipmentTraceability/index.vue View File

@@ -261,7 +261,7 @@ export default {
// }, // },
{ {
type: this.$auth.hasPermi( type: this.$auth.hasPermi(
'monitoring:equipment-traceability:query'
'analysis:equipment:query'
) )
? 'button' ? 'button'
: '', : '',
@@ -271,14 +271,14 @@ export default {
}, },
{ {
type: this.$auth.hasPermi( type: this.$auth.hasPermi(
'monitoring:equipment-traceability:export'
'analysis:equipment:export'
) )
? 'separate' ? 'separate'
: '', : '',
}, },
{ {
type: this.$auth.hasPermi( type: this.$auth.hasPermi(
'monitoring:equipment-traceability:export'
'analysis:equipment:export'
) )
? 'button' ? 'button'
: '', : '',


Loading…
Cancel
Save