Merge pull request 'projects/mesxc-zhp' (#193) from projects/mesxc-zhp into projects/mesxc-test

Reviewed-on: #193

.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-01-29 15:49:57
+ # @LastEditTime: 2024-01-29 16:29:24
  # @LastEditors: zhp
  # @Description:
 ###
@@ -16,12 +16,13 @@ VUE_APP_TITLE = MES系统
 # VUE_APP_BASE_API = 'http://10.70.2.2:8080'
 # VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.20:48080'
+# VUE_APP_BASE_API = 'http://192.168.1.20:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
-VUE_APP_BASE_API = 'http://192.168.1.104:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 

src/api/base/qualityInspectionBoxPermissions.js

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2023-12-04 14:10:37
- * @LastEditTime: 2024-01-29 10:42:49
+ * @LastEditTime: 2024-01-29 16:48:40
  * @LastEditors: zhp
  * @Description:
  */
@@ -77,8 +77,15 @@ export function getListByLineSection(query) {
 
 export function getUserList(query) {
   return request({
-    url: 'system/user/page',
+    url: 'base/quality-inspection-box-btn-auth/getUserList',
     method: 'get',
     params: query,
   })
 }
+export function getPage(query) {
+  return request({
+    url: 'base/quality-inspection-box-btn-auth/page',
+    method: 'post',
+    data:query
+  })
+}

src/views/OperationalOverview/processingBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-01-29 15:29:39
+ * @LastEditTime: 2024-01-29 16:17:04
  * @Description:
 -->
 <template>
@@ -835,7 +835,7 @@ export default {
                 console.log(ele)
                 nameList.push(item.name)
                 outputNumList.push(ele.outputNum)
-                passRateList.push(ele.passRate * 100)
+                passRateList.push(ele.passRate)
               }
             }
           })

src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue

@@ -27,7 +27,7 @@ import {
 	updateQualityInspectionBoxBtn,
 	deleteQualityInspectionBoxBtn,
 	getQualityInspectionBoxBtn,
-	getQualityInspectionBoxBtnPage,
+  getPage,
   exportQualityInspectionBoxBtnExcel,
   getUserList
 } from '@/api/base/qualityInspectionBoxPermissions';
@@ -42,7 +42,7 @@ export default {
 	data() {
     return {
       urlOptions: {
-        getDataListURL: getQualityInspectionBoxBtnPage,
+        getDataListURL: getPage,
         deleteURL: deleteQualityInspectionBoxBtn,
         // exportURL: exportFactoryExcel,
       },
@@ -115,7 +115,8 @@ export default {
 			listQuery: {
 				pageNo: 1,
 				pageSize: 10,
-				inspectionDetContent: null,
+        userName: null,
+        nickName:null
       },
       addOrUpdateVisible: false,
       addOrEditTitle:'',
@@ -133,17 +134,17 @@ export default {
 		};
 	},
 	created() {
-    this.getDict()
+    // this.getDict()
 	},
   methods: {
-    getDict() {
+    // getDict() {
-      getUserList({
+    //   // getUserList({
-        pageNo: 1,
+    //   //   pageNo: 1,
-        pageSize:999
+    //   //   pageSize:999
-      }).then((res) => {
+    //   // }).then((res) => {
-        this.searchBarFormConfig[0].selectOptions = res.data
+    //   //   this.searchBarFormConfig[0].selectOptions = res.data
-      })
+    //   // })
-    },
+    // },
     getDataList() {
       this.dataListLoading = true;
       this.urlOptions.getDataListURL(this.listQuery).then(response => {