diff --git a/src/App.vue b/src/App.vue index 161c711..36c1f6c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -66,6 +66,10 @@ display: none; } +.el-table::before { + display: none; +} + .bottomZS { position: absolute; width: 100%; @@ -106,6 +110,12 @@ border: 1px solid rgba(40, 132, 126, 1); } + .el-pagination.is-background .el-pager li:not(.disabled).active { + background-color: rgba(64, 158, 255, 0); + color: #ccc; + border: 1px solid #76EAE4; + } + .btn-prev { margin: 0 5px; background-color: rgba(255, 255, 255, 0); diff --git a/src/api/archives/index.js b/src/api/archives/index.js index f23b641..29dc5cc 100644 --- a/src/api/archives/index.js +++ b/src/api/archives/index.js @@ -39,4 +39,12 @@ export function warningDisposal(params) { params }) } +//预警处置 +export function tbSafeCompanyVehicle(params) { + return request({ + url: '/safety/enterpriseArchives/tbSafeCompanyVehicle', + method: 'get', + params + }) +} diff --git a/src/assets/archives/列表9910.png b/src/assets/archives/列表9910.png new file mode 100644 index 0000000..1c5511f Binary files /dev/null and b/src/assets/archives/列表9910.png differ diff --git a/src/utils/request.js b/src/utils/request.js index 36bb017..97b51c0 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,7 +4,7 @@ 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', + baseURL: 'http://172.18.113.50:8080/zhapi', // baseURL: `http://${window.location.host}`, timeout: 50000, headers: { 'content-type': 'application/json' }, diff --git a/src/views/archives/car.vue b/src/views/archives/car.vue new file mode 100644 index 0000000..c017b8f --- /dev/null +++ b/src/views/archives/car.vue @@ -0,0 +1,259 @@ + + + + \ No newline at end of file diff --git a/src/views/archives/index.vue b/src/views/archives/index.vue index 7cddbf9..703b8be 100644 --- a/src/views/archives/index.vue +++ b/src/views/archives/index.vue @@ -170,6 +170,7 @@ + @@ -181,11 +182,13 @@ import { safeIndex } from '@/api/archives' import monitor from './monitor.vue' import kakou from './kakou.vue' import yujing from './yujing.vue' +import car from './car.vue' export default { components: { monitor, kakou, yujing, + car }, data() { return { diff --git a/src/views/archives/yujing.vue b/src/views/archives/yujing.vue index f648490..87a8a9e 100644 --- a/src/views/archives/yujing.vue +++ b/src/views/archives/yujing.vue @@ -7,18 +7,26 @@
- + :header-row-style="tableHeaderColor" :header-cell-style="tableHeaderCellColor"> + - + + - + - + - + - + + +