zgty/zgty-mas-m
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

feat:组价修改

Browse Source
This commit is contained in:
houjunxiang
2026-01-13 10:38:07 +08:00
parent 351c66086b
commit 4d8e7b7a06
4 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
defaultBaseUrl.js
View File

@@ -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'

10
manifest.json
View File

@@ -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
}

67
pages/analysis/sample/sample-work-edit-task.vue
View File

File diff suppressed because it is too large Load Diff

8
pages/login/login.vue
View File

@@ -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() {