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..2742e2d 100644 --- a/src/api/hunting/user.js +++ b/src/api/hunting/user.js @@ -4,3 +4,4 @@ export const listUser = (params) => request.get('/base/metaHuntersInfo', { param 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 getUserType = () => request.get('/system/dict/data/list', { params: { dictType: 'hunters_user_type' } }) diff --git a/src/assets/components/popup-bg.png b/src/assets/components/popup-bg.png index 66838d8..fe7b184 100644 Binary files a/src/assets/components/popup-bg.png and b/src/assets/components/popup-bg.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/components/card/index.vue b/src/components/card/index.vue index 6bbefc3..08f4dea 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/views/hunting/control/components/CardTable.vue b/src/views/hunting/control/components/CardTable.vue index 53fc280..2028dcc 100644 --- a/src/views/hunting/control/components/CardTable.vue +++ b/src/views/hunting/control/components/CardTable.vue @@ -3,8 +3,9 @@
-
- +
+ +
@@ -19,8 +20,8 @@
-
涉案类型
-
{{ item.caseSituation }}
+
人员类型
+
{{ item.huntersUserTypeCn }}
diff --git a/src/views/hunting/control/index.vue b/src/views/hunting/control/index.vue index 088fbff..66673ca 100644 --- a/src/views/hunting/control/index.vue +++ b/src/views/hunting/control/index.vue @@ -7,8 +7,10 @@ - - + + + + @@ -60,7 +63,7 @@
{{ scope.row.idCard }}
- + @@ -78,7 +81,7 @@ import ImgButton from '@/components/button/ImgButton.vue' import Pagination from '@/components/pagination' import OssImg from '@/components/img/OssImg.vue' import CardTable from './components/CardTable.vue' -import { listUser } from '@/api/hunting/user' +import { listUser, getUserType } from '@/api/hunting/user' export default { name: 'HuntingControl', components: { @@ -97,11 +100,13 @@ export default { total: 0, selections: [], listType: 1, - dateTimeRange: [] + dateTimeRange: [], + userTypeOptions: [] } }, created() { this.handleQuery({ pageSize: 8, pageNum: 1 }) + this.queryUserTypeOptions() }, mounted() {}, methods: { @@ -118,6 +123,10 @@ export default { this.total = res.total this.rows = res.rows }, + async queryUserTypeOptions() { + const res = await getUserType() + this.userTypeOptions = res.rows + }, handleReset() { this.dateTimeRange = [] for (let key in this.form) { 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..b332793 100644 --- a/src/views/hunting/home/components/vehicle.vue +++ b/src/views/hunting/home/components/vehicle.vue @@ -14,7 +14,7 @@
  • - +
    diff --git a/src/views/hunting/home/components/warning.vue b/src/views/hunting/home/components/warning.vue index 0e5e0eb..32e3a38 100644 --- a/src/views/hunting/home/components/warning.vue +++ b/src/views/hunting/home/components/warning.vue @@ -14,26 +14,37 @@
  • - + +
    + +
    + {{ item.huntersUserTypeCn }} +
    +
    + {{ item.huntersUserTypeCn }} +
    +
    + {{ item.huntersUserTypeCn }} +
    人员姓名 :
    证件号码 :
    -
    抓拍时间 :
    -
    滞留时间 :
    -
    抓拍地址 :
    +
    预警时间 :
    +
    预警级别 :
    +
    滞留时长 :
    -
    {{ item.userName }}
    -
    {{ item.idCard }}
    +
    {{ item.huntersUserName }}
    +
    {{ item.huntersUserIdCard }}
    - {{ item.passTime }} + {{ item.warningTime }}
    - {{ item.duration }} + {{ item.warningLevelCn }}
    {{ item.deviceAddress }} @@ -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/hunter/index.vue b/src/views/hunting/hunter/index.vue index 096f9cc..c3a7f70 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 } })