From 613247c5dc2cfb8dd163f0674e8909a40317ec26 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 23 三月 2026 15:33:09 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue | 129 ++++++++++++++++++++++++++-----------------
1 files changed, 78 insertions(+), 51 deletions(-)
diff --git a/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue b/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue
index e4af206..2d2e20a 100644
--- a/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue
+++ b/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue
@@ -1,75 +1,54 @@
<template>
<view style="padding: 20rpx 40rpx;">
<view>
- <view v-for="item in HTechParams">
- <uni-tag :text="`${item.HTechParamName}:${item.HResult}`" type="primary" />
- </view>
+ <view v-for="item in HTechParams" style="padding-bottom: 20rpx;">
+ <view class="row-head">{{ item["鍒嗙粍鍚嶇О"] }}</view>
+ <uni-row :gutter="3" class="row-content">
+ <uni-col class="equal-height-col" :span="8" v-for="unit in item['鍙傛暟鍒楄〃']">
+ <view style="font-size: 28rpx; text-align: center; padding: 8rpx 0;">
+ {{ unit.HTechParamName }}: {{unit.HResult}}
+ </view>
+ </uni-col>
+ </uni-row>
+ </view>
</view>
</view>
</template>
<script>
- import { CommonUtils } from '@/utils/common';
- import { getUserInfo } from '@/utils/auth';
+ import {
+ CommonUtils
+ } from '@/utils/common';
+ import {
+ getUserInfo
+ } from '@/utils/auth';
+ import timerManager from '@/utils/timer';
export default {
data() {
return {
+ HTimerID: 'Sc_EquipTechParamQueryTimer',
HTechParams: []
};
- },
+ },
methods: {
- async loadBillMain(HEquipID) {
+ async loadBillMain(HEquipID, showLoading=true) {
try {
let res = await CommonUtils.doRequest2Async({
url: "/Web/getSB_EquipTechParamBillListByEquipID",
data: {
HEquipID: HEquipID,
- }
+ },
+ showLoading: showLoading
})
-
+
let {
data,
count,
- Message
+ Message,
+ code
} = res.data
-
- if (count == 1) {
- // Object.assign(this.hform, {
- // "HMaterID": data[0].HMaterID,
- // "HMaterNumber": data[0].浜у搧浠ｇ爜,
- // "HMaterName": data[0].浜у搧鍚嶇О,
- // "HMaterModel": data[0].瑙勬牸鍨嬪彿,
- // "HProcID": data[0].HProcID,
- // "HProcName": data[0].宸ュ簭鍚嶇О,
- // "HProcNo": data[0].宸ュ簭鍙�,
- // //"HGroupID": data[0].HGroupID == undefined ? 0 : data[0].HGroupID,
- // //"HGroupName": data[0].鐝粍,
- // "HDeptID": data[0].HDeptID == undefined ? 0 : data[0].HDeptID,
- // "HDeptName": data[0].鍔犲伐杞﹂棿,
-
- // "HSourceID": data[0].HSourceID,
- // "HSourceName": data[0].鐢熶骇璧勬簮,
-
- // "HEquipID": data[0].HEquipID,
- // "HEquipName": data[0].璁惧鍚嶇О,
-
- // "HICMOInterID": data[0].hicmointerid,
- // "HICMOEntryID": data[0].HICMOEntryID,
- // "HICMOBillNo": data[0].浠诲姟鍗曞彿,
-
- // "HProcExchInterID": data[0].hmainid,
- // "HProcExchEntryID": data[0].HEntryID,
- // "HProcExchBillNo": data[0].鍗曟嵁鍙�,
-
- // "HMainSourceInterID": data[0].hmainid,
- // "HMainSourceEntryID": data[0].HEntryID,
- // "HMainSourceBillNo": data[0].鍗曟嵁鍙�,
- // "HMainSourceBillType": data[0].鍗曟嵁绫诲瀷,
-
- // "HMouldName": data[0].妯″叿鍚嶇О,
- // "HMouldID": data[0].HMouldID
- // })
-
+
+ if (code == 1) {
this.HTechParams = data
} else {
CommonUtils.showTips({
@@ -77,7 +56,7 @@
message: `鑾峰彇婧愬崟淇℃伅澶辫触: ${Message}`
})
}
-
+
} catch (err) {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
@@ -85,14 +64,62 @@
})
}
},
+
},
onLoad(e) {
- let {HEquipID} = e
+ let {
+ HEquipID
+ } = e
this.loadBillMain(HEquipID)
+ this.HEquipID = HEquipID
+ },
+ onShow() {
+ // 鍒濆鍖栧畾鏃跺櫒 瀹氭椂璁块棶璁惧宸ヨ壓鍙傛暟
+ timerManager.createTimer(this.HTimerID, () => {
+ this.loadBillMain(this.HEquipID, false)
+ }, 60000, 'interval')
+ },
+ beforeDestroy() {
+ timerManager.clearAllTimers()
+ },
+ onUnload() {
+ timerManager.clearAllTimers();
}
}
</script>
<style lang="scss">
+ .row-head {
+ border-radius: 10rpx 10rpx 0 0;
+ background-color: rgb(0, 125, 255);
+ color: rgb(255, 255, 255);
+ font-weight: bold;
+ padding: 12rpx 16rpx;
+ font-family: "PingFang SC", "Microsoft YaHei", sans-serifs;
+ }
-</style>
+ .row-content {
+ width: 100%;
+ padding: 15rpx;
+ background: #f5f5f5;
+ word-break: break-all;
+ display: flex;
+ align-items: stretch;
+ flex-wrap: wrap;
+ border-collapse: collapse;
+ border: #f0f0f0 2px solid;
+ }
+
+ .row-content:last-child {
+ border-radius: 0 0 10rpx 10rpx;
+ }
+
+ .equal-height-col {
+ display: flex;
+ height: inherit;
+ padding: 1rpx;
+ justify-content: center;
+ color: rgba(51, 51, 51, 1.0);
+ font-family: "PingFang SC", "Microsoft YaHei", sans-serifs;
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.1