From 8b3d00fbf11cf8ac769522ffeb83861eb3fc7902 Mon Sep 17 00:00:00 2001
From: lancer <1905818361@qq.com>
Date: Wed, 20 Oct 2021 19:02:28 +0800
Subject: [PATCH] init
---
src/api/modules/api.js | 8 +
src/views/Equipment/equipmentDetailList.vue | 93 ++++---
src/views/Equipment/record.vue | 283 ++++++++++++++++++++
src/views/Equipment/state.vue | 4 +-
src/views/Statistics/TrendAnalysis.vue | 8 +-
src/views/building/Count.vue | 16 ++
6 files changed, 367 insertions(+), 45 deletions(-)
create mode 100644 src/views/Equipment/record.vue
create mode 100644 src/views/building/Count.vue
diff --git a/src/api/modules/api.js b/src/api/modules/api.js
index fd0f20f..559cc8f 100644
--- a/src/api/modules/api.js
+++ b/src/api/modules/api.js
@@ -668,3 +668,11 @@ export function wifiInsert(data) {
data
})
}
+// 获取领用记录列表
+export function equipReceiveFindByPage(query) {
+ return request({
+ url: '/autoSR/equipReceive/findByPage',
+ method:'get',
+ params:query
+ })
+}
diff --git a/src/views/Equipment/equipmentDetailList.vue b/src/views/Equipment/equipmentDetailList.vue
index 3f0c1ef..df81730 100644
--- a/src/views/Equipment/equipmentDetailList.vue
+++ b/src/views/Equipment/equipmentDetailList.vue
@@ -61,6 +61,7 @@
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"
+ :picker-options="pickerOptions"
>
@@ -85,6 +86,7 @@
placeholder="选择日期"
format="yyyy - MM - dd "
value-format="yyyy-MM-dd"
+ :picker-options="pickerOptions"
>
@@ -631,6 +633,7 @@
+
+
diff --git a/src/views/Equipment/state.vue b/src/views/Equipment/state.vue
index c9414e3..0f6e758 100644
--- a/src/views/Equipment/state.vue
+++ b/src/views/Equipment/state.vue
@@ -775,7 +775,7 @@ export default {
this.onLineCount = res.data.onLineCount;
this.offLineCount = res.data.offLineCount;
this.workingCount = res.data.workingCount;
- this.total = res.data.total;
+ this.total = res.data.list.total;
});
},
//批量
@@ -1153,10 +1153,12 @@ export default {
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.size = val;
+ this.getTableList();
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.currentPage = val;
+ this.getTableList();
},
},
};
diff --git a/src/views/Statistics/TrendAnalysis.vue b/src/views/Statistics/TrendAnalysis.vue
index 52cfe3f..ba937d1 100644
--- a/src/views/Statistics/TrendAnalysis.vue
+++ b/src/views/Statistics/TrendAnalysis.vue
@@ -44,7 +44,7 @@
- 对比时间段
+ 对比时间段
@@ -343,6 +343,12 @@ export default {
this.selectTime = e;
this.selectTime1 = this.timestampToTime(new Date(e).getTime() + num);
}
+ },
+ radioChange() {
+ this.selectTime = "";
+ this.selectTime1 = "";
+ // this.compareList = [];
+ this.$set(this, "time", null);
},
confirmtime(e) {
this.timeType = "-1";
diff --git a/src/views/building/Count.vue b/src/views/building/Count.vue
new file mode 100644
index 0000000..c6999c0
--- /dev/null
+++ b/src/views/building/Count.vue
@@ -0,0 +1,16 @@
+
+
+楼盘
+
+
+
+
+
+