From 67fcba3d227790dfc9e3a50e35be0cde821c58e3 Mon Sep 17 00:00:00 2001
From: Administrator <2856754968@qq.com>
Date: 星期四, 06 十一月 2025 20:21:21 +0800
Subject: [PATCH] 111
---
pages/index.vue | 305 ++++++++++++++++++++++++--------------------------
1 files changed, 148 insertions(+), 157 deletions(-)
diff --git a/pages/index.vue b/pages/index.vue
index 9b752f8..0a14b72 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,55 +1,46 @@
-锘�<template>
+<template>
- <view class="page-container">
- <!-- 椤堕儴鎿嶄綔鏉＄粺涓�灞曠ず鏈哄彴淇℃伅涓庡揩鎹锋搷浣� -->
- <view class="top-bar">
- <view class="top-bar__title">娴溠呭殠閹笛嗩攽閹貉冨煑閸�?/view>
- <view class="top-bar__actions inline-gap">
- <view class="device-chip">
- <text class="device-chip__label">瑜版挸澧犻張鍝勫酱</text>
- <text class="device-chip__value">{{ machineName || '閺堫亞绮︾��? }}</text>
- </view>
- <button class="btn btn--secondary" @click="refresh">閸掗攱鏌�</button>
- </view>
- </view>
- <!-- 妯悜鏍囩瀵艰埅锛屼繚鎸佸悇涓氬姟椤垫牱寮忎竴鑷� -->
- <view class="tab-strip">
- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 7 }" @click="changeTab(7)">
+ <view>
+ <view class="tab-bar">
+ <view class="tab-item" :class="{ active: currentTab === 7 }" @click="changeTab(7)">
宸ュ崟閫夋嫨
</view>
- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 0 }" @click="changeTab(0)">
+ <view class="tab-item" :class="{ active: currentTab === 0 }" @click="changeTab(0)">
涓荤晫闈�
</view>
- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 3 }" @click="changeTab(3)">
+ <view class="tab-item" :class="{ active: currentTab === 3 }" @click="changeTab(3)">
璋冩満閫佹
</view>
- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 2 }" @click="changeTab(2)">
+ <view class="tab-item" :class="{ active: currentTab === 2 }" @click="changeTab(2)">
鍒�鍏风鐞�
</view>
- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 4 }" @click="changeTab(4)">
+ <view class="tab-item" :class="{ active: currentTab === 4 }" @click="changeTab(4)">
鐢熶骇鎶ュ伐
</view>
- <!-- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 1 }" @click="changeTab(1)">
+ <!-- <view class="tab-item" :class="{ active: currentTab === 1 }" @click="changeTab(1)">
寮�宸ュ畬宸�
</view> -->
- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 5 }" @click="changeTab(5)">
+ <view class="tab-item" :class="{ active: currentTab === 5 }" @click="changeTab(5)">
e-SOP
</view>
- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 6 }" @click="changeTab(6)">
+ <view class="tab-item" :class="{ active: currentTab === 6 }" @click="changeTab(6)">
宸ヨ壓鍙傛暟
</view>
- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 9 }" @click="changeTab(9)">
+ <view class="tab-item" :class="{ active: currentTab === 9 }" @click="changeTab(9)">
璁惧鐐规
</view>
- <!-- <view class="tab-strip__item" :class="{ 'tab-strip__item--active': currentTab === 8 }" @click="changeTab(8)">
+ <!-- <view class="tab-item" :class="{ active: currentTab === 8 }" @click="changeTab(8)">
鎵撳嵃鏈鸿缃�
</view> -->
</view>
<view class="font"></view>
- <scroll-view class="page-scroll" scroll-y="true">
- <view v-if="currentTab === 7" class="tab-content content-panel">
+ <scroll-view class="content">
+ <view v-if="currentTab === 7" class="tab-content">
<view class="content">
+ <view class="top-right">
+ <button class="refresh-btn" @click="refresh">鍒锋柊</button>
+ </view>
<!--<view>
<h4>涓�鍙版満鍙板彧鑳介�夋嫨涓�鏉″伐鍗曪紙澶氶�夐粯璁や负鏈�鍚庝竴鏉★級</h4>
</view>-->
@@ -66,61 +57,61 @@
<view class="form-row">
<view>
<label style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px;">绗竴姝ラ�夋嫨宸ュ崟:</label>
- <button class="btn btn--primary choose-order-btn" @click="isShowTab">閫夋嫨宸ュ崟</button>
+ <button class="print-btn" @click="isShowTab">閫夋嫨宸ュ崟</button>
</view>
</view>
</view>
<!-- <!– 涓儴锛氳繍琛岀姸鎬�-->
<view class="section card">
- <uni-table class="table" border stripe emptyText="鏆傛棤鏇村鏁版嵁" @selection-change="selectionChange">
- <uni-tr class="table__head">
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">宸ュ簭</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">宸ュ崟鍙�/uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">浜у搧缂栫爜</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">浜у搧鍚嶇О</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">瑙勬牸</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">宸茬敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">鏈敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">娲惧伐鏁伴噺</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">宸ュ崟鏁伴噺</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">宸ュ崟鐘舵��</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">鎶ュ伐浜�</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">閫夋嫨</uni-th>
+ <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-tr>
- <uni-tr class="table__row" v-for="(item, index) in isShowTableData" :key="index">
- <uni-td align="center" class="table__cell">
+ <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" class="table__cell">
+ <uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.daa001" />
</uni-td>
- <uni-td align="center" class="table__cell">
+ <uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.daa002" />
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa003" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa003" /><!--浜у搧鍚嶇О-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa004" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa004" /><!--瑙勬牸-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa011" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa011" /><!--宸茬敓浜ф暟閲�-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" :value="(item.daa008 || 0) - (item.daa011 || 0)" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" :value="(item.daa008 || 0) - (item.daa011 || 0)" /><!--鏈敓浜ф暟閲�-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa008" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--娲惧伐鏁伴噺-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa008" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--宸ュ崟鏁伴噺-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa018" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa018" /><!--宸ュ崟鐘舵��-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.staffName" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.staffName" /><!--鎶ュ伐浜�-->
</uni-td>
<uni-td>
<view class="uni-group">
@@ -145,36 +136,44 @@
</view>
</view>
</view>
- <view v-if="currentTab === 0" class="tab-content content-panel">
+ <view v-if="currentTab === 0" class="tab-content">
<WorkOrder :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo"
:deviceNumber="machineName" />
</view>
- <view v-if="currentTab === 1" class="tab-content content-panel">
+ <view v-if="currentTab === 1" class="tab-content">
+ <!-- <!– 璋冪敤 WorkOrderStatus 缁勪欢 –>-->
<WorkOrderStatus :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
- <view v-if="currentTab === 2" class="tab-content content-panel">
+ <view v-if="currentTab === 2" class="tab-content">
+ <!-- <!– 璋冪敤 mold 缁勪欢 –>-->
<mold :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
- <view v-if="currentTab === 3" class="tab-content content-panel">
+ <view v-if="currentTab === 3" class="tab-content">
+ <!-- <!– 璋冪敤 mold 缁勪欢 –>-->
<machine :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
- <view v-if="currentTab === 4" class="tab-content content-panel">
+ <view v-if="currentTab === 4" class="tab-content">
+ <!-- 璋冪敤 mold 缁勪欢 -->
<WorkOrderPrint :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
- <view v-if="currentTab === 8" class="tab-content content-panel">
+ <view v-if="currentTab === 8" class="tab-content">
+ <!-- 璋冪敤 mold 缁勪欢 -->
<PrintInit :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
- <view v-if="currentTab === 5" class="tab-content content-panel">
+ <view v-if="currentTab === 5" class="tab-content">
<PDFShow :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
- <view v-if="currentTab === 6" class="tab-content content-panel">
+ <view v-if="currentTab === 6" class="tab-content">
<Technology :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
- <view v-if="currentTab === 9" class="tab-content content-panel">
+ <view v-if="currentTab === 9" class="tab-content">
+ <!-- 璁惧鐐规瑙嗗浘 -->
<EquipmentInspection :machineNo="machineNo" />
</view>
</scroll-view>
+
+ <!-- 寮圭獥涓嬫媺妗嗗彧鏄剧ず宸ュ崟鐘舵�� -->
<view v-if="isShow" class="overlay">
<view class="popup">
<view class="form-row">
@@ -192,52 +191,52 @@
<view class="section card">
<uni-table ref="table" type="selection" border stripe emptyText="鏆傛棤鏇村鏁版嵁"
@selection-change="selectionChange">
- <uni-tr class="table__head">
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">宸ュ簭</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">宸ュ崟鍙�</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">浜у搧缂栫爜</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">浜у搧鍚嶇О</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF">瑙勬牸</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">宸茬敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">鏈敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">娲惧伐鏁伴噺</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">宸ュ崟鏁伴噺</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">宸ュ崟鐘舵��</uni-th>
- <uni-th align="center" class="th table__cell" style="color: #FFFFFF;width: 100px;">鎶ュ伐浜�</uni-th>
+ <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-tr>
- <uni-tr class="table__row" v-for="(item, index) in tableData" :key="index">
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.procName" />
+ <uni-tr v-for="(item, index) in tableData" :key="index">
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.procName" /><!--宸ュ簭-->
</uni-td>
- <uni-td align="center" class="table__cell">
+ <uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.daa001" />
</uni-td>
- <uni-td align="center" class="table__cell">
+ <uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.daa002" />
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa003" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa003" /><!--浜у搧鍚嶇О-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa004" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa004" /><!--瑙勬牸-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa011" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa011" /><!--宸茬敓浜ф暟閲�-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" :value="(item.daa008 || 0) - (item.daa011 || 0)" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" :value="(item.daa008 || 0) - (item.daa011 || 0)" /><!--鏈敓浜ф暟閲�-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa008" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--娲惧伐鏁伴噺-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa008" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--宸ュ崟鏁伴噺-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.daa018" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa018" /><!--宸ュ崟鐘舵��-->
</uni-td>
- <uni-td align="center" class="table__cell">
- <input class="form-input" disabled="true" type="text" v-model="item.staffName" />
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.staffName" /><!--鎶ュ伐浜�-->
</uni-td>
</uni-tr>
</uni-table>
@@ -256,7 +255,7 @@
</template>
<script>
-import WorkOrderStatus from '../components/WorkOrderStatus.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";
@@ -406,7 +405,7 @@
this.getWomdaaIsShow();
},
getPrintInfo() {
- var mac = "ac:f4:2c:20:0d:b4";
+ var mac = "";
mac = "74:24:ca:4f:b7:9b";
this.$post({
@@ -426,6 +425,7 @@
this.getWomdaaIsShow();
});
+ return;
if (plus.os.name == "Android") {
@@ -834,67 +834,49 @@
flex-direction: column;
}
- /* 椤堕儴鏈哄彴淇℃伅鑳跺泭 */
- .device-chip {
+ .tab-bar {
display: flex;
- flex-direction: column;
- justify-content: center;
- min-width: 180px;
- padding: 8px 16px;
- border-radius: 12px;
- background: rgba(30, 58, 95, 0.12);
- border: 1px solid rgba(30, 58, 95, 0.35);
- color: #1e3a5f;
+ justify-content: space-around;
+ background-color: #f5f5f5;
+ padding: 1vh;
+ padding-top: 30px;
+ border-bottom: 1px solid #ccc;
}
- .device-chip__label {
- font-size: 12px;
- letter-spacing: 0.08em;
- color: rgba(27, 36, 51, 0.65);
+ .top-right {
+ position: absolute;
+ top: 10px;
+ right: 50px;
+ z-index: 1000;
}
- .device-chip__value {
- font-size: 18px;
- font-weight: 600;
+ .refresh-btn {
+ padding: 10px;
+ background-color: #00A2E9;
+ color: white;
+ border: none;
+ font-size: 1.5vw;
+ border-radius: 5px;
}
- /* 椤堕儴瀵艰埅鏍囩 */
- .tab-strip {
- display: flex;
- flex-wrap: wrap;
- gap: 16px;
- margin: 24px 0;
- padding: 16px;
- background: rgba(255, 255, 255, 0.9);
- border-radius: 16px;
- border: 1px solid rgba(30, 58, 95, 0.12);
- box-shadow: 0 20px 50px rgba(15, 34, 58, 0.12);
- }
-
- .tab-strip__item {
+ .tab-item {
flex: 1;
- min-width: 140px;
text-align: center;
- padding: 16px 12px;
- border-radius: 12px;
- background: rgba(30, 58, 95, 0.05);
- color: #1e3a5f;
+ margin-right: 0.5vw;
+ padding: 1vh;
+ border-radius: 0.5vw;
+ background-color: #fff;
+ color: #007aff;
cursor: pointer;
- font-size: 18px;
- font-weight: 600;
- letter-spacing: 0.04em;
- transition: all 0.2s ease;
+ font-size: 1.8vw;
+ /* Increased font size */
+ transition: background-color 0.3s, color 0.3s;
}
- .tab-strip__item:hover {
- background: rgba(27, 127, 233, 0.1);
- box-shadow: inset 0 0 0 1px rgba(27, 127, 233, 0.4);
- }
-
- .tab-strip__item--active {
- background: linear-gradient(135deg, #1e3a5f 0%, #0f223a 100%);
+ .tab-item.active {
+ background-color: #007aff;
color: #fff;
- box-shadow: 0 12px 35px rgba(15, 34, 58, 0.35);
+ font-weight: bold;
}
.content {
@@ -972,12 +954,21 @@
/* Increased font size within popups */
}
- .choose-order-btn {
- margin-left: 12px;
+ .print-btn {
+ float: left;
+ margin-top: 4px;
+ margin-left: 10px;
+ text-align: center;
+ font-size: 100%;
+ color: black;
+ padding: 0px 90px;
+ border: 2px solid #ccc;
+ cursor: pointer;
+ border-radius: 0.8vw;
}
@media screen and (max-width: 1920px) {
- .tab-strip__item {
+ .tab-item {
font-size: 1.6vw;
}
--
Gitblit v1.9.3