Merge branch 'projects/mesxc-test' into projects/mesxc-dy

src/api/monitoring/statisticalData.js

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2023-11-07 14:10:18
- * @LastEditTime: 2024-04-09 09:17:02
+ * @LastEditTime: 2024-04-11 16:16:05
  * @LastEditors: zhp
  * @Description:
  */
@@ -18,14 +18,14 @@ export function getStatisticalDataPage(query) {
 
 export function getWorkOrderList(query) {
   return request({
-    url: 'base/quality-inspection-record/listbyfilter',
+    url: 'base/core-work-order/listbyfilter',
     method: 'get',
     params: query,
   })
 }
 export function getProductList(query) {
   return request({
-    url: 'base/statistical-data/listAll',
+    url: 'base/core-product/listAll',
     method: 'get',
     params: query,
   })

src/views/quality/monitoring/deviceParameters/index.vue

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

src/views/quality/monitoring/equipmentTraceability/index.vue

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