diff --git a/package-lock.json b/package-lock.json
index 271a460..026e5ca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,7 +41,8 @@
"vue-router": "^4.2.5",
"vue3-pdfjs": "^0.1.6",
"vue3-print-nb": "^0.1.4",
- "vue3-puzzle-vcode": "^1.1.5"
+ "vue3-puzzle-vcode": "^1.1.5",
+ "vue3-seamless-scroll": "^2.0.1"
},
"devDependencies": {
"@our-patches/postcss-px-to-viewport": "^1.2.0",
@@ -6018,6 +6019,14 @@
"resolved": "https://registry.npmmirror.com/vue3-puzzle-vcode/-/vue3-puzzle-vcode-1.1.7.tgz",
"integrity": "sha512-mW780dz7HKjrElnE60CeYSeHGidKBKHoMjTDYfqF21330rTkFOsfDK1FQKZ22MktgMtTEoS/imfpEDlM1cxY/g=="
},
+ "node_modules/vue3-seamless-scroll": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmmirror.com/vue3-seamless-scroll/-/vue3-seamless-scroll-2.0.1.tgz",
+ "integrity": "sha512-mI3BaDU3pjcPUhVSw3/xNKdfPBDABTi/OdZaZqKysx4cSdNfGRbVvGNDzzptBbJ5S7imv5T55l6x/SqgnxKreg==",
+ "dependencies": {
+ "throttle-debounce": "5.0.0"
+ }
+ },
"node_modules/web-streams-polyfill": {
"version": "3.3.2",
"resolved": "https://registry.npmmirror.com/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz",
diff --git a/package.json b/package.json
index 422b29d..201b269 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,8 @@
"vue-router": "^4.2.5",
"vue3-pdfjs": "^0.1.6",
"vue3-print-nb": "^0.1.4",
- "vue3-puzzle-vcode": "^1.1.5"
+ "vue3-puzzle-vcode": "^1.1.5",
+ "vue3-seamless-scroll": "^2.0.1"
},
"devDependencies": {
"@our-patches/postcss-px-to-viewport": "^1.2.0",
diff --git a/src/assets/css/element.scss b/src/assets/css/element.scss
index fe42715..5157b2c 100644
--- a/src/assets/css/element.scss
+++ b/src/assets/css/element.scss
@@ -251,6 +251,14 @@
color: var(--el-text-color-regular) !important;
}
+.el-date-table.is-week-mode .el-date-table__row {
+ &.current, &:hover {
+ .el-date-table-cell {
+ --el-datepicker-inrange-bg-color: var(--el-fill-color-light) !important;
+ }
+ }
+}
+
.el-input.is-disabled .el-input__wrapper {
box-shadow: 0 0 0 1px var(--el-border-color) inset !important;
}
diff --git a/src/assets/images/map_tools/icon1.png b/src/assets/images/map_tools/icon1.png
new file mode 100644
index 0000000..02d8bbc
Binary files /dev/null and b/src/assets/images/map_tools/icon1.png differ
diff --git a/src/assets/images/map_tools/icon2.png b/src/assets/images/map_tools/icon2.png
new file mode 100644
index 0000000..adb8225
Binary files /dev/null and b/src/assets/images/map_tools/icon2.png differ
diff --git a/src/assets/images/map_tools/icon3.png b/src/assets/images/map_tools/icon3.png
new file mode 100644
index 0000000..b907b29
Binary files /dev/null and b/src/assets/images/map_tools/icon3.png differ
diff --git a/src/assets/js/useAliYunUpload.js b/src/assets/js/useAliYunUpload.js
index de2991f..345a44d 100644
--- a/src/assets/js/useAliYunUpload.js
+++ b/src/assets/js/useAliYunUpload.js
@@ -33,9 +33,9 @@ export default function useAliYunUpload({
Title: uploadInfo.file.name,
FileName: uploadInfo.file.name,
});
- uploadAddress = resData.body.uploadAddress;
- uploadAuth = resData.body.uploadAuth;
- videoId = resData.body.videoId;
+ uploadAddress = resData.data.uploadAddress;
+ uploadAuth = resData.data.uploadAuth;
+ videoId = resData.data.videoId;
} else {
const resData = await setVideoRefresh({
Title: uploadInfo.file.name,
diff --git a/src/components/editor/index.vue b/src/components/editor/index.vue
index 954739b..65ae687 100644
--- a/src/components/editor/index.vue
+++ b/src/components/editor/index.vue
@@ -1,5 +1,5 @@
-
+
-
完成绘制
-
清除绘制
-
还原建筑
-
当前选中楼层id:{{ model_id }}
+
+
+
+
+
+
+
完成绘制
+
+
+
+
+
清除绘制
+
+
+
+
+
还原建筑
+
+
当前选中楼层id：{{ model_id }}
+
@@ -32,22 +45,18 @@ import { getEnterpriseInfo } from "@/request/enterprise_management.js";
const props = defineProps({
type: {
type: Number,
- required: true,
default: 1,
},
positions: {
type: Array,
- required: true,
default: () => [],
},
position: {
type: Array,
- required: true,
default: () => [],
},
modUuid: {
type: String,
- required: true,
default: "",
},
});
@@ -88,17 +97,48 @@ onBeforeUnmount(() => {
window.$carmer = null;
});
+
diff --git a/src/components/sign/index.vue b/src/components/sign/index.vue
index 3bf4783..11459be 100644
--- a/src/components/sign/index.vue
+++ b/src/components/sign/index.vue
@@ -13,9 +13,10 @@
:width="800"
:height="300"
:is-crop="false"
+ :is-clear-bg-color="false"
:line-width="6"
line-color="#000"
- bg-color="#FFFFFF"
+ bg-color="#fff"
/>
重签
diff --git a/src/request/axios.js b/src/request/axios.js
index 9869ab6..2fc5409 100644
--- a/src/request/axios.js
+++ b/src/request/axios.js
@@ -81,12 +81,6 @@ export function post(url, params) {
},
})
.then((res) => {
- if (
- res.config.url === "/app/audioOrVideo/createUploadVideo" ||
- res.config.url === "/app/audioOrVideo/refreshUploadVideo"
- ) {
- res.data.result = "success";
- }
if (res.data.result === "success") {
if (res.config.url.split("/")[1] === "positAlarm") {
if (res.data.code === 200 || res.data.code === 0) resolve(res.data);
diff --git a/src/request/map_settings.js b/src/request/map_settings.js
index a19aa2e..08373e1 100644
--- a/src/request/map_settings.js
+++ b/src/request/map_settings.js
@@ -30,4 +30,6 @@ export const getPathPlanningList = (params) =>
export const setPathPlanningDelete = (params) =>
post("/positAlarm/coordinateLine/batchDelete", params); // 路径规划删除
export const setPositioning = (params) =>
- post("/videomanager/setPositioning", params); // 摆放摄像头
+ post("/videomanager/setPositioning", params); // 摆放摄像头
+export const setLayAdd = (params) => post("/positAlarm/save", params); // 新建图层
+export const setLayEdit = (params) => post("/positAlarm/edit", params); // 新建图层
diff --git a/src/request/notification_announcement.js b/src/request/notification_announcement.js
new file mode 100644
index 0000000..d9cbc1a
--- /dev/null
+++ b/src/request/notification_announcement.js
@@ -0,0 +1,26 @@
+import { post, upload } from "@/request/axios";
+
+export const getNotificationAnnouncementList = (params) =>
+ post("/noticecorp/list", params); // 企业公告列表
+export const setNotificationAnnouncementChangeStatus = (params) =>
+ post("/noticecorp/changeStatus", params); // 企业公告修改启用状态
+export const setNotificationAnnouncementTopping = (params) =>
+ post("/noticecorp/changeIsTop", params); // 企业公告置顶
+export const setNotificationAnnouncementDelete = (params) =>
+ post("/noticecorp/delete", params); // 企业公告删除
+export const setNotificationAnnouncementBatchDeletion = (params) =>
+ post("/noticecorp/deleteAll", params); // 企业公告删除多选
+export const getNotificationAnnouncementViewStatusList = (params) =>
+ post("/noticecorp/listUserRead", params); // 企业公告查看状态列表
+export const getSelectNotifierList = (params) =>
+ post("/user/listSelect", params); // 通知人列表
+export const setNotificationAnnouncementAdd = (params) =>
+ upload("/noticecorp/add", params); // 企业公告添加
+export const getNotificationTemplateConfigurationList = (params) =>
+ post("/notice_management/list", params); // 通知模板配置列表
+export const setNotificationTemplateConfigurationAdd = (params) =>
+ post("/notice_management/add", params); // 通知模板配置改变状态
+export const setNotificationTemplateConfigurationConfigureList = (params) =>
+ post("/notice_management/userlist", params); // 通知模板配置配置列表
+export const setNotificationTemplateConfigurationConfigure = (params) =>
+ post("/notice_management/editUserName", params); // 通知模板配置配置
diff --git a/src/views/BI/components/video_ai_analysis.vue b/src/views/BI/components/video_ai_analysis.vue
index e1f7dfc..a730c4a 100644
--- a/src/views/BI/components/video_ai_analysis.vue
+++ b/src/views/BI/components/video_ai_analysis.vue
@@ -25,23 +25,23 @@
-
-
-
-
-
-
-
{{ item.serialNumber }}
-
{{ item.type }}
-
{{ item.time }}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.countCk }}/{{ row.countAll }}
+
+
+
+
+
+
+ 查看
+
+
+ {{ row.ISTOP === "0" ? "置顶" : "取消置顶" }}
+
+
+ 删除
+
+
+
+
+
+ 新增
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/notification_announcement/notification_template_configuration/components/configure.vue b/src/views/notification_announcement/notification_template_configuration/components/configure.vue
new file mode 100644
index 0000000..9455a2f
--- /dev/null
+++ b/src/views/notification_announcement/notification_template_configuration/components/configure.vue
@@ -0,0 +1,128 @@
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
diff --git a/src/views/notification_announcement/notification_template_configuration/index.vue b/src/views/notification_announcement/notification_template_configuration/index.vue
new file mode 100644
index 0000000..f09ed33
--- /dev/null
+++ b/src/views/notification_announcement/notification_template_configuration/index.vue
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+ {{ serialNumber(pagination, $index) }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 配置
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/statistical_analysis/detection_situation/index.vue b/src/views/statistical_analysis/detection_situation/index.vue
index 7a887f3..6a2dce1 100644
--- a/src/views/statistical_analysis/detection_situation/index.vue
+++ b/src/views/statistical_analysis/detection_situation/index.vue
@@ -4,7 +4,7 @@
@@ -42,7 +42,7 @@
搜索
-
+
重置
@@ -98,25 +98,26 @@ import {
import { useRouter } from "vue-router";
const router = useRouter();
-const { list, searchForm, pagination, fnResetPagination } = useListData(
+const { list, searchForm, pagination, fnGetData } = useListData(
getDetectionSituationList,
{
immediate: false,
+ usePagination: false,
}
);
-const fnResetPaginationTransfer = () => {
- fnResetPagination({
+const fnGetDataTransfer = () => {
+ fnGetData({
STARTTIME: searchForm.value.dates?.[0],
ENDTIME: searchForm.value.dates?.[1],
DEPTIDS: searchForm.value.DEPTIDS?.join(","),
});
};
-const fnGetData = async () => {
+const fnInit = async () => {
const resData = await getDetectionSituationListTime();
searchForm.value.dates = [resData.pd.MINTIME, resData.pd.MAXTIME];
- fnResetPaginationTransfer();
+ fnGetDataTransfer();
};
-fnGetData();
+fnInit();
diff --git a/src/views/statistical_analysis/usage_situation/index.vue b/src/views/statistical_analysis/usage_situation/index.vue
index 48ccce1..a80c4a4 100644
--- a/src/views/statistical_analysis/usage_situation/index.vue
+++ b/src/views/statistical_analysis/usage_situation/index.vue
@@ -4,7 +4,7 @@
@@ -48,7 +48,7 @@
搜索
-
+
重置
@@ -112,7 +112,7 @@ const achieving = ref(0);
const listNoCheckNum = ref(0);
const listCheckedNum = ref(0);
const checkTheRate = ref(0);
-const { list, searchForm, pagination, fnResetPagination } = useListData(
+const { list, searchForm, pagination, fnGetData } = useListData(
getUsageSituationList,
{
defaultSearchForm: {
@@ -128,8 +128,8 @@ const { list, searchForm, pagination, fnResetPagination } = useListData(
},
}
);
-const fnResetPaginationTransfer = () => {
- fnResetPagination({
+const fnGetDataTransfer = () => {
+ fnGetData({
DEPTIDS: searchForm.value.DEPTIDS?.join(","),
});
};
diff --git a/src/views/video_manager/video_manager/components/selecting_points.vue b/src/views/video_manager/video_manager/components/selecting_points.vue
index 4b4a939..0b3f55a 100644
--- a/src/views/video_manager/video_manager/components/selecting_points.vue
+++ b/src/views/video_manager/video_manager/components/selecting_points.vue
@@ -1,11 +1,6 @@
-
+
关闭
保存
@@ -28,9 +23,9 @@ const props = defineProps({
default: false,
},
id: {
- type: Number,
+ type: String,
required: true,
- default: 0,
+ default: "",
},
});
const emits = defineEmits(["update:visible", "get-data"]);
@@ -46,7 +41,12 @@ const fnSubmit = debounce(
ElMessage.warning("请选择坐标点");
return;
}
- await setPositioning({ camId: props.id, lon: position.value[0], lat: position.value[1], alt: position.value[2] });
+ await setPositioning({
+ camId: props.id,
+ lon: position.value[0],
+ lat: position.value[1],
+ alt: position.value[2],
+ });
ElMessage.success("保存成功");
fnClose();
emits("get-data");