feat:页面修改

components/sample/auncel-select-popup.vue

@@ -49,7 +49,7 @@ const props = defineProps({
   }
 })
 
-const emit = defineEmits(['update:showAuncelSelector'])
+const emit = defineEmits(['update:showAuncelSelector', 'doSelect'])
 
 // 响应式数据
 const auncelList = ref([])
@@ -64,15 +64,12 @@ const open = () => {
 }
 
 const close = () => {
-  console.log('auncel-selector close触发')
   auncelList.value = []
-  uni.$emit('auncelSelector_close')
   closeDeviceListener()
   emit('update:showAuncelSelector', false)
 }
 
 const getPageData = () => {
-  uni.showLoading({ title: '加载中...' })
   nx.$api.laboratory
     .getDeviceLaboratoryListBy({
       deviceType: 'auncel',
@@ -93,11 +90,6 @@ const getPageData = () => {
         controlRealName: ''
       }))
       auncelList.value = dataList
-      uni.hideLoading()
-    })
-    .catch(err => {
-      console.error('加载天平列表失败:', err)
-      uni.hideLoading()
     })
 }
 
@@ -109,7 +101,7 @@ const doSelect = index => {
     return
   }
 
-  if (currentAuncel.controlRealName && currentAuncel.controlRealName !== userInfo.value.realname) {
+  if (currentAuncel.controlRealName && currentAuncel.controlRealName !== userInfo.value.nickname) {
     uni.showToast({
       title: `当前天平正被“${currentAuncel.controlRealName}”使用，请选择其他天平！`,
       icon: 'none'
@@ -132,15 +124,15 @@ const doSelect = index => {
       deviceCode: currentAuncel.code,
       deviceName: currentAuncel.name,
       isControl: true,
-      controlRealName: userInfo.value.realname
+      controlRealName: userInfo.value.nickname
     }
   }
 
   const sendControl = () => {
     const controlData = JSON.stringify(controlDevice)
     nx.$measure.send(controlData)
-    console.log('controlDevice', controlData)
-    uni.$emit('auncelSelector_doSelect', controlDevice)
+    emit('update:showAuncelSelector', false)
+    emit('doSelect', controlDevice)
   }
 
   if (delayFlag) {
@@ -159,7 +151,7 @@ const releaseDeviceControl = deviceId => {
     data: {
       deviceId,
       isControl: false,
-      controlRealName: userInfo.value.realname
+      controlRealName: userInfo.value.nickname
     }
   }
   nx.$measure.send(JSON.stringify(controlDevice))

nx/api/assayTask.js

@@ -54,7 +54,10 @@ const execSendSample = data => {
   return request({
     url: '/qms/bus/qmsBusAssayTask/sendSample',
     method: 'POST',
-    data: data
+    data: data,
+    custom: {
+      showSuccess: true
+    }
   })
 }
 

pages.json

@@ -160,13 +160,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/analysis/sample/sample-look",
-			"style": {
-				"navigationBarTitleText": "找样理样",
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/analysis/sample/sample-receive",
 			"style": {
@@ -174,13 +167,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/analysis/sample/sample-weigh",
-			"style": {
-				"navigationBarTitleText": "样品称重",
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/analysis/sample/sample-work-list",
 			"style": {
@@ -209,20 +195,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/analysis/auncel/auncel-weigh",
-			"style": {
-				"navigationBarTitleText": "样品称重",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/analysis/auncel/auncel-select",
-			"style": {
-				"navigationBarTitleText": "选择天平",
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/analysis/sample/sample-report",
 			"style": {
@@ -237,20 +209,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/analysis/sample/sample-send",
-			"style": {
-				"navigationBarTitleText": "送样",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/analysis/sample/sample-review",
-			"style": {
-				"navigationBarTitleText": "样重复核",
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/analysis/sample/sample-print",
 			"style": {