From 185f48c0ff3712937cf211dcaa72d6ddccc996fa Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 06 八月 2024 11:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before
---
src/components/do/b1-ins-order/add.vue | 12 +++
index.html | 8 +-
src/view/timer.vue | 72 ++++++++++++++++++++++++
src/components/do/b1-ins-order/fiberoptic-config.vue | 12 ++--
src/components/view/b1-inspection-order.vue | 30 +++++-----
src/view/index.vue | 4 +
6 files changed, 110 insertions(+), 28 deletions(-)
diff --git a/index.html b/index.html
index fea4cf1..bf9d2d7 100644
--- a/index.html
+++ b/index.html
@@ -2,10 +2,10 @@
<html>
<head>
<meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
- <meta http-equiv="Expires" CONTENT="0">
- <meta http-equiv="Cache-Control" CONTENT="no-cache">
- <meta http-equiv="Pragma" CONTENT="no-cache">
+
+ <meta http-equiv="pragram" content="no-cache">
+ <meta http-equiv="cache-control" content="no-cache, no-store, must-revalidate">
+ <meta http-equiv="expires" content="0">
<title>LIMS瀹為獙瀹ょ鐞嗙郴缁�</title>
<link rel="icon" type="image/x-icon" href="./static/img/logo.png">
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index b60ee13..3557a4d 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1572,10 +1572,19 @@
isHaveBushing = false
}
})
+ console.log('isHaveBushing===', this.totalArr)
+ // inspectionItem
+ let spcialItem = this.totalArr.find(a => a.state == 1 && a.inspectionItem.includes('鏉惧绠�'))
// console.log('isHaveBushing===', isHaveBushing)
if (productListSelected && select[2] === '鍏夌紗' && isHaveBushing === false) {
this.$message.error('鍏夌紗娓╁害寰幆椤圭洰蹇呴』杩涜鍏夌氦閰嶇疆')
-
+ this.$refs.sampleTable.setCurrentRow(this.currentMethod, true)
+ this.rowClick(this.currentMethod)
+ this.sampleIds = [this.currentMethod.id]
+ this.openConfig()
+ return
+ }else if(spcialItem&& isHaveBushing === false){
+ this.$message.error('鏉惧绠￠」鐩繀椤昏繘琛屽厜绾ら厤缃�')
this.$refs.sampleTable.setCurrentRow(this.currentMethod, true)
this.rowClick(this.currentMethod)
this.sampleIds = [this.currentMethod.id]
@@ -1821,7 +1830,6 @@
},
saveMethod(sampleList){
this.saveLoad = true
- console.log(333333,sampleList)
this.$axios.post(this.$api.insOrder.addInsOrder, {
str: JSON.stringify({
insOrder: this.addObj,
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index 94f73f9..f522a9c 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -885,12 +885,12 @@
this.$message.error('缂哄皯閰嶇疆鏃犳硶淇濆瓨')
return
}
- for(let a in this.bushing){
- if(this.bushing[a].fibers.length===0&&this.bushing[a].fiber.length===0){
- this.$message.error(this.bushing[a].color+'绠¤壊鏍囧绠＄己灏戦厤缃棤娉曚繚瀛�')
- return
- }
- }
+ // for(let a in this.bushing){
+ // if(this.bushing[a].fibers.length===0&&this.bushing[a].fiber.length===0){
+ // this.$message.error(this.bushing[a].color+'绠¤壊鏍囧绠＄己灏戦厤缃棤娉曚繚瀛�')
+ // return
+ // }
+ // }
this.sample.forEach(a=>{
a.bushing = this.bushing
})
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 158a138..a5d4366 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -374,7 +374,7 @@
<el-col style="font-weight: bold;"><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 14px;">
- <el-col style="font-weight: bold;"><span>鏍峰搧鍚嶇О: </span>{{ item.sampleName }}</el-col>
+ <el-col style="font-weight: bold;"><span>鏍峰搧鍚嶇О: </span>{{ item.sample }}</el-col>
</el-row>
<el-row style="margin-top: 1px;font-size: 14px;" class="ellipsis-multiline">
<el-col style="font-weight: bold;"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
@@ -401,31 +401,31 @@
</span>
</el-dialog>
<div class="el-dialog__body" style="overflow-y: auto;margin-top: 0;position: fixed;top: 999px;z-index: 99999;display: none;">
- <div id="printMOrder" class="printMOrder">
- <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 0.16cm !important;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
+ <div id="printMOrder" class="printMOrder" ref="printMOrder">
+ <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="font-size: 0.20cm !important;page-break-after: always;color: #000;box-shadow: none;margin: 0 !important;padding: 0 !important;">
<div style="display: flex;">
<div>
<el-col :span="10" :offset="2">
<vueQr :text="JSON.stringify(item.sampleCode)" :size="60" :margin="2"></vueQr>
</el-col>
</div>
- <div style="margin-left: 0.32cm;line-height: 0.21cm;">
+ <div style="margin-left: 0.32cm;line-height: 0.22cm;">
<el-row>
- <el-col style="font-size: 0.16cm;"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
+ <el-col style="font-size: 0.20cm;width: 4cm;" class="single-line-ellipsis"><span>鏍峰搧缂栧彿: </span>{{ item.sampleCode }}</el-col>
</el-row>
- <el-row style="font-size: 0.16cm;">
+ <el-row style="font-size: 0.20cm;">
<el-col><span>濮旀墭鍗曞彿: </span>{{ item.code }}</el-col>
</el-row>
- <el-row style="font-size: 0.16cm;">
+ <el-row style="font-size: 0.20cm;">
<el-col><span>瑙勬牸鍨嬪彿: </span>{{ item.model }}</el-col>
</el-row>
- <el-row style="font-size: 0.16cm;">
- <el-col ><span>鏍峰搧鍚嶇О: </span>{{ item.sampleName }}</el-col>
+ <el-row style="font-size: 0.20cm;">
+ <el-col ><span>鏍峰搧鍚嶇О: </span>{{ item.sample }}</el-col>
</el-row>
- <el-row style="font-size: 0.16cm;width: 5.6cm;">
+ <el-row style="font-size: 0.20cm;width: 4cm;">
<el-col class="ellipsis-multiline"><span>妫�娴嬮」鐩�: </span>{{ item.item }}</el-col>
</el-row>
- <el-row style="margin-top: 0.01cm;font-size: 0.16cm;">
+ <el-row style="margin-top: 0.01cm;font-size: 0.20cm;">
<el-col style="display: flex;align-items: center;"><span>鏍峰搧鐘舵��:
</span>
<span style="white-space: nowrap;"><span v-if="item.insState==0">鈭�</span><span class="scor" v-if="item.insState!=0"></span>寰呮
@@ -818,7 +818,7 @@
targetStyles:['*'],
style: `@page {
margin:0;
- size: 360px 175px collapse;
+ size: 400px 75px collapse;
margin-top:3px;
&:first-of-type{
margin-top:0 !important;
@@ -828,13 +828,13 @@
zoom:100%;
}
@media print{
- width: 360px;
- height: 175px;
+ width: 400px;
+ height: 75px;
margin:0;
}`,
onPrintDialogClose: this.erexcel=false,
targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
- font_size: '0.16cm',
+ font_size: '0.20cm',
});
},
print(){
diff --git a/src/view/index.vue b/src/view/index.vue
index 38dc5a4..41f2471 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -394,6 +394,7 @@
</span>
</el-dialog>
<notice ref="notice" @goNoticeDetail="checkForUnreadData()" />
+ <timer></timer>
</div>
</template>
@@ -411,9 +412,10 @@
import menus from '../../static/js/menu.js'
import nullFace from '../view/404.vue'
import notice from './notice.vue'
+ import timer from './timer.vue';
comObj['nullFace'] = nullFace
export default {
- components: {...comObj,notice},
+ components: {...comObj,notice,timer},
data() {
return {
userName: "value",
diff --git a/src/view/timer.vue b/src/view/timer.vue
new file mode 100644
index 0000000..12a66ce
--- /dev/null
+++ b/src/view/timer.vue
@@ -0,0 +1,72 @@
+<template>
+ <div>
+ <el-dialog
+ title="鎻愮ず"
+ :visible.sync="dialogVisible"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ :show-close="false"
+ width="30%">
+ <div style="display: flex;align-items: center;"><i class="el-icon-warning" style="color: red;font-size: 40px;margin-right: 20px;"></i><span>浠ｇ爜姝ｅ湪閮ㄧ讲锛岃30鍒嗛挓鍚庨噸鏂拌繘鍏ョ郴缁燂紒</span></div>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+export default {
+ data(){
+ return{
+ timer:null,
+ closeTimeout:null,
+ dialogVisible:false,
+ }
+ },
+ mounted() {
+ this.startScheduler();
+ },
+ methods: {
+ startScheduler() {
+ this.checkTime();
+ // 姣忓垎閽熸鏌ヤ竴娆�
+ this.timer = setInterval(this.checkTime, 60 * 1000);
+ },
+ checkTime() {
+ const now = new Date();
+ const hours = now.getHours();
+ const minutes = now.getMinutes();
+
+ if (hours === 20 && minutes === 0) {
+ this.performTask();
+ // 璁剧疆20鍒嗛挓鍚庢彁绀哄叧闂�
+ this.closeTimeout = setTimeout(() => {
+ this.promptToClose();
+ }, 20 * 60 * 1000); // 20鍒嗛挓
+ }
+ },
+ performTask() {
+ // 鍦ㄨ繖閲屾墽琛屼綘鎯宠鐨勫畾鏃朵换鍔�
+ console.log("浠诲姟鎵ц浜嗭紒");
+ this.dialogVisible = true;
+ // 杩欓噷鍙互瑙﹀彂涓�涓� Vuex 鍔ㄤ綔銆佸彂璧蜂竴涓� HTTP 璇锋眰锛屾垨鑰呭叾浠栨搷浣�
+ },
+ promptToClose() {
+ // 鎻愮ず鐢ㄦ埛鍏抽棴
+ // alert("璇疯寰楀湪20鍒嗛挓鍚庡叧闂换鍔★紒");
+ this.dialogVisible = true;
+ }
+ },
+ beforeDestroy() {
+ // 缁勪欢閿�姣佹椂娓呴櫎瀹氭椂鍣�
+ if (this.timer) {
+ clearInterval(this.timer);
+ }
+ if (this.closeTimeout) {
+ clearTimeout(this.closeTimeout);
+ }
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
--
Gitblit v1.9.3