From fdaae172a19591088c1e21238da6fe638411417b Mon Sep 17 00:00:00 2001 From: xuhaoyun Date: Mon, 8 May 2023 11:05:29 +0800 Subject: [PATCH] 0506 --- src/App.vue | 12 + src/api/archives/index.js | 34 ++- src/utils/request.js | 4 +- src/views/archives/index.vue | 27 +- src/views/archives/kakou.vue | 17 +- src/views/archives/liudongrenyuan.vue | 387 +++++++++++++++++++++++++ src/views/archives/monitor.vue | 2 +- src/views/archives/qiyeyuangong.vue | 394 ++++++++++++++++++++++++++ src/views/archives/wupin.vue | 10 +- src/views/archives/yujing.vue | 2 +- src/views/head.vue | 2 +- 11 files changed, 866 insertions(+), 25 deletions(-) create mode 100644 src/views/archives/liudongrenyuan.vue create mode 100644 src/views/archives/qiyeyuangong.vue diff --git a/src/App.vue b/src/App.vue index 36c1f6c..37b3b45 100644 --- a/src/App.vue +++ b/src/App.vue @@ -133,4 +133,16 @@ // border: 0; // } } + +.search { + position: absolute; + right: 20px; + top: 20px; + display: flex; + +} + +.el-menu .is-active { + border: 0 !important; +} diff --git a/src/api/archives/index.js b/src/api/archives/index.js index 013b5f0..84b6828 100644 --- a/src/api/archives/index.js +++ b/src/api/archives/index.js @@ -39,6 +39,38 @@ export function warningDisposal(params) { params }) } +//各类企业员工数量 +export function tbSafeCompanyStaffCount(params) { + return request({ + url: '/safety/enterpriseArchives/tbSafeCompanyStaff/count', + method: 'get', + params + }) +} +//企业员工 +export function tbSafeCompanyStaff(params) { + return request({ + url: '/safety/enterpriseArchives/tbSafeCompanyStaff', + method: 'get', + params + }) +} +//各类流动人员数量 +export function tbSafeCompanyFlowCount(params) { + return request({ + url: '/safety/enterpriseArchives/tbSafeCompanyFlow/count', + method: 'get', + params + }) +} +//流动人员 +export function tbSafeCompanyFlow(params) { + return request({ + url: '/safety/enterpriseArchives/tbSafeCompanyFlow', + method: 'get', + params + }) +} //车辆 export function tbSafeCompanyVehicle(params) { return request({ @@ -50,7 +82,7 @@ export function tbSafeCompanyVehicle(params) { //各个物品总数 export function TbSafeCompanyGoodsCount(params) { return request({ - url: 'safety/enterpriseArchives/TbSafeCompanyGoods/count', + url: '/safety/enterpriseArchives/TbSafeCompanyGoods/count', method: 'get', params }) diff --git a/src/utils/request.js b/src/utils/request.js index 030db14..17da0e6 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,8 +4,8 @@ import vm from "../main"; import { getToken } from '@/utils/auth' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const request = axios.create({ - baseURL: 'http://172.18.113.50:8080/zhapi', - //baseURL: `http://${window.location.host}/zhapi`, + //baseURL: 'http://172.18.113.50:8080/zhapi', + baseURL: `http://${window.location.host}/zhapi`, timeout: 50000, headers: { 'content-type': 'application/json' }, }) diff --git a/src/views/archives/index.vue b/src/views/archives/index.vue index d751cda..0a98495 100644 --- a/src/views/archives/index.vue +++ b/src/views/archives/index.vue @@ -18,7 +18,7 @@ 实时监控 - 实时卡口流量 + 人车流量 实时预警 @@ -29,8 +29,8 @@ 企业员工 - 流动人口 - 访客 + 流动人员 + 企业访客 @@ -164,7 +164,7 @@
{{ companyData.companyAddress }}
-
+
营业执照经营范围
{{ companyData.businessScope }}
@@ -183,6 +183,8 @@ + + @@ -200,6 +202,8 @@ import yujing from './yujing.vue' import car from './car.vue' import wupin from './wupin.vue' import anjian from './anjian.vue' +import qiyeyuangong from './qiyeyuangong.vue' +// import liudongrenyuan from './liudongrenyuan.vue' export default { components: { monitor, @@ -207,7 +211,9 @@ export default { yujing, car, wupin, - anjian + anjian, + qiyeyuangong, + //liudongrenyuan }, data() { return { @@ -536,17 +542,17 @@ export default { .jibenRight { margin-left: 20px; width: calc(100% - 366px); - height: 370px; + height: 369px; border: 1px solid rgba(91, 116, 140, 0.6); - border-bottom: 0; + .jibenhang { - height: 40px; + height: 41px; width: 100%; display: flex; border-bottom: 1px solid rgba(91, 116, 140, 0.6); - + box-sizing: border-box; .jibenhangTitle { box-sizing: border-box; @@ -666,6 +672,9 @@ export default { } } + .jibenhang1 { + border-bottom: 0; + } } .bottomZS { diff --git a/src/views/archives/kakou.vue b/src/views/archives/kakou.vue index ef2491d..8aa150d 100644 --- a/src/views/archives/kakou.vue +++ b/src/views/archives/kakou.vue @@ -2,7 +2,7 @@
- 实时卡口流量({{ total }}) + 人车流量({{ total }}
@@ -25,7 +25,8 @@
人脸
-
+
@@ -76,7 +77,8 @@
车辆
-
+
@@ -532,9 +534,14 @@ export default { } } + .imgListItem:focus { + filter: brightness(150%); + } + + + .imgListItemFocus { - background: url("~@/assets/archives/矩形备份%2036.png") no-repeat; - background-size: 100% 100%; + filter: brightness(150%); } } diff --git a/src/views/archives/liudongrenyuan.vue b/src/views/archives/liudongrenyuan.vue new file mode 100644 index 0000000..7410d64 --- /dev/null +++ b/src/views/archives/liudongrenyuan.vue @@ -0,0 +1,387 @@ + + + \ No newline at end of file diff --git a/src/views/archives/monitor.vue b/src/views/archives/monitor.vue index 0c0d608..e062df4 100644 --- a/src/views/archives/monitor.vue +++ b/src/views/archives/monitor.vue @@ -40,7 +40,7 @@
  {{ item.channelName }}
+ class="el-icon-location outline1" v-else>  {{ item.deviceName }}
diff --git a/src/views/archives/qiyeyuangong.vue b/src/views/archives/qiyeyuangong.vue new file mode 100644 index 0000000..51a05ba --- /dev/null +++ b/src/views/archives/qiyeyuangong.vue @@ -0,0 +1,394 @@ + + + + \ No newline at end of file diff --git a/src/views/archives/wupin.vue b/src/views/archives/wupin.vue index 7b7d366..c542730 100644 --- a/src/views/archives/wupin.vue +++ b/src/views/archives/wupin.vue @@ -24,17 +24,17 @@ - + - + - + - + - +