From 77be404d9d2b3fa11c7ba0890dcdf2bb0b5d6a1c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 31 十月 2024 17:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/meeting/components/OperaBookingsDetailWindow.vue | 2
admin/src/views/business/approvalConfiguration.vue | 15 +
screen/vite.config.js | 4
screen/src/assets/images/nenghao_ic1.png | 0
screen/src/router/index.js | 2
screen/src/views/SecurityControl.vue | 47 ++++---
admin/src/components/business/OperaHiddenDangerParamWindow.vue | 1
admin/src/components/business/OperaMemberWindow.vue | 63 ++++++---
screen/src/api/index.js | 23 +++
h5/pages/staff/snapshot.vue | 2
admin/src/components/business/OperaCarUseBookWindow.vue | 11 +
h5/pages/staff/vehicle/sendACarDetail.vue | 4
admin/src/components/operation/HiddenDangerParam.vue | 9 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 2
screen/src/views/EnergyConsum.vue | 155 +++++++++++++------------
15 files changed, 207 insertions(+), 133 deletions(-)
diff --git a/admin/src/components/business/OperaCarUseBookWindow.vue b/admin/src/components/business/OperaCarUseBookWindow.vue
index e1afa43..41c721b 100644
--- a/admin/src/components/business/OperaCarUseBookWindow.vue
+++ b/admin/src/components/business/OperaCarUseBookWindow.vue
@@ -18,7 +18,8 @@
<div class="list">
<div class="item" style="width: 100%">
<div class="label">鐢宠浜�</div>
- <div class="value">{{ model.memberName || '' }} {{ model.memberPhone || '' }} ({{ model.companyName || '' }})
+ <div class="value">{{ model.memberName || '' }} {{ model.memberPhone || '' }} ({{ model.companyName || ''
+ }})
</div>
</div>
<div class="item">
@@ -27,7 +28,8 @@
</div>
<div class="item">
<div class="label">鍙告満淇℃伅</div>
- <div class="value" v-if="model.driverId != null">{{ model.driverName || '' }} {{ model.driverPhone || '' }}
+ <div class="value" v-if="model.driverId != null">{{ model.driverName || '' }} {{ model.driverPhone || ''
+ }}
</div>
<div class="value" v-if="model.driverId == null">鏈寚娲�</div>
</div>
@@ -91,7 +93,7 @@
<div style="display: inline" v-if="item.statusInfo != null && item.statusInfo != ''">
锛�<span :class="{ padding: item.statusInfo == '澶勭悊涓�' || item.status == '1' }">{{
item.statusInfo || ""
- }}</span>锛�
+ }}</span>锛�
</div>
</div>
</div>
@@ -166,6 +168,7 @@
import { driveList } from '@/api/business/member'
import { approveDo } from '@/api/business/approve'
import { mapState } from 'vuex'
+
export default {
name: 'OperaCarUseBookWindow',
components: { GlobalWindow },
@@ -230,6 +233,8 @@
},
agreeOpen() {
this.isShowProblem = true
+ this.$set(this.dealForm, 'driverId', this.model.driverId)
+
this.$set(this.dealForm, 'checkInfo', '')
this.loadMemberList()
},
diff --git a/admin/src/components/business/OperaHiddenDangerParamWindow.vue b/admin/src/components/business/OperaHiddenDangerParamWindow.vue
index b645c86..ca72dcc 100644
--- a/admin/src/components/business/OperaHiddenDangerParamWindow.vue
+++ b/admin/src/components/business/OperaHiddenDangerParamWindow.vue
@@ -67,6 +67,7 @@
open(title, target, type) {
this.title = title
this.visible = true
+ this.form.memberIdList = null
this.form.type = type
this.getfindCompanyTreePage()
// 鏂板缓缁勭粐
diff --git a/admin/src/components/business/OperaMemberWindow.vue b/admin/src/components/business/OperaMemberWindow.vue
index c70c0e3..c4b80a8 100644
--- a/admin/src/components/business/OperaMemberWindow.vue
+++ b/admin/src/components/business/OperaMemberWindow.vue
@@ -11,7 +11,7 @@
娉細浠呮敮鎸侀�夋嫨 銆恵{ companyType === 0 ? '鐩稿叧鏂圭粍缁�' : '鍐呴儴缁勭粐' }}銆�
</div>
</el-form-item>
- <el-form-item label="閫夋嫨宀椾綅锛�" prop="positionId" >
+ <el-form-item label="閫夋嫨宀椾綅锛�" prop="positionId">
<el-select v-model="form.positionId" clearable filterable placeholder="璇烽�夋嫨">
<el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
@@ -34,18 +34,15 @@
<el-input v-model="form.code" placeholder="璇疯緭鍏ュ憳宸ュ伐鍙�" v-trim />
</el-form-item>
<el-form-item label="鍏ヨ亴鏃ユ湡" prop="jobDate">
- <el-date-picker
- v-model="form.jobDate"
- value-format="yyyy-MM-dd"
- type="date">
+ <el-date-picker v-model="form.jobDate" value-format="yyyy-MM-dd" type="date">
</el-date-picker>
</el-form-item>
- <el-form-item label="鏄惁鍏氬憳" prop="isDangyuan">
- <el-radio-group v-model="form.isDangyuan" >
- <el-radio :label="0">闈炲厷鍛�</el-radio>
- <el-radio :label="1">鍏氬憳</el-radio>
- </el-radio-group>
- </el-form-item>
+ <el-form-item label="鏄惁鍏氬憳" prop="isDangyuan">
+ <el-radio-group v-model="form.isDangyuan">
+ <el-radio :label="0">闈炲厷鍛�</el-radio>
+ <el-radio :label="1">鍏氬憳</el-radio>
+ </el-radio-group>
+ </el-form-item>
<el-form-item label="浜鸿劯鐓х墖" prop="faceImgFull">
<div class="upload_wrap">
<UploadFaceImg :file="{ 'imgurlfull': form.faceImgFull, 'imgurl': form.faceImg }" :uploadData="uploadData"
@@ -67,12 +64,12 @@
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
import UploadFaceImg from '@/components/common/UploadFaceImg'
import { checkMobile, validIdCardNo, validIdCardNoNew } from '@/utils/form'
-import { allList } from '@/api/business/position'
+import { allList } from '@/api/business/position'
export default {
name: 'OperaCompanyWindow',
extends: BaseOpera,
components: { GlobalWindow, UploadAvatarImage, UploadFaceImg },
- data () {
+ data() {
return {
uploadData: {
folder: 'member'
@@ -115,14 +112,14 @@
}
}
},
- created () {
+ created() {
this.config({
api: '/business/member.js',
'field.id': 'id'
})
},
methods: {
- handleChangeCompany (value) {
+ handleChangeCompany(value) {
if (this.form.company && this.form.company.length > 1) {
this.form.companyId = this.form.company[this.form.company.length - 1]
}
@@ -132,10 +129,29 @@
* @title 绐楀彛鏍囬
* @target 缂栬緫鐨勫璞�
*/
- open (title, target, depart, companyType) {
+ open(title, target, depart, companyType) {
this.title = title
this.department = depart
this.visible = true
+ this.form = {
+ id: null,
+ name: '',
+ type: '',
+ company: [],
+ code: '',
+ idcardNo: '',
+ idcardNoNew: '',
+ linkName: '',
+ idcardDecode: '',
+ companyId: null,
+ idcardType: 0,
+ phone: '',
+ faceImg: '',
+ jobDate: null,
+ isDangyuan: 0,
+ positionId: null,
+ faceImgFull: ''
+ }
this.companyType = companyType
this.getPositionList()
// 鏂板缓
@@ -165,14 +181,14 @@
}
})
},
- getPositionList () {
+ getPositionList() {
allList({})
.then(res => {
this.positionList = res
})
},
// 涓婁紶鍥剧墖
- uploadAvatarSuccess (file) {
+ uploadAvatarSuccess(file) {
this.form.faceImg = file.imgurl
this.form.faceImgFull = file.imgurlfull
}
@@ -180,19 +196,22 @@
}
</script>
<style lang="scss" scoped>
-.upload_wrap{
+.upload_wrap {
display: flex;
align-items: center;
- .avatar-uploader{
+
+ .avatar-uploader {
display: flex;
align-items: center;
justify-content: center;
}
- ::v-deep .avatar{
+
+ ::v-deep .avatar {
max-width: 90px;
max-height: 90px;
}
- .content{
+
+ .content {
display: flex;
flex-direction: column;
justify-content: center;
diff --git a/admin/src/components/operation/HiddenDangerParam.vue b/admin/src/components/operation/HiddenDangerParam.vue
index 30386b0..babe186 100644
--- a/admin/src/components/operation/HiddenDangerParam.vue
+++ b/admin/src/components/operation/HiddenDangerParam.vue
@@ -4,6 +4,7 @@
width="600px"
:visible.sync="isShowModal"
:confirm-working="isWorking"
+ @close="close"
@confirm="confirm"
>
<el-form :model="param" ref="paramRef" :rules="rules">
@@ -161,7 +162,7 @@
this.getfindCompanyTreePage()
},
getfindCompanyTreePage() {
- companyGetListPost({})
+ companyGetListPost({queryHiddenDanger: 1})
.then(res => {
if (res && res.length > 0) {
this.department = res
@@ -170,6 +171,8 @@
},
getAddrList() {
const { companyId } = this.param
+ this.$set(this.param, 'areaId', '')
+ this.$set(this.param, 'checkUserId', '')
allList({ type: 0,companyId }).then(res => { // 浣嶇疆
this.addrList = res || []
})
@@ -239,6 +242,10 @@
handleDelImg (i) {
this.fileList.splice(i, 1)
},
+ close(){
+ this.isShowModal = false
+ this.$emit('close')
+ },
// 鍚屾淇℃伅
confirm () {
this.$refs.paramRef.validate((valid) => {
diff --git a/admin/src/views/business/approvalConfiguration.vue b/admin/src/views/business/approvalConfiguration.vue
index 09b2d8f..56f5133 100644
--- a/admin/src/views/business/approvalConfiguration.vue
+++ b/admin/src/views/business/approvalConfiguration.vue
@@ -179,7 +179,7 @@
</div>
</div>
<el-transfer filterable :title="['鏈��', '宸查��']" openAll :props="{ label: 'name', key: 'keyTemp' }"
- filter-placeholder="鎼滅储鍛樺伐" v-model="searchForm.objIds" :data="memberList" class="transfer">
+ filter-placeholder="鎼滅储鍛樺伐" v-model="searchForm.objIds" :right-default-checked="searchForm.objIdsT" :data="memberList" class="transfer">
</el-transfer>
</div>
<span slot="footer" class="dialog-footer">
@@ -197,6 +197,8 @@
import { approveTemplSave, approveTemplByType } from '@/api'
import { fetchList } from '@/api/business/company'
import { fetchList as memberListPost } from '@/api/business/member'
+import { getSystemDictData } from '@/api/other/other'
+
export default {
name: 'config',
components: {
@@ -213,7 +215,9 @@
],
activeIndex: 0,
- param: {},
+ param: {
+ objIdsT: []
+ },
searchForm: {},
isShowTransfer: false,
memberList: [],
@@ -312,8 +316,8 @@
},
// 鑾峰彇缁勭粐鏍�
- getfindCompanyTreePage() {
- fetchList()
+ getfindCompanyTreePage() {
+ fetchList(2)
.then(res => {
if (res && res.length > 0) {
res[0].fsStatus = 1
@@ -350,6 +354,9 @@
console.log(row)
this.$set(this.searchForm, 'companyId', row.id)
this.$set(this.searchForm, 'erpOrgId', row.erpId)
+ this.$set(this.searchForm, 'objIdsT', this.searchForm.objIds)
+ console.log('searchForm.objIds', this.searchForm.objIds);
+
this.getMemberList()
},
TransferSub() {
diff --git a/admin/src/views/meeting/components/OperaBookingsDetailWindow.vue b/admin/src/views/meeting/components/OperaBookingsDetailWindow.vue
index d0e96a2..2e7463d 100644
--- a/admin/src/views/meeting/components/OperaBookingsDetailWindow.vue
+++ b/admin/src/views/meeting/components/OperaBookingsDetailWindow.vue
@@ -32,7 +32,7 @@
<div>
<FileLink
:links="form.fileList"
- linkName="fileFullUrl"
+ linkName="fileurlFull"
:isUpload="false"
/>
</div>
diff --git a/h5/pages/staff/snapshot.vue b/h5/pages/staff/snapshot.vue
index 4d14c15..bb925eb 100644
--- a/h5/pages/staff/snapshot.vue
+++ b/h5/pages/staff/snapshot.vue
@@ -251,7 +251,7 @@
this.isShowTime = false
},
initConfig() {
- deptListPost({}).then(res => {
+ deptListPost({queryHiddenDanger: 1}).then(res => {
this.deptList = [res.data]
})
DangerConfigType({
diff --git a/h5/pages/staff/vehicle/sendACarDetail.vue b/h5/pages/staff/vehicle/sendACarDetail.vue
index 6e62334..f45166d 100644
--- a/h5/pages/staff/vehicle/sendACarDetail.vue
+++ b/h5/pages/staff/vehicle/sendACarDetail.vue
@@ -254,6 +254,10 @@
this.getDriveList()
} else {
+ }
+ if(this.info.driverId && this.info.driverName){
+ this.$set(this.param, 'driverId', this.info.driverId)
+ this.$set(this.param, 'driverName', this.info.driverName)
}
this.showApprModal = true
},
diff --git a/screen/src/api/index.js b/screen/src/api/index.js
index 09598d0..3dc5bc7 100644
--- a/screen/src/api/index.js
+++ b/screen/src/api/index.js
@@ -97,8 +97,6 @@
}
-
-
// 瀹夐槻绠℃帶澶у睆 涓績鏁版嵁
export const getEnergyCenterData = (data) => {
return request('visitsAdmin/cloudService/board/api/security/centerData', data)
@@ -110,4 +108,25 @@
// 瀹夐槻绠℃帶澶у睆 璁垮婊炵暀鎯呭喌
export const getVisitRetentionData = (data) => {
return request('visitsAdmin/cloudService/board/api/security/visitRetentionData', data)
+}
+// 瀹夐槻绠℃帶澶у睆 璁垮鍒嗘瀽
+export const afgetVisitData = (data) => {
+ return request('visitsAdmin/cloudService/board/api/security/getVisitData', data)
+}
+
+// 鑳借�楃湅鏉� 涓績鏁版嵁
+export const zxcenterData = (data) => {
+ return request('visitsAdmin/cloudService/board/api/energy/centerData', data)
+}
+// 鑳借�楃湅鏉� 鏈堣兘鑰椼�佹补鑰楀垎鏋�
+export const zxenergyDataList = (data) => {
+ return request('visitsAdmin/cloudService/board/api/energy/energyDataList', data)
+}
+// 鑳借�楃湅鏉� 涓婃湀娌硅�楁帓琛�
+export const zxlastMonthOil = (data) => {
+ return request('visitsAdmin/cloudService/board/api/energy/lastMonthOil', data)
+}
+// 鑳借�楃湅鏉� 瀹炴椂璐熻嵎鏇茬嚎
+export const zxloadCurve = (data) => {
+ return request('visitsAdmin/cloudService/board/api/energy/loadCurve', data)
}
\ No newline at end of file
diff --git a/screen/src/assets/images/nenghao_ic1.png b/screen/src/assets/images/nenghao_ic1.png
new file mode 100644
index 0000000..49d1ac5
--- /dev/null
+++ b/screen/src/assets/images/nenghao_ic1.png
Binary files differ
diff --git a/screen/src/router/index.js b/screen/src/router/index.js
index 74799c6..e65a85c 100644
--- a/screen/src/router/index.js
+++ b/screen/src/router/index.js
@@ -5,7 +5,7 @@
routes: [
{
path: '/',
- component: () => import('../views/SecurityControl.vue')
+ component: () => import('../views/EnergyConsum.vue')
},
{
path: '/PlatformCall', // 鏈堝彴鍙彿澶у睆
diff --git a/screen/src/views/EnergyConsum.vue b/screen/src/views/EnergyConsum.vue
index c745f28..0284eb7 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -17,34 +17,15 @@
<div class="com_header">
<div class="title">
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
- <div>瀹炴椂涓夌浉鐢垫祦/鐢靛帇</div>
+ <div>鏈勾绱寰幆鐑熺</div>
</div>
<img src="@/assets/images/title@2x.png" class="bg" alt="" />
</div>
<div class="content">
- <div class="item">
- <div class="lab">A鐩哥數娴�(A)</div>
- <div class="val">60</div>
- </div>
- <div class="item">
- <div class="lab">B鐩哥數娴�(A)</div>
- <div class="val">60</div>
- </div>
- <div class="item">
- <div class="lab">C鐩哥數娴�(A)</div>
- <div class="val">60</div>
- </div>
- <div class="item">
- <div class="lab">鏈夊姛鍔熺巼(KW)</div>
- <div class="val">60</div>
- </div>
- <div class="item">
- <div class="lab">鍔熺巼鍥犳暟</div>
- <div class="val">60</div>
- </div>
- <div class="item">
- <div class="lab">鏈夊姛鐢靛害(掳)</div>
- <div class="val">60</div>
+ <img src="@/assets/images/nenghao_ic1.png" class="co2" alt="">
+ <div>
+ <div class="name">鏈勾绱寰幆鐑熺</div>
+ <div><span class="num">{{ data1.smokeBoxTotal }}</span><span>鍙�</span></div>
</div>
</div>
</div>
@@ -88,16 +69,16 @@
<img class="icon" src="@/assets/images/ic_yongdian@2x.png" alt="" />
<div class="content">
<div class="name">涓婃湀鐢ㄧ數(kw路h)</div>
- <div class="num">450</div>
+ <div class="num">{{ data1.electricityQuantity }}</div>
</div>
</div>
<div class="static">
<span class="lab">鍚屾瘮</span>
<img class="icon" src="@/assets/images/ic_up.webp" alt="" />
- <span class="val">11</span>
+ <span class="val">{{ data1.electricityYear }}</span>
<span class="lab">鐜瘮</span>
<img class="icon" src="@/assets/images/ic_down.webp" alt="" />
- <span class="val">11</span>
+ <span class="val">{{ data1.gasMonth }}</span>
</div>
</div>
<div class="item">
@@ -105,16 +86,16 @@
<img class="icon" src="@/assets/images/ic_yongshui@2x.png" alt="" />
<div class="content">
<div class="name">涓婃湀鐢ㄦ按(t)</div>
- <div class="num">450</div>
+ <div class="num">{{ data1.waterQuantity }}</div>
</div>
</div>
<div class="static">
<span class="lab">鍚屾瘮</span>
<img class="icon" src="@/assets/images/ic_up.webp" alt="" />
- <span class="val">11</span>
+ <span class="val">{{ data1.waterMonth }}</span>
<span class="lab">鐜瘮</span>
<img class="icon" src="@/assets/images/ic_down.webp" alt="" />
- <span class="val">11</span>
+ <span class="val">{{ data1.waterYear }}</span>
</div>
</div>
<div class="item">
@@ -122,16 +103,16 @@
<img class="icon" src="@/assets/images/ic_yongqi@2x.png" alt="" />
<div class="content">
<div class="name">涓婃湀鐢ㄦ皵(t)</div>
- <div class="num">450</div>
+ <div class="num">{{ data1.gasQuantity }}</div>
</div>
</div>
<div class="static">
<span class="lab">鍚屾瘮</span>
<img class="icon" src="@/assets/images/ic_up.webp" alt="" />
- <span class="val">11</span>
+ <span class="val">{{ data1.gasMonth }}</span>
<span class="lab">鐜瘮</span>
<img class="icon" src="@/assets/images/ic_down.webp" alt="" />
- <span class="val">11</span>
+ <span class="val">{{ data1.gasYear }}</span>
</div>
</div>
</div>
@@ -139,45 +120,45 @@
<div class="center_box_two">
<img class="bg" src="@/assets/images/img_city@2x.png" alt="" />
<div class="item item1">
- <div class="num fs_linear">240<span class="unit">kw路h</span></div>
+ <div class="num fs_linear">{{ data1.workHouseQuantity }}<span class="unit">kw路h</span></div>
<div class="name">鑱斿悎宸ユ埧</div>
<img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
</div>
<div class="item item2">
- <div class="num fs_linear">240<span class="unit">kw路h</span></div>
- <div class="name">鑱斿悎宸ユ埧</div>
+ <div class="num fs_linear">{{ data1.officeQuantity }}<span class="unit">kw路h</span></div>
+ <div class="name">鍔炲叕妤�</div>
<img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
</div>
<div class="item item3">
- <div class="num fs_linear">240<span class="unit">kw路h</span></div>
- <div class="name">鑱斿悎宸ユ埧</div>
+ <div class="num fs_linear">{{ data1.parkQuantity }}<span class="unit">kw路h</span></div>
+ <div class="name">鐗╂祦鍥尯</div>
<img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
</div>
<div class="item item4">
- <div class="num fs_linear">240<span class="unit">kw路h</span></div>
- <div class="name">鑱斿悎宸ユ埧</div>
+ <div class="num fs_linear">{{ data1.productHouseQuantity }}<span class="unit">kw路h</span></div>
+ <div class="name">鎴愬搧搴�</div>
<img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
</div>
<div class="item item5">
- <div class="num fs_linear">240<span class="unit">kw路h</span></div>
- <div class="name">鑱斿悎宸ユ埧</div>
+ <div class="num fs_linear">{{ data1.powerQuantity }}<span class="unit">kw路h</span></div>
+ <div class="name">鍔ㄥ姏绔欐埧</div>
<img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
</div>
<div class="bottom_wrap">
<div class="bottom bottom1">
- <div class="num fs_linear">240</div>
+ <div class="num fs_linear">{{ data1.yesterdayElectricity }}</div>
<div class="name">鏄ㄦ棩鐢ㄧ數</div>
<div class="unit">kw路h</div>
<img src="@/assets/images/ic_dianliang_b@2x.png" class="bg" alt="" />
</div>
<div class="bottom bottom2">
- <div class="num">240</div>
+ <div class="num">{{ data1.todayElectricity }}</div>
<div class="name">浠婃棩鐢ㄧ數</div>
<div class="unit">kw路h</div>
<img src="@/assets/images/ic_dianliang@2x.png" class="bg" alt="" />
</div>
<div class="bottom bottom3">
- <div class="num fs_linear">240</div>
+ <div class="num fs_linear">{{ data1.monthElectricity }}</div>
<div class="name">鏈湀鐢ㄧ數</div>
<div class="unit">kw路h</div>
<img src="@/assets/images/ic_dianliang_b@2x.png" class="bg" alt="" />
@@ -198,7 +179,7 @@
<img src="@/assets/images/ic_co2@2x.png" class="co2" alt="">
<div>
<div class="name">鏈湀绱纰虫帓鏀�</div>
- <div><span class="num">22.22</span><span>鍚�</span></div>
+ <div><span class="num">{{ data1.carbon }}</span><span>鍚�</span></div>
</div>
</div>
</div>
@@ -246,6 +227,12 @@
import ChargeRate from '@/components/ChargeRate.vue'
import * as echarts from 'echarts'
import VScaleScreen from 'v-scale-screen'
+import {
+ zxcenterData,
+ zxenergyDataList,
+ zxlastMonthOil,
+ zxloadCurve,
+} from '@/api'
const weekMap = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�',]
@@ -401,7 +388,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: [1, 2, 3, 4, 5, 5]
+ data: data4.value.map(i => i.timeData)
},
yAxis: {
type: 'value',
@@ -428,12 +415,7 @@
},
series: [
{
- data: [1, 2, 3, 4, 4, 4000].map(i => {
- return {
- name: i,
- value: i,
- }
- }),
+ data: data4.value.map(i => i.energy),
type: 'line',
areaStyle: {
normal: {
@@ -546,10 +528,41 @@
})
}
+const data1 = ref({})
+const getData1 = () => {
+ zxcenterData().then(res => {
+ const result = res.data
+ })
+}
+const data2 = ref([])
+const getData2 = () => {
+ zxenergyDataList().then(res => {
+ const result = res.data
+ data2.value = result
+ })
+}
+const data3 = ref([])
+const getData3 = () => {
+ zxlastMonthOil().then(res => {
+ const result = res.data
+ data3.value = result
+ })
+}
+const data4 = ref([])
+const getData4 = () => {
+ zxloadCurve().then(res => {
+ const result = res.data
+ data4.value = result
+ initLoadReal()
+ })
+}
+
onMounted(() => {
- initOperation()
- initLoadReal()
- initEnergy()
+ getData1()
+ getData2()
+ getData3()
+ getData4()
+
})
@@ -568,26 +581,22 @@
margin-bottom: 20px;
.content {
- width: 100%;
- padding: 24px 5%;
+ height: 164px;
display: flex;
- flex-wrap: wrap;
+ align-items: center;
+ justify-content: center;
- .item {
- width: 33.3%;
- margin-bottom: 12px;
+ .co2 {
+ width: 100px;
+ margin-right: 30px;
+ }
- .lab {
- font-size: 14px;
- color: #ffffff;
- }
-
- .val {
- font-weight: 600;
- font-size: 20px;
- color: #01d9fe;
- margin-top: 4px;
- }
+ .num {
+ margin-top: 10px;
+ color: #01D9FE;
+ font-weight: 600;
+ font-size: 36px;
+ margin-right: 2px;
}
}
}
diff --git a/screen/src/views/SecurityControl.vue b/screen/src/views/SecurityControl.vue
index a8f450a..beec715 100644
--- a/screen/src/views/SecurityControl.vue
+++ b/screen/src/views/SecurityControl.vue
@@ -201,15 +201,15 @@
<div class="item">
<div class="name">寰呰闂�</div>
<div class="num_wrap">
- <span class="num">22</span>
+ <span class="num">{{ data4.waitVisitNum }}</span>
<span>浜�</span>
</div>
</div>
<div class="spacing"></div>
<div class="item">
- <div class="name">宸茬櫥鏈�</div>
+ <div class="name">宸茬櫥璁�</div>
<div class="num_wrap">
- <span class="num">22</span>
+ <span class="num">{{ data4.registerVisitNum }}</span>
<span>浜�</span>
</div>
</div>
@@ -217,7 +217,7 @@
<div class="item">
<div class="name">宸茬寮�</div>
<div class="num_wrap">
- <span class="num">22</span>
+ <span class="num">{{ data4.levelNum }}</span>
<span>浜�</span>
</div>
</div>
@@ -225,7 +225,7 @@
<div class="item">
<div class="name">婊炵暀</div>
<div class="num_wrap">
- <span class="num">22</span>
+ <span class="num">{{ data4.retentionNum }}</span>
<span>浜�</span>
</div>
</div>
@@ -419,7 +419,7 @@
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
import * as echarts from 'echarts'
-import { getEnergyCenterData, getSecurityDeviceData, getVisitRetentionData } from '@/api'
+import { getEnergyCenterData, getSecurityDeviceData, getVisitRetentionData, afgetVisitData } from '@/api'
const weekMap = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�',]
@@ -594,6 +594,11 @@
offset: 1,
color: '#61d3f9'
}])]
+ const data = []
+ data.push({ name: '寰呰闂�', value: data4.value.waitVisitNum,rate: data4.value.waitVisitRata })
+ data.push({ name: '宸茬櫥璁�', value: data4.value.registerVisitNum,rate: data4.value.registerVisitRata })
+ data.push({ name: '宸茬寮�', value: data4.value.levelNum,rate: data4.value.levelRata })
+ data.push({ name: '婊炵暀', value: data4.value.retentionNum,rate: data4.value.retentionRata })
const option = {
color: colors,
tooltip: {
@@ -617,7 +622,7 @@
color: "#000"
},
itemHeight: 2,
- data: ['寰呰闂�', '宸茬櫥璁�', '宸茬寮�', '婊炵暀']
+ data: data.map(i => i.name)
},
series: [
{
@@ -639,13 +644,7 @@
borderWidth: 0,
borderColor: '#fff'
},
- data: [
- { value: 100, name: '寰呰闂�', },
- { value: 50, name: '宸茬櫥璁�' },
- { value: 20, name: '宸茬寮�' },
- { value: 30, name: '婊炵暀' },
-
- ]
+ data
},
{
type: 'funnel',
@@ -691,13 +690,7 @@
opacity: 1
}
},
- data: [
- { value: 100, name: '寰呰闂�', },
- { value: 50, name: '宸茬櫥璁�' },
- { value: 20, name: '宸茬寮�' },
- { value: 30, name: '婊炵暀' },
-
- ]
+ data
},
]
}
@@ -752,12 +745,22 @@
})
})
}
+const data4 = ref({})
+const getData4 = () => {
+ afgetVisitData().then(res => {
+ const result = res.data || {}
+ dataList4.value = result
+ initEchart3()
+ })
+}
+
onMounted(() => {
getData1()
getData2()
getData3()
- initEchart3()
+ getData4()
+
// initEchart1()
})
diff --git a/screen/vite.config.js b/screen/vite.config.js
index 4074074..f4a5d19 100644
--- a/screen/vite.config.js
+++ b/screen/vite.config.js
@@ -25,9 +25,9 @@
server: {
proxy: {
"/gateway_interface": {
- // target: "http://192.168.0.138:10010",
+ target: "http://192.168.0.103:10010",
// target: "http://10.50.250.253:8088/gateway_interface",
- target: "http://192.168.0.173/gateway_interface",
+ // target: "http://192.168.0.173/gateway_interface",
changeOrigin: true,
rewrite: (path) => path.replace(/^\/gateway_interface/, ""),
},
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index dac2084..e7782a0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -356,7 +356,6 @@
@Override
public List<Company> findList(Company company) {
MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
- queryWrapper.eq(Company::getIsdeleted,Constants.ZERO) ;
if (company.getId() != null) {
queryWrapper.eq(Company::getId, company.getId());
}
@@ -456,6 +455,7 @@
.select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) as countNum") ;
queryWrapper.select("t1.name",Company::getParentName);
queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
+ queryWrapper.apply(" t.isdeleted = 0 ") ;
queryWrapper.eq(Objects.nonNull(company.getStatus()),Company::getStatus,Constants.ZERO);
queryWrapper.like(StringUtils.isNotBlank(company.getName()),Company::getName,company.getName());
queryWrapper.like(StringUtils.isNotBlank(company.getParentName()),"c.name",company.getParentName());
--
Gitblit v1.9.3