fix

virgo.wzfrontend/console/package-lock.json

@@ -4048,6 +4048,12 @@
 			"integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
 			"dev": true
 		},
+		"async": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmmirror.com/async/-/async-1.5.0.tgz",
+			"integrity": "sha512-m9nMwCtLtz29LszVaR0q/FqsJWkrxVoQL95p7JU0us7qUx4WEcySQgwvuneYSGVyvirl81gz7agflS3V1yW14g==",
+			"dev": true
+		},
 		"async-each": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmmirror.com/async-each/-/async-each-1.0.6.tgz",
@@ -7778,6 +7784,49 @@
 			"integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
 			"dev": true
 		},
+		"happypack": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmmirror.com/happypack/-/happypack-5.0.1.tgz",
+			"integrity": "sha512-AzXVxLzX0mtv0T40Kic72rfcGK4Y2b/cDdtcyw+e+V/13ozl7x0+EZ4hvrL1rJ8MoefR9+FfUJQsK2irH0GWOw==",
+			"dev": true,
+			"requires": {
+				"async": "1.5.0",
+				"json-stringify-safe": "5.0.1",
+				"loader-utils": "1.1.0",
+				"serialize-error": "^2.1.0"
+			},
+			"dependencies": {
+				"big.js": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmmirror.com/big.js/-/big.js-3.2.0.tgz",
+					"integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+					"dev": true
+				},
+				"emojis-list": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-2.1.0.tgz",
+					"integrity": "sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng==",
+					"dev": true
+				},
+				"json5": {
+					"version": "0.5.1",
+					"resolved": "https://registry.npmmirror.com/json5/-/json5-0.5.1.tgz",
+					"integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
+					"dev": true
+				},
+				"loader-utils": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.1.0.tgz",
+					"integrity": "sha512-gkD9aSEG9UGglyPcDJqY9YBTUtCLKaBK6ihD2VP1d1X60lTfFspNZNulGBBbUZLkPygy4LySYHyxBpq+VhjObQ==",
+					"dev": true,
+					"requires": {
+						"big.js": "^3.1.3",
+						"emojis-list": "^2.0.0",
+						"json5": "^0.5.0"
+					}
+				}
+			}
+		},
 		"har-schema": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmmirror.com/har-schema/-/har-schema-2.0.0.tgz",
@@ -12237,6 +12286,12 @@
 				}
 			}
 		},
+		"serialize-error": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmmirror.com/serialize-error/-/serialize-error-2.1.0.tgz",
+			"integrity": "sha512-ghgmKt5o4Tly5yEG/UJp8qTd0AN7Xalw4XBtDEKP655B699qMEtra1WlXeE6WIvdEG481JvRxULKsInq/iNysw==",
+			"dev": true
+		},
 		"serialize-javascript": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz",

virgo.wzfrontend/console/package.json

@@ -14,7 +14,6 @@
 		"dayjs": "^1.11.11",
 		"element-ui": "^2.15.13",
 		"ezuikit-js": "^7.7.0",
-		"jquery": "^3.7.1",
 		"js-md5": "^0.8.3",
 		"luckyexcel": "^1.0.1",
 		"path-browserify": "^1.0.1",
@@ -39,6 +38,7 @@
 		"crypto-js": "^4.2.0",
 		"eslint": "^5.16.0",
 		"eslint-plugin-vue": "^5.0.0",
+		"happypack": "^5.0.1",
 		"node-sass": "^4.14.1",
 		"nprogress": "^0.2.0",
 		"sass-loader": "^8.0.0",

virgo.wzfrontend/console/src/components/common/listFilter.vue

@@ -1,230 +1,242 @@
-<template>
-	<div class="hui-content-filter">
-		<div class="filter-box" v-if="type === 'customer'">
-			<div class="filter-item">
-				<el-input prefix-icon="el-icon-search" v-model="customer.name" placeholder="请输入客户名称"></el-input>
-			</div>
-			<div class="filter-item">
-				<el-select v-model="customer.type" placeholder="请选择客户类型">
-					<el-option :label="item.name" :value="item.id" v-for="(item,index) in $field.field.customerType"
-						:key="item.id">
-					</el-option>
-				</el-select>
-			</div>
-			<div class="filter-item">
-				<el-select v-model="customer.followUpState" placeholder="请选择跟进状态">
-					<el-option :label="item.name" :value="item.id" v-for="(item,index) in $field.field.followUpState"
-						:key="item.id">
-					</el-option>
-				</el-select>
-			</div>
-		</div>
-		<div class="filter-box" v-if="type === 'highseas'">
-			<div class="filter-item">
-				<el-input prefix-icon="el-icon-search" v-model="highseas.name" placeholder="请输入客户名称"></el-input>
-			</div>
-			<div class="filter-item">
-				<el-select v-model="highseas.type" placeholder="请选择客户类型">
-					<el-option :label="item.name" :value="item.id" v-for="(item,index) in $field.field.customerType"
-						:key="item.id">
-					</el-option>
-				</el-select>
-			</div>
-		</div>
-		<div class="filter-box" v-if="type === 'agent'">
-			<div class="filter-item">
-				<el-input prefix-icon="el-icon-search" v-model="agent.name" placeholder="请输入经纪人名称"></el-input>
-			</div>
-		</div>
-		<div class="filter-box" v-if="type === 'organization'">
-			<div class="filter-item">
-				<el-input prefix-icon="el-icon-search" v-model="organization.name" placeholder="请输入公司名称"></el-input>
-			</div>
-		</div>
-		<div class="filter-box" v-if="type === 'contract'">
-			<div class="filter-item">
-				<el-select v-model="contract.type" placeholder="请选择合同类型">
-					<el-option :label="item.name" :value="item.id" v-for="(item,index) in $field.field.contractType"
-						:key="item.id">
-					</el-option>
-				</el-select>
-			</div>
-			<div class="filter-item">
-				<el-input prefix-icon="el-icon-search" v-model="contract.code" placeholder="请输入合同编码"></el-input>
-			</div>
-			<div class="filter-item">
-				<el-input v-model="contract.value" placeholder="请输入客商名称">
-					<el-select v-model="contract.select" slot="prepend" placeholder="请选择">
-						<el-option label="企业" value="1"></el-option>
-						<el-option label="个人" value="2"></el-option>
-					</el-select>
-				</el-input>
-			</div>
-			<div class="filter-item">
-				<select-house ref="selectHouse" @change="changeHouse">
-				</select-house>
-			</div>
-		</div>
-		<div class="filter-box" v-if="type === 'order'">
-			<div class="filter-item">
-				<el-input prefix-icon="el-icon-search" v-model="order.name" placeholder="请输入工单名称"></el-input>
-			</div>
-			<div class="filter-item">
-				<el-select v-model="order.status" placeholder="请选择工单状态">
-					<el-option label="待提交" :value="null"></el-option>
-					<el-option label="待处理" :value="1"></el-option>
-					<el-option label="处理中" :value="2"></el-option>
-					<el-option label="已处理" :value="3"></el-option>
-				</el-select>
-			</div>
-		</div>
-		<div class="filter-box" v-if="type === 'billContract'">
-			<div class="filter-item">
-				<el-input prefix-icon="el-icon-search" v-model="billContract.contractCode" placeholder="请输入合同编码">
-				</el-input>
-			</div>
-		</div>
-		<div class="filter-box" v-if="type === 'billRoutine'">
-			<div class="filter-item">
-				<el-input prefix-icon="el-icon-search" v-model="billRoutine.name" placeholder="请输入账单名称">
-				</el-input>
-			</div>
-		</div>
-		<div class="filter-box" v-if="type === 'invoice'">
-			<div class="filter-item">
-				<el-input prefix-icon="el-icon-search" v-model="invoice.name" placeholder="请输入发票名称">
-				</el-input>
-			</div>
-		</div>
-		<div class="filter-btn">
-			<el-button type="primary" size="medium" @click="submit">查询</el-button>
-			<el-button size="medium" @click="resetForm">重置</el-button>
-		</div>
-	</div>
-</template>
-
-<script>
-	import selectHouse from '@/components/common/selectHouse';
-	export default {
-		props: ['type'],
-		data() {
-			return {
-				customer: {
-					name: '',
-					type: '',
-					followUpState: ''
-				},
-				customerData: {},
-				highseas: {
-					name: '',
-					type: ''
-				},
-				highseasData: {},
-				agent: {
-					name: ''
-				},
-				agentData: {},
-				organization: {
-					name: ''
-				},
-				organizationData: {},
-				contract: {
-					code: '',
-					value: '',
-					select: '1',
-					projectItemTargetRoomIds: ''
-				},
-				contractData: {},
-				order: {
-					name: '',
-					status: ''
-				},
-				orderData: {},
-				billContract: {
-					contractCode: ''
-				},
-				billContractData: {},
-				billRoutine: {
-					name: ''
-				},
-				billRoutineData: {},
-				invoice: {
-					name: ''
-				},
-				invoiceData: {}
-			}
-		},
-		mounted() {
-			this[this.type + 'Data'] = JSON.parse(JSON.stringify(this[this.type]));
-		},
-		methods: {
-			resetForm() {
-				this[this.type] = JSON.parse(JSON.stringify(this[this.type + 'Data']));
-				this.$emit('filter', {});
-			},
-			resetField() {
-				this[this.type] = JSON.parse(JSON.stringify(this[this.type + 'Data']));
-			},
-			submit() {
-				let data = this.filterOption(this[this.type]);
-				this.$emit('filter', data);
-			},
-			filterOption(data) {
-				let obj = {};
-				for (let key in data) {
-					if (data[key]) obj[key] = data[key]
-				}
-				return obj;
-			},
-			changeHouse(data) {
-				this.contract['projectItemTargetRoomIds'] = data.map(node => node.roomId).join(',');
-			}
-		},
-		components: {
-			selectHouse
-		}
-	}
-</script>
-
-<style lang="scss">
-	.hui-content-filter {
-		display: flex;
-		margin-bottom: 15px;
-
-		.filter-box {
-			flex: 1;
-			width: 0;
-			display: flex;
-			flex-wrap: wrap;
-		}
-
-		.filter-item {
-			width: 240px;
-			margin-right: 12px;
-		}
-
-		.el-input-group__append,
-		.el-input-group__prepend {
-			width: 70px;
-			padding: 0;
-			background: transparent;
-			border-color: $--input-border;
-
-			.el-input__suffix {
-				right: 0;
-			}
-
-			.el-input--suffix .el-input__inner {
-				padding-right: 20px;
-			}
-		}
-
-		.el-input-group__append .el-select,
-		.el-input-group__append .el-button,
-		.el-input-group__prepend .el-select,
-		.el-input-group__prepend .el-button {
-			margin: -10px 0;
-		}
-
-	}
+<template>
+	<div class="hui-content-filter">
+		<div class="filter-box" v-if="type === 'customer'">
+			<div class="filter-item">
+				<el-input prefix-icon="el-icon-search" v-model="customer.name" placeholder="请输入客户名称"></el-input>
+			</div>
+			<div class="filter-item">
+				<el-select v-model="customer.type" placeholder="请选择客户类型">
+					<el-option :label="item.name" :value="item.id" v-for="(item,index) in $field.field.customerType"
+						:key="item.id">
+					</el-option>
+				</el-select>
+			</div>
+			<div class="filter-item">
+				<el-select v-model="customer.followUpState" placeholder="请选择跟进状态">
+					<el-option :label="item.name" :value="item.id" v-for="(item,index) in $field.field.followUpState"
+						:key="item.id">
+					</el-option>
+				</el-select>
+			</div>
+		</div>
+		<div class="filter-box" v-if="type === 'highseas'">
+			<div class="filter-item">
+				<el-input prefix-icon="el-icon-search" v-model="highseas.name" placeholder="请输入客户名称"></el-input>
+			</div>
+			<div class="filter-item">
+				<el-select v-model="highseas.type" placeholder="请选择客户类型">
+					<el-option :label="item.name" :value="item.id" v-for="(item,index) in $field.field.customerType"
+						:key="item.id">
+					</el-option>
+				</el-select>
+			</div>
+		</div>
+		<div class="filter-box" v-if="type === 'agent'">
+			<div class="filter-item">
+				<el-input prefix-icon="el-icon-search" v-model="agent.name" placeholder="请输入经纪人名称"></el-input>
+			</div>
+		</div>
+		<div class="filter-box" v-if="type === 'organization'">
+			<div class="filter-item">
+				<el-input prefix-icon="el-icon-search" v-model="organization.name" placeholder="请输入公司名称"></el-input>
+			</div>
+		</div>
+		<div class="filter-box" v-if="type === 'contract'">
+			<div class="filter-item">
+				<el-select v-model="contract.type" placeholder="请选择合同类型">
+					<el-option :label="item.name" :value="item.id" v-for="(item,index) in $field.field.contractType"
+						:key="item.id">
+					</el-option>
+				</el-select>
+			</div>
+			<div class="filter-item">
+				<el-input prefix-icon="el-icon-search" v-model="contract.code" placeholder="请输入合同编码"></el-input>
+			</div>
+			<div class="filter-item">
+				<el-input v-model="contract.value" placeholder="请输入客商名称">
+					<el-select v-model="contract.select" slot="prepend" placeholder="请选择">
+						<el-option label="企业" value="1"></el-option>
+						<el-option label="个人" value="2"></el-option>
+					</el-select>
+				</el-input>
+			</div>
+			<div class="filter-item">
+				<select-house ref="selectHouse" @change="changeHouse">
+				</select-house>
+			</div>
+		</div>
+		<div class="filter-box" v-if="type === 'order'">
+			<div class="filter-item">
+				<el-input prefix-icon="el-icon-search" v-model="order.name" placeholder="请输入工单名称"></el-input>
+			</div>
+			<div class="filter-item">
+				<el-select v-model="order.status" placeholder="请选择工单状态">
+					<el-option label="待提交" :value="null"></el-option>
+					<el-option label="待处理" :value="1"></el-option>
+					<el-option label="处理中" :value="2"></el-option>
+					<el-option label="已处理" :value="3"></el-option>
+				</el-select>
+			</div>
+		</div>
+		<div class="filter-box" v-if="type === 'billContract'">
+			<div class="filter-item">
+				<el-input prefix-icon="el-icon-search" v-model="billContract.contractCode" placeholder="请输入合同编码">
+				</el-input>
+			</div>
+		</div>
+		<div class="filter-box" v-if="type === 'billRoutine'">
+			<div class="filter-item">
+				<el-input prefix-icon="el-icon-search" v-model="billRoutine.name" placeholder="请输入账单名称">
+				</el-input>
+			</div>
+		</div>
+		<div class="filter-box" v-if="type === 'invoice'">
+			<div class="filter-item">
+				<el-input prefix-icon="el-icon-search" v-model="invoice.name" placeholder="请输入发票名称">
+				</el-input>
+			</div>
+		</div>
+		<div class="filter-box" v-if="type === 'cost'">
+			<div class="filter-item">
+				<el-select v-model="cost.status" placeholder="请选择状态">
+					<el-option label="未缴费" :value="null"></el-option>
+					<el-option label="已交费" :value="1"></el-option>
+				</el-select>
+			</div>
+		</div>
+		<div class="filter-btn">
+			<el-button type="primary" size="medium" @click="submit">查询</el-button>
+			<el-button size="medium" @click="resetForm">重置</el-button>
+		</div>
+	</div>
+</template>
+
+<script>
+	import selectHouse from '@/components/common/selectHouse';
+	export default {
+		props: ['type'],
+		data() {
+			return {
+				customer: {
+					name: '',
+					type: '',
+					followUpState: ''
+				},
+				customerData: {},
+				highseas: {
+					name: '',
+					type: ''
+				},
+				highseasData: {},
+				agent: {
+					name: ''
+				},
+				agentData: {},
+				organization: {
+					name: ''
+				},
+				organizationData: {},
+				contract: {
+					code: '',
+					value: '',
+					select: '1',
+					projectItemTargetRoomIds: ''
+				},
+				contractData: {},
+				order: {
+					name: '',
+					status: ''
+				},
+				orderData: {},
+				billContract: {
+					contractCode: ''
+				},
+				billContractData: {},
+				billRoutine: {
+					name: ''
+				},
+				billRoutineData: {},
+				invoice: {
+					name: ''
+				},
+				invoiceData: {},
+				cost: {
+					status: ''
+				},
+				costData: {}
+			}
+		},
+		mounted() {
+			this[this.type + 'Data'] = JSON.parse(JSON.stringify(this[this.type]));
+		},
+		methods: {
+			resetForm() {
+				this[this.type] = JSON.parse(JSON.stringify(this[this.type + 'Data']));
+				this.$emit('filter', {});
+			},
+			resetField() {
+				this[this.type] = JSON.parse(JSON.stringify(this[this.type + 'Data']));
+			},
+			submit() {
+				let data = this.filterOption(this[this.type]);
+				this.$emit('filter', data);
+			},
+			filterOption(data) {
+				let obj = {};
+				for (let key in data) {
+					if (data[key] || data[key] == null) obj[key] = data[key]
+				}
+				return obj;
+			},
+			changeHouse(data) {
+				this.contract['projectItemTargetRoomIds'] = data.map(node => node.roomId).join(',');
+			}
+		},
+		components: {
+			selectHouse
+		}
+	}
+</script>
+
+<style lang="scss">
+	.hui-content-filter {
+		display: flex;
+		margin-bottom: 15px;
+
+		.filter-box {
+			flex: 1;
+			width: 0;
+			display: flex;
+			flex-wrap: wrap;
+		}
+
+		.filter-item {
+			width: 240px;
+			margin-right: 12px;
+		}
+
+		.el-input-group__append,
+		.el-input-group__prepend {
+			width: 70px;
+			padding: 0;
+			background: transparent;
+			border-color: $--input-border;
+
+			.el-input__suffix {
+				right: 0;
+			}
+
+			.el-input--suffix .el-input__inner {
+				padding-right: 20px;
+			}
+		}
+
+		.el-input-group__append .el-select,
+		.el-input-group__append .el-button,
+		.el-input-group__prepend .el-select,
+		.el-input-group__prepend .el-button {
+			margin: -10px 0;
+		}
+
+	}
 </style>

virgo.wzfrontend/console/src/components/document/editor.vue

@@ -73,7 +73,6 @@
 		getSealDetailById,
 		getRequestSealDetail
 	} from '@/httpApi/organization';
-	import $ from 'jquery';
 	import {
 		constData
 	} from '@/uitls/index.js';

virgo.wzfrontend/console/src/components/work/bim/operationModel.vue

@@ -90,7 +90,7 @@
 					name: '监控'
 				}, {
 					id: 3,
-					name: '设备'
+					name: '空调'
 				}, {
 					id: 4,
 					name: '灯光'
@@ -548,10 +548,10 @@
 					}
 					if (bimData.roomList[i].floorName) {
 						this.bimViewer.addDrawable({
-							position: {
-								x: x,
-								y: y,
-								z: boundary[0].z + bimData.roomList[i].height
+							position: {
+								x: x,
+								y: y,
+								z: boundary[0].z + bimData.roomList[i].height
 							},
 							offsetX: -30,
 							offsetY: 5,
@@ -583,7 +583,7 @@
 			setDevice() {
 				for (var i = 0; i < bimData.deviceList.length; i++) {
 					this.bimViewer.add3DMaker('image', bimData.deviceList[i],
-						'http://static.bimface.com/resources/3DMarker/warner/warner_red.png', (data) => {
+						'./assets/kongtiao.png', (data) => {
 							this.showDrap('deviceDetail');
 						}, 'device' + i);
 				}

virgo.wzfrontend/console/src/components/work/staging/cost.vue

@@ -1,117 +1,143 @@
-<template>
-	<div class="hui-flex hui-content">
-		<div class="hui-content-title">
-			<div :class="'hui-title-item' + (item.id === nowTitle.id?' active':'') " v-for="item in title"
-				:key="item.id" @click="changeTitle(item)">
-				{{item.name}}
-			</div>
-		</div>
-		<div class="hui-flex-box hui-flex hui-table">
-			<div class="hui-flex-box">
-				<el-table :data="dataList[nowTitle.type]" row-key="id" border height="100%">
-					<el-table-column label="序号" width="50">
-						<template slot-scope="scope">
-							<div style="text-align: center;">{{scope.$index + 1}}</div>
-						</template>
-					</el-table-column>
-					<el-table-column label="客户名称" prop="name">
-						<template slot-scope="scope">
-							<span>{{scope.row.payClientName || scope.row.payMerchantName}}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="应收金额" prop="amount"></el-table-column>
-					<el-table-column label="已收金额">
-						<template slot-scope="scope">
-							<span>{{scope.row.status === 1 ? scope.row.amount: 0}}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="累计收费" prop="received"></el-table-column>
-					<el-table-column label="状态">
-						<template slot-scope="scope">
-							<div class="hui-table-tag">
-								<div class="hui-tag hui-tag-info" v-if="!scope.row.status">未缴费</div>
-								<div class="hui-tag hui-tag-success" v-if="scope.row.status === 1">已缴费</div>
-							</div>
-						</template>
-					</el-table-column>
-					<el-table-column label="操作" width="80">
-						<template slot-scope="scope">
-							<div class="hui-table-operation">
-								<span class="table-operation" @click="look(scope.row)">查看</span>
-							</div>
-						</template>
-					</el-table-column>
-					<template slot="empty">
-						<empty description="暂无数据"></empty>
-					</template>
-				</el-table>
-			</div>
-		</div>
-		<el-drawer title="费用详情" :visible.sync="drawer" :size="400" :append-to-body="true">
-			<cost-detail v-if="drawer" :detail="detail"></cost-detail>
-		</el-drawer>
-	</div>
-</template>
-
-<script>
-	import {
-		getPaymentList
-	} from '@/httpApi/staging'
-	import costDetail from './costDetail'
-	export default {
-		props: ['nodeType'],
-		data() {
-			return {
-				dataList: {
-					hydropower: [],
-					property: [],
-					rent: []
-				},
-				title: [{
-					id: 1,
-					name: '房租',
-					type: 'rent'
-				}, {
-					id: 2,
-					name: '物业',
-					type: 'property'
-				}, {
-					id: 3,
-					name: '水电',
-					type: 'hydropower'
-				}],
-				nowTitle: {
-					id: 1,
-					name: '房租',
-					type: 'rent'
-				},
-				drawer: false,
-				detail: {}
-			}
-		},
-		mounted() {
-			console.log(this.nodeType);
-			this.nowTitle = this.title.find(node => node.id === this.nodeType);
-			this.init();
-		},
-		methods: {
-			init() {
-				getPaymentList(this.$store.getters.project.id).then(res => {
-					if (res.state) this.dataList = res.data;
-				})
-			},
-			changeTitle(item) {
-				this.nowTitle = item;
-			},
-			look(val) {
-				this.detail = val;
-				this.drawer = true;
-			}
-		},
-		components: {
-			costDetail
-		}
-	}
-</script>
-
+<template>
+	<div class="hui-flex hui-content">
+		<div class="hui-content-title">
+			<div :class="'hui-title-item' + (item.id === nowTitle.id?' active':'') " v-for="item in title"
+				:key="item.id" @click="changeTitle(item)">
+				{{item.name}}
+			</div>
+		</div>
+		<div class="hui-flex-box hui-flex hui-table">
+			<list-filter ref="listFilter" type="cost" @filter="filterInit"></list-filter>
+			<div class="hui-flex-box">
+				<el-table :data="dataList" row-key="id" border height="100%">
+					<el-table-column label="序号" width="50">
+						<template slot-scope="scope">
+							<div style="text-align: center;">{{scope.$index + 1}}</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="客户名称" prop="name">
+						<template slot-scope="scope">
+							<span>{{scope.row.payClientName || scope.row.payMerchantName}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="应收金额" prop="amount"></el-table-column>
+					<el-table-column label="已收金额">
+						<template slot-scope="scope">
+							<span>{{scope.row.status === 1 ? scope.row.amount: 0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="累计收费" prop="received"></el-table-column>
+					<el-table-column label="状态">
+						<template slot-scope="scope">
+							<div class="hui-table-tag">
+								<div class="hui-tag hui-tag-info" v-if="!scope.row.status">未缴费</div>
+								<div class="hui-tag hui-tag-success" v-if="scope.row.status === 1">已缴费</div>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" width="80">
+						<template slot-scope="scope">
+							<div class="hui-table-operation">
+								<span class="table-operation" @click="look(scope.row)">查看</span>
+							</div>
+						</template>
+					</el-table-column>
+					<template slot="empty">
+						<empty description="暂无数据"></empty>
+					</template>
+				</el-table>
+			</div>
+			<div class="hui-content-pagination">
+				<el-pagination :page-size="pageSize" :pager-count="9" layout="prev, pager, next" :total="totalCount"
+					@current-change="currentChange">
+				</el-pagination>
+			</div>
+		</div>
+		<el-drawer title="费用详情" :visible.sync="drawer" :size="400" :append-to-body="true">
+			<cost-detail v-if="drawer" :detail="detail"></cost-detail>
+		</el-drawer>
+	</div>
+</template>
+
+<script>
+	import {
+		getPaymentListByQuery
+	} from '@/httpApi/staging'
+	import costDetail from './costDetail'
+	import listFilter from '@/components/common/listFilter'
+	export default {
+		props: ['nodeType'],
+		data() {
+			return {
+				dataList: [],
+				title: [{
+					id: 1,
+					name: '房租'
+				}, {
+					id: 2,
+					name: '物业'
+				}, {
+					id: 3,
+					name: '水电'
+				}],
+				nowTitle: {
+					id: 1,
+					name: '房租'
+				},
+				drawer: false,
+				detail: {},
+				currPage: 1,
+				pageSize: 10,
+				totalCount: 0,
+				filterOption: {}
+			}
+		},
+		mounted() {
+			this.nowTitle = this.title.find(node => node.id === this.nodeType);
+			this.init();
+		},
+		methods: {
+			init() {
+				this.dataList = [];
+				let postData = {
+					projectId: this.$store.getters.project.id,
+					currPage: this.currPage,
+					pageSize: this.pageSize,
+					type: this.nowTitle.id,
+				};
+				postData = Object.assign(postData, this.filterOption);
+				getPaymentListByQuery(postData).then(res => {
+					if (res.state) {
+						this.dataList = res.data.dataList;
+						this.totalCount = res.data.totalCount;
+					}
+				})
+			},
+			filterInit(option) {
+				this.filterOption = option;
+				this.currPage = 1;
+				this.init();
+			},
+			currentChange(currPage) {
+				this.currPage = currPage;
+				this.init();
+			},
+			changeTitle(item) {
+				this.nowTitle = item;
+				this.currPage = 1;
+				this.$refs.listFilter.
+				this.init();
+			},
+			look(val) {
+				this.detail = val;
+				this.drawer = true;
+			}
+		},
+		components: {
+			costDetail,
+			listFilter
+		}
+	}
+</script>
+
 <style lang="scss"></style>

virgo.wzfrontend/console/src/config/demo1.js

@@ -204,15 +204,17 @@ export default {
 		title: '设备信息',
 		list: [{
 			name: '设备名称',
-			value: '烟感报警器'
+			value: '空调'
 		}, {
 			name: '设备位置',
 			value: '1201'
 		}, {
 			name: '设备状态',
 			value: '在线'
-		}],
-		imageUrl: 'https://file-node.oss-cn-shanghai.aliyuncs.com/youji/d8f0a8b4bd2043dfb8058d92763e57b0'
+		}, {
+			name: '空调操作',
+			value: 'operation'
+		}]
 	},
 	lightDetail: {
 		title: '灯光信息',

virgo.wzfrontend/console/src/httpApi/staging.js

@@ -53,7 +53,7 @@ export function eventManagement(projectId) {
 		url: `/api/reminder/count/${projectId}`,
 		method: 'get'
 	})
-}
+}
 /* 
  * 工单
  * 
@@ -64,7 +64,7 @@ export function orderManagement(projectId) {
 		url: `/api/workOrder/count/${projectId}`,
 		method: 'get'
 	})
-}
+}
 /* 
  * 设备
  * 
@@ -75,7 +75,7 @@ export function deviceManagement(projectId) {
 		url: `/api/operateDevice/count/${projectId}`,
 		method: 'get'
 	})
-}
+}
 /* 
  * 获取账单统计列表
  * 
@@ -86,4 +86,16 @@ export function getPaymentList(projectId) {
 		url: `/api/payment/monthCount/${projectId}`,
 		method: 'get'
 	})
+}
+/* 
+ * 获取账单统计列表
+ * 
+ * 
+ */
+export function getPaymentListByQuery(data) {
+	return request({
+		url: `/api/payment/monthCount`,
+		method: 'post',
+		data: data
+	})
 }

virgo.wzfrontend/console/src/layout/components/topNav.vue

@@ -17,7 +17,7 @@
 		</div>
 		<div class="work-layout-right">
 			<div class="work-layout-button" @click="$router.push('/website/home')" style="margin-right: 20px;">
-				<i class="iconfont huifont-shouye"></i><span>公海房源</span>
+				<i class="iconfont huifont-shouye"></i><span>WORKARK</span>
 			</div>
 			<div :class="'work-layout-type'+($route.path === item.path?' active' : '')" v-for="(item,index) in list"
 				@click="$router.push(item.path)" :key="item.id">

virgo.wzfrontend/console/src/uitls/controls.js

@@ -1,4 +1,3 @@
-import $ from 'jquery';
 import model from '@/bimAttribute'
 import {
 	Message

virgo.wzfrontend/console/vue.config.js

@@ -2,6 +2,7 @@
 const dev_baseURL = 'https://www.waywish.com';
 const isProduction = process.env.NODE_ENV === 'production'; //是否为生产环境
 const path = require("path");
+const Happypack = require('happypack');
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
@@ -41,14 +42,14 @@ module.exports = {
 			})
 		}
 	},
-	configureWebpack: (config) => {
-		// if (isProduction) {
-		// 	config.optimization.minimizer[0].options.minimizer.options.compress = Object.assign(
-		// 		config.optimization.minimizer[0].options.minimizer.options.compress, {
-		// 			drop_console: true
-		// 		}
-		// 	);
-		// }
+	configureWebpack: {
+		plugins: [
+			new Happypack({
+				loaders: ['babel-loader', 'vue-loader'],
+				cache: true,
+				threads: 10 // 线程数取决于你电脑性能的好坏，好的电脑建议开更多线程
+			})
+		]
 	},
 	devServer: {
 		port: 8080, // 端口