diff --git a/src/api/sensitivePerception/model.ts b/src/api/sensitivePerception/model.ts
index e47cd84..d081f1a 100644
--- a/src/api/sensitivePerception/model.ts
+++ b/src/api/sensitivePerception/model.ts
@@ -2,14 +2,33 @@ import request from "@/api/request";
export function listModel(query) {
return request.get({
- url: '/model',
+ url: '/models',
query
});
}
+export function treeModel() {
+ return request.get({
+ url: '/models/tree'
+ });
+}
+
export function addModel(body) {
return request.post({
- url: '/model',
+ url: '/models',
body
});
+}
+
+export function updateModel(body) {
+ return request.put({
+ url: '/models',
+ body
+ });
+}
+
+export function delModel(id) {
+ return request.del({
+ url: `/models/${id}`
+ });
}
\ No newline at end of file
diff --git a/src/api/sensitivePerception/modelClue.ts b/src/api/sensitivePerception/modelClue.ts
new file mode 100644
index 0000000..f8ad4fd
--- /dev/null
+++ b/src/api/sensitivePerception/modelClue.ts
@@ -0,0 +1,14 @@
+import request from "@/api/request";
+
+export function listModelClue(query) {
+ return request.get({
+ url: `/model/clues`,
+ query
+ });
+}
+
+export function listTopModelClueRecords(modelId) {
+ return request.get({
+ url: `/model/clue/records/${modelId}/top`
+ });
+}
\ No newline at end of file
diff --git a/src/api/system/dict.ts b/src/api/system/dict.ts
index b66a796..8823149 100644
--- a/src/api/system/dict.ts
+++ b/src/api/system/dict.ts
@@ -21,6 +21,12 @@ export function updateDictType(body) {
});
}
+export function delDictType(id) {
+ return request.del({
+ url: '/dict/' + id
+ });
+}
+
export function listDictDatas(query, dictType) {
return request.get({
url: `/dict/${dictType}/dictData`,
diff --git a/src/api/system/police.ts b/src/api/system/police.ts
index 8cc64a5..bdbd0e4 100644
--- a/src/api/system/police.ts
+++ b/src/api/system/police.ts
@@ -21,6 +21,12 @@ export function updatePolice(body) {
});
}
+export function delPolice(id) {
+ return request.del({
+ url: `/police/${id}`
+ });
+}
+
export function listPoliceAll(departId) {
return request.get({
url: `/police/${departId}/all`
diff --git a/src/components/depart-tree-select.vue b/src/components/depart-tree-select.vue
index 14e14cc..1f34f26 100644
--- a/src/components/depart-tree-select.vue
+++ b/src/components/depart-tree-select.vue
@@ -1,11 +1,32 @@
-
+
\ No newline at end of file
diff --git a/src/enums/appEnums.ts b/src/enums/appEnums.ts
index 37e57a6..21b007d 100644
--- a/src/enums/appEnums.ts
+++ b/src/enums/appEnums.ts
@@ -9,8 +9,13 @@ export const MENU_ROOT_ID = 0;
export const DICT_CONTENT_ROOT_ID = -1;
+// 部门跟节点
+export const ROOT_DEPART_ID = '12630';
+
// 状态
export enum Status {
ENABLE = '1',
DISABLE = '0'
-}
\ No newline at end of file
+}
+
+export const WEEKS = ["一", "二", "三", "四", "五", "六", "日"];
\ No newline at end of file
diff --git a/src/enums/dictEnums.ts b/src/enums/dictEnums.ts
index 47f33e8..c6cf0d8 100644
--- a/src/enums/dictEnums.ts
+++ b/src/enums/dictEnums.ts
@@ -108,8 +108,15 @@ export enum SubjectiveAspect {
OTHER = '3'
}
-// 分发周期
+// 分发方式
export enum DistributionMethod {
- AUTO = '1',
- MANUAL = '2'
+ NEGATIVE_DISTRIBUTE = '1',
+ DATA_SAVE = '2',
+ WARNING_NOTIFICATION = '3'
+}
+
+// 分发周期
+export enum DistributionCycle {
+ DAY = 'day',
+ WEEKLY = 'weekly'
}
\ No newline at end of file
diff --git a/src/layout/components/Header.vue b/src/layout/components/Header.vue
index 3c01377..aab0254 100644
--- a/src/layout/components/Header.vue
+++ b/src/layout/components/Header.vue
@@ -16,10 +16,10 @@
-
+
技术支持
diff --git a/src/permission.ts b/src/permission.ts
index e927911..23c793e 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -45,7 +45,6 @@ router.beforeEach(async (to, from, next) => {
}
router.addRoute(route)
})
- console.log(routes)
next({ ...to, replace: true })
return
}
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 8180f46..222c1aa 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -6,6 +6,10 @@ import Layout from '@/layout/Index.vue'
export const LAYOUT = () => Promise.resolve(Layout)
export const routes = [
+ {
+ path: '/',
+ redirect: '/home'
+ },
{
path: '/login',
component: () => import('@/views/Login.vue'),
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 95114ce..57e0ecf 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -18,7 +18,7 @@
+
@@ -45,7 +46,7 @@
-
添加模型
@@ -95,19 +96,7 @@
)
}}
-
- 下发条数
- {{
- item.windingNumber
- }}条
-
+
最近活跃时间
@@ -142,8 +131,29 @@
-
+
+
+
+
+
+
+
-
+
@@ -186,6 +197,24 @@
>
+
+
+ {{ item.dictLabel
+ }}{{ item.remark ? `(${item.remark})` : "" }}
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
取消
- 添加模型
+ {{
+ mode === "add" ? "添加模型" : "确认"
+ }}
@@ -331,6 +397,15 @@
+
+ 建模方式
+ {{
+ getDictLable(
+ dict.modelingMethod,
+ activeModel.modelingMethod
+ )
+ }}
+
分发方式
{{
@@ -340,6 +415,15 @@
)
}}
+
+ 数据类型
+ {{
+ getDictLable(
+ dict.modelDataType,
+ activeModel.modelDataType
+ )
+ }}
+
分发周期
{{
@@ -385,10 +469,7 @@
最近活跃时间
{{ activeModel.updateTime }}
-
- 下发条数
- {{ activeModel.windingNumber }}
-
+
@@ -396,38 +477,48 @@
{{ activeModel.remarks }}
-
- 查看预警线索
- 预警模型设计
-
+
-
+
+
\ No newline at end of file
diff --git a/src/views/sensitivePerception/ModelClueTask.vue b/src/views/sensitivePerception/ModelClueTask.vue
new file mode 100644
index 0000000..e527f87
--- /dev/null
+++ b/src/views/sensitivePerception/ModelClueTask.vue
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看详情
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/system/Dict.vue b/src/views/system/Dict.vue
index be603bc..4fa4d9e 100644
--- a/src/views/system/Dict.vue
+++ b/src/views/system/Dict.vue
@@ -254,6 +254,7 @@ import {
listDictTypes,
addDictType,
updateDictType,
+ delDictType,
listDictDatas,
addDictData,
updateDictData,
@@ -310,6 +311,13 @@ const typeForm = ref({
status: "0",
});
const typeFormRef = ref(null);
+
+watch(typeMode, (val) => {
+ if (val === "add") {
+ typeForm.value = { status: "0" };
+ }
+});
+
const typeRules = {
dictName: [
{
@@ -336,6 +344,13 @@ function handleEdit(row) {
typeForm.value = { ...row };
}
+async function handleDel(row) {
+ await feedback.confirm(`确认删除字典 ${row.dictName} ?`)
+ await delDictType(row.dictId)
+ getList()
+
+}
+
function submit() {
typeFormRef.value.validate((flag) => {
if (flag) {
diff --git a/src/views/system/Holiday.vue b/src/views/system/Holiday.vue
index 95ac741..e728e8e 100644
--- a/src/views/system/Holiday.vue
+++ b/src/views/system/Holiday.vue
@@ -49,11 +49,12 @@
\ No newline at end of file
diff --git a/src/views/system/Role.vue b/src/views/system/Role.vue
index e5be991..c712665 100644
--- a/src/views/system/Role.vue
+++ b/src/views/system/Role.vue
@@ -5,7 +5,10 @@
-
+
@@ -15,13 +18,15 @@
- 新增角色
+ 新增角色
- 查询
+ 查询
重置
@@ -43,13 +48,19 @@
/>
- 菜单权限
编辑
- 删除
@@ -58,23 +69,37 @@
-
+
-
+
-
+
-
-
-
+
+
+
-
+
@@ -85,7 +110,7 @@
@@ -100,17 +125,29 @@
diff --git a/src/views/system/User.vue b/src/views/system/User.vue
index 60b6ee2..9bc948f 100644
--- a/src/views/system/User.vue
+++ b/src/views/system/User.vue
@@ -1,6 +1,6 @@
-
+
@@ -19,47 +19,85 @@
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
-
-
-
-
-
-
-
- 查询
- 重置
-
-
-
-
-
-
-
- 正常
-
-
-
+
+
+
{{ item }}
-
-
+
+
+ {{
+ row.userType === "super"
+ ? "超级管理员"
+ : "普通管理员"
+ }}
+
+
+
+
+
+ 正常
+
+
+
- 编辑
diff --git a/vite.config.ts b/vite.config.ts
index 920ceb4..8dca79b 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -70,16 +70,16 @@ export default ({ mode }) => {
},
postcss: {
plugins: [
- // postCssPxToRem({
- // rootValue: 192,
- // propList: ['*'],
- // })
+ postCssPxToRem({
+ rootValue: 192,
+ propList: ['*'],
+ })
]
}
},
build: {
outDir: 'v2',
- target: "es2015"
+ // target: "es2015"
}
})
}