From 8ec527a513fbf89409ea9c1c0a4c48d529ae11f3 Mon Sep 17 00:00:00 2001
From: lancer <1905818361@qq.com>
Date: Sat, 20 Nov 2021 17:40:19 +0800
Subject: [PATCH 1/2] init
---
src/views/ReceivingRecords/index.vue | 71 ++++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
diff --git a/src/views/ReceivingRecords/index.vue b/src/views/ReceivingRecords/index.vue
index f6cf607..66e3d6b 100644
--- a/src/views/ReceivingRecords/index.vue
+++ b/src/views/ReceivingRecords/index.vue
@@ -152,6 +152,47 @@
+
+
+
+
+
接待时长：
-->
+
+ {{ row.taboo==0?'否':'是' }}
+
+
+ {{ row.zfal==0?'已加精':'未加精' }}
+
查看
@@ -348,6 +395,26 @@ export default {
label: "未标记",
},
],
+ options11: [
+ {
+ value: "0",
+ label: "否",
+ },
+ {
+ value: "1",
+ label: "是",
+ },
+ ],
+ options12: [
+ {
+ value: "0",
+ label: "已加精",
+ },
+ {
+ value: "1",
+ label: "未加精",
+ },
+ ],
currentPage: 1,
size: 10,
total: 10,
@@ -368,6 +435,8 @@ export default {
houseType: "",
dateType: "0",
projectId: "",
+ taboo:'',
+ zfal:''
},
};
},
@@ -432,6 +501,8 @@ export default {
endDate: "",
houseType: "",
dateType: "0",
+ taboo:'',
+ zfal:'',
// projectId: this.houseList[0].id,
projectId:
this.orgType == 3
From 12f33f24ba77b119f943e2b2be2a00d6e03b4082 Mon Sep 17 00:00:00 2001
From: lancer <1905818361@qq.com>
Date: Mon, 22 Nov 2021 11:17:58 +0800
Subject: [PATCH 2/2] init
---
src/views/Customer/AgentManagement.vue | 2 +-
src/views/Customer/CompanyRecord.vue | 2 +-
src/views/Customer/SalesStage.vue | 1 +
src/views/Equipment/index.vue | 1 +
src/views/ReceivingRecords/index.vue | 2 +-
src/views/Scheduling/index.vue | 14 ++++++++------
src/views/Statistics/dataScreeAge.vue | 15 +++++++++++----
src/views/Statistics/dataScreeOrg.vue | 15 +++++++++++----
src/views/Statistics/dataScreeSys.vue | 15 +++++++++++----
src/views/Template/taboo.vue | 1 +
src/views/building/index.vue | 4 ++--
vue.config.js | 4 ++--
12 files changed, 51 insertions(+), 25 deletions(-)
diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue
index ed8208f..b6a437e 100644
--- a/src/views/Customer/AgentManagement.vue
+++ b/src/views/Customer/AgentManagement.vue
@@ -411,7 +411,7 @@ export default {
}else{
this.addagentobj.managerPassword=''
}
- this.resetFlag=false
+ this.resetFlag=true
this.passFlag=false
callback();
diff --git a/src/views/Customer/CompanyRecord.vue b/src/views/Customer/CompanyRecord.vue
index bf620e2..dc39784 100644
--- a/src/views/Customer/CompanyRecord.vue
+++ b/src/views/Customer/CompanyRecord.vue
@@ -347,7 +347,7 @@ export default {
}else{
this.addagentobj.managerPassword=''
}
- this.resetFlag=false
+ this.resetFlag=true
this.passFlag=false
callback();
diff --git a/src/views/Customer/SalesStage.vue b/src/views/Customer/SalesStage.vue
index 0a43fff..f771e76 100644
--- a/src/views/Customer/SalesStage.vue
+++ b/src/views/Customer/SalesStage.vue
@@ -136,6 +136,7 @@ computed: {
sort: "", // 联系人
remarks: "", // 联系人手机号
};
+ this.$refs.ruleForm.resetFields()
},
zkhousePage() {
this.$api.api
diff --git a/src/views/Equipment/index.vue b/src/views/Equipment/index.vue
index 98ba3aa..e6bab4c 100644
--- a/src/views/Equipment/index.vue
+++ b/src/views/Equipment/index.vue
@@ -956,6 +956,7 @@ export default {
batchId: "",
remark: "",
};
+ this.$refs.addForm.resetFields()
},
resetBind() {
this.bindForm = {
diff --git a/src/views/ReceivingRecords/index.vue b/src/views/ReceivingRecords/index.vue
index 66e3d6b..fafa5e4 100644
--- a/src/views/ReceivingRecords/index.vue
+++ b/src/views/ReceivingRecords/index.vue
@@ -275,7 +275,7 @@
}}
-
+
{{ row.markAdvisor == 0 ? "未标记" : "已标记" }}
diff --git a/src/views/Scheduling/index.vue b/src/views/Scheduling/index.vue
index 15c9ec8..5771bb7 100644
--- a/src/views/Scheduling/index.vue
+++ b/src/views/Scheduling/index.vue
@@ -83,14 +83,16 @@
-
+
-
+
空闲
接待中
@@ -100,17 +102,17 @@
-
+
有排班
无排班
-
+
暂停接待
空闲
diff --git a/src/views/Statistics/dataScreeAge.vue b/src/views/Statistics/dataScreeAge.vue
index 82885b3..e9a7777 100644
--- a/src/views/Statistics/dataScreeAge.vue
+++ b/src/views/Statistics/dataScreeAge.vue
@@ -427,7 +427,7 @@ export default {
let arr1 = [];
let arr2 = [];
// console.log(timeDate);
- if (idx == 1 || idx == 3) {
+ if (idx == 1 ) {
// 接待量
this.secondTab.yesterdayReceptionList.map((item) => {
timeDate.push(item.time.substring(11, 16));
@@ -447,9 +447,16 @@ export default {
arr2.push(item.data);
});
}
- // if (idx == 3) {
- // // 活跃设备
- // }
+ if (idx == 3) {
+ // 活跃设备
+ this.secondTab.todayActiveEquipmentList.map((item) => {
+ timeDate.push(item.time.substring(11, 16));
+ arr2.push(item.data);
+ });
+ this.secondTab.yesterdayActiveEquipmentList.map((item) => {
+ arr1.push(item.data);
+ });
+ }
let arr = [
{
name: Strname[0],
diff --git a/src/views/Statistics/dataScreeOrg.vue b/src/views/Statistics/dataScreeOrg.vue
index 32e7247..80c2cb9 100644
--- a/src/views/Statistics/dataScreeOrg.vue
+++ b/src/views/Statistics/dataScreeOrg.vue
@@ -400,7 +400,7 @@ export default {
let arr1 = [];
let arr2 = [];
// console.log(timeDate);
- if (idx == 1 || idx == 3) {
+ if (idx == 1 ) {
// 接待量
this.secondTab.yesterdayReceptionList.map((item) => {
timeDate.push(item.time.substring(11, 16));
@@ -420,9 +420,16 @@ export default {
arr2.push(item.data);
});
}
- // if (idx == 3) {
- // // 活跃设备
- // }
+ if (idx == 3) {
+ // 活跃设备
+ this.secondTab.todayActiveEquipmentList.map((item) => {
+ timeDate.push(item.time.substring(11, 16));
+ arr2.push(item.data);
+ });
+ this.secondTab.yesterdayActiveEquipmentList.map((item) => {
+ arr1.push(item.data);
+ });
+ }
let arr = [
{
name: Strname[0],
diff --git a/src/views/Statistics/dataScreeSys.vue b/src/views/Statistics/dataScreeSys.vue
index 5e7d971..f243e3d 100644
--- a/src/views/Statistics/dataScreeSys.vue
+++ b/src/views/Statistics/dataScreeSys.vue
@@ -425,7 +425,7 @@ export default {
let arr1 = [];
let arr2 = [];
// console.log(timeDate);
- if (idx == 1 || idx == 3) {
+ if (idx == 1 ) {
// 接待量
this.secondTab.yesterdayReceptionList.map((item) => {
timeDate.push(item.time.substring(11, 16));
@@ -445,9 +445,16 @@ export default {
arr2.push(item.data);
});
}
- // if (idx == 3) {
- // // 活跃设备
- // }
+ if (idx == 3) {
+ // 活跃设备
+ this.secondTab.todayActiveEquipmentList.map((item) => {
+ timeDate.push(item.time.substring(11, 16));
+ arr2.push(item.data);
+ });
+ this.secondTab.yesterdayActiveEquipmentList.map((item) => {
+ arr1.push(item.data);
+ });
+ }
let arr = [
{
name: Strname[0],
diff --git a/src/views/Template/taboo.vue b/src/views/Template/taboo.vue
index 51726f9..97c0d22 100644
--- a/src/views/Template/taboo.vue
+++ b/src/views/Template/taboo.vue
@@ -86,6 +86,7 @@
{
// console.log(res);
// 判断数据是否已经有了
@@ -611,7 +611,7 @@ export default {
}else{
this.ruleForm.managerPassword=''
}
- this.resetFlag=false
+ this.resetFlag=true
this.passFlag=false
callback();
diff --git a/vue.config.js b/vue.config.js
index b514bbc..db6248b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,9 +3,9 @@
* https://cli.vuejs.org/zh/config/
*/
// const url = 'http://pigx-gateway'
-// const url = 'http://39.97.167.65:9999' //测试
+const url = 'http://39.97.167.65:9999' //测试
// const url = 'http://192.168.31.169:9999' //长龙
-const url = 'http://192.168.31.134:9999' //嘉豪
+// const url = 'http://192.168.31.134:9999' //嘉豪
// const url = 'http://192.168.31.100:9999' //王笑
// const url = 'http://nitu5e.natappfree.cc' //王笑