feat: 更新应用版本至1.3.25并优化功能

- 更新config.js、manifest.json等文件中的版本号至1.3.25
- 在editby.vue页面添加品名、规格等钢卷信息展示
- 调整easycode.vue中otherTypes的过滤条件
- 修改klp-header.vue中的镀锌机组名称
- 更新update.js中的静态版本号
This commit is contained in:
砂糖
2026-01-27 09:45:06 +08:00
parent 8e3a26448a
commit 2f47047ae6
7 changed files with 33 additions and 9 deletions

View File

@@ -38,7 +38,7 @@ export default {
lineList: [ lineList: [
{ name: "科伦普重工-酸轧机组", key: "acidity" }, { name: "科伦普重工-酸轧机组", key: "acidity" },
// { name: "科伦普重工-彩涂机组", key: "paint" }, // { name: "科伦普重工-彩涂机组", key: "paint" },
{ name: "科伦普重工-镀锌线一组", key: "zinc1" }, { name: "科伦普重工-镀锌组", key: "zinc1" },
// { name: "科伦普重工-镀锌线二组", key: "zinc2" }, // { name: "科伦普重工-镀锌线二组", key: "zinc2" },
// { name: "科伦普重工-镀锌线三组", key: "zinc3" }, // { name: "科伦普重工-镀锌线三组", key: "zinc3" },
], ],

View File

@@ -9,7 +9,7 @@ module.exports = {
// 应用名称 // 应用名称
name: "ruoyi-app", name: "ruoyi-app",
// 应用版本 // 应用版本
version: "1.3.24", version: "1.3.25",
// 应用logo // 应用logo
logo: "/static/logo.jpg", logo: "/static/logo.jpg",
// 官方网站 // 官方网站

View File

@@ -2,7 +2,7 @@
"name" : "科伦普", "name" : "科伦普",
"appid" : "__UNI__E781B49", "appid" : "__UNI__E781B49",
"description" : "", "description" : "",
"versionName" : "1.3.24", "versionName" : "1.3.25",
"versionCode" : 1, "versionCode" : 1,
"transformPx" : false, "transformPx" : false,
"app-plus" : { "app-plus" : {

View File

@@ -229,7 +229,7 @@
otherTypes() { otherTypes() {
return this.types.filter(item => { return this.types.filter(item => {
const value = parseInt(item.dictValue); const value = parseInt(item.dictValue);
return value < 100 || value > 199; return value < 100 || (value > 199 && value < 400);
}); });
} }
}, },

View File

@@ -1,6 +1,22 @@
<template> <template>
<view class="typing-container"> <view class="typing-container">
<view class="info-grid"> <view class="info-grid">
<view class="info-item">
<text class="item-label">品名</text>
<text class="item-value">{{ coilDetail.itemName }}</text>
</view>
<view class="info-item">
<text class="item-label">规格</text>
<text class="item-value">{{ coilDetail.itemSpecification }}</text>
</view>
<view class="info-item">
<text class="item-label">材质</text>
<text class="item-value">{{ coilDetail.itemMaterial }}</text>
</view>
<view class="info-item">
<text class="item-label">厂家</text>
<text class="item-value">{{ coilDetail.itemManufacturer }}</text>
</view>
<view class="info-item"> <view class="info-item">
<text class="item-label">入场钢卷号</text> <text class="item-label">入场钢卷号</text>
<text class="item-value">{{ coilDetail.enterCoilNo || '-' }}</text> <text class="item-value">{{ coilDetail.enterCoilNo || '-' }}</text>
@@ -93,7 +109,8 @@
data() { data() {
return { return {
form: {}, form: {},
coilDetail: {}, coilDetail: {
},
loading: false, loading: false,
} }
}, },
@@ -107,8 +124,14 @@
fetchCoil(coilId) { fetchCoil(coilId) {
getMaterialCoil(coilId).then(res => { getMaterialCoil(coilId).then(res => {
this.form = res.data; this.form = res.data;
this.coilDetail = res.data; this.coilDetail = {
console.log(this.form, '钢卷信息') ...res.data,
itemName: res.data.materialType == '成品' ? res.data.product.productName : res.data.rawMaterial.rawMaterialName,
itemSpecification: res.data.materialType == '成品' ? res.data.product.specification : res.data.rawMaterial.specification,
itemManufacturer: res.data.materialType == '成品' ? res.data.product.manufacturer : res.data.rawMaterial.manufacturer,
itemMaterial: res.data.materialType == '成品' ? res.data.product.material : res.data.rawMaterial.material
};
console.log('钢卷信息', this.form, )
}) })
}, },
// 获取设备信息(原有方法不变) // 获取设备信息(原有方法不变)

View File

@@ -73,7 +73,8 @@ function checkStorageSpace() {
function checkUpdate(forceCheck = false) { function checkUpdate(forceCheck = false) {
// 1. 准备本地版本信息 // 1. 准备本地版本信息
const localVersion = plus.runtime.version; // 基座版本 const localVersion = plus.runtime.version; // 基座版本
const staticVersion = '1.3.24'; // 静态默认版本 const staticVersion = '1.3.25'; // 静态默认版本
// const localWgtVersion = staticVersion;
const localWgtVersion = uni.getStorageSync('wgtVersion') || staticVersion; // 本地wgt版本从存储获取或用默认 const localWgtVersion = uni.getStorageSync('wgtVersion') || staticVersion; // 本地wgt版本从存储获取或用默认
const currentVersion = compareVersion(localWgtVersion, localVersion) > 0 const currentVersion = compareVersion(localWgtVersion, localVersion) > 0
? localWgtVersion ? localWgtVersion

View File

@@ -1,5 +1,5 @@
{ {
"version": "klp 1.3.24", "version": "klp 1.3.25",
"wgtUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.wgt", "wgtUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.wgt",
"apkUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.apk" "apkUrl": "http://49.232.154.205:10900/fadapp-update/klp/klp.apk"
} }