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/public/index.html b/public/index.html index 805a979..1542bc9 100644 --- a/public/index.html +++ b/public/index.html @@ -11,9 +11,9 @@ - + diff --git a/src/api/hunting/home.js b/src/api/hunting/home.js new file mode 100644 index 0000000..40e0509 --- /dev/null +++ b/src/api/hunting/home.js @@ -0,0 +1,4 @@ +import request from '@/utils/request' + +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 new file mode 100644 index 0000000..1eac79c --- /dev/null +++ b/src/api/hunting/hunter.js @@ -0,0 +1,3 @@ +import request from '@/utils/request' + +export const listHunter = (params) => request.get('/base/transitHuntersUserRecord', { params }) diff --git a/src/api/hunting/user.js b/src/api/hunting/user.js new file mode 100644 index 0000000..55f56f5 --- /dev/null +++ b/src/api/hunting/user.js @@ -0,0 +1,6 @@ +import request from '@/utils/request' + +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(',') } }) diff --git a/src/api/hunting/vehicle.js b/src/api/hunting/vehicle.js new file mode 100644 index 0000000..6544ad2 --- /dev/null +++ b/src/api/hunting/vehicle.js @@ -0,0 +1,6 @@ +import request from '@/utils/request' + +export const listVehicle = (params) => request.get('/base/transitHuntersVehicleRecord', { params }) +export const addVehicle = (data) => request.post('/base/transitHuntersVehicleRecord', data) +export const editVehicle = (data) => request.put('/base/transitHuntersVehicleRecord', data) +export const delVehicle = (idList) => request.delete('/base/transitHuntersVehicleRecord', { params: { idList: idList.join(',') } }) diff --git a/src/assets/components/card-bg.png b/src/assets/components/card-bg.png new file mode 100644 index 0000000..a0ff0b6 Binary files /dev/null and b/src/assets/components/card-bg.png differ diff --git a/src/assets/components/close.png b/src/assets/components/close.png new file mode 100644 index 0000000..c2c6102 Binary files /dev/null and b/src/assets/components/close.png differ diff --git a/src/assets/components/layout-bg.png b/src/assets/components/layout-bg.png new file mode 100644 index 0000000..2e2ad7b Binary files /dev/null and b/src/assets/components/layout-bg.png differ diff --git a/src/assets/components/popup-bg.png b/src/assets/components/popup-bg.png new file mode 100644 index 0000000..66838d8 Binary files /dev/null and b/src/assets/components/popup-bg.png differ diff --git a/src/assets/hunting/address.png b/src/assets/hunting/address.png new file mode 100644 index 0000000..8acecd9 Binary files /dev/null and b/src/assets/hunting/address.png differ diff --git a/src/assets/hunting/btn-bg-light.png b/src/assets/hunting/btn-bg-light.png new file mode 100644 index 0000000..af81ddf Binary files /dev/null and b/src/assets/hunting/btn-bg-light.png differ diff --git a/src/assets/hunting/btn-bg.png b/src/assets/hunting/btn-bg.png new file mode 100644 index 0000000..6c86654 Binary files /dev/null and b/src/assets/hunting/btn-bg.png differ diff --git a/src/assets/hunting/card-list-active.png b/src/assets/hunting/card-list-active.png new file mode 100644 index 0000000..2ae3d16 Binary files /dev/null and b/src/assets/hunting/card-list-active.png differ diff --git a/src/assets/hunting/card-list.png b/src/assets/hunting/card-list.png new file mode 100644 index 0000000..e999ef0 Binary files /dev/null and b/src/assets/hunting/card-list.png differ diff --git a/src/assets/hunting/dizuo.png b/src/assets/hunting/dizuo.png new file mode 100644 index 0000000..1829b4d Binary files /dev/null and b/src/assets/hunting/dizuo.png differ diff --git a/src/assets/hunting/dizuo2.png b/src/assets/hunting/dizuo2.png new file mode 100644 index 0000000..5b58480 Binary files /dev/null and b/src/assets/hunting/dizuo2.png differ diff --git a/src/assets/hunting/gaikuang.png b/src/assets/hunting/gaikuang.png new file mode 100644 index 0000000..768feb2 Binary files /dev/null and b/src/assets/hunting/gaikuang.png differ diff --git a/src/assets/hunting/guiji.png b/src/assets/hunting/guiji.png new file mode 100644 index 0000000..8c5c662 Binary files /dev/null and b/src/assets/hunting/guiji.png differ diff --git a/src/assets/hunting/home.png b/src/assets/hunting/home.png new file mode 100644 index 0000000..57762b7 Binary files /dev/null and b/src/assets/hunting/home.png differ diff --git a/src/assets/hunting/icon.png b/src/assets/hunting/icon.png new file mode 100644 index 0000000..57ef528 Binary files /dev/null and b/src/assets/hunting/icon.png differ diff --git a/src/assets/hunting/id-card.png b/src/assets/hunting/id-card.png new file mode 100644 index 0000000..e170586 Binary files /dev/null and b/src/assets/hunting/id-card.png differ diff --git a/src/assets/hunting/involved.png b/src/assets/hunting/involved.png new file mode 100644 index 0000000..0b1b056 Binary files /dev/null and b/src/assets/hunting/involved.png differ diff --git a/src/assets/hunting/name.png b/src/assets/hunting/name.png new file mode 100644 index 0000000..a6b30bf Binary files /dev/null and b/src/assets/hunting/name.png differ diff --git a/src/assets/hunting/record-list-active.png b/src/assets/hunting/record-list-active.png new file mode 100644 index 0000000..b7c47e8 Binary files /dev/null and b/src/assets/hunting/record-list-active.png differ diff --git a/src/assets/hunting/record-list.png b/src/assets/hunting/record-list.png new file mode 100644 index 0000000..63048c0 Binary files /dev/null and b/src/assets/hunting/record-list.png differ diff --git a/src/assets/hunting/shean.png b/src/assets/hunting/shean.png new file mode 100644 index 0000000..d010eb5 Binary files /dev/null and b/src/assets/hunting/shean.png differ diff --git a/src/assets/hunting/shejing.png b/src/assets/hunting/shejing.png new file mode 100644 index 0000000..e707082 Binary files /dev/null and b/src/assets/hunting/shejing.png differ diff --git a/src/assets/hunting/time.png b/src/assets/hunting/time.png new file mode 100644 index 0000000..bfe9c82 Binary files /dev/null and b/src/assets/hunting/time.png differ diff --git a/src/assets/hunting/title-bg.png b/src/assets/hunting/title-bg.png new file mode 100644 index 0000000..df080be Binary files /dev/null and b/src/assets/hunting/title-bg.png differ diff --git a/src/assets/hunting/yujing.png b/src/assets/hunting/yujing.png new file mode 100644 index 0000000..4566684 Binary files /dev/null and b/src/assets/hunting/yujing.png differ diff --git a/src/assets/main.scss b/src/assets/main.scss index c4ea8c9..00d1142 100644 --- a/src/assets/main.scss +++ b/src/assets/main.scss @@ -1,4 +1,5 @@ -html,body { +html, +body { margin: 0; padding: 0; box-sizing: border-box; @@ -7,4 +8,68 @@ html,body { // * 隐藏地图logo a.minemap-ctrl-logo { display: none; -} \ No newline at end of file +} + +::-webkit-scrollbar { + width: 6px; +} +::-webkit-scrollbar-thumb { + background-color: #ccc; + border-radius: 6px; +} + +.query-form { + color: white; + .el-form-item { + width: 17vw; + display: inline-flex; + margin-right: 0; + margin-bottom: 3vh; + .el-form-item__label { + width: 6vw; + padding: 0; + color: white; + } + .el-form-item__content { + flex: 1; + } + .el-input, + .el-select { + width: 100%; + } + .el-range-input, + .el-input__inner { + color: white !important; + } + } +} + +.el-range-input, +.el-input__inner { + background: rgba(2, 43, 91, 0.31); + border: 1px solid rgba(127, 207, 244, 0.55); +} + +.fy-center { + display: flex; + align-items: center; +} +.f-center { + display: flex; + align-items: center; + justify-content: center; +} +.flex-col{ + display: flex; + flex-direction: column; +} +.flex-1 { + flex: 1; +} +.line-1 { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + flex: 1; + width: 1px; +} diff --git a/src/components/button/ImgButton.vue b/src/components/button/ImgButton.vue new file mode 100644 index 0000000..5c4fa9b --- /dev/null +++ b/src/components/button/ImgButton.vue @@ -0,0 +1,35 @@ + + + diff --git a/src/components/card/index.vue b/src/components/card/index.vue new file mode 100644 index 0000000..6bbefc3 --- /dev/null +++ b/src/components/card/index.vue @@ -0,0 +1,52 @@ + + + diff --git a/src/components/img/OssImg.vue b/src/components/img/OssImg.vue new file mode 100644 index 0000000..2c5ea54 --- /dev/null +++ b/src/components/img/OssImg.vue @@ -0,0 +1,23 @@ + + + diff --git a/src/components/pagination/index.vue b/src/components/pagination/index.vue new file mode 100644 index 0000000..72f5db9 --- /dev/null +++ b/src/components/pagination/index.vue @@ -0,0 +1,79 @@ + + + diff --git a/src/main.js b/src/main.js index 6c06da5..97aa310 100644 --- a/src/main.js +++ b/src/main.js @@ -2,6 +2,7 @@ import Vue from 'vue' import App from './App.vue' import ElementUI from 'element-ui'; import 'element-ui/lib/theme-chalk/index.css'; +import '@/assets/main.scss'; import router from './router'; import store from './store' diff --git a/src/router/index.js b/src/router/index.js index 3ca0a95..f2cc0d5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -45,6 +45,34 @@ const routes = [ component: () => import('@/views/buildUse/index.vue') } ] + }, + { + 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') + } + ] } ] const router = new VueRouter({ diff --git a/src/utils/request.js b/src/utils/request.js index b891777..b13c31a 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,11 +3,11 @@ 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://50.146.63.43:1129/hjapi', + // baseURL: 'http://50.146.63.43:1129/hjapi', //baseURL: 'http://121.41.91.94:12002/hjapi', //baseURL: `http://${window.location.host}/hjapi`, // baseURL: 'http://121.41.91.94:12524/hjapi/', //外网 - // baseURL: 'http://121.41.91.94:12524/hjapi/', //外网 + baseURL: 'http://121.41.91.94:12524/hjapi/', //外网 timeout: 50000, headers: { 'content-type': 'application/json' } }) diff --git a/src/views/Layout/index.vue b/src/views/Layout/index.vue index 3903648..498138f 100644 --- a/src/views/Layout/index.vue +++ b/src/views/Layout/index.vue @@ -1,41 +1,54 @@ - + diff --git a/src/views/hunting/control/components/CardTable.vue b/src/views/hunting/control/components/CardTable.vue new file mode 100644 index 0000000..53fc280 --- /dev/null +++ b/src/views/hunting/control/components/CardTable.vue @@ -0,0 +1,103 @@ + + + + diff --git a/src/views/hunting/control/index.vue b/src/views/hunting/control/index.vue new file mode 100644 index 0000000..94b52cc --- /dev/null +++ b/src/views/hunting/control/index.vue @@ -0,0 +1,188 @@ + + + + + diff --git a/src/views/hunting/home/components/keyPerson.vue b/src/views/hunting/home/components/keyPerson.vue new file mode 100644 index 0000000..81173e8 --- /dev/null +++ b/src/views/hunting/home/components/keyPerson.vue @@ -0,0 +1,431 @@ + + + + diff --git a/src/views/hunting/home/components/resource.vue b/src/views/hunting/home/components/resource.vue new file mode 100644 index 0000000..362009a --- /dev/null +++ b/src/views/hunting/home/components/resource.vue @@ -0,0 +1,105 @@ + + + + diff --git a/src/views/hunting/home/components/vehicle.vue b/src/views/hunting/home/components/vehicle.vue new file mode 100644 index 0000000..89fcdbd --- /dev/null +++ b/src/views/hunting/home/components/vehicle.vue @@ -0,0 +1,345 @@ + + + + diff --git a/src/views/hunting/home/components/warning.vue b/src/views/hunting/home/components/warning.vue new file mode 100644 index 0000000..8e7f48c --- /dev/null +++ b/src/views/hunting/home/components/warning.vue @@ -0,0 +1,334 @@ + + + + diff --git a/src/views/hunting/home/index.vue b/src/views/hunting/home/index.vue new file mode 100644 index 0000000..cb72c96 --- /dev/null +++ b/src/views/hunting/home/index.vue @@ -0,0 +1,364 @@ + + + diff --git a/src/views/hunting/hunter/components/Box.vue b/src/views/hunting/hunter/components/Box.vue new file mode 100644 index 0000000..7bd5f1c --- /dev/null +++ b/src/views/hunting/hunter/components/Box.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/src/views/hunting/hunter/index.vue b/src/views/hunting/hunter/index.vue new file mode 100644 index 0000000..096f9cc --- /dev/null +++ b/src/views/hunting/hunter/index.vue @@ -0,0 +1,236 @@ + + + + + diff --git a/src/views/hunting/warning/Detail.vue b/src/views/hunting/warning/Detail.vue new file mode 100644 index 0000000..3728259 --- /dev/null +++ b/src/views/hunting/warning/Detail.vue @@ -0,0 +1,78 @@ + + + diff --git a/src/views/hunting/warning/index.vue b/src/views/hunting/warning/index.vue new file mode 100644 index 0000000..7bf56d3 --- /dev/null +++ b/src/views/hunting/warning/index.vue @@ -0,0 +1,268 @@ + + + + +