diff --git a/package-lock.json b/package-lock.json
index 9ea4b18..fda808e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2043,51 +2043,6 @@
"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
"dev": true
},
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
- "optional": true,
- "requires": {
- "color-convert": "^2.0.1"
- }
- },
- "chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "dev": true,
- "optional": true,
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- },
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true,
- "optional": true
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "dev": true,
- "optional": true
- },
"ssri": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
@@ -2096,28 +2051,6 @@
"requires": {
"minipass": "^3.1.1"
}
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dev": true,
- "optional": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- },
- "vue-loader-v16": {
- "version": "npm:vue-loader@16.8.3",
- "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
- "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
- "dev": true,
- "optional": true,
- "requires": {
- "chalk": "^4.1.0",
- "hash-sum": "^2.0.0",
- "loader-utils": "^2.0.0"
- }
}
}
},
@@ -14617,6 +14550,75 @@
}
}
},
+ "vue-loader-v16": {
+ "version": "npm:vue-loader@16.8.3",
+ "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+ "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "chalk": "^4.1.0",
+ "hash-sum": "^2.0.0",
+ "loader-utils": "^2.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true,
+ "optional": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
+ "optional": true
+ },
+ "supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ }
+ }
+ },
"vue-router": {
"version": "4.1.3",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.3.tgz",
diff --git a/src/api/mosty-jcz.js b/src/api/mosty-jcz.js
index bf53d0c..ec7c4f4 100644
--- a/src/api/mosty-jcz.js
+++ b/src/api/mosty-jcz.js
@@ -404,6 +404,18 @@ export const JczdeleteById = (id) => {
method: "delete"
});
};
+
+// 检查站详情
+export const JczselectById = (params) => {
+ return request({
+ url: api + `/jcz/selectById`,
+ method: "get",
+ params
+ });
+};
+
+
+
//盘查管理
// 人
export const BpcryselectCrewList = (params) => {
@@ -438,11 +450,11 @@ export const GjrytxeditEntity = (data) => {
});
};
// 查询过检人员图像
-export const GjrytxselectPage = (data) => {
+export const GjrytxselectPage = (params) => {
return request({
url: api + `/jczGjrytx/selectPage`,
method: "get",
- data
+ params
});
};
// 删除过检人员图像
@@ -670,3 +682,35 @@ export const tbJczXfbbdeleteJyQxzb = (data) => {
data
});
};
+
+
+/**
+ * 新增摄像头
+ */
+export const sxtBatch = (data) => {
+ return request({
+ url: api + `/tbJczSxt/batch`,
+ method: "post",
+ data
+ });
+};
+/**
+ * 完成报备
+ */
+export const finishEntity = (id) => {
+ return request({
+ url: api + `/tbJczXfbb/finishEntity/${id}`,
+ method: "get",
+ });
+};
+/**
+ * 获取摄像头列表
+ */
+export const sxtGetList = (data) => {
+ return request({
+ url: api + `/tbJczSxt/getList`,
+ method: "POST",
+ data
+ });
+};
+
diff --git a/src/api/service.js b/src/api/service.js
new file mode 100644
index 0000000..1909431
--- /dev/null
+++ b/src/api/service.js
@@ -0,0 +1,330 @@
+import request from "@/utils/request";
+const api = "/mosty-api/mosty-jmxf";
+const apibase = "/mosty-api/mosty-jmxf";
+
+
+export const http = {
+ // 获取视频ws地址
+ getSpWs: (params) => {
+ return request({
+ url: "/jcApi/api/haikang/cameras/getws",
+ method: "GET",
+ params
+ });
+ },
+ // 警力 全部list
+ getJlAllList: (params) => {
+ return request({
+ url: api + "/jlqk/jmjl/qbList",
+ method: "GET",
+ params
+ });
+ },
+ // 警力 在岗list
+ getJlZgList: (params) => {
+ return request({
+ url: api + "/jlqk/jmjl/zgList",
+ method: "GET",
+ params
+ });
+ },
+
+ // 街面警力 - 民警辅警统计
+ getJmjlDate: (params) => {
+ return request({
+ url: api + "/tbQwXfbb/selectMfjCount",
+ method: "GET",
+ params
+ });
+ },
+ // 街面警力 - 民警list
+ getJmjlDateMJList: (params) => {
+ return request({
+ url: api + "/jlqk/jmjl/mjlb",
+ method: "GET",
+ params
+ });
+ },
+ // 街面警力 - fu警list
+ getJmjlDateFJList: (params) => {
+ return request({
+ url: api + "/jlqk/jmjl/fjlb",
+ method: "GET",
+ params
+ });
+ },
+
+ // 警力情况 - 警力全部
+ getJlAll: (params) => {
+ return request({
+ url: api + "/jlqk/jmjl/qb",
+ method: "GET",
+ params
+ });
+ },
+ // 警力情况 - 警力在岗
+ getJlZg: (params) => {
+ return request({
+ url: api + "/jlqk/jmjl/zg",
+ method: "GET",
+ params
+ });
+ },
+ // 警力情况 - 民警全部
+ getMjAll: (params) => {
+ return request({
+ url: api + "/jlqk/mj/qbmj",
+ method: "GET",
+ params
+ });
+ },
+ // 警力情况 - 民警在岗
+ getMjZg: (params) => {
+ return request({
+ url: api + "/jlqk/mj/zgmj",
+ method: "GET",
+ params
+ });
+ },
+ // 警力情况 - 民警全部
+ getMjAllList: (params) => {
+ return request({
+ url: api + "/jlqk/mj/qbmj",
+ method: "GET",
+ params
+ });
+ },
+ // 警力情况 - 民警在岗
+ getMjZgList: (params) => {
+ return request({
+ url: api + "/jlqk/mj/zgmj",
+ method: "GET",
+ params
+ });
+ },
+ // 警力情况 - 辅警全部
+ getFjAll: (params) => {
+ return request({
+ url: api + "/jlqk/fj/qbfj",
+ method: "GET",
+ params
+ });
+ },
+ // 警力情况 -辅警在岗
+ getFjZg: (params) => {
+ return request({
+ url: api + "/jlqk/fj/zgfj",
+ method: "GET",
+ params
+ });
+ },
+
+ // 可抽调 -民警 - 辅警
+ getKcd(params) {
+ return request({
+ url: api + "/jlqk/kcd/zbtj",
+ method: "GET",
+ params: params
+ });
+ },
+
+ // 警力情况 - 辅警全部列表
+ getFjAllList: (params) => {
+ return request({
+ url: api + "/jlqk/fj/qblb",
+ method: "GET",
+ params
+ });
+ },
+ // 警力情况 - 辅警在岗列表
+ getFjAllListZG: (params) => {
+ return request({
+ url: api + "/jlqk/fj/zglb",
+ method: "GET",
+ params
+ });
+ },
+ // 警力情况 -请休假Mj-FJ
+ getRest: (params) => {
+ return request({
+ url: api + "/jlqk/qxj/mjfjtj",
+ method: "GET",
+ params
+ });
+ },
+
+ // 街面警力统计 app查询界面警力民警辅警数量
+ getJmjlTj: (data) => {
+ return request({
+ url: api + "/tbQwXfbb/selectMfjCount",
+ method: "GET",
+ params: data
+ });
+ },
+
+ // 请休假
+ getQxj: (data) => {
+ return request({
+ url: api + "/jlqk/qxj/mjfjtj",
+ method: "GET",
+ params: data
+ });
+},
+
+ // 警力情况 -请休假Mj
+ getRestMj: (params) => {
+ return request({
+ url: api + "/jlqk/qxj/mjlb",
+ method: "GET",
+ params
+ });
+ },
+ // 警力情况 -请休假FJ
+ getRestFj: (params) => {
+ return request({
+ url: api + "/jlqk/qxj/fjlb",
+ method: "GET",
+ params
+ });
+ },
+
+
+ // 勤务列表 - 警力清单
+ getJlList: (params) => {
+ return request({
+ url: api + "/tbQwBmjlbb/getJlqdList",
+ method: "GET",
+ params
+ });
+ },
+ // 勤务列表 - 不在岗警力清单
+ getBZGlist: (params) => {
+ return request({
+ url: api + "/qwlb/bzgjlqd",
+ method: "GET",
+ params
+ });
+ },
+
+
+ // 大屏首页统计 - 在岗警力 - 民警
+ getJlmj: (params) => {
+ return request({
+ url: api + "/jlqk/mj/zglb",
+ method: "GET",
+ params
+ });
+ },
+ getJlfj: (params) => {
+ return request({
+ url: api + "/jlqk/fj/zglb",
+ method: "GET",
+ params
+ });
+ },
+ getJlqbmj: (params) => {
+ return request({
+ url: api + "/jlqk/mj/qblb",
+ method: "GET",
+ params
+ });
+ },
+ // 大屏首页统计 - 街面巡组 - 计划 列表
+ getJMXZ: (params) => {
+ return request({
+ url: api + "/tbQwXfbb/selectJhjmxzList",
+ method: "GET",
+ params
+ });
+ },
+ // 大屏首页统计 - 街面巡组 - 实际 列表
+ selectSjjmxzList: (params) => {
+ return request({
+ url: api + "/tbQwXfbb/selectSjjmxzList",
+ method: "GET",
+ params
+ });
+ },
+
+ // 大屏首页统计 - 街面力量 - 计划、实际
+ getJMLL: (params) => {
+ return request({
+ url: api + "/tbQwXfbb/selectJmllList",
+ method: "GET",
+ params
+ });
+ },
+
+ // 大屏首页统计 - 街面警力- 民警
+ getjMJLmj: (params) => {
+ return request({
+ url: api + "/tbQwXfbb/selectJmllList",
+ method: "GET",
+ params
+ });
+
+ },
+
+ // 大屏首页统计- 可抽查 - 值班
+ getZB: (params) => {
+ return request({
+ url: api + "/jlqk/kcd/zbtj",
+ method: "GET",
+ params
+ });
+ },
+
+ // 大屏首页统计- 可抽查 - 辅警列表
+ getKccFjList: (params) => {
+ return request({
+ url: api + "/jlqk/kcd/fjlb",
+ method: "GET",
+ params
+ });
+ },
+ // 大屏首页统计- 可抽查 - 民警列表
+ getKccMjList: (params) => {
+ return request({
+ url: api + "/jlqk/kcd/mjlb",
+ method: "GET",
+ params
+ });
+ },
+
+ // 根据监控点编号进行云台操作
+ controllingSbbh: (data) => {
+ return request({
+ url: apibase + "/tbYsSxt/controlling",
+ method: "POST",
+ data
+ });
+ },
+
+ // 获取HLS地址
+ getGbHls: (params) => {
+ return request({
+ url: apibase + "/tbYsSxt/getGbHls",
+ method: "GET",
+ params
+ });
+ },
+ // 获取HLS地址
+ previewURLs: (params) => {
+ return request({
+ url: apibase + "/tbYsSxt/previewURLs",
+ method: "GET",
+ params
+ });
+ },
+ // 获取回放地址
+ rebackURLs: (params) => {
+ return request({
+ url: apibase + "/tbYsSxt/playbackURLs",
+ method: "GET",
+ params
+ });
+ },
+}
+
+
+
diff --git a/src/api/yszx.js b/src/api/yszx.js
new file mode 100644
index 0000000..a15792e
--- /dev/null
+++ b/src/api/yszx.js
@@ -0,0 +1,26 @@
+import request from "@/utils/request";
+const api = "/mosty-api/mosty-yszx";
+/*
+ * 查询摄像头列表
+ * return promise 查询摄像头列表
+ */
+export const ysSxtGetList = (data = {}) => {
+ return request({
+ url: api + "/tbYsSxt/getList",
+ method: "POST",
+ data
+ });
+};
+
+/**
+ * 获取摄像头列表
+ * @param {*} data
+ */
+export const ysSxtgetPageList = (data = {}) => {
+ return request({
+ url: api + "/tbYsSxt/getPageList",
+ method: "POST",
+ data
+ });
+};
+
diff --git a/src/assets/css/pulic.scss b/src/assets/css/pulic.scss
index f539475..8b44996 100644
--- a/src/assets/css/pulic.scss
+++ b/src/assets/css/pulic.scss
@@ -116,6 +116,7 @@
.relative {
position: relative;
}
+
.absolute {
position: absolute;
}
@@ -159,9 +160,11 @@
.flex {
display: flex;
}
+
.flex-grow1 {
flex-grow: 1;
}
+
.shrink0 {
flex-shrink: 0;
}
@@ -169,6 +172,7 @@
.flex-warp {
flex-wrap: wrap;
}
+
.flex-nowrap {
flex-wrap: nowrap;
}
@@ -180,6 +184,7 @@
.just-between {
justify-content: space-between;
}
+
.just-around {
justify-content: space-around;
}
@@ -207,11 +212,13 @@
.align-bottom {
align-items: flex-end;
}
+
.flexcc {
display: flex;
justify-content: center;
align-items: center;
}
+
.flexcb {
display: flex;
justify-content: space-between;
@@ -317,11 +324,11 @@
}
.ww#{$i} {
- width: #{$i}+ "%";
+ width: #{$i}+"%";
}
.hh#{$i} {
- height: #{$i}+ "%";
+ height: #{$i}+"%";
}
//高度
@@ -333,26 +340,32 @@
.lh#{$i} {
line-height: #{$i}px;
}
+
//自适应大号字体(通常为统计数字 18-30)
.font_size_big {
font-size: clamp(1.125rem, -0.894rem + 2.31vw, 1.875rem);
}
+
//自适应一号字体(通常为一级标题 14-18)
.font_size_title {
font-size: clamp(0.875rem, 0.37rem + 0.58vw, 1.063rem);
}
+
//自适应统计字体(通常为统计数字 14-22)
.font_size1 {
font-size: clamp(0.875rem, -0.471rem + 1.54vw, 1.375rem);
}
+
//自适应二号字体(通常为二级标题 14-16)
.font_size2 {
font-size: clamp(0.75rem, 0.077rem + 0.77vw, 1rem);
}
+
//自适应普通字体(通常为默认大小 10-14)
.font_size_default {
font-size: clamp(0.625rem, -0.048rem + 0.77vw, 0.875rem);
}
+
.flex#{$i} {
flex: #{$i};
}
@@ -364,9 +377,29 @@
font-weight: normal;
font-style: normal;
}
+
@font-face {
font-family: "HANYILINGXINTIJIAN";
src: url("~@/assets/font/HANYILINGXINTIJIAN-1.TTF");
font-weight: normal;
font-style: normal;
}
+
+/* 自定义滚动条样式 */
+::-webkit-scrollbar {
+ width: 0.5em;
+ height: 0.5em;
+}
+
+::-webkit-scrollbar-track {
+ background: #000000;
+}
+
+::-webkit-scrollbar-thumb {
+ background: #021b31;
+ border-radius: 0.25em;
+}
+
+::-webkit-scrollbar-thumb:hover {
+ background: #011733cd;
+}
\ No newline at end of file
diff --git a/src/components/GdMap/index copy.vue b/src/components/GdMap/index copy2.vue
similarity index 90%
rename from src/components/GdMap/index copy.vue
rename to src/components/GdMap/index copy2.vue
index 45d925a..5e5ad06 100644
--- a/src/components/GdMap/index copy.vue
+++ b/src/components/GdMap/index copy2.vue
@@ -1,8 +1,7 @@