diff --git a/defaultBaseUrl.js b/defaultBaseUrl.js
index 3ae432c..35c9d0c 100644
--- a/defaultBaseUrl.js
+++ b/defaultBaseUrl.js
@@ -1,14 +1,14 @@
// 在此不用配置接口前缀
const isDev = process.env.NODE_ENV === 'development'
// 正式环境
-const BaseUrl = isDev ? 'http://172.17.19.29:48080/admin-api' : 'http://172.17.19.29:48080/admin-api'
-const upgradeBaseUrl = isDev? 'http://172.17.19.29:48080/admin-api':'http://172.17.19.29:48080/admin-api'
-const websocketUrl = isDev ? 'ws://172.17.19.11:30330' : 'ws://172.17.19.11:30330'
+// const BaseUrl = isDev ? 'http://172.17.19.29:48080/admin-api' : 'http://172.17.19.29:48080/admin-api'
+// const upgradeBaseUrl = isDev? 'http://172.17.19.29:48080/admin-api':'http://172.17.19.29:48080/admin-api'
+// const websocketUrl = isDev ? 'ws://172.17.19.11:30330' : 'ws://172.17.19.11:30330'
// 公司测试环境
-// const BaseUrl = isDev ? 'http://192.168.26.163:48080/admin-api' : 'http://192.168.26.116:888/admin-api'
-// const upgradeBaseUrl = isDev ? 'http://192.168.26.116:888/admin-api' : 'http://192.168.26.116:888/admin-api'
-// const websocketUrl = isDev ? 'ws://192.168.26.116:888/ws' : 'ws://192.168.26.116:888/ws'
+const BaseUrl = isDev ? 'http://192.168.26.116:888/admin-api' : 'http://192.168.26.116:888/admin-api'
+const upgradeBaseUrl = isDev ? 'http://192.168.26.116:888/admin-api' : 'http://192.168.26.116:888/admin-api'
+const websocketUrl = isDev ? 'ws://192.168.26.116:888/ws' : 'ws://192.168.26.116:888/ws'
const tenantId = '1'
export const clientId = 'zgty_lims'
diff --git a/manifest.json b/manifest.json
index a3cc388..0910520 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "实验室管理系统",
"appid" : "__UNI__4B3B4B0",
"description" : "实验室管理系统",
- "versionName" : "1.0.2",
- "versionCode" : 102,
+ "versionName" : "1.0.3",
+ "versionCode" : 103,
"transformPx" : false,
"app-plus" : {
"usingComponents" : true,
@@ -95,21 +95,21 @@
/* 可选，JSON对象，应用UserAgent相关配置 **/
"useragent" : {
/* 可选，字符串类型，设置的默认userAgent值 */
- "value" : "LIMS-PDA/1.0.2",
+ "value" : "LIMS-PDA/1.0.3",
/* 可选，Boolean类型，是否将value值作为追加值连接到系统默认userAgent值之后 */
"concatenate" : true
},
/* 可选，JSON对象，Android平台应用UserAgent相关配置，优先级高于useragent配置 */
"useragent_android" : {
/* 可选，字符串类型，设置的默认userAgent值 */
- "value" : "LIMS-PDA/1.0.2",
+ "value" : "LIMS-PDA/1.0.3",
/* 可选，Boolean类型，是否将value值作为追加值连接到系统默认userAgent值之后 */
"concatenate" : true
},
/* 可选，JSON对象，iOS平台应用UserAgent相关配置，优先级高于useragent配置 */
"useragent_ios" : {
/* 可选，字符串类型，设置的默认userAgent值 */
- "value" : "LIMS-PDA/1.0.2",
+ "value" : "LIMS-PDA/1.0.3",
/* 可选，Boolean类型，是否将value值作为追加值连接到系统默认userAgent值之后 */
"concatenate" : true
}
diff --git a/pages/analysis/sample/sample-work-edit-task.vue b/pages/analysis/sample/sample-work-edit-task.vue
index 3620d30..d6356d4 100644
--- a/pages/analysis/sample/sample-work-edit-task.vue
+++ b/pages/analysis/sample/sample-work-edit-task.vue
@@ -34,29 +34,28 @@
:placeholder="field.placeholder"
:disabled="field.disabled || field.fillingWay == 'calculate'"
/>
-
-
- {{ field.value }}
- 请选择
-
-
-
+
+
+ 请选择
+
+
+
+
+
+
+
+
+
+
-
+
{{ nx.$dayjs(field.value).format('YYYY-MM-DD HH:mm:ss') }}
请选择
{
if (param.currentTaskId) {
currentTaskId.value = param.currentTaskId
- configReportTemplateKey.value = param.configReportTemplateKey
-
+ configReportTemplateKey.value = param.configReportTemplateKey
}
loadTaskDetail()
})
@@ -152,12 +150,19 @@ async function loadTaskDetail() {
dataCollectionParams.dataCollectionKey = dataCollectionKey
}
const data = await nx.$api.assayTask.getDynamicBaseFormSchema(dataCollectionParams)
- dynamicFormSchema = data.map(item => ({
- label: item.fieldName,
- fieldKey: item.fieldKey,
- type: item.fieldType,
- placeholder: '请输入'
- }))
+ dynamicFormSchema = data.map(item => {
+ let customConfig = JSON.parse(item.customConfig)
+ let field = {
+ label: item.fieldName,
+ fieldKey: item.fieldKey,
+ type: item.fieldType,
+ placeholder: '请输入'
+ }
+ if (customConfig?.componentProps?.options) {
+ field.options = customConfig.componentProps.options
+ }
+ return field
+ })
formFields.value = [...staticFormSchema, ...dynamicFormSchema]
bindFormValue()
@@ -201,10 +206,10 @@ async function updateTableDataByConfigFields() {
if (!columnObj) continue
tab.tableData.forEach(row => {
// 赋值配置列参与计算
- if(row[columnObj.fieldIndex]){
- row[columnObj.fieldIndex].value = formData[key]
- calcRowAnalysisValue(row, columnObj, tab.columns)
- }
+ if (row[columnObj.fieldIndex]) {
+ row[columnObj.fieldIndex].value = formData[key]
+ calcRowAnalysisValue(row, columnObj, tab.columns)
+ }
})
}
}
@@ -271,10 +276,8 @@ const realFormData = computed(() => {
// 实际保存逻辑
async function handleSave(change) {
let params = {}
-
- const dynamicData = Object.fromEntries(
- Object.entries(realFormData.value).filter(([key]) => key !== 'assayTime')
- );
+
+ const dynamicData = Object.fromEntries(Object.entries(realFormData.value).filter(([key]) => key !== 'assayTime'))
console.log(dynamicData)
if (change) {
// 计算样品数据
diff --git a/pages/login/login.vue b/pages/login/login.vue
index b54f862..05c8539 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -57,8 +57,8 @@ import callCheckUpdate from '@/nx/utils/check-update'
const loading = ref(false)
const captchaEnable = true
let loginInfo = reactive({
- username: 'ytjyZhfx1',
- password: 'P@ssword25',
+ username: '',
+ password: '',
captchaVerification: ''
})
@@ -72,11 +72,11 @@ function togglePasswordVisibility() {
onShow(() => {
//检查APP更新
// #ifdef APP-PLUS
- if (process.env.NODE_ENV !== 'development') {
+ // if (process.env.NODE_ENV !== 'development') {
setTimeout(() => {
callCheckUpdate()
}, 1500)
- }
+ // }
// #endif
})
async function bindLogin() {