xh
/
saas0801
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

0913版本更改提交

master
xiaoheiiskinder 1 year ago
parent
f7cdc468d8
commit
ceb7a95cc3
12 changed files with 240 additions and 57 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      config/index.js
  2. +1
    -1
      dist/index.html
  3. +1
    -0
      src/api/all.js
  4. +4
    -2
      src/components/houseing1.vue
  5. +1
    -1
      src/store/index.js
  6. +116
    -14
      src/views/agreement.vue
  7. +4
    -0
      src/views/doorLock.vue
  8. +1
    -1
      src/views/rechargeManagement/bill.vue
  9. +2
    -1
      src/views/rechargeManagement/rechargeManagement.vue
  10. +18
    -10
      src/views/room.vue
  11. +76
    -16
      src/views/userManagement.vue
  12. +14
    -9
      src/views/visualization/flatsIndex.vue

+ 2
- 2
config/index.js View File

@ -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: {
//重写路径


+ 1
- 1
dist/index.html View File

@ -1 +1 @@
<!DOCTYPE html><html><head><meta http-equiv=Content-Language><meta name=viewport content="width=device-width,initial-scale=1"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta http-equiv=Content-Type content="text/html;charset=utf-8"><title>智慧公寓管理系统</title><link href=/static/css/app.4235ce62fb9c140db2020a89f8ca28fc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.18ec6b5593d846b34fd0.js></script><script type=text/javascript src=/static/js/vendor.9c8489941f3a5aa906bb.js></script><script type=text/javascript src=/static/js/app.509b36048f5247e714bd.js></script></body></html>
<!DOCTYPE html><html><head><meta http-equiv=Content-Language><meta name=viewport content="width=device-width,initial-scale=1"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta http-equiv=Content-Type content="text/html;charset=utf-8"><title>智慧公寓管理系统</title><link href=/static/css/app.3eb8f39093d854e5965330b2168dcaed.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.43412603cc1681ec7a7c.js></script><script type=text/javascript src=/static/js/vendor.622945be597e735b1a7b.js></script><script type=text/javascript src=/static/js/app.4e6c096e3d34a6829a94.js></script></body></html>

+ 1
- 0
src/api/all.js View File

@ -199,6 +199,7 @@ api.screenStatisticsItems="/v1/statistics/device/items"
// 合同
api.postrenewal = "/v1/leases/update" // 续租
api.postLeasesList="/v1/leases/get/list" // 获取合同列表
api.postAddLeases="/v1/leases/add" // 创建合同
api.postUpdateLeases="/v1/leases/update" // 修改合同


+ 4
- 2
src/components/houseing1.vue View File

@ -8,7 +8,7 @@
</div>
<div class="room-item-row2">
<div class="room-row2-item">
<div>{{ data.count }}</div>
<div>{{ data.count.count ? data.count.count : data.count }}</div>
<div>入住</div>
</div>
<div class="room-line"></div>
@ -43,7 +43,9 @@
data() {
return {}
},
mounted() {},
mounted() {
console.log(this.data);
},
methods: {},
};
</script>


+ 1
- 1
src/store/index.js View File

@ -114,7 +114,7 @@ const store = new Vuex.Store({
},
getConditionRoomAndPersonnel(state){
var data = {};
httpGet(data, api.onlyTenant).then((res) => {
httpPost(data, api.onlyTenant).then((res) => {
if(res.success){
state.conditionRoomAndPersonnel = res.data.list
}


+ 116
- 14
src/views/agreement.vue View File

@ -836,6 +836,19 @@ export default {
// 重新绑定房间
httpPost(unbind, this.$api.setTenant).then((res) => {
console.log(res);
// 续约
let data = {
cardId: this.batchmessage.cardId,
signingTime: this.batchRenewalFrom.startTime,
cutoffTime: this.batchRenewalFrom.endTime,
status: 1
}
httpPost(data, this.$api.postrenewal).then(res1 => {
console.log(123123, res1);
if (res1.success) {
this.getLeasesList()
}
})
})
// 修改凭证
httpGet(data, this.$api.getCertificates).then((res) => {
@ -887,7 +900,7 @@ export default {
})
})
this.batchRenewalShow = false
}else{
} else {
this.$message.error("暂未发现对应设备")
}
} else {
@ -904,10 +917,47 @@ export default {
// 查询和房间相关的设备
getAboutDevice() {
httpGet("", this.$api.onlySiteDevice).then((res) => {
this.AboutDevice = res.data.list;
this.$store.commit("getAboutDevice", res.data.list);
});
let data = {
orderBy: "create_time desc",
pageNum: 0,
pageSize: 0,
q: JSON.stringify({
name: '',
number: '',
cardId: ''
})
}
let data1 = []
httpPost(data, this.$api.getlistNum).then((res) => {
console.log("123", res);
if (res.success) {
res.data.list.map(li => {
data1.push(li.id)
})
let data2 = {
cardIds: data1
}
httpPost(data2, this.$api.onlyTenant).then((res1) => {
// this.$store.commit("getAboutRoom", res.data.list);
// this.getlist();
console.log(res1);
let data3 = []
if (res1.success) {
res1.data.list.map(li => {
data3.push(li.roomId)
})
let data4 = {
ids: data3
}
httpPost(data4, this.$api.onlySiteDevice).then((res) => {
console.log(res);
this.AboutDevice = res.data.list;
this.$store.commit("getAboutDevice", res.data.list);
});
}
});
}
})
},
getEnterprise() {
httpGet("", this.$api.getEnterprise).then((res) => {
@ -1552,9 +1602,31 @@ export default {
},
// 查询和人员相关的房间
getAboutRoom() {
httpGet("", this.$api.onlyTenant).then((res) => {
this.$store.commit("getAboutRoom", res.data.list);
});
let data = {
orderBy: "create_time desc",
pageNum: 0,
pageSize: 0,
q: JSON.stringify({
name: '',
number: '',
cardId: ''
})
}
let data1 = []
httpPost(data, this.$api.getlistNum).then((res) => {
console.log("123", res);
if (res.success) {
res.data.list.map(li => {
data1.push(li.id)
})
let data2 = {
cardIds: data1
}
httpPost(data2, this.$api.onlyTenant).then((res1) => {
this.$store.commit("getAboutRoom", res.data.list);
});
}
})
},
// 添加人员
saveEdit() {
@ -1602,9 +1674,31 @@ export default {
httpPost(ids, this.$api.createkeyCard).then(res => {
})
httpGet("", this.$api.onlyTenant).then((res) => {
this.$store.commit("getAboutRoom", res.data.list);
});
let data = {
orderBy: "create_time desc",
pageNum: 0,
pageSize: 0,
q: JSON.stringify({
name: '',
number: '',
cardId: ''
})
}
let data1 = []
httpPost(data, this.$api.getlistNum).then((res) => {
console.log("123", res);
if (res.success) {
res.data.list.map(li => {
data1.push(li.id)
})
let data2 = {
cardIds: data1
}
httpPost(data2, this.$api.onlyTenant).then((res1) => {
this.$store.commit("getAboutRoom", res.data.list);
});
}
})
} else {
}
})
@ -2223,9 +2317,9 @@ export default {
},
// 删除凭证
deletefun(index, row) {
this.savevoucherlist = this.savevoucherlist.filter(li => {
console.log(li, row)
return li.password == row.password
return li.password != row.password
})
},
// 录入凭证
@ -3274,13 +3368,17 @@ export default {
let _this = this
this.multipleSelection.map(li => {
this.getRoomIdDeviceInfo(li.siteId).then(res => {
console.log(res, res.data.total);
if (res.data.total > 0) {
if (res.data.list[0].manufactureId === 201 || res.data.list[0].manufactureId === 221) {
RequestSet.unbindPeopleAndRooms(li.cardId, res.data.list[0].imei, (callback) => {
console.log(callback);
if (callback.success) {
let dataOne = utils.zlib_unzip(callback.data)
console.log(dataOne);
if (dataOne.length > 0) {
let lookUserInfo = JSON.parse(dataOne[0].content)
console.log(lookUserInfo);
let dataLook = {
lockerId: dataOne[0].deviceNum,
imei: dataOne[0].imei,
@ -3293,12 +3391,14 @@ export default {
roomName: lookUserInfo.roomName
}
httpPost(dataLook, _this.$api.ZGduserOperation).then(res2 => {
console.log(dataLook, res2);
if (res2.success) {
let dataUnbind = [{
siteId: li.siteId,
cardId: li.cardId,
}]
httpPost(dataUnbind, _this.$api.unbindCard).then((res) => {
console.log(res);
_this.$message.success("退租成功")
let refundLeasesData = [
{
@ -3306,7 +3406,9 @@ export default {
status: 3
}
]
httpPost(refundLeasesData, _this.$api.postUpdateLeases).then(res => { })
httpPost(refundLeasesData, _this.$api.postUpdateLeases).then(res => {
console.log(res);
})
_this.getLeasesList()
_this.getLeasesStatus()
})


+ 4
- 0
src/views/doorLock.vue View File

@ -1284,6 +1284,7 @@ export default {
roomName: item.roomName,
deviceNum: item.deviceNum,
imei: item.imei,
imsi: item.imsi,
isOnline: item.isOnline == 1 ? '在线' : item.isOnline == 2 ? '异常' : '离线',
battery: item.battery,
rssi: item.rssi,
@ -1296,6 +1297,7 @@ export default {
roomName: '房间名称',
deviceNum: '设备号',
imei: 'IMEI',
imsi: 'IMSI',
isOnline: '状态',
battery: '电量',
rssi: '信号',
@ -2248,6 +2250,7 @@ export default {
order: 61101,
roomName: li.roomName,
opendDoorType: 0,
imei: li.imei,
lockerId: li.deviceNum,
lockerUserId: li.iotId,
startTime: moment(this.opendTime[0]).format('YYYY-MM-DD HH:mm:ss'),
@ -2340,6 +2343,7 @@ export default {
roomName: li.roomName,
opendDoorType: 1,
lockerId: li.deviceNum,
imei: li.imei,
lockerUserId: li.iotId,
startTime: moment(this.opendTime[0]).format('YYYY-MM-DD HH:mm:ss'),
endTime: moment(this.opendTime[1]).format('YYYY-MM-DD HH:mm:ss'),


+ 1
- 1
src/views/rechargeManagement/bill.vue View File

@ -88,7 +88,7 @@
</template>
<script>
import {httpGet} from "../../api";
import {httpGet, download} from "../../api";
import utils from "../../utils/util";
import moment from "moment";


+ 2
- 1
src/views/rechargeManagement/rechargeManagement.vue View File

@ -427,7 +427,8 @@
nickname:li.name
})
}
httpPost(data,this.$api.rentPrepayOrder).then(res=>{
console.log(this.$api.rentPrepayOrder);
httpPost(data, this.$api.rentPrepayOrder).then(res=>{
if(res.success){
this.$message.success('结算成功')
this.getLeasesList()


+ 18
- 10
src/views/room.vue View File

@ -175,13 +175,17 @@
title="切换表格展示"></i>
</div>
<div class="adddbtn">
<el-button type="primary" @click="handleSearch1" size="mini" class="mb-2" style="background: #FA8E00; border: none;">添加</el-button>
<el-button type="primary" @click="selectmoredel" size="mini" class="mb-2" style="background: #FA8E00; border: none;">批量删除</el-button>
<el-button type="primary" @click="handleSearch1" size="mini" class="mb-2"
style="background: #FA8E00; border: none;">添加</el-button>
<el-button type="primary" @click="selectmoredel" size="mini" class="mb-2"
style="background: #FA8E00; border: none;">批量删除</el-button>
<!-- <el-button type="primary" @click="dbing" size="mini"
>管理绑定</el-button
> -->
<el-button type="primary" @click="exportfun" size="mini" class="mb-2" style="background: #FA8E00; border: none;">导出房源</el-button>
<el-button type="primary" @click="backFun" size="mini" class="mb-2" style="background: #FA8E00; border: none;">返回</el-button>
<el-button type="primary" @click="exportfun" size="mini" class="mb-2"
style="background: #FA8E00; border: none;">导出房源</el-button>
<el-button type="primary" @click="backFun" size="mini" class="mb-2"
style="background: #FA8E00; border: none;">返回</el-button>
</div>
<el-row :gutter="20">
<el-card shadow="nerver" class="m20">
@ -248,8 +252,10 @@
<el-option key="2" label="已绑定" value="1">
</el-option>
</el-select>
<el-button type="primary" @click="getlist3" size="small" class="mb-2" style="background: #FA8E00; border: none;">查询</el-button>
<el-button type="primary" @click="resetInput" size="small" class="mb-2" style="background: #FA8E00; border: none;">重置</el-button>
<el-button type="primary" @click="getlist3" size="small" class="mb-2"
style="background: #FA8E00; border: none;">查询</el-button>
<el-button type="primary" @click="resetInput" size="small" class="mb-2"
style="background: #FA8E00; border: none;">重置</el-button>
</div>
<el-table :data="userlist" border stripe class="table" ref="multipleTable"
@ -2333,8 +2339,8 @@ export default {
q: JSON.stringify(q),
};
httpGet(data, this.$api.getSiteList).then((res) => {
var pageuserlist = [],
userlist = [];
console.log(res);
var pageuserlist = []
res.data.list.list.map((li, index) => {
let countNum = res.data.tenants.filter(item => item.id == li.id)[0]
if (countNum) {
@ -2360,12 +2366,15 @@ export default {
li.count = 0
}
});
console.log(pageuserlist);
this.pageuserlist = pageuserlist;
var userlist = []
pageuserlist.map((li, index) => {
if (0 <= index && index <= 20) {
userlist.push(li);
}
});
console.log(userlist);
this.userlist = userlist;
this.total = pageuserlist.length;
});
@ -3257,5 +3266,4 @@ export default {
.h700 {
height: 300px;
}
}
</style>
}</style>

+ 76
- 16
src/views/userManagement.vue View File

@ -1167,15 +1167,15 @@ export default {
if (res.success) {
res.data.list.map(li => {
// 待签约
if(li.status == 0){
if (li.status == 0) {
signedNum++
}else if(li.status == 1){
} else if (li.status == 1) {
// 已签约
checkinNum++
}else if(li.status == 2){
} else if (li.status == 2) {
// 已欠费
arrearsNum++
}else if(li.status == 4){
} else if (li.status == 4) {
// 已到期
expiredNum++
}
@ -2568,10 +2568,33 @@ export default {
},
// 查询和人员相关的房间
getAboutRoom() {
httpGet("", this.$api.onlyTenant).then((res) => {
this.$store.commit("getAboutRoom", res.data.list);
this.getlist();
});
let data = {
orderBy: "create_time desc",
pageNum: 0,
pageSize: 0,
q: JSON.stringify({
name: '',
number: '',
cardId: ''
})
}
let data1 = []
httpPost(data, this.$api.getlistNum).then((res) => {
console.log("123", res);
if (res.success) {
res.data.list.map(li => {
data1.push(li.id)
})
let data2 = {
cardIds: data1
}
httpPost(data2, this.$api.onlyTenant).then((res1) => {
console.log(res1);
this.$store.commit("getAboutRoom", res1.data.list);
this.getlist();
});
}
})
},
getEnterprise() {
httpGet("", this.$api.getEnterprise).then((res) => {
@ -2616,10 +2639,47 @@ export default {
},
// 查询和房间相关的设备
getAboutDevice() {
httpGet("", this.$api.onlySiteDevice).then((res) => {
this.AboutDevice = res.data.list;
this.$store.commit("getAboutDevice", res.data.list);
});
let data = {
orderBy: "create_time desc",
pageNum: 0,
pageSize: 0,
q: JSON.stringify({
name: '',
number: '',
cardId: ''
})
}
let data1 = []
httpPost(data, this.$api.getlistNum).then((res) => {
console.log("123", res);
if (res.success) {
res.data.list.map(li => {
data1.push(li.id)
})
let data2 = {
cardIds: data1
}
httpPost(data2, this.$api.onlyTenant).then((res1) => {
// this.$store.commit("getAboutRoom", res.data.list);
// this.getlist();
console.log(res1);
let data3 = []
if (res1.success) {
res1.data.list.map(li => {
data3.push(li.roomId)
})
let data4 = {
ids: data3
}
httpPost(data4, this.$api.onlySiteDevice).then((res) => {
console.log(res);
this.AboutDevice = res.data.list;
this.$store.commit("getAboutDevice", res.data.list);
});
}
});
}
})
},
@ -2859,7 +2919,6 @@ export default {
})
},
bindRoomTop1(index, row) {
console.log(row)
this.multipleSelection2 = row
this.bindRoomStatus1 = true
let startTime = ''
@ -2883,6 +2942,7 @@ export default {
let tt = this.findParentIds(this.bindRoomlist, li.roomId)
arr.push(...tt)
})
console.log(row)
let treeId = ids.concat([...new Set(arr)])
this.getSelectedTab(treeId).then((res) => {
if (res.length > 0) {
@ -4110,11 +4170,9 @@ export default {
if (li.isRoom == 1) {
roomScreen.push(li)
}
console.log(li)
roomtable.push(li);
}
});
console.log(roomtable)
this.roomtablestatus = false;
if (this.activeName == 0) {
var data = JSON.parse(JSON.stringify(this.zNodes))
@ -4129,6 +4187,7 @@ export default {
// this.bindRoomlist = this.roomlist
}
var list = roomtable.sort((pre, cur) => pre.siteId - cur.siteId)
console.log(list);
this.getSearchRoomList()
this.$nextTick(function () {
this.roomtable = list;
@ -7435,4 +7494,5 @@ export default {
.adddbtn {
left: 70px;
}
}</style>
}
</style>

+ 14
- 9
src/views/visualization/flatsIndex.vue View File

@ -792,15 +792,20 @@ export default {
console.log(res);
if (res.success) {
let middleChartExtend = this.middleChartExtend
let arr = new Array(0).fill(this.sumRoom)
middleChartExtend.series[2].data = arr
res.data.leases.map(li => {
middleChartExtend.series[0].data[li.order] = li.count
})
res.data.site.map(li => {
middleChartExtend.series[2].data[li.order] = li.count
})
arr.map((li, index) => {
// let arr = new Array(0).fill(this.sumRoom)
// console.log(arr);
// middleChartExtend.series[2].data = arr
if (res.data.leases.length != 0) {
res.data.leases.map(li => {
middleChartExtend.series[0].data[li.order - 1] = li.count
})
}
if (res.data.site.length != 0) {
res.data.site.map(li => {
middleChartExtend.series[2].data[li.order - 1] = li.count
})
}
middleChartExtend.series[2].data.map((li, index) => {
middleChartExtend.series[1].data[index] = middleChartExtend.series[2].data[index] - middleChartExtend.series[0].data[index]
})
let myMiddleChartObj = this.$echarts.init(


Write Preview
Loading…
Cancel
Save