From 5612ee75d4c64c215e334e8e7577f4486b55ef49 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 17 七月 2024 09:43:27 +0800
Subject: [PATCH] 修改部分bug
---
src/main.js | 8 ++++----
src/components/do/b1-inspect-order-plan/Inspection.vue | 3 ++-
src/components/do/b3-work-time-management/work-time-management.vue | 6 +++---
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 425a9b3..ef99776 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -2096,7 +2096,8 @@
if (this.equipOptions[i].value === val) {
for (let i1 in this.param[n.i].equipName) {
if (this.param[n.i].equipName[i1].i === n.i && this.param[n.i].equipName[i1].r === n.r) {
- this.param[n.i].equipName[i1].v.v = this.equipOptions[i].label
+ this.$set(this.param[n.i].equipName[i1].v,'v',this.equipOptions[i].label)
+ // this.param[n.i].equipName[i1].v.v = this.equipOptions[i].label
}
}
}
diff --git a/src/components/do/b3-work-time-management/work-time-management.vue b/src/components/do/b3-work-time-management/work-time-management.vue
index fa6f726..f47b25e 100644
--- a/src/components/do/b3-work-time-management/work-time-management.vue
+++ b/src/components/do/b3-work-time-management/work-time-management.vue
@@ -1,7 +1,7 @@
<template>
<div class="work-time-management">
<div class="search">
- <div class="search_thing">
+ <!-- <div class="search_thing">
<div class="search_label">鍛ㄦ锛�</div>
<div class="search_input" style="display: flex;align-items: center;">
<el-input size="small" placeholder="寮�濮嬪懆娆�" clearable
@@ -10,7 +10,7 @@
<el-input size="small" placeholder="缁撴潫鍛ㄦ" clearable
v-model="entity.week2"></el-input>
</div>
- </div>
+ </div> -->
<div class="search_thing" style="width: 200px;">
<div class="search_label">鏄熸湡锛�</div>
<el-select v-model="entity.weekDay" placeholder="鍏ㄩ儴" size="small" @change="refreshTable()" clearable>
@@ -224,7 +224,7 @@
entity: {
week: null,
weekDay: null,
- dateTime: null,
+ dateTime: new Date(),
name:null,
orderBy: {
field: 'id',
diff --git a/src/main.js b/src/main.js
index db3b571..0f44237 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,17 +18,17 @@
Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
// Vue.prototype.PROJECT = '瑁呭鐢电紗'
//鏈湴
-Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
+// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://10.1.88.162:8001';
+// const javaApi = 'http://10.1.88.162: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';
+Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
+const javaApi = 'http://10.1.200.86:8001';
//瑁呭鐢电紗娴嬭瘯搴�
// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
--
Gitblit v1.9.3