diff --git a/package.json b/package.json index 5380ca6b..da76473f 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "less": "^3.12.2", "less-loader": "^7.1.0", "nprogress": "^0.2.0", + "sortablejs": "^1.13.0", "vue": "^3.0.0", "vue-router": "^4.0.0-0", "vuedraggable": "^4.0.1", diff --git a/public/json/app.json b/public/json/app.json new file mode 100644 index 00000000..0211e556 --- /dev/null +++ b/public/json/app.json @@ -0,0 +1,23 @@ +{ + "code": 200, + "count": 2, + "data": [ + { + "id": "100", + "appName": "自助机", + "appId": "selfHelp", + "secret": "YuOju6lP3t4thLbZOhRSV4UZ79vdnwIC", + "type": "ALL", + "exp": "长期" + }, + { + "id": "101", + "appName": "微信小程序", + "appId": "WechatApp", + "secret": "WgBbsRtCeXiNXIYkkShxxvqOGrAYKK2e", + "type": "", + "exp": "长期" + } + ], + "message": "" +} diff --git a/public/json/dic_info.json b/public/json/dic_info.json index 5c74f05f..96db4d7c 100644 --- a/public/json/dic_info.json +++ b/public/json/dic_info.json @@ -6,37 +6,22 @@ "id": "100", "key": "1", "name": "发布通知", - "yx": 1 - }, - { - "id": "101", - "key": "2", - "name": "批转通知", - "yx": 1 + "dic": "1", + "yx": "1" }, { "id": "102", - "key": "3", + "key": "2", "name": "转发通知", - "yx": 1 - }, - { - "id": "103", - "key": "4", - "name": "指示通知", - "yx": 0 - }, - { - "id": "104", - "key": "5", - "name": "任免通知", - "yx": 0 + "dic": "1", + "yx": "1" }, { "id": "105", - "key": "6", + "key": "3", "name": "事务通知", - "yx": 1 + "dic": "1", + "yx": "0" } ], "message": "" diff --git a/public/json/user_list.json b/public/json/user_list.json index 6a591f4a..790ee6cc 100644 --- a/public/json/user_list.json +++ b/public/json/user_list.json @@ -5,6 +5,7 @@ { "id": "100", "userName": "81883387", + "avatar": "images/avatar.jpg", "mail": "81883387@qq.com", "name": "sakuya", "group": ["1"], @@ -14,6 +15,7 @@ { "id": "101", "userName": "luhkpev", + "avatar": "images/avatar3.gif", "mail": "k.luhkpev@zdgtfd.ma", "name": "John Martinez", "group": ["22", "23"], diff --git a/src/api/index.js b/src/api/index.js index ad846f69..7c85ac2e 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -72,6 +72,15 @@ const api = { } } }, + app: { + list: { + url: `${config.API_URL}/json/app.json`, + name: "应用列表", + get: async function(){ + return await http.get(this.url); + } + } + }, demo: { select: { url: `${config.API_URL}/json/select.json`, diff --git a/src/components/scUpload/index.vue b/src/components/scUpload/index.vue new file mode 100644 index 00000000..3ecc93e6 --- /dev/null +++ b/src/components/scUpload/index.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/src/main.js b/src/main.js index cbc8b857..7a470c10 100644 --- a/src/main.js +++ b/src/main.js @@ -13,6 +13,7 @@ import http from "./utils/request" import permission from './utils/permission' import scTable from './components/scTable' import scFilterBar from './components/scFilterBar' +import scUpload from './components/scUpload' const app = createApp(App); @@ -28,5 +29,6 @@ app.use(ElementPlus, {size: 'small', zIndex: 3000 ,locale: locale}); app.component('scTable', scTable); app.component('scFilterBar', scFilterBar); +app.component('scUpload', scUpload); app.mount('#app'); diff --git a/src/views/setting/client/index.vue b/src/views/setting/client/index.vue new file mode 100644 index 00000000..5a018766 --- /dev/null +++ b/src/views/setting/client/index.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/src/views/setting/dic/dic.vue b/src/views/setting/dic/dic.vue index 2372ec53..40f93124 100644 --- a/src/views/setting/dic/dic.vue +++ b/src/views/setting/dic/dic.vue @@ -1,24 +1,14 @@ diff --git a/src/views/setting/dic/index.vue b/src/views/setting/dic/index.vue index f9fe5b46..44f5ddbc 100644 --- a/src/views/setting/dic/index.vue +++ b/src/views/setting/dic/index.vue @@ -28,24 +28,32 @@
- +
- + - + + + @@ -53,7 +61,7 @@ - + - +