From 2c7a7d3eaf692fdfd04a30b42da2d94848cdc89a Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 24 十二月 2025 16:25:50 +0800
Subject: [PATCH] 界面样式优化
---
pages/index.vue | 761 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 571 insertions(+), 190 deletions(-)
diff --git a/pages/index.vue b/pages/index.vue
index 4d8ca7d..46af944 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -14,6 +14,9 @@
<view class="tab-item" :class="{ active: currentTab === 3 }" @click="changeTab(3)">
璋冩満閫佹
</view>
+ <view class="tab-item" :class="{ active: currentTab === 10 }" @click="changeTab(10)">
+ 涓婁笅鍒�/棣栨鍗曡褰�
+ </view>
<view class="tab-item" :class="{ active: currentTab === 4 }" @click="changeTab(4)">
鐢熶骇鎶ュ伐
</view>
@@ -38,102 +41,96 @@
<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>
+ <!--<view>
<h4>涓�鍙版満鍙板彧鑳介�夋嫨涓�鏉″伐鍗曪紙澶氶�夐粯璁や负鏈�鍚庝竴鏉★級</h4>
- </view>
+ </view>-->
<view class="section top-section">
- <!--鏄剧ず褰撳墠鏈哄彴-->
- <view class="form-row">
- <view>
- <input v-model="machineName"
- disabled="true"
- type="text"
- class="machine-name-box" />
+ <view class="form-row align-row">
+ <input v-model="machineName"
+ disabled="true"
+ type="text"
+ class="machine-name-box" />
+ <view class="form-group">
+ <label style="float: left;margin-top: 18px;font-size: 22px;">鐐瑰嚮鎸夐挳绛涢�夊伐鍗曠姸鎬�:</label>
+ <superwei-combox :candidates="engineeringNoMapList" placeholder="璇烽�夋嫨" v-model="engineeringNo"
+ @select="onEngineeringNoChange" class="picker"
+ style="padding: 7px 46px;width: 650px;margin-right: 20px;"></superwei-combox>
</view>
- </view>
-
- <view class="form-row">
- <view>
- <label style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px;">绗竴姝ラ�夋嫨宸ュ崟:</label>
- <button class="print-btn" @click="isShowTab">閫夋嫨宸ュ崟</button>
+ <view class="top-right">
+ <button class="refresh-btn" @click="refresh">鍒锋柊</button>
</view>
</view>
</view>
- <!-- <!– 涓儴锛氳繍琛岀姸鎬�-->
+ <!-- 宸ュ崟閫夋嫨琛ㄦ牸 -->
<view class="section card">
- <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁" @selection-change="selectionChange">
+ <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
<uni-tr>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 100px;">宸ュ簭</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 200px;">宸ュ崟鍙�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 150px;">浜у搧缂栫爜</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 260px;">浜у搧鍚嶇О</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 200px;">瑙勬牸</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 75px;">宸茬敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 75px;">鏈敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 75px;">娲惧伐鏁伴噺</uni-th>
- <!--<uni-th align="center" class="th" style="color: #FFFFFF; width: 70px;">宸ュ崟鏁伴噺</uni-th>-->
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 90px;">宸ュ崟鐘舵��</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 90px;">鎶ュ伐浜�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 90px;">閫夋嫨</uni-th>
+ <uni-th align="center" class="th" style="width: 220px;">鎿嶄綔</uni-th>
+ <uni-th align="center" class="th" style="width: 100px;">宸ュ簭</uni-th>
+ <uni-th align="center" class="th" style="width: 200px;">宸ュ崟鍙�</uni-th>
+ <uni-th align="center" class="th" style="width: 150px;">浜у搧缂栫爜</uni-th>
+ <uni-th align="center" class="th" style="width: 240px;">浜у搧鍚嶇О</uni-th>
+ <uni-th align="center" class="th" style="width: 200px;">瑙勬牸</uni-th>
+ <uni-th align="center" class="th" style="width: 150px;">宸茬敓浜ф暟閲�</uni-th>
+ <uni-th align="center" class="th" style="width: 150px;">鏈敓浜ф暟閲�</uni-th>
+ <uni-th align="center" class="th" style="width: 150px;">娲惧伐鏁伴噺</uni-th>
+ <uni-th align="center" class="th" style="width: 150px;">宸ュ崟鏁伴噺</uni-th>
+ <uni-th align="center" class="th" style="width: 90px;">宸ュ崟鐘舵��</uni-th>
+ <uni-th align="center" class="th" style="width: 90px;">鎶ュ伐浜�</uni-th>
</uni-tr>
- <uni-tr v-for="(item, index) in isShowTableData" :key="index">
+ <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">
- <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" /><!--浜у搧缂栫爜-->
- </uni-td>
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa003" /><!--浜у搧鍚嶇О-->
- </uni-td>
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa004" /><!--瑙勬牸-->
- </uni-td>
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa011" /><!--宸茬敓浜ф暟閲�-->
- </uni-td>
- <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">
- <input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--娲惧伐鏁伴噺-->
- </uni-td>
- <!--<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa008" />--><!--宸ュ崟鏁伴噺-->
- <!--</uni-td>-->
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa018" /><!--宸ュ崟鐘舵��-->
- </uni-td>
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.staffName" /><!--鎶ュ伐浜�-->
- </uni-td>
- <uni-td>
- <view class="uni-group">
- <button class="select-btn" type="default" @click="toDetail(item)">
- 閫夋嫨
+ <view class="operation-btns">
+ <button
+ :class="getStartBtnClass(item)"
+ :disabled="isStartBtnDisabled(item)"
+ @click="handleStartWork(item)">
+ {{ getStartBtnText(item) }}
+ </button>
+ <button
+ class="pause-btn"
+ :disabled="isPauseBtnDisabled(item)"
+ @click="handlePauseWork(item)">
+ 鏆傚仠
</button>
</view>
</uni-td>
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.procName" />
+ </uni-td>
+ <uni-td align="center">
+ <div class="form-input">{{ item.daa001 }}</div>
+ </uni-td>
+ <uni-td align="center">
+ <div class="form-input">{{ item.daa002 }}</div>
+ </uni-td>
+ <uni-td align="center">
+ <div class="form-input">{{ item.daa003 }}</div>
+ </uni-td>
+ <uni-td align="center">
+ <div class="form-input">{{ item.daa004 }}</div>
+ </uni-td>
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa011" />
+ </uni-td>
+ <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">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa008" />
+ </uni-td>
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa008" />
+ </uni-td>
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa018" />
+ </uni-td>
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.staffName" />
+ </uni-td>
</uni-tr>
</uni-table>
- </view>
-
- <view class="bottom-section">
- <button class="cancel-btn" @click="cancel">娓呯┖閲嶉��</button>
- </view>
-
- <view>
- <!--<text style="color: red;">
- 璇存槑:鍙兘鍚屾椂寮�宸ヤ竴涓伐鍗曘�傞�夋嫨瀹屾垚锛岀偣鍑讳繚瀛橀�夋嫨銆傜郴缁熶繚鐣欓�変腑鐨勫伐鍗曘��
- 濡傛灉瑕侀噸閫夛紝鐐瑰嚮娓呯┖閲嶉�夊姛鑳姐��
- </text>-->
</view>
</view>
</view>
@@ -152,6 +149,10 @@
<view v-if="currentTab === 3" class="tab-content">
<!-- <!– 璋冪敤 mold 缁勪欢 –>-->
<machine :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
+ </view>
+ <view v-if="currentTab === 10" class="tab-content">
+ <!-- 璋冪敤 moldRecord 缁勪欢 -->
+ <MoldRecord :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo" />
</view>
<view v-if="currentTab === 4" class="tab-content">
<!-- 璋冪敤 mold 缁勪欢 -->
@@ -179,7 +180,7 @@
<view class="popup">
<view class="form-row">
<view style="display: flex; align-items: center;">
- <label style="float: left;margin-top: 18px;">鐐瑰嚮鎸夐挳绛涢�夊伐鍗曠姸鎬�:</label>
+ <label style="float: left;margin-top: 18px;font-size: 22px;">鐐瑰嚮鎸夐挳绛涢�夊伐鍗曠姸鎬�:</label>
<superwei-combox :candidates="engineeringNoMapList" placeholder="璇烽�夋嫨" v-model="engineeringNo"
@select="onEngineeringNoChange" class="picker"
style="padding: 7px 46px;width: 650px;"></superwei-combox>
@@ -187,25 +188,25 @@
</view>
</view>
- <div style="height: 400px; overflow: auto;">
+ <div style="height: 450px; overflow: auto;"> <!-- 璋冩暣楂樺害涓�380px锛屼负搴曢儴鎸夐挳鐣欏嚭鏇村绌洪棿 -->
<table>
<view class="section card">
<uni-table ref="table" type="selection" border stripe emptyText="鏆傛棤鏇村鏁版嵁"
class="large-selection-table" @selection-change="selectionChange">
<uni-tr>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 100px;">宸ュ簭</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: 150px;">浜у搧缂栫爜</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 260px;">浜у搧鍚嶇О</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 260px;">瑙勬牸</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">宸茬敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">鏈敓浜ф暟閲�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">娲惧伐鏁伴噺</uni-th>
- <!--<uni-th align="center" class="th" style="color: #FFFFFF; width: 80px;">宸ュ崟鏁伴噺</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="width: 100px;">宸ュ簭</uni-th>
+ <uni-th align="center" class="th" style="width: 200px;">宸ュ崟鍙�</uni-th>
+ <uni-th align="center" class="th" style="width: 150px;">浜у搧缂栫爜</uni-th>
+ <uni-th align="center" class="th" style="width: 240px;">浜у搧鍚嶇О</uni-th>
+ <uni-th align="center" class="th" style="width: 200px;">瑙勬牸</uni-th>
+ <uni-th align="center" class="th" style="width: 150px;">宸茬敓浜ф暟閲�</uni-th>
+ <uni-th align="center" class="th" style="width: 150px;">鏈敓浜ф暟閲�</uni-th>
+ <uni-th align="center" class="th" style="width: 150px;">娲惧伐鏁伴噺</uni-th>
+ <uni-th align="center" class="th" style="width: 150px;">宸ュ崟鏁伴噺</uni-th>
+ <uni-th align="center" class="th" style="width: 90px;">宸ュ崟鐘舵��</uni-th>
+ <uni-th align="center" class="th" style="width: 90px;">鎶ュ伐浜�</uni-th>
+<!-- <uni-th align="center" class="th" style="width: 126px;">閫夋嫨</uni-th> -->
</uni-tr>
<uni-tr v-for="(item, index) in tableData"
:key="index"
@@ -216,16 +217,16 @@
<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" />
+ <div class="form-input">{{ item.daa001 }}</div>
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa002" />
+ <div class="form-input">{{ item.daa002 }}</div>
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa003" /><!--浜у搧鍚嶇О-->
+ <div class="form-input">{{ item.daa003 }}</div>
</uni-td>
<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa004" /><!--瑙勬牸-->
+ <div class="form-input">{{ item.daa004 }}</div><!--瑙勬牸-->
</uni-td>
<uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.daa011" /><!--宸茬敓浜ф暟閲�-->
@@ -236,14 +237,21 @@
<uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--娲惧伐鏁伴噺-->
</uni-td>
- <!--<uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.daa008" />--><!--宸ュ崟鏁伴噺-->
- <!--</uni-td>-->
+ <uni-td align="center">
+ <input class="form-input" disabled="true" type="text" v-model="item.daa008" /><!--宸ュ崟鏁伴噺-->
+ </uni-td>
<uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.daa018" /><!--宸ュ崟鐘舵��-->
</uni-td>
<uni-td align="center">
<input class="form-input" disabled="true" type="text" v-model="item.staffName" /><!--鎶ュ伐浜�-->
+ </uni-td>
+ <uni-td>
+<!-- <view class="uni-group">
+ <button class="select-btn" type="default" @click="toDetail(item)">
+ 杞埌涓荤晫闈�
+ </button>
+ </view> -->
</uni-td>
</uni-tr>
</uni-table>
@@ -273,6 +281,7 @@
import PrintInit from "../components/PrintInit.vue";
import PrintTest from "../components/PrintTest.vue";
import EquipmentInspection from "../components/EquipmentInspection.vue";
+import MoldRecord from "../pages/moldRecord.vue";
export default {
components: {
@@ -286,7 +295,8 @@
PDFShow,
PrintInit,
PrintTest,
- EquipmentInspection
+ EquipmentInspection,
+ MoldRecord
},
data() {
return {
@@ -317,6 +327,14 @@
selectedIndexs: [],
isShow: false,
+
+ // 鑷姩璺宠浆鐩稿叧
+ autoRedirectTimer: null,
+ autoRedirectTime: 5 * 60 * 1000, // 5鍒嗛挓
+
+ // 宸ュ崟閫夋嫨椤甸潰瀹氭椂鍒锋柊
+ autoRefreshTimer: null,
+ autoRefreshInterval: 60 * 1000, // 1鍒嗛挓
};
},
created() {
@@ -342,12 +360,55 @@
},
onShow() {
this.refresh();
+ this.resetAutoRedirectTimer();
+ // 椤甸潰鏄剧ず鏃跺姞杞藉伐鍗曞垪琛�
+ if (this.currentTab === 7) {
+ // 榛樿閫変腑鈥滃緟寮�宸ャ�佹湭寮�宸ャ�佹殏鍋溾��
+ this.engineeringNo = '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�';
+ this.engineeringNoMapList = [
+ '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�',
+ '寮�宸�',
+ '瀹屽伐'
+ ];
+ this.getWomdaaByStatus();
+ // 鍚姩瀹氭椂鍒锋柊
+ this.startAutoRefresh();
+ }
+ },
+ onHide() {
+ // 椤甸潰闅愯棌鏃舵竻闄ゅ畾鏃跺櫒
+ this.stopAutoRefresh();
},
methods: {
onRowClick(index) {
this.selectedIndexs = [index]; // 鍗曢��
// 鎵嬪姩瑙﹀彂 selectionChange 浠ュ悓姝ュ閫夋
this.selectionChange({ detail: { index } });
+ // 閲嶇疆鑷姩璺宠浆璁℃椂鍣�
+ this.resetAutoRedirectTimer();
+ },
+
+ // 閲嶇疆鑷姩璺宠浆璁℃椂鍣�
+ resetAutoRedirectTimer() {
+ // 娓呴櫎鐜版湁鐨勫畾鏃跺櫒
+ if (this.autoRedirectTimer) {
+ clearTimeout(this.autoRedirectTimer);
+ this.autoRedirectTimer = null;
+ }
+
+ // 闄や簡涓婚〉(0)銆佸伐鍗曢�夋嫨椤�(7)銆佺敓浜ф姤宸ラ〉(4)涔嬪鐨勯〉闈㈡墠璁剧疆鑷姩璺宠浆
+ if (this.currentTab !== 0 && this.currentTab !== 7 && this.currentTab !== 4) {
+ this.autoRedirectTimer = setTimeout(() => {
+ // 璺宠浆鍥炰富椤�
+ this.currentTab = 0;
+ // 鏄剧ず鎻愮ず淇℃伅
+ uni.showToast({
+ title: '椤甸潰瓒呮椂锛岃嚜鍔ㄨ繑鍥炰富椤�',
+ icon: 'none',
+ duration: 2000
+ });
+ }, this.autoRedirectTime);
+ }
},
checkForUpdate() {
this.$post({
@@ -415,11 +476,22 @@
this.getMachineList();
this.getPrintInfo();
this.getWomdaaIsShow();
+ // 濡傛灉褰撳墠鍦ㄥ伐鍗曢�夋嫨椤甸潰锛岄粯璁ゅ姞杞藉伐鍗曞垪琛�
+ if (this.currentTab === 7) {
+ // 榛樿閫変腑鈥滃緟寮�宸ャ�佹湭寮�宸ャ�佹殏鍋溾��
+ this.engineeringNo = '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�';
+ this.engineeringNoMapList = [
+ '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�',
+ '寮�宸�',
+ '瀹屽伐'
+ ];
+ this.getWomdaaByStatus();
+ }
},
getPrintInfo() {
var mac = "";
- mac = "74:24:ca:4f:b7:9b";
+ mac = "74:24:ca:4f:b7:4d";
this.$post({
url: "/DevMachine/GetDevMachineByPdaMac",
data: {
@@ -440,43 +512,43 @@
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();
@@ -616,7 +688,14 @@
// 褰撳垏鎹㈠埌宸ュ崟閫夋嫨椤甸潰(index === 7)鏃惰嚜鍔ㄥ埛鏂�
if (index === 7) {
this.refresh();
+ // 鍚姩瀹氭椂鍒锋柊
+ this.startAutoRefresh();
+ } else {
+ // 绂诲紑宸ュ崟閫夋嫨椤甸潰鏃跺仠姝㈠畾鏃跺埛鏂�
+ this.stopAutoRefresh();
}
+ // 閲嶇疆鑷姩璺宠浆璁℃椂鍣�
+ this.resetAutoRedirectTimer();
console.log(index);
},
onMachineChange(event) {
@@ -746,6 +825,120 @@
this.productCode = item.daa002; // 浜у搧缂栫爜
this.productSpec = item.daa004; // 浜у搧瑙勬牸
this.currentTab = 0;
+ },
+
+ // 鑾峰彇寮�宸ユ寜閽殑class
+ getStartBtnClass(item) {
+ const isSelected = this.isShowTableData.length > 0 && this.isShowTableData[0].daa001 === item.daa001;
+ if (isSelected) {
+ return 'start-btn start-btn-selected'; // 褰撳墠閫変腑鐨勫伐鍗曪紝缁胯壊
+ }
+ return 'start-btn';
+ },
+
+ // 鍒ゆ柇寮�宸ユ寜閽槸鍚︾鐢�
+ isStartBtnDisabled(item) {
+ // 濡傛灉宸茬粡鏈夐�変腑鐨勫伐鍗曪紝涓斿綋鍓嶉」涓嶆槸閫変腑鐨勫伐鍗曪紝鍒欑鐢�
+ if (this.isShowTableData.length > 0 && this.isShowTableData[0].daa001 !== item.daa001) {
+ return true;
+ }
+ return false;
+ },
+
+ // 鍒ゆ柇鏆傚仠鎸夐挳鏄惁绂佺敤
+ isPauseBtnDisabled(item) {
+ // 濡傛灉宸茬粡鏈夐�変腑鐨勫伐鍗曪紝涓斿綋鍓嶉」涓嶆槸閫変腑鐨勫伐鍗曪紝鍒欑鐢�
+ if (this.isShowTableData.length > 0 && this.isShowTableData[0].daa001 !== item.daa001) {
+ return true;
+ }
+ // 濡傛灉杩樻病鏈夐�変腑浠讳綍宸ュ崟锛屼篃绂佺敤鏆傚仠鎸夐挳
+ if (this.isShowTableData.length === 0) {
+ return true;
+ }
+ return false;
+ },
+
+ // 鑾峰彇寮�宸ユ寜閽枃鏈�
+ getStartBtnText(item) {
+ const isSelected = this.isShowTableData.length > 0 && this.isShowTableData[0].daa001 === item.daa001;
+ if (isSelected) {
+ return '杞烦鍒颁富鐣岄潰';
+ }
+ return '寮�宸�';
+ },
+
+ // 澶勭悊寮�宸�
+ async handleStartWork(item) {
+ // 鍒ゆ柇褰撳墠宸ュ崟鏄惁宸查�変腑
+ const isSelected = this.isShowTableData.length > 0 && this.isShowTableData[0].daa001 === item.daa001;
+
+ if (isSelected) {
+ // 濡傛灉宸查�変腑锛屽垯璺宠浆鍒颁富鐣岄潰
+ this.toDetail(item);
+ } else {
+ // 濡傛灉鏈�変腑锛屽垯鎵ц寮�宸ラ�昏緫
+ let orderSelect = [{
+ orderId: item.id,
+ orderNo: item.daa001
+ }];
+
+ let editDate = this.formatDate(new Date());
+
+ this.$post({
+ url: "/MesOrderSelect/Add",
+ data: {
+ machineNo: this.machineNo,
+ editDate: editDate,
+ item: orderSelect
+ }
+ }).then(res => {
+ if (res.data.tbBillList) {
+ this.getWomdaaIsShow();
+ uni.showToast({
+ title: '寮�宸ユ垚鍔�',
+ icon: 'success',
+ duration: 2000
+ });
+ }
+ });
+ }
+ },
+
+ // 澶勭悊鏆傚仠锛堜娇鐢ㄦ竻绌洪噸閫夌殑閫昏緫锛�
+ async handlePauseWork(item) {
+ if (!this.machineNo) {
+ return;
+ }
+
+ // 鐩存帴鐢� flag 鍒ゆ柇
+ if (this.hasBindedCutterFlag) {
+ uni.showToast({
+ title: '褰撳墠宸ュ崟宸茬粦瀹氬垁鍏凤紝涓嶈兘鏆傚仠',
+ icon: 'error',
+ duration: 2000
+ });
+ return;
+ }
+
+ let editDate = this.formatDate(new Date());
+ this.selectedIndexs = [];
+
+ this.$post({
+ url: "/MesOrderSelect/Remove",
+ data: {
+ machineNo: this.machineNo,
+ editDate: editDate
+ },
+ }).then(res => {
+ if (res.data.tbBillList > 0) {
+ this.isShowTableData = [];
+ uni.showToast({
+ title: '宸ュ崟宸叉殏鍋�',
+ icon: 'success',
+ duration: 2000
+ });
+ }
+ });
}
},
computed: {}
@@ -917,7 +1110,7 @@
.top-right {
position: absolute;
- top: 10px;
+ top: -15px;
right: 50px;
z-index: 1000;
}
@@ -927,7 +1120,7 @@
background-color: #00A2E9;
color: white;
border: none;
- font-size: 1.5vw;
+ font-size: 22px;
border-radius: 5px;
}
@@ -940,23 +1133,24 @@
background-color: #fff;
color: #007aff;
cursor: pointer;
- font-size: 1.8vw;
- /* Increased font size */
+ font-size: 22px;
+ font-weight: 500;
transition: background-color 0.3s, color 0.3s;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
}
.tab-item.active {
background-color: #007aff;
color: #fff;
- font-weight: bold;
+ font-weight: 600;
+ box-shadow: 0 4px 8px rgba(0, 122, 255, 0.3);
}
.content {
flex: 1;
padding: 1vh 1vw;
background-color: white;
- font-size: 1.5vw;
- /* Increased font size for content */
+ font-size: 16px;
}
.picker {
@@ -976,17 +1170,43 @@
}
.th {
- background-color: lightskyblue;
+ background-color: white;
+ color: black;
height: 6vh;
- font-size: 2vw;
- font-size: 2.6vw; /* 瀛椾綋鏇村ぇ */
- /* Increased font size for table headers */
+ font-size: 22px;
+ font-weight: 600;
+ border: 1px solid #555;
+ padding: 6px 8px;
+ text-align: center;
+ white-space: normal;
+ word-break: break-all;
+ }
+
+ /* 涓昏〃鏍艰竟妗嗘牱寮� */
+ uni-table {
+ border: 2px solid #d00 !important;
+ border-collapse: separate !important;
+ border-spacing: 0 !important;
+ }
+
+ .uni-th, .uni-td {
+ border: 1px solid #555 !important;
+ position: relative !important;
+ z-index: 1 !important;
}
- .form-input {
- font-size: 1.8vw;
- /* Increased input font size */
- }
+ .form-input {
+ word-break: break-all;
+ white-space: normal;
+ line-height: 1.4;
+ text-align: center;
+ vertical-align: middle;
+ max-width: 180px;
+ overflow-wrap: break-word;
+ font-size: 22px;
+ padding: 6px 8px;
+ background-color: transparent; /* 璁剧疆鑳屾櫙涓洪�忔槑 */
+ }
/* 搴曢儴淇濆瓨鍜屽彇娑堟寜閽� */
.bottom-section {
@@ -994,7 +1214,7 @@
justify-content: space-around;
margin-bottom: 2vh;
padding: 2vh 1vw;
- margin-top: 40px; // 鏂板锛氳鎸夐挳鏁翠綋涓嬬Щ
+ margin-top: 20px; // 鍑忓皬椤堕儴杈硅窛锛岀‘淇濇寜閽湪寮圭獥鍐呮纭樉绀�
}
.save-btn,
@@ -1003,33 +1223,112 @@
padding: 1.5vh;
background-color: #00a2e9;
color: white;
- font-size: 1.8vw;
- /* Increased button font size */
+ font-size: 22px;
+ font-weight: 500;
border: none;
text-align: center;
cursor: pointer;
+ border-radius: 4px;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+ transition: all 0.3s;
}
-
- .overlay {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background-color: rgba(0, 0, 0, 0.5);
+
+ .cancel-btn {
+ background-color: #00A2E9;
+ color: white;
+ }
+
+ /* 鎿嶄綔鎸夐挳鍖哄煙 */
+ .operation-btns {
display: flex;
justify-content: center;
align-items: center;
+ gap: 10px;
}
+
+ /* 寮�宸ユ寜閽� */
+ .start-btn {
+ padding: 8px 20px;
+ background-color: #00A2E9;
+ color: white;
+ font-size: 18px;
+ font-weight: 500;
+ border: none;
+ border-radius: 4px;
+ cursor: pointer;
+ transition: all 0.3s;
+ box-shadow: 0 2px 4px rgba(0, 162, 233, 0.2);
+ }
+
+ .start-btn:hover:not(:disabled) {
+ background-color: #0092d6;
+ box-shadow: 0 4px 8px rgba(0, 162, 233, 0.3);
+ transform: translateY(-1px);
+ }
+
+ /* 寮�宸ユ寜閽� - 閫変腑鐘舵�侊紙缁胯壊锛� */
+ .start-btn-selected {
+ background-color: #52c41a !important;
+ box-shadow: 0 2px 4px rgba(82, 196, 26, 0.3) !important;
+ }
+
+ .start-btn-selected:hover:not(:disabled) {
+ background-color: #49b015 !important;
+ box-shadow: 0 4px 8px rgba(82, 196, 26, 0.4) !important;
+ }
+
+ /* 鏆傚仠鎸夐挳 */
+ .pause-btn {
+ padding: 8px 20px;
+ background-color: #ff4d4f;
+ color: white;
+ font-size: 18px;
+ font-weight: 500;
+ border: none;
+ border-radius: 4px;
+ cursor: pointer;
+ transition: all 0.3s;
+ box-shadow: 0 2px 4px rgba(255, 77, 79, 0.2);
+ }
+
+ .pause-btn:hover:not(:disabled) {
+ background-color: #ff3336;
+ box-shadow: 0 4px 8px rgba(255, 77, 79, 0.3);
+ transform: translateY(-1px);
+ }
+
+ /* 鎸夐挳绂佺敤鐘舵�� */
+ .start-btn:disabled,
+ .pause-btn:disabled {
+ background-color: #d9d9d9 !important;
+ color: #999 !important;
+ cursor: not-allowed !important;
+ box-shadow: none !important;
+ opacity: 0.6;
+ }
+
+ .overlay {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ z-index: 2000; // 澧炲姞z-index锛岀‘淇濆脊绐楀湪鍒锋柊鎸夐挳涔嬩笂
+ }
.popup {
background-color: #fff;
- padding: 2vh;
+ padding: 2vh 2vh 8vh 2vh; // 澧炲姞搴曢儴鍐呰竟璺濓紝涓烘寜閽暀鍑虹┖闂�
border: 1px solid #ccc;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
- width: 90vw;
- height: 85vh; /* 鍘�70vh锛岃皟楂� */
+ width: 90.16vw; // 鍘熸潵鐨�98vw缂╁皬8% (98vw * 0.92)
+ height: 68vh; // 鍘熸潵鐨�85vh缂╁皬20% (85vh * 0.8)
font-size: 1.6vw;
+ box-sizing: border-box; // 纭繚鍐呰竟璺濅笉褰卞搷鎬诲昂瀵�
}
.print-btn {
@@ -1037,22 +1336,23 @@
margin-top: 4px;
margin-left: 10px;
text-align: center;
- font-size: 100%;
- color: black;
+ font-size: 22px;
+ color: white;
+ background-color: #00A2E9;
padding: 0px 90px;
- border: 2px solid #ccc;
+ border: 2px solid #00A2E9;
cursor: pointer;
border-radius: 0.8vw;
}
.machine-name-box {
- border: 2px solid #e53935; /* 绾㈣壊杈规 */
+ border: 2px solid #007aff; /* 钃濊壊杈规 */
border-radius: 8px;
font-family: fantasy;
font-size: 33px;
margin-top: 20px;
- padding: 15px 48px; /* 涓婁笅20px锛屽乏鍙�48px锛屽鍔犲唴杈硅窛 */
- width: 500px; /* 鏇村锛屼繚璇佸唴瀹瑰畬鏁存樉绀� */
+ padding: 15px 28px; /* 涓婁笅20px锛屽乏鍙�48px锛屽鍔犲唴杈硅窛 */
+ width: 300px; /* 鏇村锛屼繚璇佸唴瀹瑰畬鏁存樉绀� */
height: 70px; /* 澧炲姞楂樺害 */
box-sizing: border-box;
background: #fff;
@@ -1074,18 +1374,22 @@
// font-size: 14px;
//}*/
+ .popup .card {
+ margin-bottom: 40px !important; // 鍘熸潵250px锛屾敼涓�40px锛岀┖鐧芥槑鏄惧噺灏�
+ }
+
@media screen and (max-width: 1920px) {
.tab-item {
- font-size: 1.6vw;
+ font-size: 22px;
}
.content {
padding: 1vw;
- font-size: 1.5vw;
+ font-size: 22px;
}
.form-input {
- font-size: 1.6vw;
+ font-size: 22px;
}
}
@@ -1098,35 +1402,112 @@
vertical-align: middle; // 鍨傜洿灞呬腑
max-width: 180px; // 淇濇寔鍗曞厓鏍兼渶澶у搴�
overflow-wrap: break-word; // 鍏煎鎬ф洿濂�
+ background-color: transparent; /* 璁剧疆鑳屾櫙涓洪�忔槑 */
}
- // 鏀惧ぇ寮圭獥鍐呰〃鏍煎瓧浣擄紙琛ㄥご鍜屽唴瀹癸級
- .popup .large-selection-table,
+ // 寮圭獥鍐呰〃鏍兼牱寮忎笌鐢熶骇鎶ュ伐椤甸潰鍘嗗彶鎶ュ伐璁板綍琛ㄦ牸涓�鑷�
.popup .large-selection-table .uni-th,
- .popup .large-selection-table .uni-td,
- .popup .large-selection-table input.form-input {
- font-size: 2.2vw !important; // 鍙牴鎹疄闄呴渶姹傝皟鏁�
+ .popup .large-selection-table .uni-td {
+ padding: 6px 8px;
+ text-align: center;
+ white-space: normal;
+ word-break: break-all;
+ font-size: 22px;
+ background-color: transparent; /* 璁剧疆鑳屾櫙涓洪�忔槑 */
+ border: 1px solid #555 !important;
+ }
+
+ .popup .large-selection-table .uni-th {
+ background-color: white;
+ color: black;
+ font-weight: 600;
+ font-size: 22px;
+ }
+
+ /* 寮圭獥琛ㄦ牸澶栨绾� */
+ .popup .large-selection-table {
+ border: 2px solid #d00 !important;
+ border-collapse: separate !important;
+ border-spacing: 0 !important;
}
.select-btn {
- width: 180px; // 鏇村
- height: 80px; // 鏇撮珮
- font-size: 1.8vw; // 瀛椾綋涔熺暐澶�
+ width: 150px; // 鍘熸潵鐨�70% (180px * 0.7)
+ height: 75px; // 鍘熸潵鐨�65% (80px * 0.65)
+ font-size: 22px; // 瀛椾綋涔熺暐澶�
+ //font-weight: 200;
border-radius: 10px;
- background-color: #f5f5f5;
- color: #007aff;
- border: 2px solid #007aff;
+ background-color: #00A2E9;
+ color: white;
+ border: 2px solid #00A2E9;
margin: 0 auto;
display: block;
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+ transition: all 0.3s;
+ }
+
+ .top-section {
+ position: relative;
+ display: flex;
+ flex-direction: column;
+ margin-bottom: 20px;
+ padding: 20px 10px;
+ }
+
+ .form-row.align-row {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ position: relative;
+ width: 100%;
+ }
+
+ .machine-name-box {
+ flex: 1 1 45%;
+ margin-right: 20px;
+ }
+
+ .form-group {
+ display: flex;
+ align-items: center;
+ flex: 1 1 45%;
+ justify-content: flex-start;
+ }
+
+ .order-label {
+ font-family: fantasy;
+ font-size: 22px;
+ margin-top: 20px;
+ margin-right: 10px;
+ float: none;
+ }
+
+ .print-btn {
+ margin-top: 20px;
+ }
+
+ .top-right {
+ position: absolute;
+ top: -30px; // 寰�涓婄Щ
+ right: 0;
+ z-index: 1000;
}
/* 鏀惧ぇ琛ㄥご鍜岃〃鏍煎唴瀹瑰瓧浣� */
.th,
.uni-th,
th {
- font-size: 1.7vw !important;
- font-weight: bold;
- letter-spacing: 2px;
+ font-size: 22px !important;
+ color: black !important;
+ font-weight: 600;
+ letter-spacing: 1px;
+ }
+
+ .popup .large-selection-table .th,
+ .popup .large-selection-table .uni-th,
+ .popup .large-selection-table th {
+ font-size: 22px !important;
+ color: black !important;
}
/* 閽堝1280x800鐨勫钩鏉夸娇鐢ㄥ獟浣撴煡璇㈣繘琛岄�傞厤 */
@@ -1137,21 +1518,21 @@
.save-btn,
.cancel-btn {
- font-size: 1.6vw;
+ font-size: 16px;
}
.inp {
width: 85%;
- font-size: 20px;
+ font-size: 16px;
}
.status-block p {
- font-size: 20px;
+ font-size: 16px;
}
.uni-tr,
.uni-td {
- font-size: 20px;
+ font-size: 22px;
}
}
--
Gitblit v1.9.3