diff --git a/src/api/safetyIndex/index.js b/src/api/safetyIndex/index.js
index 779a529..3d028ab 100644
--- a/src/api/safetyIndex/index.js
+++ b/src/api/safetyIndex/index.js
@@ -49,21 +49,21 @@ export function flowDetail(params) {
})
}
//企业今日进园区
-export function vehicleIn(params) {
+export function vehicleIn(data) {
return request({
- url: '/safety/index/vehicle/in',
+ url: '/safety/tbParkVehicleRecord/list',
method: 'post',
- params
- })
-}
-//企业今日出园区
-export function vehicleOut(params) {
- return request({
- url: '/safety/index/vehicle/out',
- method: 'post',
- params
+ data
})
}
+// //企业今日出园区
+// export function vehicleOut(params) {
+// return request({
+// url: '/safety/index/vehicle/out',
+// method: 'post',
+// params
+// })
+// }
//企业车辆使用方式
export function vehicleUserType(params) {
return request({
diff --git a/src/assets/realtimeWarning/消息.png b/src/assets/realtimeWarning/消息.png
index 284a2a3..f7f76ef 100644
Binary files a/src/assets/realtimeWarning/消息.png and b/src/assets/realtimeWarning/消息.png differ
diff --git a/src/components/offLineMap/index.vue b/src/components/offLineMap/index.vue
index 97944d0..559da43 100644
--- a/src/components/offLineMap/index.vue
+++ b/src/components/offLineMap/index.vue
@@ -19,7 +19,8 @@ export default {
villageList: [],
villageSumList: [],
flag: true,
- companyList: []
+ companyList: [],
+ label1: {}
}
},
mounted() {
@@ -180,9 +181,10 @@ export default {
label.setStyle({ backgroundColor: ' rgba(0, 0, 0, 0)', border: '0', color: '#0060ce', fontSize: '16px' })
map.addOverlay(label);
marker.addEventListener("click", function () {
+ map.removeOverlay(that.label1);
topMapOne({ companyId: item.companyId, companyName: item.companyName }).then(res => {
- var label = new BMap.Label();
- label.setStyle({
+ that.label1 = new BMap.Label();
+ that.label1.setStyle({
color: 'blue',
borderRadius: '5px',
borderColor: '#ccc',
@@ -192,10 +194,10 @@ export default {
transform: 'translateX(-50%) translateY(calc(-100% - 10px))'
});
- label.setPosition(new BMap.Point(item.longitude, item.latitude));
- label.setOffset(new BMap.Size(130, -10))
- label.setStyle({ width: '372px', height: '242px', background: 'url(pbImg/bz49.png) no-repeat', backgroundSize: '100% 100%', border: '0', color: '#fff', padding: '13px 20px' })
- label.setContent(`
+ that.label1.setPosition(new BMap.Point(item.longitude, item.latitude));
+ that.label1.setOffset(new BMap.Size(130, -10))
+ that.label1.setStyle({ width: '372px', height: '242px', background: 'url(pbImg/bz49.png) no-repeat', backgroundSize: '100% 100%', border: '0', color: '#fff', padding: '13px 20px' })
+ that.label1.setContent(`
${res.data.companyName}
企业看板
@@ -243,17 +245,17 @@ export default {
`);
- map.addOverlay(label);
+ map.addOverlay(that.label1);
let closebtn = document.querySelector('.closeBtn')
let closeBtn1 = document.querySelector('.closeBtn1')
closeBtn1.addEventListener('click', () => {
- map.removeOverlay(label);
+ map.removeOverlay(that.label1);
})
//console.log(btn, 'btn');
closebtn.addEventListener('click', () => {
that.$emit('toArchives', item)
- map.removeOverlay(label);
+ map.removeOverlay(that.label1);
})
})
});
diff --git a/src/views/companyCanban/fanggopngji.vue b/src/views/companyCanban/fanggopngji.vue
index e6f9616..b7593d1 100644
--- a/src/views/companyCanban/fanggopngji.vue
+++ b/src/views/companyCanban/fanggopngji.vue
@@ -32,7 +32,6 @@
-
@@ -52,14 +51,7 @@
{{ staffStatisticsList[3].levelIndexTwo }}
-
-
+
{{ staffStatisticsList[3].sumNumValue }}
diff --git a/src/views/enterpriseRank/index.vue b/src/views/enterpriseRank/index.vue
index 40bb74d..2bc2d8d 100644
--- a/src/views/enterpriseRank/index.vue
+++ b/src/views/enterpriseRank/index.vue
@@ -28,21 +28,21 @@
-
+
{{ scope.row.ymjz || 0 }}
-
+
{{ scope.row.hsjc || 0 }}
-
+
{{ scope.row.csm || 0 }}
@@ -58,7 +58,7 @@
-
+
{{ scope.row.ldrr || 0 }}
@@ -72,14 +72,14 @@
-
+
{{ scope.row.zdgw || 0 }}
-
+
{{ scope.row.zjrr || 0 }}
@@ -126,28 +126,28 @@
-
+
{{ scope.row.xfss || 0 }}
-
+
{{ scope.row.xfzd || 0 }}
-
+
{{ scope.row.qytz || 0 }}
-
+
{{ scope.row.xfsj || 0 }}
@@ -156,21 +156,21 @@
-
+
{{ scope.row.fsy || 0 }}
-
+
{{ scope.row.whp || 0 }}
-
+
{{ scope.row.myqz || 0 }}
@@ -186,7 +186,7 @@
-
+
{{ scope.row.bmjc || 0 }}
@@ -257,7 +257,7 @@
-
+
{{ scope.row.yxpx || 0 }}
@@ -266,28 +266,28 @@
-
+
{{ scope.row.qyrf || 0 }}
-
+
{{ scope.row.qyjf || 0 }}
-
+
{{ scope.row.qywf || 0 }}
-
+
{{ scope.row.qyzz || 0 }}
diff --git a/src/views/factorResources/index.vue b/src/views/factorResources/index.vue
index c2e9808..98f28ea 100644
--- a/src/views/factorResources/index.vue
+++ b/src/views/factorResources/index.vue
@@ -135,6 +135,7 @@ export default {
},
reset() {
+ this.formInline = {}
this.getList()
},
showCompanyData(val) {
diff --git a/src/views/realtimeWarning/index.vue b/src/views/realtimeWarning/index.vue
index d7e0957..a4de4ae 100644
--- a/src/views/realtimeWarning/index.vue
+++ b/src/views/realtimeWarning/index.vue
@@ -3,12 +3,23 @@
实时预警
+
实时预警根据平安指数配置的预警规则,辖区内的企业达到预警分值后产生即时预警
预警列表
( {{ total }} )
+
+
+
+
+
+ 搜索
+
+
@@ -22,8 +33,15 @@
- 一级指标:
{{ item.levelIndexOne }} 预警指标:
“{{ item.levelIndexThree }}”异常
+
一级指标:{{ item.levelIndexOne
+ }}
+
+
预警指标:
+
+ “{{ item.levelIndexThree
+ }}”异常
+
+
预警时间:{{ item.alarmTime }}
@@ -66,7 +84,6 @@ export default {
},
data() {
return {
-
waringList: [],
diaVisible: false,
checkedDepts: [],
@@ -75,6 +92,7 @@ export default {
pageSize: 10,
pageNum: 1,
total: 0,
+ formInline: {},
}
},
created() {
@@ -82,7 +100,7 @@ export default {
},
methods: {
getList() {
- mapList({ pageSize: this.pageSize, pageNum: this.pageNum }).then(res => {
+ mapList({ pageSize: this.pageSize, pageNum: this.pageNum, ...this.formInline }).then(res => {
this.waringList = res.data
this.total = res.total
})
@@ -162,6 +180,31 @@ export default {
background: url('~@/assets/realtimeWarning/矩形备份 289981.png') no-repeat;
background-size: 100% 100%;
padding: 20px;
+ position: relative;
+
+ .shuoming {
+ position: absolute;
+ top: 20px;
+ left: 20px;
+ height: 40px;
+ width: calc(100% - 40px);
+ background: rgba(15, 17, 19, 0.40);
+ z-index: 999999999;
+ padding: 0 10px;
+ display: flex;
+ align-items: center;
+ font-size: 14px;
+ color: rgba(255, 255, 255, 0.7);
+ letter-spacing: 1px;
+ font-weight: 400;
+
+ img {
+
+ width: 20px;
+ height: 20px;
+ }
+
+ }
.map {
height: 100%;
@@ -190,11 +233,90 @@ export default {
font-size: 16px;
color: #EBFFF4;
letter-spacing: 2px;
-
+ width: 120px;
text-shadow: 0 0 9px rgba(21, 255, 195, 0.60);
font-weight: 400;
}
+ .searchBox {
+ height: 40px;
+ width: 320px;
+ display: flex;
+ box-sizing: border-box;
+ align-items: center;
+
+ .search {
+ height: 35px;
+ box-sizing: border-box;
+ margin-top: -5px;
+ }
+
+ /deep/.el-input__inner {
+ // background: url('~@/assets/companyFile/2121.png') no-repeat;
+ background: #3B4450;
+ border: 1px solid #5B748C;
+ color: rgba(234, 246, 255, 0.7);
+ height: 35px;
+
+ .el-range-separator {
+ color: #ccc;
+ }
+
+ .el-range-input {
+ background: rgba(0, 0, 0, 0);
+ color: #ccc;
+ }
+ }
+
+ /deep/.el-form-item {
+
+ margin: 0;
+
+ .el-form-item__content {
+ line-height: 35px;
+ }
+
+ .el-form-item__label {
+ color: #EAF6FF;
+ letter-spacing: 1px;
+ text-align: center;
+ font-weight: 400;
+ }
+
+ }
+
+ /deep/.el-button--primary {
+ width: 60px;
+ height: 35px;
+ line-height: 30px;
+ padding: 0;
+ text-align: center;
+ background: rgba(0, 0, 0, 0);
+ border: 0;
+ background: url('~@/assets/companyFile/2121.png') no-repeat;
+ background-size: 100% 100%;
+ font-size: 14px;
+ color: #F8FBFF;
+ letter-spacing: 0.89px;
+ font-weight: 500;
+ }
+
+ /deep/.el-button--default {
+ width: 60px;
+ height: 35px;
+ line-height: 30px;
+ padding: 0;
+ text-align: center;
+ background: #3B4450;
+ border: 0;
+
+ font-size: 14px;
+ color: #F8FBFF;
+ letter-spacing: 0.89px;
+ font-weight: 500;
+ }
+ }
+
.redText {
font-size: 16px;
color: #FF9191;
@@ -360,6 +482,32 @@ export default {
white-space: nowrap;
text-overflow: ellipsis;
+ .topItem {
+ display: flex;
+ align-items: center;
+ width: 50%;
+ height: 100%;
+ font-size: 14px;
+ color: rgba(255, 255, 255, 0.8);
+ letter-spacing: 0;
+ font-weight: 400;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+
+ span {
+
+ width: 70px;
+ }
+
+ .numValue {
+ width: calc(100% - 70px);
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ }
+
.numValue {
font-size: 14px;
color: #FFFFFF;
diff --git a/src/views/safetyIndex/cheliang.vue b/src/views/safetyIndex/cheliang.vue
index 4dcb45b..65ee198 100644
--- a/src/views/safetyIndex/cheliang.vue
+++ b/src/views/safetyIndex/cheliang.vue
@@ -78,7 +78,7 @@