diff --git a/src/api/kvt/kvt.js b/src/api/kvt/kvt.js
new file mode 100644
index 0000000..a50e074
--- /dev/null
+++ b/src/api/kvt/kvt.js
@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+// 查询kvt列表
+export function listKvt(query) {
+ return request({
+ url: '/kvt/kvt/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询kvt详细
+export function getKvt(id) {
+ return request({
+ url: '/kvt/kvt/' + id,
+ method: 'get'
+ })
+}
+
+// 新增kvt
+
+export function addKvt(data) {
+ return request({
+ url: '/kvt/kvt',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改kvt
+
+export function updateKvt(data) {
+ return request({
+ url: '/kvt/kvt/'+data.id,
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除kvt
+
+export function delKvt(id) {
+ return request({
+ url: '/kvt/kvt/' + id,
+ method: 'delete'
+ })
+}
+// 测试连接
+
+export function connectionTest(data) {
+ return request({
+ url: '/kvt/kvt/connectionTest/',
+ method: 'post',
+ data
+ })
+}
+// 选择数据库
+export function dataTypeList() {
+ return request({
+ url: '/kvt/kvt/dataTypeList/',
+ method: 'post'
+ })
+}
diff --git a/src/api/product/dept.js b/src/api/product/dept.js
new file mode 100644
index 0000000..f304e46
--- /dev/null
+++ b/src/api/product/dept.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询用户与部门中间列表
+export function listDept(query) {
+ return request({
+ url: '/product/dept/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询用户与部门中间详细
+export function getDept(id) {
+ return request({
+ url: '/product/dept/' + id,
+ method: 'get'
+ })
+}
+
+// 新增用户与部门中间
+export function addDept(data) {
+ return request({
+ url: '/product/dept',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改用户与部门中间
+export function updateDept(data) {
+ return request({
+ url: '/product/dept',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除用户与部门中间
+export function delDept(id) {
+ return request({
+ url: '/product/dept/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/api/system/notice.js b/src/api/system/notice.js
index c274ea5..d0f0ba4 100644
--- a/src/api/system/notice.js
+++ b/src/api/system/notice.js
@@ -9,6 +9,28 @@ export function listNotice(query) {
})
}
+export function updateAsUserDept(id) {
+ return request({
+ url: '/system/userDept/UpdateAsUserDept?id=' + id,
+ method: 'get'
+ })
+}
+
+export function getNum(id) {
+ return request({
+ url: '/system/userDept/GetNum?noticeId=' + id,
+ method: 'get'
+ })
+}
+
+export function getNoticeList(data) {
+ return request({
+ url: '/system/notice/GetNoticeList',
+ method: 'post',
+ data
+ })
+}
+
// 查询公告详细
export function getNotice(noticeId) {
return request({
@@ -41,4 +63,4 @@ export function delNotice(noticeId) {
url: '/system/notice/' + noticeId,
method: 'delete'
})
-}
\ No newline at end of file
+}
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 7ccea26..a67d781 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -7,7 +7,9 @@
+
+
+
+ 全部
+ 通知
+ 公告
+
+
+
+ 全部
+ 已读
+ 未读
+
+
+
+
+
+ 阅读消息
+
+
+
+
+ 消息发布时间
+
+ {{notice.createTime}}
+
+
+
+
+ 消息发布人
+
+ {{notice.createBy}}
+
+
+
+
+ 消息类型
+
+
+
+
+
+
+ 消息当前状态
+
+
+
+
+
+
+
+
+
+
+
@@ -46,8 +115,51 @@ import Hamburger from '@/components/Hamburger'
import Screenfull from '@/components/Screenfull'
import SizeSelect from '@/components/SizeSelect'
import Search from '@/components/HeaderSearch'
+import {getNoticeList, updateAsUserDept} from "@/api/system/notice";
export default {
+ dicts: ['is_read', 'sys_notice_type'],
+ data() {
+ return {
+ noticeVisble: false,
+ noticeInfo: {},
+ noticeAttr: [
+ {
+ createTime: '',
+ createBy: 'admin',
+ noticeType: '1',
+ isRead: '1',
+ noticeTitle: '哈哈',
+ noticeContent: '嘻嘻嘻嘻嘻',
+ noticeId: 1,
+ },
+ {
+ createTime: '',
+ createBy: 'admin',
+ noticeType: '2',
+ isRead: '0',
+ noticeTitle: '哈撒大大哈',
+ noticeContent: '嘻嘻嘻嘻阿尽快嘻',
+ noticeId: 2,
+ },
+ {
+ createTime: '',
+ createBy: 'admin',
+ noticeType: '1',
+ isRead: '0',
+ noticeTitle: '哈哈是',
+ noticeContent: '嘻嘻嘻萨达嘻嘻',
+ noticeId: 3,
+ }
+ ],
+ form: {
+ noticeType: '',
+ isRead: ''
+ },
+ messageTotal: undefined,
+ noticeTableVisible: false
+ }
+ },
components: {
Breadcrumb,
TopNav,
@@ -80,6 +192,25 @@ export default {
}
},
methods: {
+ getNoticeList(){
+ getNoticeList(this.form).then(
+ res=>{
+ console.log(res)
+ this.noticeAttr=res.data;
+ }
+ )
+ },
+ readNotice(row){
+ this.noticeIngo=row;
+ this.noticeVisble=true;
+ updateAsUserDept(row.id).then(res=>{
+ this.getNoticeList()
+ })
+ },
+ noticeTableList(){
+ this.getNoticeList();
+ this.noticeTableVisible=true;
+ },
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
diff --git a/src/utils/request.js b/src/utils/request.js
index 47d1bcb..1946061 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -73,7 +73,7 @@ service.interceptors.request.use(config => {
// 响应拦截器
service.interceptors.response.use(res => {
- debugger
+
// 未设置状态码则默认成功状态
const code = res.data.code || 200;
// 获取错误信息
diff --git a/src/views/kvt/kvt/index.vue b/src/views/kvt/kvt/index.vue
new file mode 100644
index 0000000..198a6b2
--- /dev/null
+++ b/src/views/kvt/kvt/index.vue
@@ -0,0 +1,598 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.maxWaitTime, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+ 测试连接
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+ 基础配置信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据连接参数
+
+
+
+
+
+
+
+
+ 新增参数
+
+
+ 清空参数
+
+
+
+
+
+
+
+ :
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+ 连接池配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 其他信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+