From 5b4acf22b23079c1f689e217f55780f864ac79c6 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 06 八月 2024 10:38:28 +0800
Subject: [PATCH] 完成定时更新
---
src/components/do/b1-ins-order/add.vue | 12 ++++++++++--
src/main.js | 4 ++--
src/view/timer.vue | 17 +++++++++--------
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 77a6e60..83edca8 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/main.js b/src/main.js
index 02eed56..ddc5532 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,14 +20,14 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-// const javaApi = 'http://192.168.92.2:8001';
+const javaApi = 'http://192.168.92.249:8001';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
// const javaApi = 'http://114.132.189.42:1234';
// //妫�娴嬩腑蹇冩寮忓簱
// Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
-const javaApi = 'http://10.1.200.86:8001';
+// const javaApi = 'http://10.1.200.86:8001';
//瑁呭鐢电紗娴嬭瘯搴�
// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
diff --git a/src/view/timer.vue b/src/view/timer.vue
index a037a4b..12a66ce 100644
--- a/src/view/timer.vue
+++ b/src/view/timer.vue
@@ -3,12 +3,11 @@
<el-dialog
title="鎻愮ず"
:visible.sync="dialogVisible"
- width="30%"
- :before-close="handleClose">
- <span>杩欐槸涓�娈典俊鎭�</span>
- <span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="dialogVisible = false">纭� 瀹�</el-button>
- </span>
+ :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>
@@ -36,7 +35,7 @@
const hours = now.getHours();
const minutes = now.getMinutes();
- if (hours === 22 && minutes === 0) {
+ if (hours === 20 && minutes === 0) {
this.performTask();
// 璁剧疆20鍒嗛挓鍚庢彁绀哄叧闂�
this.closeTimeout = setTimeout(() => {
@@ -47,11 +46,13 @@
performTask() {
// 鍦ㄨ繖閲屾墽琛屼綘鎯宠鐨勫畾鏃朵换鍔�
console.log("浠诲姟鎵ц浜嗭紒");
+ this.dialogVisible = true;
// 杩欓噷鍙互瑙﹀彂涓�涓� Vuex 鍔ㄤ綔銆佸彂璧蜂竴涓� HTTP 璇锋眰锛屾垨鑰呭叾浠栨搷浣�
},
promptToClose() {
// 鎻愮ず鐢ㄦ埛鍏抽棴
- alert("璇疯寰楀湪20鍒嗛挓鍚庡叧闂换鍔★紒");
+ // alert("璇疯寰楀湪20鍒嗛挓鍚庡叧闂换鍔★紒");
+ this.dialogVisible = true;
}
},
beforeDestroy() {
--
Gitblit v1.9.3