-
-
-
-
- 清空
-
-
-
-
-
+
+
-
-
-
-
-
- {{ props.row.method }}
-
-
- {{ props.row.params }}
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.time }}ms
- {{ scope.row.time }}ms
- {{ scope.row.time }}ms
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ - 登录日志
+ - 操作日志
+ - 异常日志
+
+
+
+
-
diff --git a/src/views/system/log/errorLog.vue b/src/views/system/log/index2.vue
similarity index 51%
rename from src/views/system/log/errorLog.vue
rename to src/views/system/log/index2.vue
index 1e4d7d8..2296b5c 100644
--- a/src/views/system/log/errorLog.vue
+++ b/src/views/system/log/index2.vue
@@ -1,7 +1,7 @@
-
+
清空
-
-
+
+
-
-
+
{{ props.row.method }}
- {{ props.row.params }}
+ {{ props.row.params }}
-
-
-
-
-
-
-
- {{ scope.row.createTime | parseTime }}
-
-
-
+
+
+
+
+
+
- 查看详情
+ {{ scope.row.time }}ms
+ {{ scope.row.time }}ms
+ {{ scope.row.time }}ms
+
-
-
-
-
-
@@ -63,33 +53,34 @@
-
确认清空所有操作日志吗?
+
确认清空所有操作日志吗?
+
+
+
diff --git a/src/views/system/log/operateLog/index.vue b/src/views/system/log/operateLog/index.vue
new file mode 100644
index 0000000..ac19aee
--- /dev/null
+++ b/src/views/system/log/operateLog/index.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
+
+
+
+ {{ props.row.method }}
+
+
+ {{ props.row.params }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.time }}ms
+ {{ scope.row.time }}ms
+ {{ scope.row.time }}ms
+
+
+
+
+ {{ scope.row.createTime | parseTime }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/log/search.vue b/src/views/system/log/search.vue
index a9d7200..3abb0f3 100644
--- a/src/views/system/log/search.vue
+++ b/src/views/system/log/search.vue
@@ -1,40 +1,94 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 清空
+
+
+
+
+
+
+
+
此操作将清空所选数据
+
你是否还要继续?
+
+
+
diff --git a/src/views/system/notifyManage/data.json b/src/views/system/notifyManage/data.json
new file mode 100644
index 0000000..1f91dfd
--- /dev/null
+++ b/src/views/system/notifyManage/data.json
@@ -0,0 +1,26 @@
+[
+ {
+ "id": 1,
+ "label": "全宗部门选择",
+ "children": [
+ {
+ "id": 2,
+ "label": "全宗A",
+ "children": [
+ {
+ "id": 4,
+ "label": "部门A1"
+ },
+ {
+ "id": 5,
+ "label": "部门A2"
+ }
+ ]
+ },
+ {
+ "id": 3,
+ "label": "全宗B"
+ }
+ ]
+ }
+]
diff --git a/src/views/system/notifyManage/index.vue b/src/views/system/notifyManage/index.vue
index 4598847..b6c37bc 100644
--- a/src/views/system/notifyManage/index.vue
+++ b/src/views/system/notifyManage/index.vue
@@ -7,7 +7,7 @@
-
-
-
- 用户
- 设备
-
-
-
-
-
-
+
@@ -131,12 +113,14 @@
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import DateRangePicker from '@/components/DateRangePicker'
+import SelectObj from './module/selectObj'
// noticeDel
import { noticeCreate, getAllDev, getAllUser, getNoticeList } from '@/api/system/logs'
+
const defaultForm = {}
export default {
name: 'NotifyManage',
- components: { rrOperation, DateRangePicker },
+ components: { rrOperation, DateRangePicker, SelectObj },
cruds() {
return CRUD({ title: '通知', url: 'api/system/logs', crudMethod: { }})
},
@@ -148,15 +132,11 @@ export default {
tableData: [],
selections: [],
sendVisible: false,
- sendObjVisible: false,
sendForm: {
msgType: '系统消息',
title: null,
notification: ''
},
- selectObjForm: {
- sendObj: 0
- },
pushObj: '用户',
checked: '',
noticeType: 1,
@@ -182,11 +162,6 @@ export default {
{ required: true, message: '发送对象不可为空', trigger: 'blur' }
]
},
- rulesObj: {
- sendObj: [
- { required: true, message: '请选择发送对象', trigger: 'change' }
- ]
- },
allUser: null,
allDev: null,
page: {
@@ -213,6 +188,9 @@ export default {
this.getTableData()
},
methods: {
+ openSelectObj() {
+ this.$refs.selectObj.sendObjVisible = true
+ },
getParams() {
const params = {
page: null,
@@ -485,4 +463,5 @@ export default {
text-align: center;
cursor: pointer;
}
+
diff --git a/src/views/system/notifyManage/module/selectObj.vue b/src/views/system/notifyManage/module/selectObj.vue
new file mode 100644
index 0000000..a699881
--- /dev/null
+++ b/src/views/system/notifyManage/module/selectObj.vue
@@ -0,0 +1,177 @@
+
+
+
+
+
+
+
+
+
+ 用户
+ 设备
+
+
+
+
+
+
+
+
+
+
已选中
+
+
+ {{ tag }}
+
+
+
+
+
+
+
+
+