From f7cdc468d80519c55c9adda72625971022c44d63 Mon Sep 17 00:00:00 2001 From: xiaohei <11674173+xiaohei102908@user.noreply.gitee.com> Date: Fri, 4 Aug 2023 09:00:44 +0800 Subject: [PATCH] =?UTF-8?q?8=E6=9C=883=E6=97=A5=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 4 +- src/store/index.js | 3 +- src/views/Screen.vue | 4 +- src/views/agreement.vue | 168 + src/views/dataScreen/rightChartTop.vue | 2 +- src/views/device/smartMeter.vue | 16 +- src/views/device/waterMeter.vue | 14 +- src/views/doorLock.vue | 6331 ++++++++++---------- src/views/loginAccount.vue | 2529 ++++---- src/views/rechargeManagement/bill.vue | 6 +- .../rechargeManagement/rechargeManagement.vue | 4 +- src/views/room.vue | 81 +- src/views/systemConfiguration.vue | 152 +- src/views/template/contractExportTemplate.vue | 2 +- src/views/userManagement.vue | 1230 ++-- src/views/visualization/flatsIndex.vue | 1 + 16 files changed, 5425 insertions(+), 5122 deletions(-) diff --git a/config/index.js b/config/index.js index 9f473bf..54cfc86 100644 --- a/config/index.js +++ b/config/index.js @@ -11,9 +11,9 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/api': { - target: 'http://apartmentcloud.xiaozhisz.cn/', + // target: 'http://apartmentcloud.xiaozhisz.cn/', // target: 'http://test.zhiweisz.cn/', - // target: 'http://192.168.1.26:8600/', + target: 'http://192.168.1.26:8600/', changeOrigin: true, //是否跨域 pathRewrite: { //重写路径 diff --git a/src/store/index.js b/src/store/index.js index c9cebc5..0643a93 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -426,7 +426,8 @@ const store = new Vuex.Store({ // 侧边栏折叠 hadndleCollapse(state, data) { state.collapse = data; - } + }, + }, actions: {}, modules: {} diff --git a/src/views/Screen.vue b/src/views/Screen.vue index 7b6b43c..abe51e9 100644 --- a/src/views/Screen.vue +++ b/src/views/Screen.vue @@ -19,10 +19,10 @@
- + - +
diff --git a/src/views/agreement.vue b/src/views/agreement.vue index aad1472..6584766 100644 --- a/src/views/agreement.vue +++ b/src/views/agreement.vue @@ -174,6 +174,7 @@ @@ -248,15 +257,14 @@ {{ scope.row.battery || 0 - }}% + }}% @@ -361,7 +369,7 @@ -
+
@@ -390,7 +398,7 @@
+ v-if="form.manufacturer == 701 || form.manufacturer == 702 || form.manufacturer == 703 || form.manufacturer == 704 || form.manufacturer == 705 || form.manufacturer == 706 || form.manufacturer == 707"> @@ -406,7 +414,8 @@ - +
@@ -451,53 +460,55 @@ {{ formInline.lastReportAt }} - + 静音 低音 高音 - + 静音 低音 高音 - - - - - - - - + + + + + + + + 数据同步 - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +
- +
@@ -525,38 +536,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -635,1673 +646,1742 @@ +} diff --git a/src/views/loginAccount.vue b/src/views/loginAccount.vue index 8c611f4..f3e7256 100644 --- a/src/views/loginAccount.vue +++ b/src/views/loginAccount.vue @@ -3,13 +3,14 @@
- + - 搜索 - 添加账户 - 添加部门 - 历史账户 + 搜索 + 添加账户 + 添加部门 + 历史账户
@@ -36,11 +37,11 @@ - - - + + + @@ -50,7 +51,7 @@ 删除 强制删除 + v-if="userInfo.type == 0">强制删除 @@ -69,31 +70,45 @@ - + - + - + - + - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/rechargeManagement/bill.vue b/src/views/rechargeManagement/bill.vue index 839ab27..c8f51bc 100644 --- a/src/views/rechargeManagement/bill.vue +++ b/src/views/rechargeManagement/bill.vue @@ -33,8 +33,8 @@ - 查询 - 批量导出 + 查询 + 批量导出
@@ -72,7 +72,7 @@ diff --git a/src/views/rechargeManagement/rechargeManagement.vue b/src/views/rechargeManagement/rechargeManagement.vue index ebc1d64..49abe7d 100644 --- a/src/views/rechargeManagement/rechargeManagement.vue +++ b/src/views/rechargeManagement/rechargeManagement.vue @@ -53,14 +53,14 @@
短信余额:{{infoData.balance?(infoData.balance/10):0}}
- 充值结算 + 充值结算
楼栋数
-
{{ roomNum }}
+
{{ buildingNum }}
@@ -32,7 +32,7 @@
已入住
-
0
+
{{ checkin }}
@@ -41,7 +41,7 @@
空房间
-
0
+
{{ emptyroomNum }}
@@ -68,7 +68,7 @@
未绑定门锁
-
0
+
{{ unboundNum }}
@@ -175,13 +175,13 @@ title="切换表格展示">
- 添加 - 批量删除 + 添加 + 批量删除 - 导出房源 - 返回 + 导出房源 + 返回
@@ -218,13 +218,13 @@ class="inputBox mb-2"> - + - + - + - + @@ -248,8 +248,8 @@ - 查询 - 重置 + 查询 + 重置
{ + console.log(res) this.projectNum = res.data.list.total var schoollist = res.data.list.list; this.schoollist = schoollist @@ -1528,7 +1534,7 @@ export default { }); }, // 获取房间总数 - getcount() { + getcount(data) { // var data = { // type: 5, // }; @@ -1537,9 +1543,26 @@ export default { // this.pageTotal = res.data[0].device // this.offline = res.data[0].offline // }); - httpGet('', this.$api.getSiteList).then((res) => { + httpGet(data, this.$api.getSiteList).then((res) => { + console.log(res); var roomNum = 0; + var buildingNum = 0 + var checkin = 0 + var unboundNum = 0 res.data.list.list.map((li, index) => { + // 楼栋数 + if (li.pid % 10 == 1 && li.type == 1) { + buildingNum++ + } + // 已入住 + if (li.isRoom == 1 && li.count != 0) { + checkin++ + } + // 未绑定门锁 + if (!li.imei && li.isRoom == 1) { + unboundNum++ + } + // 房间总数 let countNum = res.data.tenants.filter(item => item.id == li.id)[0] if (countNum) { li.count = countNum.count @@ -1555,6 +1578,10 @@ export default { } }); this.roomNum = roomNum; + this.buildingNum = buildingNum + this.checkin = checkin + this.unboundNum = unboundNum + this.emptyroomNum = roomNum - unboundNum - checkin }) }, // 获取设备 @@ -2216,15 +2243,16 @@ export default { // 获取列表 getlistChildren(row) { var q = { - name: this.input6, - deviceNum: this.searchDeviceNum, + name: this.input6, // 房间名称 + deviceNum: this.searchDeviceNum, // 设备号 ancestor: row.id, - operationStatus: this.searchSelectStatus, + operationStatus: this.searchSelectStatus, // 绑定情况 isRoom: 1, - layout: this.roomLayout, - expand: { - // type: this.searchRoomStatus - }, + layout: this.roomLayout, // 房间户型 + roomStatus: this.searchRoomStatus, + // expand: { + // type: this.searchRoomStatus + // }, }; var data = { q: JSON.stringify(q), @@ -3229,4 +3257,5 @@ export default { .h700 { height: 300px; } -} +} + diff --git a/src/views/systemConfiguration.vue b/src/views/systemConfiguration.vue index dd8886e..772b8d2 100644 --- a/src/views/systemConfiguration.vue +++ b/src/views/systemConfiguration.vue @@ -2,29 +2,33 @@
- - - - - - - - - - - - - - - - - 确认 - - + + + + + + + + + + + + + + + + + + +
将文件拖到此处,或点击上传
+
+
+ + 确认 + +
@@ -33,16 +37,12 @@ - + - 点击上传 @@ -57,22 +57,22 @@ - + diff --git a/src/views/template/contractExportTemplate.vue b/src/views/template/contractExportTemplate.vue index c4950c0..37c5882 100644 --- a/src/views/template/contractExportTemplate.vue +++ b/src/views/template/contractExportTemplate.vue @@ -1,6 +1,6 @@