From 00573ced1f083d45dbeea58aad6bf4dced03903c Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期五, 20 三月 2026 10:03:57 +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 |  144 ++++++++++++++++++++++++++++++------------------
 1 files changed, 90 insertions(+), 54 deletions(-)

diff --git a/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue b/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue
index 7483baa..857cdc1 100644
--- a/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue
+++ b/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue
@@ -1,30 +1,34 @@
 <template>
     <view style="padding: 20rpx 40rpx;">
         <view>
-        	<view v-for="item in HTechParams">
-                    {{ item["鍒嗙粍鍚嶇О"] }}
-                    <uni-row :gutter="3">
-                        <uni-col :span="8" v-for="unit in item['鍙傛暟鍒楄〃']">
-                            <view>
-                                 <uni-tag :text="`${unit.HTechParamName}:${unit.HResult}`" type="primary" />
-                            </view>
-                        </uni-col>
-                    </uni-row>
+            <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;">
+                            {{ unit.HTechParamName }}:{{unit.HResult}}
+                        </view>
+                    </uni-col>
+                </uni-row>
 
-        	</view>
+            </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';
     export default {
         data() {
             return {
                 HTechParams: []
             };
-        },  
+        },
         methods: {
             async loadBillMain(HEquipID) {
                 try {
@@ -34,51 +38,51 @@
                             HEquipID: HEquipID,
                         }
                     })
-            
+
                     let {
                         data,
                         count,
                         Message,
                         code
                     } = res.data
-            
+
                     if (code == 1) {
-            //             Object.assign(this.hform, {
-            //                 "HMaterID": data[0].HMaterID,
-            //                 "HMaterNumber": data[0].浜у搧浠g爜,
-            //                 "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
-            //             })
-            
+                        //             Object.assign(this.hform, {
+                        //                 "HMaterID": data[0].HMaterID,
+                        //                 "HMaterNumber": data[0].浜у搧浠g爜,
+                        //                 "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
+                        //             })
+
                         this.HTechParams = data
                     } else {
                         CommonUtils.showTips({
@@ -86,7 +90,7 @@
                             message: `鑾峰彇婧愬崟淇℃伅澶辫触: ${Message}`
                         })
                     }
-            
+
                 } catch (err) {
                     CommonUtils.showTips({
                         title: '娓╅Θ鎻愮ず',
@@ -96,12 +100,44 @@
             },
         },
         onLoad(e) {
-            let {HEquipID} = e
+            let {
+                HEquipID
+            } = e
             this.loadBillMain(HEquipID)
         }
     }
 </script>
 
 <style lang="scss">
+    .row-head {
+        border-radius: 10rpx 10rpx 0 0;
+        background-color: rgb(229, 236, 243);
+        padding: 0 12rpx;
+        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(124, 124, 124, 1.0);
+        font-family: "PingFang SC", "Microsoft YaHei", sans-serifs;
+    }
+</style>
\ No newline at end of file

--
Gitblit v1.9.1