diff --git a/.env b/.env new file mode 100644 index 0000000..7944d28 --- /dev/null +++ b/.env @@ -0,0 +1 @@ +VUE_APP_OSS = http://50.146.63.224:8118 \ No newline at end of file diff --git a/src/api/hunting/home.js b/src/api/hunting/home.js index c99292d..40e0509 100644 --- a/src/api/hunting/home.js +++ b/src/api/hunting/home.js @@ -1,6 +1,4 @@ import request from '@/utils/request' -export const getResources = () => - request.post('/base/poaching/overviewResources') -export const getStatistics = () => - request.post('/base/poaching/personnelStatistics') +export const getResources = () => request.post('/base/poaching/overviewResources') +export const getStatistics = () => request.post('/base/poaching/personnelStatistics') diff --git a/src/api/hunting/hunter.js b/src/api/hunting/hunter.js index 1eac79c..8a4ee27 100644 --- a/src/api/hunting/hunter.js +++ b/src/api/hunting/hunter.js @@ -1,3 +1,3 @@ import request from '@/utils/request' -export const listHunter = (params) => request.get('/base/transitHuntersUserRecord', { params }) +export const listHunter = (params) => request.get('/base/transitHuntersUserModelRecord', { params }) diff --git a/src/api/hunting/user.js b/src/api/hunting/user.js index 55f56f5..277584c 100644 --- a/src/api/hunting/user.js +++ b/src/api/hunting/user.js @@ -1,6 +1,14 @@ import request from '@/utils/request' -export const listUser = (params) => request.get('/base/metaHuntersInfo', { params }) +export const listUser = (params) => + request.get('/base/metaHuntersInfo', { params }) export const addUser = (data) => request.post('/base/metaHuntersInfo', data) export const editUser = (data) => request.put('/base/metaHuntersInfo', data) -export const delUser = (idList) => request.delete('/base/metaHuntersInfo', { params: { idList: idList.join(',') } }) +export const delUser = (idList) => + request.delete('/base/metaHuntersInfo', { + params: { idList: idList.join(',') } + }) +export const getUserType = () => + request.get('/system/dict/data/list', { + params: { dictType: 'hunters_user_type' } + }) diff --git a/src/api/sensingDevice/resource/index.js b/src/api/sensingDevice/resource/index.js index f343d71..0aca49f 100644 --- a/src/api/sensingDevice/resource/index.js +++ b/src/api/sensingDevice/resource/index.js @@ -15,16 +15,6 @@ export function transitVehicleRecord(params) { params }) } - -// * 重点人车辆记录表 -export function getTransitImpVehicleAPI(params) { - return request({ - url: '/base/transitImpVehicleRecord', - method: 'get', - params - }) -} - //人车数量 export function humanVehicleStatistics(params) { return request({ diff --git a/src/assets/building-picture-hza/bg_瀵艰埅@2x.png b/src/assets/building-picture-hza/bg_瀵艰埅@2x.png new file mode 100644 index 0000000..58b7f72 Binary files /dev/null and b/src/assets/building-picture-hza/bg_瀵艰埅@2x.png differ diff --git a/src/assets/building-picture-hza/搴曞骇@2x.png b/src/assets/building-picture-hza/搴曞骇@2x.png new file mode 100644 index 0000000..da71233 Binary files /dev/null and b/src/assets/building-picture-hza/搴曞骇@2x.png differ diff --git a/src/assets/hunting/control.png b/src/assets/hunting/control.png new file mode 100644 index 0000000..a086e35 Binary files /dev/null and b/src/assets/hunting/control.png differ diff --git a/src/assets/hunting/user-default.png b/src/assets/hunting/user-default.png new file mode 100644 index 0000000..ea083e5 Binary files /dev/null and b/src/assets/hunting/user-default.png differ diff --git a/src/assets/hunting/warning.png b/src/assets/hunting/warning.png new file mode 100644 index 0000000..6fa1b6c Binary files /dev/null and b/src/assets/hunting/warning.png differ diff --git a/src/assets/picture/bg_淇℃伅@2x.png b/src/assets/picture/bg_淇℃伅@2x.png new file mode 100644 index 0000000..8074ec4 Binary files /dev/null and b/src/assets/picture/bg_淇℃伅@2x.png differ diff --git a/src/components/button/ImgButton.vue b/src/components/button/ImgButton.vue index 8e69f26..fdd2b64 100644 --- a/src/components/button/ImgButton.vue +++ b/src/components/button/ImgButton.vue @@ -29,7 +29,12 @@ export default { border: 1px solid rgba(54, 181, 255, 1); &.img-button_light { - background: linear-gradient(270deg, rgba(0, 142, 224, 0) 0%, #008ee0 49%, rgba(0, 142, 224, 0) 100%); + background: linear-gradient( + 270deg, + rgba(0, 142, 224, 0) 0%, + #008ee0 49%, + rgba(0, 142, 224, 0) 100% + ); } } diff --git a/src/components/card/index.vue b/src/components/card/index.vue index 26d2b84..ad87ef8 100644 --- a/src/components/card/index.vue +++ b/src/components/card/index.vue @@ -13,7 +13,7 @@ export default { }, methods: { handleClose() { - this.back && this.$router.push(this.back) + this.back ? this.$router.push(this.back) : this.$router.back() } } } diff --git a/src/components/img/OssImg.vue b/src/components/img/OssImg.vue index c9f4ecc..295e55e 100644 --- a/src/components/img/OssImg.vue +++ b/src/components/img/OssImg.vue @@ -9,8 +9,7 @@ export default { }, data() { return { - // oss: process.env.VUE_APP_OSS - oss: 'http://50.146.63.224:8118' + oss: process.env.VUE_APP_OSS } } } diff --git a/src/router/index.js b/src/router/index.js index ff170f9..a937609 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -52,6 +52,34 @@ const routes = [ // } ] }, + { + path: '/hunting', + name: 'hunting', + redirect: { name: 'huntingHome' }, + component: () => import('@/views/Layout/index.vue'), + children: [ + { + path: '', + name: 'huntingHome', + component: () => import('@/views/hunting/home/index.vue') + }, + { + path: 'control', + name: 'huntingControl', + component: () => import('@/views/hunting/control/index.vue') + }, + { + path: 'warning', + name: 'huntingWarning', + component: () => import('@/views/hunting/warning/index.vue') + }, + { + path: 'hunter', + name: 'huntingHunter', + component: () => import('@/views/hunting/hunter/index.vue') + } + ] + }, { path: '/hunting', name: 'hunting', diff --git a/src/views/coastalMap/components/actualBuilding.vue b/src/views/coastalMap/components/actualBuilding.vue index 8d66798..7a6dd7d 100644 --- a/src/views/coastalMap/components/actualBuilding.vue +++ b/src/views/coastalMap/components/actualBuilding.vue @@ -57,7 +57,7 @@ export default { }, created() {}, methods: { - + } } diff --git a/src/views/coastalMap/index.vue b/src/views/coastalMap/index.vue index 1377c93..086465c 100644 --- a/src/views/coastalMap/index.vue +++ b/src/views/coastalMap/index.vue @@ -26,6 +26,7 @@ +
- +
-
- +
+ +
@@ -18,17 +16,12 @@
证件号码
-
- {{ item.idCard }} -
+
{{ item.idCard }}
-
涉案类型
-
{{ item.caseSituation }}
+
人员类型
+
{{ item.huntersUserTypeCn }}
@@ -83,19 +76,9 @@ export default { grid-template-rows: min-content; grid-gap: 10px; .card-item { - background: linear-gradient( - 180deg, - rgba(0, 97, 224, 0.3) 0%, - rgba(0, 71, 224, 0) 49%, - rgba(0, 97, 224, 0.25) 100% - ); + background: linear-gradient(180deg, rgba(0, 97, 224, 0.3) 0%, rgba(0, 71, 224, 0) 49%, rgba(0, 97, 224, 0.25) 100%); border: 1px solid; - border-image: linear-gradient( - 153deg, - rgba(127, 207, 244, 1), - rgba(48, 184, 246, 0.7) - ) - 1 1; + border-image: linear-gradient(153deg, rgba(127, 207, 244, 1), rgba(48, 184, 246, 0.7)) 1 1; backdrop-filter: blur(3px); position: relative; padding: 1vh 0.5vw; diff --git a/src/views/hunting/home/components/keyPerson.vue b/src/views/hunting/home/components/keyPerson.vue index 9a94bbe..4bc39b2 100644 --- a/src/views/hunting/home/components/keyPerson.vue +++ b/src/views/hunting/home/components/keyPerson.vue @@ -15,7 +15,7 @@
非法狩猎人员
-
{{ importpeople.ffslryCount }}
+
{{ importpeople.count }}
@@ -27,8 +27,8 @@
-
{{ item.name }}
-
{{ item.value }}
+
{{ item.name }}
+
{{ item.percentage }}
@@ -38,12 +38,21 @@
  • - + +
    -
    非法狩猎
    +
    + {{ item.huntersUserTypeCn }} +
    +
    + {{ item.huntersUserTypeCn }} +
    +
    + {{ item.huntersUserTypeCn }} +
    人员姓名 :
    @@ -53,7 +62,7 @@
    现住地址 :
    -
    {{ item.userName }}
    +
    {{ item.hunterName }}
    {{ item.phone }}
    {{ item.idCard }} @@ -99,7 +108,7 @@ export default { }, mounted() { this.init_charts() - this.timer = setInterval(this.scrollAnimate, 1500) + this.timer = setInterval(this.scrollAnimate, 5000) }, created() { this.onkeyPersonnelAPI() @@ -116,12 +125,10 @@ export default { }) const data = [] - const count = this.importpeople.ffslryCount for (let key in this.importpeople) { - if (key != 'ffslryCount') { - for (let name in this.importpeople[key]) { - data.push({ value: Math.round((count * parseInt(this.importpeople[key][name])) / 100), name: key }) - } + if (key != 'count') { + const item = this.importpeople[key] + data.push(item) } } this.seriesData = data @@ -376,13 +383,13 @@ export default { display: flex; .person_type { position: absolute; - width: 3vw; - height: 2vh; + width: 5vw; top: 0px; right: 0px; color: #061122; text-align: center; - line-height: 2vh; + white-space: normal; + font-size: 10px; } .one_type { background: #ffc426; diff --git a/src/views/hunting/home/components/vehicle.vue b/src/views/hunting/home/components/vehicle.vue index 2d5c709..80a179a 100644 --- a/src/views/hunting/home/components/vehicle.vue +++ b/src/views/hunting/home/components/vehicle.vue @@ -14,7 +14,7 @@
  • - +
    @@ -46,7 +46,7 @@
    {{ item.passTime }}
    -
    {{ item.duration }}
    +
    {{ item.residenceTime }}
    {{ item.deviceAddress }}
    diff --git a/src/views/hunting/home/components/warning.vue b/src/views/hunting/home/components/warning.vue index 0e5e0eb..dd1d09e 100644 --- a/src/views/hunting/home/components/warning.vue +++ b/src/views/hunting/home/components/warning.vue @@ -14,29 +14,40 @@
  • - + +
    + +
    + {{ item.huntersUserTypeCn }} +
    +
    + {{ item.huntersUserTypeCn }} +
    +
    + {{ item.huntersUserTypeCn }} +
    人员姓名 :
    证件号码 :
    -
    抓拍时间 :
    -
    滞留时间 :
    -
    抓拍地址 :
    +
    预警时间 :
    +
    预警级别 :
    +
    滞留时长 :
    -
    {{ item.userName }}
    -
    {{ item.idCard }}
    +
    {{ item.huntersUserName }}
    +
    {{ item.huntersUserIdCard }}
    - {{ item.passTime }} + {{ item.warningTime }}
    - {{ item.duration }} + {{ item.warningLevelCn }}
    -
    - {{ item.deviceAddress }} +
    + {{ item.residenceTime }}
    @@ -65,7 +76,7 @@ export default { } }, mounted() { - this.timer = setInterval(this.scrollAnimate, 1500) + this.timer = setInterval(this.scrollAnimate, 3000) }, created() { this.onkeyPersonnelAPI() @@ -272,13 +283,13 @@ export default { display: flex; .person_type { position: absolute; - width: 3vw; - height: 2vh; + width: 5vw; top: 0px; right: 0px; color: #061122; text-align: center; - line-height: 2vh; + white-space:normal; + font-size: 10px; } .one_type { background: #ffc426; diff --git a/src/views/hunting/home/index.vue b/src/views/hunting/home/index.vue index e8e8a22..d81b7ee 100644 --- a/src/views/hunting/home/index.vue +++ b/src/views/hunting/home/index.vue @@ -20,13 +20,19 @@
    -
    +
    + +
    -
    人员管控
    +
    + +
    -
    人员预警
    +
    + +
    @@ -340,7 +346,7 @@ export default { .item_check_back { width: 5.5vw; height: 5.5vw; - background-image: url('@/assets/picture/under_button.png'); + background-image: url('@/assets/hunting/dizuo.png'); background-repeat: no-repeat; background-size: 100% 100%; font-size: 1.2rem; @@ -356,7 +362,6 @@ export default { color: #00f5ff; // * 强行增亮 filter: brightness(140%); - background-size: 100% auto; } } } diff --git a/src/views/hunting/hunter/index.vue b/src/views/hunting/hunter/index.vue index 9f62e38..efe0dff 100644 --- a/src/views/hunting/hunter/index.vue +++ b/src/views/hunting/hunter/index.vue @@ -1,9 +1,10 @@ @@ -104,14 +106,16 @@ import ImgButton from '@/components/button/ImgButton.vue' import Pagination from '@/components/pagination' import { listVehicle } from '@/api/hunting/vehicle' import { listHunter } from '@/api/hunting/hunter' -import Detail from './Detail.vue' +import VehicleDetail from './VehicleDetail.vue' +import UserDetail from './UserDetail.vue' export default { name: 'HuntingWarning', components: { Card, ImgButton, Pagination, - Detail + VehicleDetail, + UserDetail }, data() { return { @@ -161,36 +165,7 @@ export default { }, handleDetail(row) { this.dialogVisible = true - if (this.listType == 0) { - this.detail = { - pic: row.globalPic, - albums: [row.platePic], - columns: [ - { label: '姓名', content: row.userName }, - { label: '证件号码', content: row.idCard }, - { label: '联系方式', content: row.phone }, - { label: '抓拍时间', content: row.passTime }, - { label: '经过位置', content: row.deviceAddress }, - { label: '经度', content: row.longitude }, - { label: '纬度', content: row.latitude } - ] - } - } else { - this.detail = { - pic: row.globalPic, - columns: [ - { label: '车牌号码', content: row.plateNo }, - { label: '姓名', content: row.ownerName }, - { label: '证件号码', content: row.idCard }, - { label: '联系方式', content: row.phone }, - { label: '过车时间', content: row.passTime }, - { label: '经过位置', content: row.deviceAddress }, - { label: '经度', content: row.longitude }, - { label: '纬度', content: row.latitude } - ] - } - } - console.log(row) + this.detail = row }, toDetail(idCard) { this.$router.push({ name: 'huntingHunter', query: { idCard } }) diff --git a/src/views/sensingDevice/components/mancarStatistics.vue b/src/views/sensingDevice/components/mancarStatistics.vue index a4a0180..4a948b6 100644 --- a/src/views/sensingDevice/components/mancarStatistics.vue +++ b/src/views/sensingDevice/components/mancarStatistics.vue @@ -20,11 +20,17 @@