diff --git a/index.html b/index.html index 1bdbff1..07103e2 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,59 @@ +
diff --git a/package.json b/package.json index fc4d719..d4dec2f 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "@univerjs/ui": "^0.2.5", "@vue-office/docx": "^1.6.0", "@vue-office/excel": "^1.7.11", + "@vueup/vue-quill": "^1.2.0", "amfe-flexible": "^2.2.1", "baidu-map-vue3": "^0.4.9", "crypto-js": "^4.2.0", diff --git a/public/imgs/police.png b/public/imgs/police.png new file mode 100644 index 0000000..f4282f4 Binary files /dev/null and b/public/imgs/police.png differ diff --git a/src/api/datav.ts b/src/api/datav.ts index a6de431..d97c8ec 100644 --- a/src/api/datav.ts +++ b/src/api/datav.ts @@ -41,8 +41,22 @@ export function getRecentlyMailTrend12337(query) { }); } +export function getAuditOverview(time) { + return request.get({ + url: `/datav/audit/overview`, + query: { + beginTime: time[0], + endTime: time[1] + } + }); +} - - - - +export function getAuditProblems(time) { + return request.get({ + url: `/datav/audit/problems`, + query: { + beginTime: time[0], + endTime: time[1] + } + }); +} \ No newline at end of file diff --git a/src/api/mobileSupervision/inspection.ts b/src/api/mobileSupervision/inspection.ts index 2618a16..512d338 100644 --- a/src/api/mobileSupervision/inspection.ts +++ b/src/api/mobileSupervision/inspection.ts @@ -12,4 +12,11 @@ export function listInspection(query) { url: '/task/inspection', query }); +} + +export function listInspectionProblems(taskId, query) { + return request.get({ + url: `/task/inspection/${taskId}/problem`, + query + }); } \ No newline at end of file diff --git a/src/api/mobileSupervision/selfexamination.ts b/src/api/mobileSupervision/selfexamination.ts new file mode 100644 index 0000000..4c4e480 --- /dev/null +++ b/src/api/mobileSupervision/selfexamination.ts @@ -0,0 +1,22 @@ +import request from "@/api/request"; + + +export function listSelfexamination(query) { + return request.get({ + url: '/task/selfexamination', + query + }); +} + +export function getSelfexaminationDetail(id) { + return request.get({ + url: '/task/selfexamination/' + id + }); +} + +export function addSelfexamination(body) { + return request.post({ + url: '/task/selfexamination', + body + }); +} \ No newline at end of file diff --git a/src/api/mobileSupervision/taskProblem.ts b/src/api/mobileSupervision/taskProblem.ts new file mode 100644 index 0000000..5e0a572 --- /dev/null +++ b/src/api/mobileSupervision/taskProblem.ts @@ -0,0 +1,9 @@ +import request from "@/api/request"; + + +export function listTaskProblem(query) { + return request.get({ + url: '/task/problem', + query + }); +} \ No newline at end of file diff --git a/src/api/mobileSupervision/testingAlcohol.ts b/src/api/mobileSupervision/testingAlcohol.ts index f952a91..79c5e09 100644 --- a/src/api/mobileSupervision/testingAlcohol.ts +++ b/src/api/mobileSupervision/testingAlcohol.ts @@ -19,4 +19,11 @@ export function listTestingAlcohol(query) { url: '/task/testingAlcohol', query }); +} + +export function listTestingAlcoholPeoples(taskId, query) { + return request.get({ + url: `/task/testingAlcohol/${taskId}/people`, + query + }); } \ No newline at end of file diff --git a/src/api/system/user.ts b/src/api/system/user.ts index c04b1b4..57bca02 100644 --- a/src/api/system/user.ts +++ b/src/api/system/user.ts @@ -19,4 +19,11 @@ export function updateUser(body) { url: '/user', body }); +} + +export function updateUserPassword(body) { + return request.put({ + url: '/user/password', + body + }); } \ No newline at end of file diff --git a/src/components/datav/statistic.vue b/src/components/datav/statistic.vue index 163d0a5..d5dcbdd 100644 --- a/src/components/datav/statistic.vue +++ b/src/components/datav/statistic.vue @@ -38,7 +38,7 @@ const outputValue = useTransition(value, { \ No newline at end of file diff --git a/src/components/video-play.vue b/src/components/video-play.vue index 3d106e3..89c02c3 100644 --- a/src/components/video-play.vue +++ b/src/components/video-play.vue @@ -37,6 +37,7 @@ onMounted(() => { container: playerRef.value, isFlv: true, // 是否使用flv格式 showBandwidth: false, // 是否显示带宽使用情况 + supportDblclickFullscreen: true, isResize: false, operateBtns, loadingText: "加载中...", diff --git a/src/layout/components/Aside.vue b/src/layout/components/Aside.vue index 69c25de..9b7f76b 100644 --- a/src/layout/components/Aside.vue +++ b/src/layout/components/Aside.vue @@ -115,17 +115,17 @@ aside { transition: width height 0.6s; } .menu-item { + height: 56px; + padding: 0 18px; + display: flex; + justify-content: space-between; + transition: all 0.6s; > * { margin-right: 20px; &:last-child { margin-right: 0; } } - height: 56px; - padding: 0 18px; - display: flex; - justify-content: space-between; - transition: all 0.6s; &:hover, &[active="true"] { background-color: #22339a; diff --git a/src/style/public.scss b/src/style/public.scss index d186408..5c62368 100644 --- a/src/style/public.scss +++ b/src/style/public.scss @@ -19,6 +19,7 @@ body { color: #333; font-family: SourceHanSansCN; line-height: 1.4; + width: 100% !important; } h2 { @@ -455,7 +456,7 @@ svg+span { background-color: #4d515d80; -webkit-backdrop-filter: blur(10px); backdrop-filter: blur(10px); - z-index: 999; + z-index: 9999999; } .position-center { diff --git a/src/views/data/Gabxf.vue b/src/views/data/Gabxf.vue index 21dab2c..d59bc66 100644 --- a/src/views/data/Gabxf.vue +++ b/src/views/data/Gabxf.vue @@ -124,24 +124,29 @@ - - - + + + - - - - +