diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index c0a6e5a..0000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "recommendations": ["Vue.volar", "Vue.vscode-typescript-vue-plugin"] -} diff --git a/src/api/request.ts b/src/api/request.ts new file mode 100644 index 0000000..bac29b8 --- /dev/null +++ b/src/api/request.ts @@ -0,0 +1,25 @@ +import axios from "axios"; +import requestURL from './url'; +let token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImFkbWluIiwiaWRlbnRpZmllciI6ImU5Y2EyM2Q2OGQ4ODRkNGViYjE5ZDA3ODg5NzI3ZGFlIiwiZXhwIjoxNzAyMDA1MDQ4fQ.M1Xlecj3eUOgZUSofOlyBMoxJ5F01KH-tgJxaV2Femc\n' +const service = axios.create({ + baseURL: requestURL, + timeout: 50000, + headers: { + // 设置后端需要的传参类型 + 'Content-Type': 'application/json;charset=UTF-8', + 'X-Access-Token':token + } +}) +export const get = (url, params) => { + return new Promise((resolve, reject) => { + service.get(url, {params: params}).then(res => { + if (res.data.code === 200) { + resolve(res.data); + } else { + reject(res.data); + } + }).catch(err => { + reject(err.data); + }) + }); +} \ No newline at end of file diff --git a/src/api/url.ts b/src/api/url.ts new file mode 100644 index 0000000..86bf074 --- /dev/null +++ b/src/api/url.ts @@ -0,0 +1,3 @@ +const requestURL = "http://192.168.1.16"; + +export default requestURL \ No newline at end of file diff --git a/src/assets/less/index.less b/src/assets/less/index.less index fd50835..f12717f 100644 --- a/src/assets/less/index.less +++ b/src/assets/less/index.less @@ -1,86 +1,87 @@ .type-time { - padding-right: 4%; - padding-top: 3%; - font-size: 16px; - display: flex; - justify-content: right; - span { - padding: 0 2%; - cursor: pointer; - } - - .select { - color: #45A2FF; - position: relative; - - &:after { - content: ''; - position: absolute; - display: block; - width: 72%; - left: 6px; - bottom: -12px; - height: 6px; - background: url("../images/light.png") no-repeat; - background-size: 100% 100%; + padding-right: 4%; + padding-top: 3%; + font-size: 16px; + display: flex; + justify-content: right; + span { + padding: 0 2%; + cursor: pointer; } - } - .unSelect { - color: #A3A4A4; - } + .select { + color: #45a2ff; + position: relative; + + &:after { + content: ''; + position: absolute; + display: block; + width: 72%; + left: 6px; + bottom: -12px; + height: 6px; + background: url('../images/light.png') no-repeat; + background-size: 100% 100%; + } + } + + .unSelect { + color: #a3a4a4; + } } *::-webkit-scrollbar { - width: 12px; - height: 12px; + width: 12px; + height: 12px; } *::-webkit-scrollbar-button { - width: 0; - height: 0; - display: none; + width: 0; + height: 0; + display: none; } *::-webkit-scrollbar-corner { - background-color: transparent; + background-color: transparent; } *::-webkit-scrollbar-thumb { - border: 4px solid rgba(0, 0, 0, 0); - height: 6px; - border-radius: 25px; - background-clip: padding-box; - background-color: rgba(0, 0, 0, 0.30); + border: 4px solid rgba(0, 0, 0, 0); + height: 6px; + border-radius: 25px; + background-clip: padding-box; + background-color: rgba(0, 0, 0, 0.3); } /* antd表格样式 */ -.ant-table-thead > tr > th{ - border-bottom: 1px solid #1e73c2!important; +.ant-table-thead > tr > th { + border-bottom: 1px solid #1e73c2 !important; } -.ant-table-body{ - background-color: #00152B; +.ant-table-body { + background-color: #00152b; } -.ant-modal-header{ - border-bottom: none!important; +.ant-modal-header { + border-bottom: none !important; } -.ant-table-tbody > tr > td{ - border-bottom: 1px solid #1e73c2!important; - background-color: #00152B; - color: #ffffff; +.ant-table-tbody > tr > td { + border-bottom: 1px solid #1e73c2 !important; + background-color: #00152b; + color: #ffffff; } -.ant-table-tbody > tr.ant-table-row:hover > td, .ant-table-tbody > tr > td.ant-table-cell-row-hover, -.ant-table-thead > tr > th{ - background-color: #00152B!important; - color: #ffffff!important; +.ant-table-tbody > tr.ant-table-row:hover > td, +.ant-table-tbody > tr > td.ant-table-cell-row-hover, +.ant-table-thead > tr > th { + background-color: #00152b !important; + color: #ffffff !important; } -.ant-table-cell-scrollbar{ - box-shadow: none!important; +.ant-table-cell-scrollbar { + box-shadow: none !important; } /* 表格滚动条 */ .ant-table-body::-webkit-scrollbar-thumb { - border: 4px solid rgba(0, 0, 0, 0); - height: 6px; - border-radius: 25px; - background-clip: padding-box; - background-color: rgba(30, 115, 194, 0.3); -} \ No newline at end of file + border: 4px solid rgba(0, 0, 0, 0); + height: 6px; + border-radius: 25px; + background-clip: padding-box; + background-color: rgba(30, 115, 194, 0.3); +} diff --git a/src/components/body-d-left/left.api.ts b/src/components/body-d-left/left.api.ts new file mode 100644 index 0000000..cf62bf1 --- /dev/null +++ b/src/components/body-d-left/left.api.ts @@ -0,0 +1,5 @@ +import { get } from '../../api/request' +enum Api { + server='/health-emergency/emergency/tblUserHelp/statistics' +} +export const list = (params) => get(Api.server, params) \ No newline at end of file diff --git a/src/components/body-d-left/oneL.vue b/src/components/body-d-left/oneL.vue index ff147d0..f1f5f55 100644 --- a/src/components/body-d-left/oneL.vue +++ b/src/components/body-d-left/oneL.vue @@ -1,88 +1,109 @@ \ No newline at end of file + diff --git a/src/components/body-d-left/threeL.vue b/src/components/body-d-left/threeL.vue index 543b4f8..ef9b078 100644 --- a/src/components/body-d-left/threeL.vue +++ b/src/components/body-d-left/threeL.vue @@ -1,97 +1,108 @@ \ No newline at end of file + diff --git a/src/components/body-d-left/twoL.vue b/src/components/body-d-left/twoL.vue index 183e101..d756fd3 100644 --- a/src/components/body-d-left/twoL.vue +++ b/src/components/body-d-left/twoL.vue @@ -1,200 +1,203 @@ \ No newline at end of file + .ant-select-dropdown { + background-color: #00152b !important; + border-right: 1px solid #1b7ef2; + border-left: 1px solid #1b7ef2; + border-bottom: 1px solid #1b7ef2; + } + .ant-select-item { + color: #1b7ef2 !important; + } + //框背景色 + .ant-select:not(.ant-select-customize-input) .ant-select-selector { + color: #1b7ef2 !important; + background-color: transparent !important; + border: 1px solid #1b7ef2 !important; + } + .ant-select-item-option-selected { + color: #ffffff !important; + } + // 选中字体颜色 + .ant-select-selection-item { + color: #1b7ef2 !important; + } + .ant-select-item-option-active { + background-color: transparent !important; + } + .ant-select-item-option-active:hover { + background-color: #002e64 !important; + } + // 箭头颜色 + .ant-select-arrow { + color: #1b7ef2 !important; + } + .ant-select-item-option-selected:not(.ant-select-item-option-disabled) { + background-color: #002e64 !important; + } + diff --git a/src/components/body-d-right/oneR.vue b/src/components/body-d-right/oneR.vue index 03bc74b..5fbabcd 100644 --- a/src/components/body-d-right/oneR.vue +++ b/src/components/body-d-right/oneR.vue @@ -1,318 +1,322 @@ \ No newline at end of file + .police-con { + color: #ffffff; + background-color: #00152b; + border: 1px solid #129bff; + padding: 2% 0 2% 5%; + .con-item { + padding: 1.3% 0; + span:nth-child(1) { + font-weight: bold; + display: inline-block; + width: 20%; + text-align: right; + } + span:nth-child(2) { + padding-left: 2%; + } + } + } + diff --git a/src/components/body-d-right/threeR.vue b/src/components/body-d-right/threeR.vue index 02e9a55..f5e55a1 100644 --- a/src/components/body-d-right/threeR.vue +++ b/src/components/body-d-right/threeR.vue @@ -1,6 +1,6 @@ \ No newline at end of file + diff --git a/src/components/body-d-right/twoR.vue b/src/components/body-d-right/twoR.vue index 6903429..1e88ad6 100644 --- a/src/components/body-d-right/twoR.vue +++ b/src/components/body-d-right/twoR.vue @@ -1,83 +1,83 @@ \ No newline at end of file + .inner { + width: 90%; + margin: 0 auto; + height: calc(100% - 40px); + } + diff --git a/src/components/chinaMap/chinaMap.vue b/src/components/chinaMap/chinaMap.vue index b52cd42..3587b36 100644 --- a/src/components/chinaMap/chinaMap.vue +++ b/src/components/chinaMap/chinaMap.vue @@ -490,4 +490,4 @@ } } } - \ No newline at end of file + diff --git a/src/components/dialog/Dialog.vue b/src/components/dialog/Dialog.vue index d4fce32..8c35fb8 100644 --- a/src/components/dialog/Dialog.vue +++ b/src/components/dialog/Dialog.vue @@ -1,67 +1,62 @@ \ No newline at end of file + .dialog { + .ant-modal-title { + position: relative; + display: flex; + align-items: center; + width: 100%; + height: 56px; + background: url('../../assets/images/dialog.png') no-repeat; + background-size: 100% 100%; + color: #ffffff !important; + padding-left: 2%; + } + .ant-modal-header { + padding: 0 !important; + padding-bottom: 0; + } + .ant-modal-header, + .ant-modal-content { + background-color: transparent !important; + } + .ant-modal-body { + padding: 0 !important; + } + .ant-modal-close-x, + .anticon { + color: #999999 !important; + } + .ant-modal-footer { + border-top: none !important; + } + .ant-modal-wrap { + background-color: rgba(0, 0, 0, 0.6); + } + } +