feat:分析管理

components/n-verify/n-verify.vue

@@ -4,7 +4,7 @@
       <view class="s-verify-wrapper" @tap.stop>
         <view class="s-verify-header">
           <text class="s-verify-title">安全验证</text>
-          <view class="s-verify-close" @tap="handleClose">×</view>
+          <!-- <view class="s-verify-close" @tap="handleClose">×</view> -->
         </view>
 
         <view class="s-verify-body">

defaultBaseUrl.js

@@ -1,9 +1,10 @@
 // 在此不用配置接口前缀
 const isDev = process.env.NODE_ENV === 'development'
-const BaseUrl = isDev ? 'http://192.168.26.190:48080/admin-api' : 'http://172.33.199.28:8088/api'
+const BaseUrl = isDev ? 'http://192.168.26.116:888/admin-api' : 'http://192.168.26.116:888/admin-api'
+// const BaseUrl = isDev ? 'http://192.168.26.190:48080/admin-api' : 'http://192.168.26.116:888/admin-api'
 
 // const BaseUrl = isDev ? 'http://localhost:9999' : ''
-const upgradeBaseUrl = 'http://172.33.199.28:8088'
+const upgradeBaseUrl = 'http://192.168.26.116:888'
 
 const tenantId = '1'
 export const clientId = 'lsky_lims'
@@ -31,5 +32,5 @@ export function getUpgradeBaseUrl() {
 }
 export function getWebSocketUrl() {
   // return uni.getStorageSync('base_url').replace('/api', '') + '/ws'
-  return 'ws://192.168.26.190:8330'
+  return 'ws://192.168.26.116:888/ws'
 }

manifest.json

@@ -1,7 +1,7 @@
 {
-    "name": "凉山矿业设备管理系统",
-    "appid": "__UNI__460BC4C",
-    "description": "凉山矿业设备管理系统",
+    "name" : "实验室管理系统",
+    "appid" : "__UNI__4B3B4B0",
+    "description" : "实验室管理系统",
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
@@ -21,7 +21,7 @@
         },
         "distribute" : {
             "android" : {
-                "packagename": "tech.zzjc.mas.lskylims",
+                "packagename" : "tech.zzjc.mas.zgtylims",
                 "keystore" : "zzjc_android.jks",
                 "password" : "zzjc@20190226",
                 "aliasname" : "app",
@@ -90,21 +90,21 @@
         /* 可选，JSON对象，应用UserAgent相关配置 **/
         "useragent" : {
             /* 可选，字符串类型，设置的默认userAgent值 */
-            "value": "LIMS-PDA/1.0.8",
+            "value" : "LIMS-PDA/1.0.0",
             /* 可选，Boolean类型，是否将value值作为追加值连接到系统默认userAgent值之后 */
             "concatenate" : true
         },
         /* 可选，JSON对象，Android平台应用UserAgent相关配置，优先级高于useragent配置 */
         "useragent_android" : {
             /* 可选，字符串类型，设置的默认userAgent值 */
-            "value": "LIMS-PDA/1.0.8",
+            "value" : "LIMS-PDA/1.0.0",
             /* 可选，Boolean类型，是否将value值作为追加值连接到系统默认userAgent值之后 */
             "concatenate" : true
         },
         /* 可选，JSON对象，iOS平台应用UserAgent相关配置，优先级高于useragent配置 */
         "useragent_ios" : {
             /* 可选，字符串类型，设置的默认userAgent值 */
-            "value": "LIMS-PDA/1.0.8",
+            "value" : "LIMS-PDA/1.0.0",
             /* 可选，Boolean类型，是否将value值作为追加值连接到系统默认userAgent值之后 */
             "concatenate" : true
         }

nx/helper/calcAnalysisValue.js

@@ -46,12 +46,11 @@ export function calcAnalysisValue(group) {
         if (formulaVal.startsWith('Get')) {
           //计算公式为Get开头的，都是执行方法
           v = eval(formulaVal)
-        } else if (formulaVal.startsWith('From')) {
         } else {
           v = math.evaluate(formulaVal).toString()
           v = isFinite(v) ? v.toString() : ''
         }
-        ele.value = handleRoundFiveNumber(v, ele.dataType)
+        ele.value = handleRoundFiveNumber(v, ele.decimalPosition)
       }
     }
   } catch (error) {
@@ -86,7 +85,6 @@ export function calcRowAnalysisValue(row, columnObj, dynamicsColumns) {
       if (formulaVal.startsWith('Get')) {
         formulaVal = formulaVal.replace(')', ",'" + row.conBaseSampleId + "')")
         v = eval(formulaVal)
-      } else if (formulaVal.startsWith('From')) {
       } else {
         v = math.evaluate(formulaVal).toString()
         v = isFinite(v) ? v : 0
@@ -330,10 +328,14 @@ function accAdd(arg1, arg2) {
 }
 
 // 通过配置项分组
-export function groupByField(list, groupKey = 'groupDictionaryBusinessKey') {
+export function groupByField(list, cupNumFieldIndex, groupKey = 'groupDictionaryBusinessKey') {
   const groupMap = new Map()
   list.unshift({ groupDictionaryBusinessKey: 'all', groupDictionaryBusinessName: '全部' })
   for (const item of list) {
+    // 赋值杯号fieldindex
+    if (item.title === '杯号') {
+      cupNumFieldIndex.value = item.fieldIndex
+    }
     const key = item[groupKey]
     if (!key) continue // 跳过没有 group 的项（可选）
 

pages/analysis/auncel/auncel-status.vue

@@ -107,6 +107,8 @@ function handleDeviceData(res) {
 }
 
 function handleDeviceStatus(res) {
+  console.log(res)
+
   if (res.deviceType === 'balance') {
     auncelList.value.forEach(item => {
       if (item.id === res.deviceId) {

pages/analysis/sample/sample-work-edit-task.vue

@@ -101,7 +101,7 @@ const formFields = ref([])
 const staticFormSchema = [
   { label: '指派单号', fieldKey: 'businessAssayTaskId', hidden: true },
   { type: 'title', value: '分析原始记录单' },
-  { label: '检测方法', type: 'Input', fieldKey: 'configAssayMethodName', disabled: true },
+  { label: '检测方法', type: 'Input', fieldKey: 'configAssayMethodName' },
   { label: '分析人', type: 'Input', fieldKey: 'assayOperator', disabled: true },
   { label: '检测时间', type: 'date', fieldKey: 'assayTime' }
 ]
@@ -294,10 +294,11 @@ function getDynamicFormSchemaFormData(obj) {
 }
 // 检查动态字段值在空白样或者标样的（影响计算配置字段）中是否变化
 function checkPropertyEquality() {
-  if (configQCSampleMethodInfos.value.length === 0) return false
-  for (const config of configQCSampleMethodInfos.value) {
-    const target = config.target
-    if (!target) continue
+  let allColumns = tabs.value.flatMap(tab => tab.columns)
+  for (const column of allColumns) {
+    const formula = column.formula
+    if (!formula) continue
+    const target = formula.split(':')[1]
     const originalValue = dynamicFormData.value[target]
     const currentValue = realFormData.value[target]
     console.log('checkPropertyEquality', originalValue, currentValue)