From 26351be21d952cfb1e109c823475579c50a268ed Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 14 十一月 2025 09:45:47 +0800
Subject: [PATCH] 调试
---
pages/index.vue | 241 ++++++++++++++++++++++++++---------------------
1 files changed, 132 insertions(+), 109 deletions(-)
diff --git a/pages/index.vue b/pages/index.vue
index 5f62566..842bc80 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -15,20 +15,23 @@
鍒�鍏风鐞�
</view>
<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>
@@ -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>
@@ -126,11 +129,10 @@
</view>
<view>
- <text style="color: red;">
- 璇存槑:鍒濆鐘舵�佹槸锛屾寜榻胯疆鏈烘煡鍑烘墍鏈夌殑鏈畬宸ョ殑宸ュ崟銆傜敤閫夋嫨妗嗘爣璇嗘満鍣ㄨ寮�宸ョ殑宸ュ崟銆�
- 鍙兘鍚屾椂寮�宸ヤ竴涓伐鍗曘�傞�夋嫨瀹屾垚锛岀偣鍑讳繚瀛橀�夋嫨銆傜郴缁熶繚鐣欓�変腑鐨勫伐鍗曘��
+ <!--<text style="color: red;">
+ 璇存槑:鍙兘鍚屾椂寮�宸ヤ竴涓伐鍗曘�傞�夋嫨瀹屾垚锛岀偣鍑讳繚瀛橀�夋嫨銆傜郴缁熶繚鐣欓�変腑鐨勫伐鍗曘��
濡傛灉瑕侀噸閫夛紝鐐瑰嚮娓呯┖閲嶉�夊姛鑳姐��
- </text>
+ </text>-->
</view>
</view>
</view>
@@ -164,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>
@@ -171,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>
@@ -183,7 +190,7 @@
<table>
<view class="section card">
- <uni-table ref="table" type="radio" border stripe emptyText="鏆傛棤鏇村鏁版嵁"
+ <uni-table ref="table" type="selection" border stripe emptyText="鏆傛棤鏇村鏁版嵁"
@selection-change="selectionChange">
<uni-tr>
<uni-th align="center" class="th" style="color: #FFFFFF">宸ュ簭</uni-th>
@@ -249,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: {
@@ -271,12 +279,16 @@
WorkOrderStatus,
PDFShow,
PrintInit,
- PrintTest
+ PrintTest,
+ EquipmentInspection
},
data() {
return {
orderStatus: '', // 榛樿鍏ㄩ儴
currentTab: 7,
+
+ productCode: '', // 浜у搧缂栫爜
+ productSpec: '', // 浜у搧瑙勬牸
machineList: [],
@@ -394,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: {
@@ -414,45 +426,46 @@
this.getWomdaaIsShow();
});
+ return;
- // if (plus.os.name == "Android") {
- // //鑾峰彇鎵嬫満MAC鍦板潃
- // var Context = plus.android.importClass("android.content.Context");
- // var WifiManager = plus.android.importClass("android.net.wifi.WifiManager");
- // var wifiManager = plus.android.runtimeMainActivity().getSystemService(Context.WIFI_SERVICE);
- // var WifiInfo = plus.android.importClass("android.net.wifi.WifiInfo");
- // var wifiInfo = wifiManager.getConnectionInfo();
- // mac = wifiInfo.getMacAddress();
+ if (plus.os.name == "Android") {
+ //鑾峰彇鎵嬫満MAC鍦板潃
+ var Context = plus.android.importClass("android.content.Context");
+ var WifiManager = plus.android.importClass("android.net.wifi.WifiManager");
+ var wifiManager = plus.android.runtimeMainActivity().getSystemService(Context.WIFI_SERVICE);
+ var WifiInfo = plus.android.importClass("android.net.wifi.WifiInfo");
+ var wifiInfo = wifiManager.getConnectionInfo();
+ mac = wifiInfo.getMacAddress();
- // //濡傛灉mac涓衡��02:00:00:00:00:00鈥濓紝鍒欏彲鑳芥槸瀹夊崜6.0浠ヤ笂鐗堟湰锛屽垯浣跨敤鍙︿竴绉嶆柟娉曡幏鍙杕ac鍦板潃
- // if (mac == "02:00:00:00:00:00") {
- // mac = this.getMacNew();
- // }
- // //濡傛灉mac浣跨敤鏂版柟娉曚緷鐒舵槸鈥�02:00:00:00:00:00鈥濆垯涓嶈繘琛屼繚瀛�
- // if (mac == "02:00:00:00:00:00") {
- // return;
- // }
- // uni.setStorageSync('pdaMac', mac);
+ //濡傛灉mac涓衡��02:00:00:00:00:00鈥濓紝鍒欏彲鑳芥槸瀹夊崜6.0浠ヤ笂鐗堟湰锛屽垯浣跨敤鍙︿竴绉嶆柟娉曡幏鍙杕ac鍦板潃
+ if (mac == "02:00:00:00:00:00") {
+ mac = this.getMacNew();
+ }
+ //濡傛灉mac浣跨敤鏂版柟娉曚緷鐒舵槸鈥�02:00:00:00:00:00鈥濆垯涓嶈繘琛屼繚瀛�
+ if (mac == "02:00:00:00:00:00") {
+ return;
+ }
+ uni.setStorageSync('pdaMac', mac);
- // this.$post({
- // url: "/DevMachine/GetDevMachineByPdaMac",
- // data: {
- // pdaMac: mac,
- // }
- // }).then(res => {
- // let devMachine = res.data.tbBillList;
- // this.machineNo = devMachine.machineNo;
- // this.machineName = "褰撳墠鏈哄彴锛�" + this.machineNo + "鍙锋敞濉戞満";
+ this.$post({
+ url: "/DevMachine/GetDevMachineByPdaMac",
+ data: {
+ pdaMac: mac,
+ }
+ }).then(res => {
+ let devMachine = res.data.tbBillList;
+ this.machineNo = devMachine.machineNo;
+ this.machineName = "褰撳墠鏈哄彴锛�" + this.machineNo + "鍙烽娇杞満";
- // uni.setStorageSync('machineNo', this.machineNo);
- // uni.setStorageSync('printMac', devMachine.printMac);
+ uni.setStorageSync('machineNo', this.machineNo);
+ uni.setStorageSync('printMac', devMachine.printMac);
- // this.getWomdaaIsShow();
+ this.getWomdaaIsShow();
- // });
- // }
+ });
+ }
},
save() {
let data = this.selectedItems();
@@ -568,12 +581,8 @@
return `${year}-${month}-${day}`; // 杩斿洖鏍煎紡鍖栧悗鐨勫瓧绗︿覆
},
selectionChange(e) {
- // 鍙繚鐣欐渶鍚庝竴涓�変腑鐨勫伐鍗�
- if (Array.isArray(e.detail.index)) {
- this.selectedIndexs = [e.detail.index[e.detail.index.length - 1]];
- } else {
- this.selectedIndexs = [e.detail.index];
- }
+ // 鍗曢�夌洿鎺ヨ祴鍊�
+ this.selectedIndexs = [e.detail.index];
},
selectedItems() {
@@ -637,29 +646,25 @@
});
},
- isShowTab() {
+ isShowTab() {
+ if (this.isShowTableData.length > 0) {
+ uni.showToast({
+ title: '宸叉湁姝ｅ湪鎿嶄綔鐨勫伐鍗曪紝涓嶈兘鍐嶆閫夋嫨',
+ icon: 'error',
+ duration: 2000
+ });
+ return;
+ }
- if (this.isShowTableData.length > 0) {
- uni.showToast({
- title: '宸叉湁姝ｅ湪鎿嶄綔鐨勫伐鍗曪紝涓嶈兘鍐嶆閫夋嫨',
- //灏嗗�艰缃负 success 鎴栬�呯洿鎺ヤ笉鐢ㄥ啓icon杩欎釜鍙傛暟
- icon: 'error',
- //鏄剧ず鎸佺画鏃堕棿涓� 2绉�
- duration: 2000
- });
-
- return;
- }
-
- this.isShow = true;
-
- this.engineeringNo = null;
- this.tableData = [];
+ this.isShow = true;
+ // 榛樿閫変腑鈥滃緟寮�宸モ��
+ this.engineeringNo = '寰呭紑宸�';
+ this.tableData = [];
// 涓嬫媺妗嗗彧鏄剧ず宸ュ崟鐘舵��
- this.engineeringNoMapList = ['寰呭紑宸�', '鏈紑宸�', '瀹屽伐', '鏆傚仠'];
- // 榛樿鏄剧ず鍏ㄩ儴宸ュ崟
- this.getWomdaa();
- },
+ this.engineeringNoMapList = ['寰呭紑宸�', '鏈紑宸�', '寮�宸�', '鏆傚仠', '瀹屽伐'];
+ // 榛樿鏄剧ず鈥滃緟寮�宸モ�濆伐鍗�
+ this.getWomdaaByStatus();
+ },
// 涓嬫媺妗嗛�変腑鍚庯紝鎸夌姸鎬佺瓫閫夊伐鍗�
onEngineeringNoChange(status) {
this.engineeringNo = status;
@@ -696,6 +701,8 @@
toDetail(item) {
this.orderId = item.id;
this.selectedOrder = item.daa001;
+ this.productCode = item.daa002; // 浜у搧缂栫爜
+ this.productSpec = item.daa004; // 浜у搧瑙勬牸
this.currentTab = 0;
}
},
@@ -881,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;
@@ -1001,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