diff --git a/ruoyi-ui/src/api/Simulated.js b/ruoyi-ui/src/api/Simulated.js new file mode 100644 index 0000000..60ce100 --- /dev/null +++ b/ruoyi-ui/src/api/Simulated.js @@ -0,0 +1,23 @@ +import request from '@/utils/request' +export const getMarketQuotation = () => { + return request({ + url: 'api/trading/getMarketQuotation', + method: 'post' + }) + } + // 可用资金 + export const getMemberById = ( memberId) => { + return request({ + url: 'api/member/getMemberById ', + method: 'post', + data: memberId + }) + } + // 可用资金 + export const getMarketQuotationByCode = ( code) => { + return request({ + url: 'api/trading/getMarketQuotationByCode ', + method: 'post', + data: code + }) + } \ No newline at end of file diff --git a/ruoyi-ui/src/api/homepage.js b/ruoyi-ui/src/api/homepage.js new file mode 100644 index 0000000..935b3d1 --- /dev/null +++ b/ruoyi-ui/src/api/homepage.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' +export const getMember = (data) => { + return request({ + url: 'api/member/getMember', + method: 'post', + data:data + }) + } diff --git a/ruoyi-ui/src/api/index.js b/ruoyi-ui/src/api/index.js index f447014..5a92eb3 100644 --- a/ruoyi-ui/src/api/index.js +++ b/ruoyi-ui/src/api/index.js @@ -20,4 +20,12 @@ export const findAll = (data) => { method: 'get', params: data }) +} +// 获取实训任务 +export const findTrainingList = (data) => { + return request({ + url: '/api/training/findTrainingList', + method: 'get', + params: data + }) } \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/EarlyWarning.svg b/ruoyi-ui/src/assets/icons/svg/EarlyWarning.svg new file mode 100644 index 0000000..4943a2f --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/EarlyWarning.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/dashboard.svg b/ruoyi-ui/src/assets/icons/svg/dashboard.svg index 5317d37..bd1cbce 100644 --- a/ruoyi-ui/src/assets/icons/svg/dashboard.svg +++ b/ruoyi-ui/src/assets/icons/svg/dashboard.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/market.svg b/ruoyi-ui/src/assets/icons/svg/market.svg new file mode 100644 index 0000000..3e089b9 --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/market.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/quest.svg b/ruoyi-ui/src/assets/icons/svg/quest.svg new file mode 100644 index 0000000..4f2e79d --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/quest.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/icons/svg/teachingplan.svg b/ruoyi-ui/src/assets/icons/svg/teachingplan.svg new file mode 100644 index 0000000..4943a2f --- /dev/null +++ b/ruoyi-ui/src/assets/icons/svg/teachingplan.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/images/csrc.png b/ruoyi-ui/src/assets/images/csrc.png new file mode 100644 index 0000000..b9d7dcc Binary files /dev/null and b/ruoyi-ui/src/assets/images/csrc.png differ diff --git a/ruoyi-ui/src/assets/images/dongfang.png b/ruoyi-ui/src/assets/images/dongfang.png new file mode 100644 index 0000000..d7e2620 Binary files /dev/null and b/ruoyi-ui/src/assets/images/dongfang.png differ diff --git a/ruoyi-ui/src/assets/images/sina.png b/ruoyi-ui/src/assets/images/sina.png new file mode 100644 index 0000000..65bbb88 Binary files /dev/null and b/ruoyi-ui/src/assets/images/sina.png differ diff --git a/ruoyi-ui/src/assets/images/u2008.png b/ruoyi-ui/src/assets/images/u2008.png new file mode 100644 index 0000000..5daa795 Binary files /dev/null and b/ruoyi-ui/src/assets/images/u2008.png differ diff --git a/ruoyi-ui/src/assets/images/微信图片_20230703135000.png b/ruoyi-ui/src/assets/images/微信图片_20230703135000.png new file mode 100644 index 0000000..845a444 Binary files /dev/null and b/ruoyi-ui/src/assets/images/微信图片_20230703135000.png differ diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue index 8312f6e..6a2e0b3 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/ruoyi-ui/src/layout/components/Navbar.vue @@ -3,12 +3,12 @@ - +
@@ -101,10 +101,10 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - this.$store.dispatch('LogOut').then(() => { - location.href = '/index'; + this.$store.dispatch('FedLogOut').then(() => { + location.href = '/index' }) - }).catch(() => {}); + }).catch(() => {}) } } } diff --git a/ruoyi-ui/src/layout/components/Sidebar/index.vue b/ruoyi-ui/src/layout/components/Sidebar/index.vue index b83ad1c..d95a43f 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/index.vue +++ b/ruoyi-ui/src/layout/components/Sidebar/index.vue @@ -1,72 +1,77 @@ + \ No newline at end of file diff --git a/ruoyi-ui/src/views/quotation/index.vue b/ruoyi-ui/src/views/quotation/index.vue index 6044a9d..96ace9d 100644 --- a/ruoyi-ui/src/views/quotation/index.vue +++ b/ruoyi-ui/src/views/quotation/index.vue @@ -1,35 +1,35 @@