@@ -258,6 +288,8 @@
import BreadCrumb from '@/components/BreadCrumb'
import EmptyCard from '@/components/EmptyCard'
import {getESDParameterByDeviceId} from "../../utils/DeviceManagementApi";
+import {getEsdLogList, getSearFormSelection} from "@/utils/ESD";
+import {baseUrl} from "@/utils/config";
export default {
name: "FlowRecord",
@@ -268,35 +300,32 @@ export default {
data() {
return {
drawer: false,
+ query: {
+ pager: {
+ pageSize: 10,
+ currentPage: 1,
+ total: null
+ },
+ searchObject: ''
+ },
+ personTypeList: [{id: 1, name: '访客'}, {id: 3, name: '教师'}, {id: 2, name: '黑名单'}],
+ snList:[],
activeName: 'first',
- inner: {title: '流水管理'},
+ inner: { title: '流水管理' },
searchForm: {
- date: '', // 时间
- range: 0, // 范围
- deviceId: '', // 设备号
- resistanceStatus: '', // 阻值状态
- regionName: '', // 区域名称
- name: '', // 员工名称
- handResistance: '', // 手阻值
- leftFootResistance: '', // 左脚阻值
- rightFootResistance: '', // 右脚阻值
- }, // 查询数据
- tableData: [
- {
- registerPhoto: '', // 注册照片
- snapPhoto: '', // 抓拍照片
- deviceId: '', // 设备号
- workId: '', // 工号
- name: '', // 姓名
- department: '', // 部门
- regionName: '', // 区域名称
- accessTime: '', // 通行时间
- handResistance: '', // 手阻值
- leftFootResistance: '', // 左脚阻值
- rightFootResistance: '', // 右脚阻值
- resistanceStatus: '', // 阻值状态
- }
- ], // 表格数据
+ date: '',
+ personType: '',
+ an: '',
+ resistanceStatus: '',
+ areaName: '',
+ name: '',
+ handResistance: '',
+ leftFootResistance: '',
+ rightFootResistance: '',
+ startTime: '',
+ endTime: ''
+ },
+ tableData: [], // 表格数据
tableLoading: false, // 表格加载动画
multipleSelection: [], // 选中列表
pager: {
@@ -306,12 +335,12 @@ export default {
}, // 分页数据
kanbanVisible: false, // 看板模式对话框
selectForm: {
- deviceName:'', // 设备名称
+ deviceName: '', // 设备名称
}, // 筛选表单
detailInfo: {
IDCard: '', // 身份证号
name: '', // 姓名
- workId: '', // 工号
+ employeeCardId: '', // 工号
snapPhoto: '', // 抓拍照片
accessTime: '', // 通行时间
sex: '', // 性别
@@ -327,11 +356,57 @@ export default {
detailVisible: false // 详情信息
}
},
+ created() {
+ this.getSearFormSelection()
+ this.getTableData()
+ },
methods: {
// 表格选中函数
handleSelectionChange(val) {
this.multipleSelection = val
},
+ async getTableData() {
+ this.searchForm.startTime = this.searchForm.date[0]
+ this.searchForm.endTime = this.searchForm.date[1]
+ console.log(this.query)
+ this.query.searchObject = this.searchForm
+ const res = await getEsdLogList(this.query)
+ if (res.code === 200) {
+ this.tableData = res.data.tableData
+ this.query.pager.total = res.data.totalPage
+ }
+ for (let i = 0; i < this.tableData.length; i++) {
+ this.tableData[i].currentImage = 'http://' + baseUrl + '/esd-image/now_img/' + this.tableData[i].nowImg
+ }
+ for (let i = 0; i < this.tableData.length; i++) {
+ this.tableData[i].idImg = 'http://' + baseUrl + '/esd-image/id_img/' + this.tableData[i].idImg
+ }
+ console.log(res.data)
+ },
+ // 获取下拉框的数据
+ async getSearFormSelection() {
+ const res = await getSearFormSelection()
+ if (res.code === 200) {
+ console.log(res.data)
+ this.snList = res.data.snList
+ let temp
+ for (let i = 0; i < res.data.personTypeList.length; i++) {
+ temp = { id: null, name: null }
+ temp.id = res.data.personTypeList[i].id
+ temp.name = res.data.personTypeList[i].name
+ this.personTypeList.push(temp)
+ }
+ console.log(this.personTypeList)
+ }
+ },
+ changeTableSize(value) {
+ this.query.pager.pageSize = value
+ this.getTableData()
+ },
+ changeTableCurrent(value) {
+ this.query.pager.currentPage = value
+ this.getTableData()
+ },
// 表格清空多选的回调
clearCheck() {
// 清空表格多选框
@@ -339,8 +414,8 @@ export default {
},
// 点击编辑设备信息 函数
async editEquipment(scope, row) {
- console.log("row:",row)
- console.log("scope:",scope)
+ console.log("row:", row)
+ console.log("scope:", scope)
this.detailVisible = true
},
// 分页回调函数
@@ -458,6 +533,7 @@ export default {
margin-right: 15px !important;
margin-bottom: 12px !important;
}
+
// 日期填写宽度样式修改
/deep/ .el-date-editor--daterange.el-input__inner {
width: 280px !important;
@@ -475,6 +551,7 @@ export default {
width: 100%;
background: #010f24;
box-sizing: border-box;
+
.top-bar {
box-sizing: border-box;
height: 100px;
@@ -482,16 +559,20 @@ export default {
display: flex;
margin-bottom: 10px;
}
- .top-item, .left-item, .right-item{
+
+ .top-item, .left-item, .right-item {
width: 33.33%;
}
- .left-box,.right-box {
+
+ .left-box, .right-box {
display: flex;
}
+
.left-border {
margin: 20px auto;
position: relative;
}
+
.left-border:before {
content: "";
position: absolute;
@@ -501,6 +582,7 @@ export default {
height: 4px;
background-color: #010f24;
}
+
.divider {
display: block;
height: 2px;
@@ -509,14 +591,17 @@ export default {
border: 0.5px solid #01e1e3;
box-sizing: border-box;
}
+
.button-box {
height: 40px;
width: 90px;
line-height: 60px;
text-align: left;
}
+
.squares-item {
position: relative;
+
.quadrilateral {
box-sizing: border-box;
border: 2px solid #01e1e3;
@@ -525,6 +610,7 @@ export default {
position: relative;
border-left: 0;
border-right: 0;
+
&:before {
box-sizing: border-box;
content: "";
@@ -535,6 +621,7 @@ export default {
height: 4px;
background-color: #010f24;
}
+
&:after {
box-sizing: border-box;
content: "";
@@ -545,6 +632,7 @@ export default {
height: 4px;
background-color: #010f24;
}
+
.left-line, .right-line, .left-border-two, .right-line-two {
height: 22px;
width: 2px;
@@ -554,6 +642,7 @@ export default {
top: -3px;
}
}
+
.squares-one {
box-sizing: border-box;
height: 12px;
@@ -561,6 +650,7 @@ export default {
position: absolute;
right: 1px;
top: 22px;
+
&:before {
box-sizing: border-box;
content: "";
@@ -575,10 +665,12 @@ export default {
}
}
}
+
.right-border {
box-sizing: border-box;
margin: 38px auto;
position: relative;
+
&:before {
content: "";
position: absolute;
@@ -590,6 +682,7 @@ export default {
background-color: #010f24;
}
}
+
.center-content {
box-sizing: border-box;
margin: 0 auto;
@@ -603,10 +696,12 @@ export default {
font-size: 24px;
box-shadow: inset 0 0 15px #2c808d;
}
+
.left-border-two {
margin: 38px auto;
position: relative;
- &:before{
+
+ &:before {
content: "";
position: absolute;
right: -1px;
@@ -614,8 +709,9 @@ export default {
width: 15px;
height: 4px;
background-color: #010f24;
- }
}
+ }
+
.quadrilateral-two {
box-sizing: border-box;
border: 2px solid #01e1e3;
@@ -624,7 +720,8 @@ export default {
position: relative;
border-left: 0;
border-right: 0;
- &:before{
+
+ &:before {
content: "";
position: absolute;
left: 0;
@@ -633,7 +730,8 @@ export default {
height: 4px;
background-color: #010f24;
}
- .left-line-two,.right-line-two {
+
+ .left-line-two, .right-line-two {
height: 22px;
width: 2px;
background: #01e1e3;
@@ -642,6 +740,7 @@ export default {
top: -3px;
}
}
+
.squares-two {
box-sizing: border-box;
height: 12px;
@@ -649,6 +748,7 @@ export default {
position: absolute;
right: 6px;
top: 44px;
+
&:before {
content: "";
position: absolute;
@@ -661,10 +761,12 @@ export default {
z-index: 1;
}
}
+
.right-border-two {
margin: 56px auto;
position: relative;
box-sizing: border-box;
+
&:before {
content: "";
position: absolute;
@@ -675,6 +777,7 @@ export default {
background-color: #010f24;
}
}
+
.close-box {
width: 30px;
height: 30px;
diff --git a/src/views/NewMainPageComponents/LeftCenter.vue b/src/views/ESD/MainPageComponents/ESDLeftCenter.vue
similarity index 31%
rename from src/views/NewMainPageComponents/LeftCenter.vue
rename to src/views/ESD/MainPageComponents/ESDLeftCenter.vue
index f3cfa9b58fe889dde0f8c2e8629a89d52691a138..db6a50a3f89ca707f68d0cf9b2254182ee04c1b7 100644
--- a/src/views/NewMainPageComponents/LeftCenter.vue
+++ b/src/views/ESD/MainPageComponents/ESDLeftCenter.vue
@@ -2,7 +2,7 @@
- 报警Top10
+
报警Top10
@@ -18,15 +18,18 @@
>
-
+
+
+
+
-
-
-
- 查看
-
-
-
+
+
+
+
+
+
+
加载中...
@@ -37,550 +40,550 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
-
- 查看
-
-
-
+
+
+
+
+
+
+
加载中...
@@ -633,10 +639,10 @@ import {
editDeviceOperateData,
getConfigureByDeviceId,
getConfigData
-} from '../../utils/DeviceManagementApi'
+} from '../../../utils/DeviceManagementApi'
export default {
- name: 'LeftCenter',
+ name: 'ESDLeftCenter',
data() {
return {
imgVisible: false,
@@ -759,13 +765,11 @@ export default {
},
mounted() {
this.getConfigData()
- console.log('leftCenterVO:',this.leftCenterVO)
},
methods: {
zoomEvent() {
this.imgVisible = true
const dialogEl = this.$refs.imgDialog.$refs.dialog
- console.log(dialogEl)
dialogEl.removeAttribute('zoom')
},
async getConfigData() {
@@ -773,17 +777,14 @@ export default {
},
// 编辑设备操作
async editOperation(row) {
- console.log(row)
if (this.$refs.EquipmentOperation) {
this.$refs.EquipmentOperation.resetFields()
}
- console.log(window.localStorage.getItem('menuList'))
if (JSON.parse(window.localStorage.getItem('menuList')) !== null && JSON.parse(window.localStorage.getItem('menuList'))[0].children[0].menuId === 4) {
this.isShow = false
} else {
this.isShow = true
}
- console.log('fdsafdasf')
this.operationDialogVisible = true
this.operationDialogLoading = true
this.editArray = [row.deviceId]
@@ -805,10 +806,8 @@ export default {
await editDeviceOperateData(query)
} catch (err) {
this.$message.error(err)
- console.log(err, '111')
}
} else {
- console.log('error submit!!')
return false
}
this.operationDialogVisible = false
@@ -908,7 +907,7 @@ export default {
}
/deep/ .el-dialog {
height: 100%!important;
- background-image: url("../../assets/images/left-center-big-bgc.png");
+ //background-image: url("../src/assets/images/left-center-big-bgc.png");
background-repeat: no-repeat;
background-size:100% 100% ;
}
diff --git a/src/views/NewMainPageComponents/LeftTop.vue b/src/views/ESD/MainPageComponents/ESDLeftTop.vue
similarity index 73%
rename from src/views/NewMainPageComponents/LeftTop.vue
rename to src/views/ESD/MainPageComponents/ESDLeftTop.vue
index 2d5deeb8b3ffb20f90fe74c2f3009aeacada8048..ce5615ca2b31dc8dbd05d1748e5a4f9edd54203f 100644
--- a/src/views/NewMainPageComponents/LeftTop.vue
+++ b/src/views/ESD/MainPageComponents/ESDLeftTop.vue
@@ -1,9 +1,9 @@
- 设备概况
+
设备概况
-
+
- 设备概况
+ 设备概况
@@ -43,7 +43,7 @@
- 通行总人次
+ 检测总人次
{{ leftTopVO.passedNumber }}
@@ -67,9 +67,9 @@
-
-
-
+
+
+
{{ leftTopVO.equipmentNumber }}
@@ -78,14 +78,14 @@
{{ leftTopVO.offLineNumber }}
-
-
+
+
-
+
{{ leftTopVO.passedNumber }}
-
+
{{ leftTopVO.policeNumber }}
@@ -97,7 +97,7 @@
+
+
diff --git a/src/views/ESD/MainPageComponents/ESDRightBottom.vue b/src/views/ESD/MainPageComponents/ESDRightBottom.vue
new file mode 100644
index 0000000000000000000000000000000000000000..2fbd6c1bc932b4b90c3897684a362732deb8768a
--- /dev/null
+++ b/src/views/ESD/MainPageComponents/ESDRightBottom.vue
@@ -0,0 +1,301 @@
+
+
+
+
+
+
+
+
+ 异常提醒
+
+
+
+
+
+
+ 报警率超阈值
+
+
+
+
+
+
+
+
+ 加载中...
+
+
+ 没有更多了
+
+
+
+
+
+
+
+
+
+ 不活跃度超阈值
+
+
+
+
+
+
+
+
+ 加载中...
+
+
+ 没有更多了
+
+
+
+
+
+
+
+ 异常提醒
+
+
+
+
+ 报警率超阈值
+
+
+
+
+
+
+
+
+ 加载中...
+
+
+ 没有更多了
+
+
+
+
+
+
+
+ 不活跃度超阈值
+
+
+
+
+
+
+
+
+ 加载中...
+
+
+ 没有更多了
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/ESD/MainPageComponents/ESDRightMiddle.vue b/src/views/ESD/MainPageComponents/ESDRightMiddle.vue
new file mode 100644
index 0000000000000000000000000000000000000000..d39b9eccf08be94083dc82955f7d94c9b64c58de
--- /dev/null
+++ b/src/views/ESD/MainPageComponents/ESDRightMiddle.vue
@@ -0,0 +1,693 @@
+
+
+
+
+
+
+
+
+
+
数据环比
+
+
+
+
+
+ 以天
+
+
+ 以月
+
+
+
+
+
+
+
+
+
+
+
+ 报警率
+
+
+
+
+
+ 本周期
+ {{ currentCycle }}
+
+
+ 上周期
+ {{ lastCycle }}
+
+
+
+
+
+
+
+ 不活跃度
+
+
+
+
+
+ 本周期
+ {{ currentCycleInactivity }}
+
+
+ 上周期
+ {{ lastCycleInactivity }}
+
+
+
+
+
+
+ 报警TOP10
+
+
+
+ 以天
+
+
+ 以月
+
+
+
+
+
+
+
+
+ 报警率
+
+
+
+ 本周期
+ {{ currentCycle }}
+
+
+ 上周期
+ {{ lastCycle }}
+
+
+
+
+
+
+ 不活跃度
+
+
+
+ 本周期
+ {{ currentCycleInactivity }}
+
+
+ 上周期
+ {{ lastCycleInactivity }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/ESD/MainPageComponents/ESDRightTop.vue b/src/views/ESD/MainPageComponents/ESDRightTop.vue
new file mode 100644
index 0000000000000000000000000000000000000000..8d4b5c5aa14af5534945c7822734a0b480e93d56
--- /dev/null
+++ b/src/views/ESD/MainPageComponents/ESDRightTop.vue
@@ -0,0 +1,468 @@
+
+
+
+
+
数据统计
+
+
+
+
+
+ 以天
+
+
+ 以月
+
+
+
+
+
+
+
+
+
+ 报警TOP10
+
+
+
+ 以天
+
+
+ 以月
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 7d916ae8790288029e33b797cfdb802e6b485753..1608db94fcf47e2185c448bb86216cfc8ce48b29 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -1,32 +1,39 @@
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -58,19 +65,19 @@ export default {
activePath: ''
}
},
- watch: {
+ watch: {},
+ created() {
},
- created() {},
mounted() {
- this.$Socket.connect()
+ // this.$Socket.connect()
this.getPath()
this.menuList = JSON.parse(window.localStorage.getItem('menuList'))
this.username = JSON.parse(window.localStorage.getItem('userName'))
this.staffNumber = JSON.parse(window.localStorage.getItem('staffNumber'))
},
- beforeDestroy() {
- this.$Socket.close()
- },
+ // beforeDestroy() {
+ // this.$Socket.close()
+ // },
methods: {
// 获取当前路由地址以保存侧边栏激活状态
getPath() {
@@ -82,7 +89,7 @@ export default {
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 8d8a2ea824cc3b78524e1bab530c3c473b8a3170..a5055a249746e6c5c3a8780363acba0c277b3858 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,7 +1,7 @@
-
+
欢迎登录安检设备综合管理平台
@@ -69,9 +69,10 @@ export default {
window.localStorage.setItem('menuList', JSON.stringify(res.data.menuList))
window.localStorage.setItem('userName', JSON.stringify(res.data.userName))
window.localStorage.setItem('ipAddress', JSON.stringify(res.data.ipAddress))
+ window.localStorage.setItem('safetyPort', JSON.stringify(res.data.safetyPort))
window.localStorage.setItem('staffNumber', JSON.stringify(this.loginForm.staffNumber))
}
- await this.$router.replace('/NewMainPage')
+ await this.$router.replace('/MainPage')
}, 2000)
} else {
this.$message.error('请正确输入用户名或密码')
diff --git a/src/views/MainPage.vue b/src/views/MainPage.vue
index a8b5edf69d4414f0537272641424682dba17a686..1ae7de2ed0f2c13222cd03702e6143582a7a9a26 100644
--- a/src/views/MainPage.vue
+++ b/src/views/MainPage.vue
@@ -1,579 +1,254 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 安检门
+
+
+
+ 人脸ESD设备
+
+
+
+ 手探
+
-
-
-
+
+ 安检设备综合管理平台
-
-
-
-
-
-
+
+
+
+
+ 后台
-
+
-
-
-
+
+
+ 炸探/液探
-
-
-
-
-
-
-
+
+
+ X光机
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 设备状态总览
-
-
-
-
-
-
-
+
+
+
+
+
+ 服务器
+
+
+ IP地址:{{ ipInfo.ipAddress }}
+
+
+ 端口号:{{ ipInfo.safetyPort }}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 主交换机
+
+
+ 型号:{{ switchForm.model }}
+
+
+ 端口号:{{ switchForm.portNumber }}
+
+
+ 数量:{{ switchForm.quantity }}
+
-
-
-
-
-
+
+
+
+
+
+
+ 无线路由器
+
+
+ 型号:{{ routerForm.model }}
+
+
+ 端口号:{{ routerForm.portNumber }}
+
+
+ 数量:{{ routerForm.quantity }}
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ item.regionVO.areaId }}
+
+
+ 位置:{{ item.regionVO.address }}
+
+
+ 设备:{{ item.regionVO.number }}
+
+
-
-
-
-
-
+
+
+
+
+ 安检门
+
+
+
+
{{ item.topTenChartVO.currentPassageNumber }}
+
+
+
+
{{ item.topTenChartVO.currentPoliceNumber }}
+
+
+
+
{{ item.topTenChartVO.alarmRate }}%
+
+
+
-
-
-
-
-
+
+
+
+
+ ESD
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ X-Ray
+
+
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
diff --git a/src/views/FacilityManagement/RealTimeDate.vue b/src/views/SystemSetting/RealTimeDate.vue
similarity index 91%
rename from src/views/FacilityManagement/RealTimeDate.vue
rename to src/views/SystemSetting/RealTimeDate.vue
index 5781a02067e57958adcfd880a18976fc873a36d1..84758bd1de07ed2d03192dc8b210b2c938393629 100644
--- a/src/views/FacilityManagement/RealTimeDate.vue
+++ b/src/views/SystemSetting/RealTimeDate.vue
@@ -5,20 +5,6 @@
-
diff --git a/src/views/DataManagement/ReminderSettings.vue b/src/views/safety/DataManagement/ReminderSettings.vue
similarity index 97%
rename from src/views/DataManagement/ReminderSettings.vue
rename to src/views/safety/DataManagement/ReminderSettings.vue
index cdd7cec28f6e7d86c650a215b677c70589d2dab9..a8daf912f2d8c5e872e23c0444a8ef9ef2eca36c 100644
--- a/src/views/DataManagement/ReminderSettings.vue
+++ b/src/views/safety/DataManagement/ReminderSettings.vue
@@ -207,7 +207,7 @@
import BreadCrumb from '@/components/BreadCrumb'
import EmptyCard from '@/components/EmptyCard'
-import { getRemindInformation, updateRemind } from '../../utils/DeviceManagementApi'
+import { getRemindInformation, updateRemind } from '../../../utils/DeviceManagementApi'
export default {
components: {
EmptyCard,
@@ -342,40 +342,40 @@ export default {
},
methods: {
removeDailyNewspaperFormEmail(item) {
- if (this.dailyNewspaperForm.emails.length > 1) {
+ if (this.dailyNewspaperForm.emails.length > 0) {
var index = this.dailyNewspaperForm.emails.indexOf(item)
if (index !== -1) {
this.dailyNewspaperForm.emails.splice(index, 1)
}
} else {
this.$message({
- message: '温馨提示：最少为一个邮箱！',
+ message: '邮箱已全部清空！',
type: 'warning'
})
}
},
removePoliceFormEmail(item) {
- if (this.policeForm.emails.length > 1) {
+ if (this.policeForm.emails.length > 0) {
var index = this.policeForm.emails.indexOf(item)
if (index !== -1) {
this.policeForm.emails.splice(index, 1)
}
} else {
this.$message({
- message: '温馨提示：最少为一个邮箱！',
+ message: '邮箱已全部清空！',
type: 'warning'
})
}
},
removeUtilizationRatioFormEmail(item) {
- if (this.utilizationRatioForm.emails.length > 1) {
+ if (this.utilizationRatioForm.emails.length > 0) {
var index = this.utilizationRatioForm.emails.indexOf(item)
if (index !== -1) {
this.utilizationRatioForm.emails.splice(index, 1)
}
} else {
this.$message({
- message: '温馨提示：最少为一个邮箱！',
+ message: '邮箱已全部清空！',
type: 'warning'
})
}
diff --git a/src/views/DataManagement/ReportExport.vue b/src/views/safety/DataManagement/ReportExport.vue
similarity index 61%
rename from src/views/DataManagement/ReportExport.vue
rename to src/views/safety/DataManagement/ReportExport.vue
index 027788b551b8a61b6ddc62d6f11744bfb20d48d9..9239a333354b5f721ad36afc1252d2150c34e6c1 100644
--- a/src/views/DataManagement/ReportExport.vue
+++ b/src/views/safety/DataManagement/ReportExport.vue
@@ -53,27 +53,38 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -127,85 +138,7 @@ export default {
},
loading: false,
downloadLoading: false,
- tableData: [
- {
- deviceId: '001',
- parameter: '122222222',
- remark: '无',
- updateTime: '2022-03-22 18:09:09',
- username: '超级管理员'
- },
- {
- deviceId: '001',
- parameter: '122222222',
- remark: '无',
- updateTime: '2022-03-22 18:09:09',
- username: '超级管理员'
- },
- {
- deviceId: '001',
- parameter: '122222222',
- remark: '无',
- updateTime: '2022-03-22 18:09:09',
- username: '超级管理员'
- },
- {
- deviceId: '001',
- parameter: '122222222',
- remark: '无',
- updateTime: '2022-03-22 18:09:09',
- username: '超级管理员'
- },
- {
- deviceId: '001',
- parameter: '122222222',
- remark: '无',
- updateTime: '2022-03-22 18:09:09',
- username: '超级管理员'
- },
- {
- deviceId: '001',
- parameter: '122222222',
- remark: '无',
- updateTime: '2022-03-22 18:09:09',
- username: '超级管理员'
- },
- {
- deviceId: '001',
- parameter: '122222222',
- remark: '无',
- updateTime: '2022-03-22 18:09:09',
- username: '超级管理员'
- },
- {
- deviceId: '001',
- parameter: '122222222',
- remark: '无',
- updateTime: '2022-03-22 18:09:09',
- username: '超级管理员'
- },
- {
- deviceId: '001',
- parameter: '122222222',
- remark: '无',
- updateTime: '2022-03-22 18:09:09',
- username: '超级管理员'
- },
- {
- deviceId: '001',
- parameter: '122222222',
- remark: '无',
- updateTime: '2022-03-22 18:09:09',
- username: '超级管理员'
- },
- {
- deviceId: '001',
- parameter: '122222222',
- remark: '无',
- updateTime: '2022-03-22 18:09:09',
- username: '超级管理员'
- }
- ],
+ tableData: [],
pager: {
currentPage: 1,
pageSize: 10,
@@ -241,6 +174,7 @@ export default {
if (res.code === 200) {
this.pager.totalPage = JSON.parse(JSON.stringify(res.data.result.totalPage)) * 10
this.tableData = res.data.result.tableData
+ console.log(this.tableData)
}
} catch (err) {
this.$message.error(err.message)
diff --git a/src/views/FacilityManagement/FacilityLists.vue b/src/views/safety/FacilityManagement/FacilityLists.vue
similarity index 84%
rename from src/views/FacilityManagement/FacilityLists.vue
rename to src/views/safety/FacilityManagement/FacilityLists.vue
index f746707b42bb5032da7d66d77bc2df0a5099f4d0..84913c54c9fbce9bf14de7782ef820b545840da6 100644
--- a/src/views/FacilityManagement/FacilityLists.vue
+++ b/src/views/safety/FacilityManagement/FacilityLists.vue
@@ -1,9 +1,11 @@
+
+
+
@@ -28,7 +31,7 @@
-
+
批量编辑
@@ -38,22 +41,32 @@
设备新增
+ 消息广播
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
{{ scope.row.updateTime }}
-
-
+
+
+
删除操作
+
+
+
@@ -157,6 +174,14 @@
:rules="modifyInfoRules"
label-width="100px"
>
+
+
+
-
+
@@ -276,7 +307,13 @@
-
+
@@ -301,7 +338,13 @@
-
+
@@ -324,7 +367,13 @@
-
+
@@ -349,7 +398,13 @@
-
+
@@ -372,7 +427,13 @@
-
+
@@ -397,7 +458,13 @@
-
+
@@ -420,7 +487,13 @@
-
+
@@ -445,12 +518,24 @@
-
+
-
+
@@ -492,12 +577,24 @@
-
+
-
+
@@ -540,12 +637,24 @@
-
+
-
+
@@ -587,12 +696,24 @@
-
+
-
+
@@ -635,7 +756,13 @@
-
+
@@ -735,7 +862,7 @@
v-model="EquipmentOperation.displayMode"
placeholder="显示模式"
style="width: 180px"
- :disabled="isShow"
+ disabled="true"
>
{
+ this.getData() // 加载数据
+ }, 1000 * 60)
+ },
+ // 停止定时器
+ clear() {
+ clearInterval(this.intervalId) // 清除计时器
+ this.intervalId = null // 设置为null
+ },
// 禁用空格
isNull(str) {
if (str === '') return true
@@ -987,16 +1113,7 @@ export default {
var re = new RegExp(regu)
return re.test(str)
},
- add() {
- if (this.isNull(this.searchFrom.searchData)) {
- uni.showToast({
- title: '请输入内容'
- })
- return false
- } else {
- console.log('添加成功')
- }
- },
+
handleClick(tab, event) {
console.log(tab, event)
},
@@ -1007,7 +1124,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(async() => {
- const res = await deleteDevice([row.deviceId])
+ const res = await deleteDevice([row.id])
if (res.code === 200) {
await this.getData()
}
@@ -1026,6 +1143,8 @@ export default {
searchObject: this.searchFrom.searchData
}
const res = await getDeviceData(query)
+ console.log('获取设备中...')
+ console.log(res)
if (res.code === 200) {
this.pager.totalPage = JSON.parse(JSON.stringify(res.data.result.totalPage)) * 10
this.tableData = res.data.result.tableData
@@ -1057,7 +1176,7 @@ export default {
} else {
this.editArray = []
this.multipleSelection.forEach(i => {
- this.editArray.push(i.deviceId)
+ this.editArray.push(i.id)
})
this.titleOfDialog = '批量编辑设备操作'
this.isShow = false
@@ -1075,9 +1194,9 @@ export default {
})
const deleteArray = []
this.multipleSelection.forEach(i => {
- deleteArray.push(i.deviceId)
+ deleteArray.push(i.id)
})
- this.$confirm(`此操作将删除设备${name}，是否继续？`, '删除提示', {
+ this.$confirm(`此操作将删除设备${name}是否继续？`, '删除提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -1130,6 +1249,7 @@ export default {
this.$refs.modifyInfo.validate(async(valid) => {
if (valid) {
try {
+ // 把modifyInfo对象转换成一个query数组
const query = {
...this.modifyInfo
}
@@ -1155,7 +1275,7 @@ export default {
this.isShow = true
this.operationDialogLoading = true
this.operationDialogVisible = true
- const res = await getConfigureByDeviceId(row.deviceId)
+ const res = await getConfigureByDeviceId(row.id)
if (res.passageway1 === undefined && res.overallSensitivity === undefined &&
res.passageway2 === undefined && res.passageway3 === undefined) {
this.$message.info('暂未设置参数')
@@ -1175,8 +1295,8 @@ export default {
this.isShow = false
this.operationDialogLoading = true
this.operationDialogVisible = true
- this.editArray = [row.deviceId]
- this.EquipmentOperation = await getConfigureByDeviceId(row.deviceId)
+ this.editArray = [row.id]
+ this.EquipmentOperation = await getConfigureByDeviceId(row.id)
this.operationDialogLoading = false
},
// 确认编辑设备操作
@@ -1185,7 +1305,7 @@ export default {
if (valid) {
try {
const query = {
- deviceId: this.editArray,
+ id: this.editArray,
staffNumber: JSON.parse(window.localStorage.getItem('staffNumber')),
...this.EquipmentOperation
}
@@ -1202,6 +1322,36 @@ export default {
this.operationDialogVisible = false
this.operationDialogLoading = false
})
+ },
+ async broadcast() {
+ console.log(this.multipleSelection)
+ let ipList = []
+ for (let i = 0; i < this.multipleSelection.length; i++) {
+ ipList.push(this.multipleSelection[i].deviceIp)
+ }
+ let res
+ if (ipList.length > 0) {
+ this.$confirm(`此操作将对选中设备发送广播`, '广播提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(async() => {
+ res = await broadcast(ipList)
+ })
+ .catch(() => {
+ })
+ } else {
+ this.$confirm(`此操作将对全部设备发送广播`, '广播提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(async() => {
+ res = await broadcast(ipList)
+ })
+ .catch(() => {
+ })
+ }
+ console.log(res)
}
}
}
@@ -1216,48 +1366,61 @@ export default {
margin-right: 5px;
margin-top: 5px;
}
+
.close {
background-color: #bfbfbf;
}
+
.abnormal {
background-color: red;
}
+
.operationDialog {
overflow: auto;
@media screen and (max-width: 1448px) {
- max-height: 450px!important;
+ max-height: 450px !important;
}
@media (min-width: 1660px) and (max-width: 1920px) {
- max-height: 600px!important;
+ max-height: 600px !important;
}
+
.el-form-item {
- margin-bottom: 8px!important;
+ margin-bottom: 8px !important;
}
+
.el-form-item__content {
- height: 25px!important;
+ height: 25px !important;
}
}
+
.el-table {
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
width: 8px; /*滚动条宽度*/
height: 8px; /*滚动条高度*/
}
+
/*定义滚动条轨道 内阴影+圆角*/
+
/deep/ .el-table__body-wrapper::-webkit-scrollbar-track {
//box-shadow: 0px 1px 3px #f1f1f1 inset; /*滚动条的背景区域的内阴影*/
border-radius: 10px; /*滚动条的背景区域的圆角*/
background-color: #d1dcff; /*滚动条的背景颜色*/
}
+
/*定义滑块 内阴影+圆角*/
+
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
//box-shadow: 0px 1px 3px #00a0e9 inset; /*滚动条的内阴影*/
border-radius: 10px; /*滚动条的圆角*/
background-color: #4a74ff; /*滚动条的背景颜色*/
}
}
+
/deep/ .el-table__body-wrapper .cell {
- height: 4.5vh;
- line-height:4.5vh;
+ height: 100px;
+}
+/deep/ .el-button+.el-button {
+ margin-left: 0px;
}
diff --git a/src/views/FacilityManagement/OperationLogs.vue b/src/views/safety/FacilityManagement/OperationLogs.vue
similarity index 65%
rename from src/views/FacilityManagement/OperationLogs.vue
rename to src/views/safety/FacilityManagement/OperationLogs.vue
index 6746fed07c52fa223bdf79a6449530d44634cdd8..2dd207589721f5f392f52623b2746cc2fccfdf25 100644
--- a/src/views/FacilityManagement/OperationLogs.vue
+++ b/src/views/safety/FacilityManagement/OperationLogs.vue
@@ -4,14 +4,21 @@
-
-
+
-
+
-
+
+
-
+
操作
@@ -139,7 +146,7 @@
import EmptyCard from '@/components/EmptyCard'
import BreadCrumb from '@/components/BreadCrumb'
// import * as echarts from 'echarts'
-import { getWebSocket } from '../../utils/api'
+import { getWebSocket } from '../../../utils/api'
import RealTimeEcharts from './RealTimeEcharts'
export default {
@@ -152,29 +159,16 @@ export default {
return {
search1: '',
search2: '',
+ search3: '',
theRealTime: {
- theEquipmentId: '',
- thePassedNumber: '',
- thePoliceNumber: '',
- thePoliceRate: ''
+ theEquipmentId: 0,
+ thePassedNumber: 0,
+ thePoliceNumber: 0,
+ thePoliceRate: 0
},
inner: {
title: '实时数据'
},
- // type_options: [
- // {
- // label: '插入',
- // value: 1
- // },
- // {
- // label: '删除',
- // value: 2
- // },
- // {
- // label: '修改',
- // value: 3
- // }
- // ], // 类型选择器
loading: false,
tableData: [],
pager: {
@@ -202,45 +196,53 @@ export default {
return newAreaIdForm // 返回一个新数组
}
},
- watch: {},
+ watch: {
+ tableData() {
+ this.$nextTick(() => {
+ this.$store.state.dataPageData.realTime
+ })
+ }
+ },
created() {
- console.log('###################qqq' + this.search1)
- console.log('###################www' + this.search2)
},
mounted() {
this.getWebSocket()
+ this.isSearch()
+ },
+ beforeDestory() {
},
methods: {
isSearch() {
- if (this.search1 === '' && this.search2 === '') {
- return this.$store.state.dataPageData.realTime
- } else if (this.search1 !== '' && this.search2 === '') {
- return this.$store.state.dataPageData.realTime.filter(data => !this.search1 || data.equipmentId.toLowerCase().includes(this.search1.toLowerCase()))
- } else if (this.search1 === '' && this.search2 !== '') {
- return this.$store.state.dataPageData.realTime.filter(data => !this.search2 || data.areaId.toLowerCase().includes(this.search2.toLowerCase()))
- } else if (this.search1 !== '' && this.search2 !== '') {
- return this.$store.state.dataPageData.realTime.filter(data => (!this.search1 || (data.equipmentId.toLowerCase().includes(this.search1.toLowerCase())) && (!this.search2 || data.areaId.toLowerCase().includes(this.search2.toLowerCase()))))
+ this.tableData = this.$store.state.dataPageData.realTime
+ if (this.search3 !== '') {
+ this.filterByAddress()
+ }
+ if (this.search2 !== '') {
+ this.filterByAreaId()
+ }
+ if (this.search1 !== '') {
+ this.filterById()
}
},
+ filterByAddress() {
+ this.tableData = this.$store.state.dataPageData.realTime.filter(data => !this.search3 || data.address.includes(this.search3))
+ },
+ filterById() {
+ this.tableData = this.$store.state.dataPageData.realTime.filter(data => !this.search1 || data.equipmentId.toLowerCase().includes(this.search1.toLowerCase()))
+ },
+ filterByAreaId() {
+ this.tableData = this.$store.state.dataPageData.realTime.filter(data => !this.search2 || data.areaId.toLowerCase().includes(this.search2.toLowerCase()))
+ },
audit(row) {
this.theRealTime.theEquipmentId = row.equipmentId
this.theRealTime.thePassedNumber = row.passedNumber
this.theRealTime.thePoliceNumber = row.policeNumber
this.theRealTime.thePoliceRate = row.policeRate
+ this.theRealTime.thePoliceAddress = row.address
},
getWebSocket() {
getWebSocket().then()
}
- // // 输入框清空回调
- // inputClear(val) {
- // if (val === '') {
- // this.getData()
- // }
- // },
- // async change(val) {
- // this.pager.currentPage = val
- // await this.getData()
- // }
}
}
@@ -259,4 +261,28 @@ export default {
height: 100%;
}
}
+.main-box{
+ width: 100%;
+ .echarts-container{
+ width: 75%;
+
+ border-radius: 15px;
+
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ align-content: center;
+ justify-content: space-between;
+ }
+ .search-box{
+ width: 100%;
+ height: 100px;
+ display: flex;
+ align-content: center;
+ align-items: center;
+ justify-content: center;
+ }
+}
+
+
diff --git a/src/views/FacilityManagement/RealTimeEcharts.vue b/src/views/safety/FacilityManagement/RealTimeEcharts.vue
similarity index 84%
rename from src/views/FacilityManagement/RealTimeEcharts.vue
rename to src/views/safety/FacilityManagement/RealTimeEcharts.vue
index 3a8a434a7ed1b357e533ef47a074e1fc0c2bcedd..04e0cc02bcfa15b063477551bf36dce3e0c985b2 100644
--- a/src/views/FacilityManagement/RealTimeEcharts.vue
+++ b/src/views/safety/FacilityManagement/RealTimeEcharts.vue
@@ -1,14 +1,15 @@
-
-
-
-
+
+
+
diff --git a/src/views/safety/MainPageComponents/LeftCenter.vue b/src/views/safety/MainPageComponents/LeftCenter.vue
new file mode 100644
index 0000000000000000000000000000000000000000..1f3c82596264c604913facc7251dbad8672487a4
--- /dev/null
+++ b/src/views/safety/MainPageComponents/LeftCenter.vue
@@ -0,0 +1,420 @@
+
+
+
+ 报警Top10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 加载中...
+
+
+ 没有更多了
+
+
+
+
+
+
+ 报警TOP10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 加载中...
+
+
+ 没有更多了
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/safety/MainPageComponents/LeftTop.vue b/src/views/safety/MainPageComponents/LeftTop.vue
new file mode 100644
index 0000000000000000000000000000000000000000..35bdd7da44392006443138d1659d4772e004c22a
--- /dev/null
+++ b/src/views/safety/MainPageComponents/LeftTop.vue
@@ -0,0 +1,264 @@
+
+
+
+
+ 设备概况
+
+
+
+
+
+ 设备概况
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/NewMainPageComponents/LowerLeft.vue b/src/views/safety/MainPageComponents/LowerLeft.vue
similarity index 72%
rename from src/views/NewMainPageComponents/LowerLeft.vue
rename to src/views/safety/MainPageComponents/LowerLeft.vue
index c4196b83ff50c322a0962eb0f0775c6f1927f589..b68de5c6062b99fb7cd7960fa74c27ef59c75b57 100644
--- a/src/views/NewMainPageComponents/LowerLeft.vue
+++ b/src/views/safety/MainPageComponents/LowerLeft.vue
@@ -2,10 +2,10 @@
@@ -26,15 +26,23 @@
diff --git a/src/views/NewMainPageComponents/RightMiddle.vue b/src/views/safety/MainPageComponents/RightMiddle.vue
similarity index 82%
rename from src/views/NewMainPageComponents/RightMiddle.vue
rename to src/views/safety/MainPageComponents/RightMiddle.vue
index 60f9b91c8f02ae8a76b5411f8c550d22a570b6cd..ff401db2985657b4d65e2986a3b206f7efb2125c 100644
--- a/src/views/NewMainPageComponents/RightMiddle.vue
+++ b/src/views/safety/MainPageComponents/RightMiddle.vue
@@ -1,36 +1,37 @@
-
- 数据环比
+
+
数据环比
-
+
-
+
-
-
+
+
报警率
-
-
-
+
+
+
本周期
{{ currentCycle }}
@@ -42,17 +43,17 @@
-
-
+
+
不活跃度
-
-
-
+
+
+
本周期
{{ currentCycleInactivity }}
@@ -76,27 +77,29 @@
报警TOP10
-
+
以天
-
-
+
报警率
-
+
本周期
{{ currentCycle }}
@@ -108,14 +111,15 @@
-
+
不活跃度
-
+
本周期
{{ currentCycleInactivity }}
@@ -133,6 +137,8 @@
diff --git a/src/views/NewMainPageComponents/RightTop.vue b/src/views/safety/MainPageComponents/RightTop.vue
similarity index 76%
rename from src/views/NewMainPageComponents/RightTop.vue
rename to src/views/safety/MainPageComponents/RightTop.vue
index 98c53d7054dea4835739a7cb34c7c531b5b58a6f..a4c238130a94e49ea05dae4ae727e45d5ee2a28f 100644
--- a/src/views/NewMainPageComponents/RightTop.vue
+++ b/src/views/safety/MainPageComponents/RightTop.vue
@@ -1,24 +1,25 @@
+ 
+ 
+ 
+ 
+ 
+ 
+