diff --git a/apps/hand-factory/pages/login.vue b/apps/hand-factory/pages/login.vue index ba3b7ff..2af7dcd 100644 --- a/apps/hand-factory/pages/login.vue +++ b/apps/hand-factory/pages/login.vue @@ -51,8 +51,9 @@ register: false, globalConfig: getApp().globalData.config, loginForm: { - username: "admin", - password: "admin123", + // 1. 修改默认值为空 + username: "", + password: "", code: "", uuid: "" } @@ -67,8 +68,43 @@ this.$tab.reLaunch('/pages/easycode/easycode') } //#endif + + // 2. 页面加载时读取本地存储的账号密码 + this.loadLoginInfo() }, methods: { + // 新增:读取本地存储的登录信息 + loadLoginInfo() { + try { + // 从本地存储获取用户名 + const savedUsername = uni.getStorageSync('login_username') + // 从本地存储获取密码 + const savedPassword = uni.getStorageSync('login_password') + + // 如果有保存的信息,填充到表单 + if (savedUsername) { + this.loginForm.username = savedUsername + } + if (savedPassword) { + this.loginForm.password = savedPassword + } + } catch (e) { + console.error('读取本地登录信息失败:', e) + } + }, + + // 新增:保存登录信息到本地存储 + saveLoginInfo() { + try { + // 保存用户名到本地 + uni.setStorageSync('login_username', this.loginForm.username) + // 保存密码到本地 + uni.setStorageSync('login_password', this.loginForm.password) + } catch (e) { + console.error('保存登录信息失败:', e) + } + }, + // 用户注册 handleUserRegister() { this.$tab.redirectTo(`/pages/register`) @@ -120,6 +156,9 @@ }, // 登录成功后,处理函数 loginSuccess(result) { + // 3. 登录成功后保存账号密码到本地存储 + this.saveLoginInfo() + // 设置用户信息 this.$store.dispatch('GetInfo').then(res => { this.$tab.reLaunch('/pages/index') @@ -177,7 +216,6 @@ text-align: left; padding-left: 15px; } - } .login-btn { @@ -207,5 +245,4 @@ } } } - - + \ No newline at end of file diff --git a/apps/l2/src/api/l2/sendJob.js b/apps/l2/src/api/l2/sendJob.js index 22ce6a7..2377169 100644 --- a/apps/l2/src/api/l2/sendJob.js +++ b/apps/l2/src/api/l2/sendJob.js @@ -1,4 +1,4 @@ -import request from '@/utils/L2Request' +import request from '@/utils/request' // 创建发送任务 export function createSendJob(data) { diff --git a/apps/l2/src/api/l2/sendTemplate.js b/apps/l2/src/api/l2/sendTemplate.js index b152e4d..6975389 100644 --- a/apps/l2/src/api/l2/sendTemplate.js +++ b/apps/l2/src/api/l2/sendTemplate.js @@ -1,4 +1,4 @@ -import request from '@/utils/L2Request' +import request from '@/utils/request' // 获取发送模板(含明细) export function getSendTemplate(templateCode) { diff --git a/apps/l2/src/api/l2/setupValue.js b/apps/l2/src/api/l2/setupValue.js index 82eabc3..dd27f1e 100644 --- a/apps/l2/src/api/l2/setupValue.js +++ b/apps/l2/src/api/l2/setupValue.js @@ -1,4 +1,4 @@ -import request from '@/utils/L2Request' +import request from '@/utils/request' // 获取 DRIVE 设定值(最新成功发送) export function getDriveSetupValue() { diff --git a/apps/l2/src/api/l2/template.js b/apps/l2/src/api/l2/template.js index d1d319e..af6a2fb 100644 --- a/apps/l2/src/api/l2/template.js +++ b/apps/l2/src/api/l2/template.js @@ -1,4 +1,4 @@ -import request from '@/utils/l2-request' +import request from '@/utils/request' /** * 按模板编码查询发送模板(含明细) diff --git a/apps/l2/src/views/l2/pdo/index.vue b/apps/l2/src/views/l2/pdo/index.vue index d857a30..b7d03a2 100644 --- a/apps/l2/src/views/l2/pdo/index.vue +++ b/apps/l2/src/views/l2/pdo/index.vue @@ -17,7 +17,7 @@ 查询 重置 - 新增记录 + 补录 -
-
diff --git a/apps/l2/src/views/l2/send/drive.vue b/apps/l2/src/views/l2/send/drive.vue index eff3eca..7146eca 100644 --- a/apps/l2/src/views/l2/send/drive.vue +++ b/apps/l2/src/views/l2/send/drive.vue @@ -80,13 +80,16 @@ 计划ID: {{ setup.planid || '-' }} | 钢卷号: {{ setup.coilid || '-' }} - | 钢种: {{ setup.steelGrade || setup.grade || '-' }} +
入口厚度: {{ setup.entryThick || '-' }} 入口宽度: {{ setup.entryWidth || '-' }} +
+ +
入口重量: {{ setup.entryWeight || '-' }} 入口长度: {{ setup.entryLength || '-' }}
@@ -94,6 +97,9 @@
拉伸机延伸率: {{ setup.tlElong || '-' }} 轧机轧制力: {{ setup.tmRollforce || '-' }} +
+ +
轧机弯辊力: {{ setup.tmBendforce || '-' }} 更新时间: {{ formatTime(setup.updateTime) }}
diff --git a/apps/l2/src/views/l2/send/furnace.vue b/apps/l2/src/views/l2/send/furnace.vue index 9a88ae8..75897e1 100644 --- a/apps/l2/src/views/l2/send/furnace.vue +++ b/apps/l2/src/views/l2/send/furnace.vue @@ -7,57 +7,26 @@
- + - + 保存模板 - + 应用上次成功参数 - + 历史记录 - + @@ -71,13 +40,7 @@ 上次下发:{{ formatTime(lastSuccess.lastSendTime) }}
- + 下发 @@ -86,11 +49,7 @@
-
+
{{ group.groupTitle }} ({{ group.items.length }} 项) @@ -98,17 +57,10 @@ - + - +
@@ -176,8 +128,17 @@ export default { computed: { templateItems() { if (!this.template || !Array.isArray(this.template.items)) return [] + // 后端 enabled 可能是 1/0、"1"/"0"、true/false,避免被错误过滤导致页面无字段 return [...this.template.items] - .filter(i => i.enabled === undefined || i.enabled === 1 || i.enabled === null) + .filter(i => { + const en = i && i.enabled + // 未提供 enabled:默认展示 + if (en === undefined || en === null || en === '') return true + // 明确禁用:0/"0"/false + if (en === 0 || en === false) return false + if (String(en) === '0') return false + return true + }) .sort((a, b) => (a.itemNo || 0) - (b.itemNo || 0)) }, @@ -428,7 +389,7 @@ export default { type: 'warning' }).then(() => { this.doSend() - }).catch(() => {}) + }).catch(() => { }) }, async doSend() { @@ -500,23 +461,88 @@ export default {