From 2c7a7d3eaf692fdfd04a30b42da2d94848cdc89a Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 24 十二月 2025 16:25:50 +0800
Subject: [PATCH] 界面样式优化
---
pages/index.vue | 1240 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 893 insertions(+), 347 deletions(-)
diff --git a/pages/index.vue b/pages/index.vue
index b889857..46af944 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -8,17 +8,20 @@
<view class="tab-item" :class="{ active: currentTab === 0 }" @click="changeTab(0)">
涓荤晫闈�
</view>
+ <view class="tab-item" :class="{ active: currentTab === 2 }" @click="changeTab(2)">
+ 涓婂垁涓嬪垁
+ </view>
<view class="tab-item" :class="{ active: currentTab === 3 }" @click="changeTab(3)">
璋冩満閫佹
</view>
- <view class="tab-item" :class="{ active: currentTab === 2 }" @click="changeTab(2)">
- 鎹㈡ā
+ <view class="tab-item" :class="{ active: currentTab === 10 }" @click="changeTab(10)">
+ 涓婁笅鍒�/棣栨鍗曡褰�
+ </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>
- <view class="tab-item" :class="{ active: currentTab === 4 }" @click="changeTab(4)">
- 鎵撶爜鎶ュ伐
</view>
<view class="tab-item" :class="{ active: currentTab === 5 }" @click="changeTab(5)">
e-SOP
@@ -26,118 +29,114 @@
<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>
<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>
+ <!--<view>
+ <h4>涓�鍙版満鍙板彧鑳介�夋嫨涓�鏉″伐鍗曪紙澶氶�夐粯璁や负鏈�鍚庝竴鏉★級</h4>
+ </view>-->
<view class="section top-section">
- <view class="form-row">
- <view>
- <!-- <label style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px">绗竴姝ラ�夋嫨鏈哄彴:</label> -->
- <!-- <superwei-combox :candidates="machineList" placeholder="璇烽�夋嫨" v-model="machineName"
- @select="onMachineChange" class="picker"></superwei-combox> -->
- <input v-model="machineName" disabled="true" type="text" style="float: left;font-family: fantasy;font-size: 33px;margin-top: 20px" />
+ <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">宸ュ簭</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="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.PROC_NAME" /><!--宸ュ簭-->
- </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.STAFF_NAME" /><!--鎶ュ伐浜�-->
- </uni-td>
- <uni-td>
- <view class="uni-group">
- <button 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>
<view v-if="currentTab === 0" class="tab-content">
<WorkOrder :orderId="orderId" :orderNo="selectedOrder" :machineNo="machineNo"
- :deviceNumber="machineName" />
+ :deviceNumber="machineName" />
</view>
<view v-if="currentTab === 1" class="tab-content">
<!-- <!– 璋冪敤 WorkOrderStatus 缁勪欢 –>-->
@@ -150,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 缁勪欢 -->
@@ -165,73 +168,98 @@
<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>
+ <!-- 寮圭獥涓嬫媺妗嗗彧鏄剧ず宸ュ崟鐘舵�� -->
<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;font-size: 22px;">鐐瑰嚮鎸夐挳绛涢�夊伐鍗曠姸鎬�:</label>
<superwei-combox :candidates="engineeringNoMapList" placeholder="璇烽�夋嫨" v-model="engineeringNo"
- @select="onEngineeringNoChange" class="picker"
- style="padding: 7px 46px;width: 650px;"></superwei-combox>
+ @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>
- <view class="section card">
- <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>
- <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 v-for="(item, index) in tableData" :key="index">
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.PROC_NAME" /><!--宸ュ簭-->
- </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.STAFF_NAME" /><!--鎶ュ伐浜�-->
- </uni-td>
- </uni-tr>
- </uni-table>
- </view>
+
+ <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="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"
+ :class="{'row-selected': selectedIndexs.includes(index)}"
+ @click="onRowClick(index)"
+ style="cursor: pointer;">
+ <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-td>
+<!-- <view class="uni-group">
+ <button class="select-btn" type="default" @click="toDetail(item)">
+ 杞埌涓荤晫闈�
+ </button>
+ </view> -->
+ </uni-td>
+ </uni-tr>
+ </uni-table>
+ </view>
+
+ </table>
+ </div>
+
<view class="bottom-section">
<button class="save-btn" @click="save">淇濆瓨閫夋嫨</button>
<button class="cancel-btn" @click="isShow = !isShow">鍙栨秷</button>
@@ -242,16 +270,18 @@
</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";
+import MoldRecord from "../pages/moldRecord.vue";
export default {
components: {
@@ -264,12 +294,17 @@
WorkOrderStatus,
PDFShow,
PrintInit,
- PrintTest
+ PrintTest,
+ EquipmentInspection,
+ MoldRecord
},
data() {
return {
orderStatus: '', // 榛樿鍏ㄩ儴
currentTab: 7,
+
+ productCode: '', // 浜у搧缂栫爜
+ productSpec: '', // 浜у搧瑙勬牸
machineList: [],
@@ -292,6 +327,14 @@
selectedIndexs: [],
isShow: false,
+
+ // 鑷姩璺宠浆鐩稿叧
+ autoRedirectTimer: null,
+ autoRedirectTime: 5 * 60 * 1000, // 5鍒嗛挓
+
+ // 宸ュ崟閫夋嫨椤甸潰瀹氭椂鍒锋柊
+ autoRefreshTimer: null,
+ autoRefreshInterval: 60 * 1000, // 1鍒嗛挓
};
},
created() {
@@ -317,8 +360,56 @@
},
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({
url: "/DevMachine/getAppUpgradeInfo",
@@ -385,11 +476,22 @@
this.getMachineList();
this.getPrintInfo();
this.getWomdaaIsShow();
+ // 濡傛灉褰撳墠鍦ㄥ伐鍗曢�夋嫨椤甸潰锛岄粯璁ゅ姞杞藉伐鍗曞垪琛�
+ if (this.currentTab === 7) {
+ // 榛樿閫変腑鈥滃緟寮�宸ャ�佹湭寮�宸ャ�佹殏鍋溾��
+ this.engineeringNo = '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�';
+ this.engineeringNoMapList = [
+ '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�',
+ '寮�宸�',
+ '瀹屽伐'
+ ];
+ this.getWomdaaByStatus();
+ }
},
getPrintInfo() {
- var mac = "ac:f4:2c:20:0d:b4";
+ var mac = "";
- mac = "e8:51:9e:7d:dc:95";
+ mac = "74:24:ca:4f:b7:4d";
this.$post({
url: "/DevMachine/GetDevMachineByPdaMac",
data: {
@@ -407,45 +509,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();
@@ -460,14 +563,14 @@
return;
}
- let firstValue = data[0]["moldId"]; // 鑾峰彇绗竴涓璞＄殑鎸囧畾灞炴�у��
+ //let firstValue = data[0]["moldId"]; // 鑾峰彇绗竴涓璞＄殑鎸囧畾灞炴�у��
- // 浣跨敤 every 鏂规硶妫�鏌ユ墍鏈夊璞＄殑璇ュ睘鎬у�兼槸鍚︿竴鑷�
- let flag = data.every(item => item["moldId"] === firstValue);
- if (!flag) {
- this.$showMessage("閫夊彇鐨�" + data.length + "涓伐鍗曚腑鐨勬ā鍏风紪鍙蜂笉涓�鑷�");
- return;
- }
+ //// 浣跨敤 every 鏂规硶妫�鏌ユ墍鏈夊璞＄殑璇ュ睘鎬у�兼槸鍚︿竴鑷�
+ //let flag = data.every(item => item["moldId"] === firstValue);
+ //if (!flag) {
+ // this.$showMessage("閫夊彇鐨�" + data.length + "涓伐鍗曚腑鐨勬ā鍏风紪鍙蜂笉涓�鑷�");
+ // return;
+ //}
let orderSelect = [];
@@ -492,7 +595,8 @@
if (res.data.tbBillList) {
this.getWomdaaIsShow();
uni.showToast({
- title: '灏嗘敞濉戞満寮�鍚堟ā鏁版竻0',
+ title: '淇濆瓨宸ュ崟鎴愬姛',
+ //title: '灏嗘敞濉戞満寮�鍚堟ā鏁版竻0',
//灏嗗�艰缃负 success 鎴栬�呯洿鎺ヤ笉鐢ㄥ啓icon杩欎釜鍙傛暟
icon: 'success',
//鏄剧ず鎸佺画鏃堕棿涓� 5绉�
@@ -531,28 +635,38 @@
}
return str;
},
- cancel() {
- if (!this.machineNo) {
- return;
- }
+ cancel() {
+ if (!this.machineNo) {
+ return;
+ }
- let editDate = this.formatDate(new Date());
+ // 鐩存帴鐢� flag 鍒ゆ柇
+ if (this.hasBindedCutterFlag) {
+ uni.showToast({
+ title: '褰撳墠宸ュ崟宸茬粦瀹氬垁鍏凤紝涓嶈兘娓呯┖閲嶉��',
+ icon: 'error',
+ duration: 2000
+ });
+ return;
+ }
- this.selectedIndexs = [];
+ 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 = [];
- }
- });
- },
+ this.$post({
+ url: "/MesOrderSelect/Remove",
+ data: {
+ machineNo: this.machineNo,
+ editDate: editDate
+ },
+ }).then(res => {
+ if (res.data.tbBillList > 0) {
+ this.isShowTableData = [];
+ }
+ });
+ },
+
formatDate(date) {
let year = date.getFullYear(); // 鑾峰彇骞翠唤
let month = String(date.getMonth() + 1).padStart(2, '0'); // 鑾峰彇鏈堜唤骞惰ˉ闆�
@@ -560,12 +674,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() {
@@ -578,7 +688,14 @@
// 褰撳垏鎹㈠埌宸ュ崟閫夋嫨椤甸潰(index === 7)鏃惰嚜鍔ㄥ埛鏂�
if (index === 7) {
this.refresh();
+ // 鍚姩瀹氭椂鍒锋柊
+ this.startAutoRefresh();
+ } else {
+ // 绂诲紑宸ュ崟閫夋嫨椤甸潰鏃跺仠姝㈠畾鏃跺埛鏂�
+ this.stopAutoRefresh();
}
+ // 閲嶇疆鑷姩璺宠浆璁℃椂鍣�
+ this.resetAutoRedirectTimer();
console.log(index);
},
onMachineChange(event) {
@@ -612,46 +729,62 @@
})
},
//鑾峰彇琛ㄦ牸鐨勬暟鎹簮
- getWomdaaIsShow() {
- this.$post({
- url: "/Womdaa/GetWomdaasByShow",
- data: {
- machineNo: this.machineNo,
- }
- }).then(res => {
- this.isShowTableData = res.data.tbBillList;
+ getWomdaaIsShow() {
+ this.$post({
+ url: "/Womdaa/GetWomdaasByShow",
+ data: {
+ machineNo: this.machineNo,
+ }
+ }).then(res => {
+ this.isShowTableData = res.data.tbBillList;
- if (this.isShowTableData.length == 1) {
- uni.setStorageSync('daa001', this.isShowTableData[0].daa001);
- uni.setStorageSync('id', this.isShowTableData[0].id);
- //this.toDetail(this.isShowTableData[0]);
- }
- });
- },
+ // 鍙垽鏂涓�鏉★紙鍙厑璁镐竴鏉″伐鍗曪級
+ const order = this.isShowTableData[0];
+ let hasBindedCutter = false;
+ if (order) {
+ hasBindedCutter =
+ (order.outToolId && order.outToolId.toString().trim() !== '') ||
+ (order.outToolCode && order.outToolCode.trim() !== '') ||
+ (order.outToolName && order.outToolName.trim() !== '');
+ }
+ // 瀛樺偍鍒� data 鍙橀噺
+ this.hasBindedCutterFlag = hasBindedCutter;
- isShowTab() {
+ if (this.isShowTableData.length == 1) {
+ uni.setStorageSync('daa001', this.isShowTableData[0].daa001);
+ uni.setStorageSync('id', this.isShowTableData[0].id);
+ }
+ });
+ },
- if (this.isShowTableData.length > 0) {
- uni.showToast({
- title: '宸叉湁姝ｅ湪鎿嶄綔鐨勫伐鍗曪紝涓嶈兘鍐嶆閫夋嫨',
- //灏嗗�艰缃负 success 鎴栬�呯洿鎺ヤ笉鐢ㄥ啓icon杩欎釜鍙傛暟
- icon: 'error',
- //鏄剧ず鎸佺画鏃堕棿涓� 2绉�
- duration: 2000
- });
+ isShowTab() {
+ if (this.isShowTableData.length > 0) {
+ uni.showToast({
+ title: '宸叉湁姝ｅ湪鎿嶄綔鐨勫伐鍗曪紝涓嶈兘鍐嶆閫夋嫨',
+ icon: 'error',
+ duration: 2000
+ });
+ return;
+ }
- return;
- }
-
- this.isShow = true;
-
- this.engineeringNo = null;
- this.tableData = [];
- // 绛涢�夊伐鍗曠姸鎬�
- this.GetWomdaasByEngineeringNo();
- this.getWomdaa();
- },
-
+ this.isShow = true;
+ // 榛樿閫変腑鈥滃緟寮�宸モ��
+ this.engineeringNo = '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�';
+ this.tableData = [];
+ // 涓嬫媺妗嗗彧鏄剧ず鍚堝苟鍚庣殑鐘舵�佸拰鍏跺畠鐘舵��
+ this.engineeringNoMapList = [
+ '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�',
+ '寮�宸�',
+ '瀹屽伐'
+ ];
+ // 榛樿鏄剧ず鈥滃緟寮�宸モ�濆伐鍗�
+ this.getWomdaaByStatus();
+ },
+ // 涓嬫媺妗嗛�変腑鍚庯紝鎸夌姸鎬佺瓫閫夊伐鍗�
+ onEngineeringNoChange(status) {
+ this.engineeringNo = status;
+ this.getWomdaaByStatus();
+ },
getWomdaa() {
let editDate = this.formatDate(new Date());
@@ -660,32 +793,152 @@
url: "/Womdaa/GetWomdaasByMachine",
data: {
machineNo: this.machineNo,
- //engineeringNo: this.engineeringNo,
editDate: editDate
}
}).then(res => {
this.tableData = res.data.tbBillList;
})
},
- // 绛涢�夊伐鍗曠姸鎬�
- GetWomdaasByEngineeringNo() {
-
- this.$post({
- url: "/Womdaa/GetWomdaasByEngineeringNo",
- data: {
- machineNo: this.machineNo,
- orderStatus: ['寰呭紑宸�', '鏈紑宸�', '瀹屽伐', '鏆傚仠'] // 鏂板鐘舵�佺瓫閫夋潯浠�
- }
- }).then(res => {
- this.engineeringNoList = res.data.tbBillList;
- // 鐩存帴鏄犲皠锛屼笉鍒嗙粍
- this.engineeringNoMapList = this.engineeringNoList.map(s => s.moldId + ":" + s.moldName + ":" + s.moldModel);
+ // 鎸夊伐鍗曠姸鎬佺瓫閫夊伐鍗�
+ getWomdaaByStatus() {
+ let editDate = this.formatDate(new Date());
+ let statusArr = [];
+ if (this.engineeringNo === '寰呭紑宸ャ�佹湭寮�宸ャ�佹殏鍋�') {
+ statusArr = ['寰呭紑宸�', '鏈紑宸�', '鏆傚仠'];
+ } else {
+ statusArr = [this.engineeringNo];
+ }
+ this.$post({
+ url: "/Womdaa/GetWomdaasByEngineeringNo",
+ data: {
+ machineNo: this.machineNo,
+ orderStatus: statusArr,
+ editDate: editDate
+ }
+ }).then(res => {
+ this.tableData = res.data.tbBillList;
});
- },
+ },
toDetail(item) {
this.orderId = item.id;
this.selectedOrder = item.daa001;
+ 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: {}
@@ -693,6 +946,26 @@
</script>
<style lang="scss">
+
+ :deep(.checkbox),
+ :deep(.checkbox__inner) {
+ width: 60px !important;
+ height: 60px !important;
+ min-width: 60px !important;
+ min-height: 60px !important;
+ padding: 16px !important;
+ margin-right: 20px !important;
+ }
+
+ .popup .large-selection-table {
+ width: 100% !important;
+ table-layout: auto !important; // 璁╄〃鏍艰嚜鍔ㄥ垎閰嶅搴�
+ }
+
+ .row-selected {
+ background-color: #e0f3ff !important;
+ }
+
.font {
background-color: #666666;
height: 30px;
@@ -771,14 +1044,23 @@
}
/* 鍗＄墖鏍峰紡 */
- .card {
- background-color: #fff;
- border-radius: 10px;
- box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
- padding: 16px;
- position: relative;
- margin-bottom: 25px
- }
+ .card {
+ background-color: #fff;
+ border-radius: 10px;
+ box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+ padding: 0; // 鍘婚櫎澶氫綑鍐呰竟璺�
+ position: relative;
+ margin-bottom: 25px;
+ width: 100%; // 濉弧鐖跺鍣�
+ box-sizing: border-box;
+ }
+
+/* //.content {
+ // flex: 1;
+ // padding: 1vh 1vw; // 淇濊瘉鏁翠綋鏈夊乏鍙崇暀鐧�
+ // background-color: white;
+ // font-size: 1.5vw;
+ //}*/
/* 鍗＄墖鏍囬鍦ㄥ乏涓婅 */
.card-header {
@@ -828,7 +1110,7 @@
.top-right {
position: absolute;
- top: 10px;
+ top: -15px;
right: 50px;
z-index: 1000;
}
@@ -838,7 +1120,7 @@
background-color: #00A2E9;
color: white;
border: none;
- font-size: 1.5vw;
+ font-size: 22px;
border-radius: 5px;
}
@@ -851,55 +1133,89 @@
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 {
- 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: 32px !important; // 寮哄埗澶у瓧浣擄紝閫傞厤浣庡瘑搴�
+ min-height: 60px; // 璁╅�夋嫨妗嗛珮搴︿篃鍙樺ぇ
+ line-height: 60px;
+ padding: 5.5px 1px;
+ background-color: #fff; // 杩欓噷鏀逛负钃濊壊
+ border: 2px solid #007aff; // 杈规涔熸敼涓鸿摑鑹�
+ color: #007aff; // 瀛椾綋棰滆壊鏀逛负鐧借壊锛屼繚璇佸彲璇绘��
+ border-radius: 6px;
+ transition: background 0.2s;
+ }
- .th {
- background-color: lightskyblue;
- height: 6vh;
- font-size: 2vw;
- /* Increased font size for table headers */
- }
+ .th {
+ background-color: white;
+ color: black;
+ height: 6vh;
+ 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 {
- display: flex;
- justify-content: space-around;
- margin-bottom: 2vh;
- padding: 2vh 1vw;
- }
+ .bottom-section {
+ display: flex;
+ justify-content: space-around;
+ margin-bottom: 2vh;
+ padding: 2vh 1vw;
+ margin-top: 20px; // 鍑忓皬椤堕儴杈硅窛锛岀‘淇濇寜閽湪寮圭獥鍐呮纭樉绀�
+ }
.save-btn,
.cancel-btn {
@@ -907,63 +1223,292 @@
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;
}
- .popup {
- background-color: #fff;
- padding: 2vh;
- border: 1px solid #ccc;
- box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
- width: 90vw;
- height: 70vh;
- font-size: 1.6vw;
- /* Increased font size within popups */
- }
+ .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 2vh 8vh 2vh; // 澧炲姞搴曢儴鍐呰竟璺濓紝涓烘寜閽暀鍑虹┖闂�
+ border: 1px solid #ccc;
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+ 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 {
float: left;
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 #007aff; /* 钃濊壊杈规 */
+ border-radius: 8px;
+ font-family: fantasy;
+ font-size: 33px;
+ margin-top: 20px;
+ padding: 15px 28px; /* 涓婁笅20px锛屽乏鍙�48px锛屽鍔犲唴杈硅窛 */
+ width: 300px; /* 鏇村锛屼繚璇佸唴瀹瑰畬鏁存樉绀� */
+ height: 70px; /* 澧炲姞楂樺害 */
+ box-sizing: border-box;
+ background: #fff;
+ color: #222;
+ font-weight: bold;
+ text-align: left;
+ display: block;
+ }
+
+/* //v-deep .checkbox {
+ // padding: 10 10px;
+ // width: 26px;
+ // padding-left: 12px;
+ // display: table-cell;
+ // vertical-align: middle;
+ // color: #333;
+ // font-weight: 500;
+ // border-bottom: 1px #ebeef5 solid;
+ // 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;
}
}
+
+ .uni-td,
+ td {
+ white-space: normal !important; // 鍏佽鑷姩鎹㈣
+ word-break: break-all !important; // 鍗曡瘝/涓枃閮借兘鏂
+ line-height: 1.4; // 琛岄珮閫傚綋锛屼究浜庡琛屾樉绀�
+ text-align: center; // 灞呬腑鏄剧ず锛堝闇�宸﹀榻愬彲鏀逛负 left锛�
+ vertical-align: middle; // 鍨傜洿灞呬腑
+ max-width: 180px; // 淇濇寔鍗曞厓鏍兼渶澶у搴�
+ overflow-wrap: break-word; // 鍏煎鎬ф洿濂�
+ background-color: transparent; /* 璁剧疆鑳屾櫙涓洪�忔槑 */
+ }
+
+ // 寮圭獥鍐呰〃鏍兼牱寮忎笌鐢熶骇鎶ュ伐椤甸潰鍘嗗彶鎶ュ伐璁板綍琛ㄦ牸涓�鑷�
+ .popup .large-selection-table .uni-th,
+ .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: 150px; // 鍘熸潵鐨�70% (180px * 0.7)
+ height: 75px; // 鍘熸潵鐨�65% (80px * 0.65)
+ font-size: 22px; // 瀛椾綋涔熺暐澶�
+ //font-weight: 200;
+ border-radius: 10px;
+ 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: 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鐨勫钩鏉夸娇鐢ㄥ獟浣撴煡璇㈣繘琛岄�傞厤 */
@media screen and (min-width: 1280px) and (max-width: 1920px) {
@@ -973,21 +1518,22 @@
.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;
}
}
-</style>
\ No newline at end of file
+
+</style>
--
Gitblit v1.9.3