From 6a7e972384b43d476bac7647ab2338d2789acded Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 14 十一月 2025 10:40:09 +0800
Subject: [PATCH] 调试
---
pages/index.vue | 123 +++++++++++++++++++++++++----------------
1 files changed, 75 insertions(+), 48 deletions(-)
diff --git a/pages/index.vue b/pages/index.vue
index 57939a5..842bc80 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -17,18 +17,21 @@
<view class="tab-item" :class="{ active: currentTab === 4 }" @click="changeTab(4)">
鐢熶骇鎶ュ伐
</view>
- <view class="tab-item" :class="{ active: currentTab === 1 }" @click="changeTab(1)">
+ <!-- <view class="tab-item" :class="{ active: currentTab === 1 }" @click="changeTab(1)">
寮�宸ュ畬宸�
- </view>
+ </view> -->
<view class="tab-item" :class="{ active: currentTab === 5 }" @click="changeTab(5)">
e-SOP
</view>
<view class="tab-item" :class="{ active: currentTab === 6 }" @click="changeTab(6)">
宸ヨ壓鍙傛暟
</view>
- <view class="tab-item" :class="{ active: currentTab === 8 }" @click="changeTab(8)">
- 鎵撳嵃鏈鸿缃�
+ <view class="tab-item" :class="{ active: currentTab === 9 }" @click="changeTab(9)">
+ 璁惧鐐规
</view>
+ <!-- <view class="tab-item" :class="{ active: currentTab === 8 }" @click="changeTab(8)">
+ 鎵撳嵃鏈鸿缃�
+ </view> -->
</view>
<view class="font"></view>
@@ -38,9 +41,9 @@
<view class="top-right">
<button class="refresh-btn" @click="refresh">鍒锋柊</button>
</view>
- <!--<view>
+ <view>
<h4>涓�鍙版満鍙板彧鑳介�夋嫨涓�鏉″伐鍗曪紙澶氶�夐粯璁や负鏈�鍚庝竴鏉★級</h4>
- </view>-->
+ </view>
<view class="section top-section">
<view class="form-row">
<view>
@@ -63,28 +66,28 @@
<view class="section card">
<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁" @selection-change="selectionChange">
<uni-tr>
- <uni-th align="center" class="th" style="color: #FFFFFF">宸ュ簭</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF">宸ュ崟鍙�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF">浜у搧缂栫爜</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF">浜у搧鍚嶇О</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF">瑙勬牸</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸茬敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">鏈敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">娲惧伐鏁伴噺</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸ュ崟鏁伴噺</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">宸ュ崟鐘舵��</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF;width: 100px;">鎶ュ伐浜�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF">閫夋嫨</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 140px;">宸ュ簭</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 180px;">宸ュ崟鍙�</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 220px;">浜у搧缂栫爜</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 180px;">浜у搧鍚嶇О</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 180px;">瑙勬牸</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">宸茬敓浜ф暟閲�</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">鏈敓浜ф暟閲�</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">娲惧伐鏁伴噺</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">宸ュ崟鏁伴噺</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">宸ュ崟鐘舵��</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">鎶ュ伐浜�</uni-th>
+ <uni-th align="center" class="th" style="color: #FFFFFF; width: 120px;">閫夋嫨</uni-th>
</uni-tr>
<uni-tr v-for="(item, index) in isShowTableData" :key="index">
<uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.procName" /><!--宸ュ簭-->
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa001" />
+ <input class="form-input" disabled="true" type="text" v-model="item.daa001" /><!--宸ュ崟鍙�-->
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa002" />
+ <input class="form-input" disabled="true" type="text" v-model="item.daa002" /><!--浜у搧缂栫爜-->
</uni-td>
<uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.daa003" /><!--浜у搧鍚嶇О-->
@@ -112,7 +115,7 @@
</uni-td>
<uni-td>
<view class="uni-group">
- <button type="default" @click="toDetail(item)">
+ <button class="select-btn" type="default" @click="toDetail(item)">
閫夋嫨
</button>
</view>
@@ -163,6 +166,10 @@
<view v-if="currentTab === 6" class="tab-content">
<Technology :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
+ <view v-if="currentTab === 9" class="tab-content">
+ <!-- 璁惧鐐规瑙嗗浘 -->
+ <EquipmentInspection :machineNo="machineNo" />
+ </view>
</scroll-view>
@@ -170,11 +177,12 @@
<view v-if="isShow" class="overlay">
<view class="popup">
<view class="form-row">
- <view>
- <label style="float: left;margin-top: 18px;">閫夋嫨宸ュ崟鐘舵��:</label>
+ <view style="display: flex; align-items: center;">
+ <label style="float: left;margin-top: 18px;">鐐瑰嚮鎸夐挳绛涢�夊伐鍗曠姸鎬�:</label>
<superwei-combox :candidates="engineeringNoMapList" placeholder="璇烽�夋嫨" v-model="engineeringNo"
@select="onEngineeringNoChange" class="picker"
style="padding: 7px 46px;width: 650px;"></superwei-combox>
+ <span style="margin-left: 20px; color: #ff6600; font-size: 18px;">澶氶�夋椂鍙繚鐣欐渶鍚庝竴鏉″伐鍗�</span>
</view>
</view>
@@ -248,16 +256,17 @@
</template>
<script>
- import WorkOrderStatus from '../components/WorkOrderStatus.vue'; // 纭繚璺緞姝ｇ‘
- import UniTable from "../uni_modules/uni-table/components/uni-table/uni-table.vue";
- import Mold from "../components/mold.vue";
- import Machine from "../components/machine.vue";
- import WorkOrderPrint from "../components/WorkOrderPrint.vue";
- import WorkOrder from "../components/WorkOrder.vue";
- import Technology from "../components/Technology.vue";
- import PDFShow from "../components/PDFShow.vue";
- import PrintInit from "../components/PrintInit.vue";
- import PrintTest from "../components/PrintTest.vue";
+import WorkOrderStatus from '../components/WorkOrderStatus.vue'; // 纭繚璺緞姝ｇ‘
+import UniTable from "../uni_modules/uni-table/components/uni-table/uni-table.vue";
+import Mold from "../components/mold.vue";
+import Machine from "../components/machine.vue";
+import WorkOrderPrint from "../components/WorkOrderPrint.vue";
+import WorkOrder from "../components/WorkOrder.vue";
+import Technology from "../components/Technology.vue";
+import PDFShow from "../components/PDFShow.vue";
+import PrintInit from "../components/PrintInit.vue";
+import PrintTest from "../components/PrintTest.vue";
+import EquipmentInspection from "../components/EquipmentInspection.vue";
export default {
components: {
@@ -270,7 +279,8 @@
WorkOrderStatus,
PDFShow,
PrintInit,
- PrintTest
+ PrintTest,
+ EquipmentInspection
},
data() {
return {
@@ -396,9 +406,9 @@
this.getWomdaaIsShow();
},
getPrintInfo() {
- var mac = "ac:f4:2c:20:0d:b4";
+ var mac = "";
- mac = "e8:51:9e:7d:dc:95";
+ mac = "74:24:ca:4f:b7:9b";
this.$post({
url: "/DevMachine/GetDevMachineByPdaMac",
data: {
@@ -416,6 +426,7 @@
this.getWomdaaIsShow();
});
+ return;
if (plus.os.name == "Android") {
@@ -445,7 +456,7 @@
}).then(res => {
let devMachine = res.data.tbBillList;
this.machineNo = devMachine.machineNo;
- this.machineName = "褰撳墠鏈哄彴锛�" + this.machineNo + "鍙锋敞濉戞満";
+ this.machineName = "褰撳墠鏈哄彴锛�" + this.machineNo + "鍙烽娇杞満";
uni.setStorageSync('machineNo', this.machineNo);
uni.setStorageSync('printMac', devMachine.printMac);
@@ -877,16 +888,19 @@
/* Increased font size for content */
}
- .picker {
- float: left;
- margin-top: 7px;
- margin-left: 10px;
- text-align: center;
- font-size: 100%;
- padding: 5.5px 1px;
- background-color: #f8f8f8;
- border: 2px solid #ccc;
- }
+ .picker {
+ float: left;
+ margin-top: 7px;
+ margin-left: 10px;
+ text-align: center;
+ font-size: 100%;
+ padding: 5.5px 1px;
+ background-color: #fff; // 杩欓噷鏀逛负钃濊壊
+ border: 2px solid #007aff; // 杈规涔熸敼涓鸿摑鑹�
+ color: #007aff; // 瀛椾綋棰滆壊鏀逛负鐧借壊锛屼繚璇佸彲璇绘��
+ border-radius: 6px;
+ transition: background 0.2s;
+ }
.th {
background-color: lightskyblue;
@@ -997,4 +1011,17 @@
font-size: 20px;
}
}
-</style>
\ No newline at end of file
+
+ .select-btn {
+ width: 180px; // 鏇村
+ height: 80px; // 鏇撮珮
+ font-size: 1.8vw; // 瀛椾綋涔熺暐澶�
+ border-radius: 10px;
+ background-color: #f5f5f5;
+ color: #007aff;
+ border: 2px solid #007aff;
+ margin: 0 auto;
+ display: block;
+ }
+
+</style>
--
Gitblit v1.9.3