From 5bb836825f0eb9a440e31b63c1781e2d059bfd01 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 18 五月 2024 16:15:45 +0800
Subject: [PATCH] 增加了会议模块
---
ruoyi-ui/.eslintignore | 4 +
ruoyi-ui/package.json | 8 +++
ruoyi-ui/src/assets/icons/index.js | 4 ++
ruoyi-ui/src/assets/icons/svg/github.svg | 6 ++
ruoyi-ui/src/main.js | 60 +++++++++++++++++++++++++++++
ruoyi-ui/src/App.vue | 7 +++
ruoyi-ui/.eslintrc.js | 11 +++++
ruoyi-ui/src/router/index.js | 2
ruoyi-ui/src/assets/icons/svg/language.svg | 2
9 files changed, 97 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/.eslintignore b/ruoyi-ui/.eslintignore
index 89be6f6..ec40d2d 100644
--- a/ruoyi-ui/.eslintignore
+++ b/ruoyi-ui/.eslintignore
@@ -7,4 +7,6 @@
# 蹇界暐褰撳墠鐩綍涓嬩负js鐨勬枃浠剁殑璇硶妫�鏌�
*.js
# 蹇界暐褰撳墠鐩綍涓嬩负vue鐨勬枃浠剁殑璇硶妫�鏌�
-*.vue
\ No newline at end of file
+*.vue
+/src/components/
+/src/
\ No newline at end of file
diff --git a/ruoyi-ui/.eslintrc.js b/ruoyi-ui/.eslintrc.js
index 82bbdee..e4d933e 100644
--- a/ruoyi-ui/.eslintrc.js
+++ b/ruoyi-ui/.eslintrc.js
@@ -9,8 +9,9 @@
browser: true,
node: true,
es6: true,
+
},
- extends: ['plugin:vue/recommended', 'eslint:recommended'],
+ extends: ['plugin:vue/recommended', 'eslint:recommended',],
// add your custom rules here
//it is base on https://github.com/vuejs/eslint-config-vue
@@ -70,6 +71,14 @@
'newIsCap': true,
'capIsNew': false
}],
+
+
+ 'no-nested-ternary': 'off',
+ '@typescript-eslint/no-unused-vars': ['error'],
+ 'vue/html-self-closing': 'off',
+ 'vue/multi-word-component-names': 'off',
+
+
'new-parens': 2,
'no-array-constructor': 2,
'no-caller': 2,
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 9c8d555..17cdd09 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -36,10 +36,13 @@
"url": "https://gitee.com/y_project/RuoYi-Vue.git"
},
"dependencies": {
+ "core-js": "3.25.3",
+ "aegis-web-sdk": "^1.35.26",
+ "trtc-js-sdk": "latest",
+ "vue-i18n": "^8.26.3",
"@riophae/vue-treeselect": "0.4.0",
"axios": "0.24.0",
"clipboard": "2.0.8",
- "core-js": "3.25.3",
"d3": "^7.8.5",
"echarts": "^5.5.0",
"element-ui": "2.15.12",
@@ -65,6 +68,9 @@
"vuex": "3.6.0"
},
"devDependencies": {
+ "@babel/core": "^7.14.6",
+ "@babel/eslint-parser": "^7.14.6",
+ "@intlify/vue-i18n-loader": "^1.1.0",
"@vue/cli-plugin-babel": "4.4.6",
"@vue/cli-plugin-eslint": "4.4.6",
"@vue/cli-service": "4.4.6",
diff --git a/ruoyi-ui/src/App.vue b/ruoyi-ui/src/App.vue
index dfa62fe..4cd4eac 100644
--- a/ruoyi-ui/src/App.vue
+++ b/ruoyi-ui/src/App.vue
@@ -13,6 +13,13 @@
export default {
name: "App",
+ mounted() {
+ this.$aegis.reportEvent({
+ name: 'loaded',
+ ext1: 'loaded-success',
+ ext2: 'webrtcQuickDemoVue2',
+ });
+ },
components: { ThemePicker },
metaInfo() {
return {
diff --git a/ruoyi-ui/src/assets/icons/index.js b/ruoyi-ui/src/assets/icons/index.js
index 2c6b309..94c6215 100644
--- a/ruoyi-ui/src/assets/icons/index.js
+++ b/ruoyi-ui/src/assets/icons/index.js
@@ -7,3 +7,7 @@
const req = require.context('./svg', false, /\.svg$/)
const requireAll = requireContext => requireContext.keys().map(requireContext)
requireAll(req)
+
+
+
+
diff --git a/ruoyi-ui/src/assets/icons/svg/github.svg b/ruoyi-ui/src/assets/icons/svg/github.svg
index db0a0d4..bb2f9d1 100644
--- a/ruoyi-ui/src/assets/icons/svg/github.svg
+++ b/ruoyi-ui/src/assets/icons/svg/github.svg
@@ -1 +1,5 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1581238998885" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4187" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M511.542857 14.057143C228.914286 13.942857 0 242.742857 0 525.142857 0 748.457143 143.2 938.285714 342.628571 1008c26.857143 6.742857 22.742857-12.342857 22.742858-25.371429v-88.571428c-155.085714 18.171429-161.371429-84.457143-171.771429-101.6C172.571429 756.571429 122.857143 747.428571 137.714286 730.285714c35.314286-18.171429 71.314286 4.571429 113.028571 66.171429 30.171429 44.685714 89.028571 37.142857 118.857143 29.714286 6.514286-26.857143 20.457143-50.857143 39.657143-69.485715-160.685714-28.8-227.657143-126.857143-227.657143-243.428571 0-56.571429 18.628571-108.571429 55.2-150.514286-23.314286-69.142857 2.171429-128.342857 5.6-137.142857 66.4-5.942857 135.428571 47.542857 140.8 51.771429 37.714286-10.171429 80.8-15.542857 129.028571-15.542858 48.457143 0 91.657143 5.6 129.714286 15.885715 12.914286-9.828571 76.914286-55.771429 138.628572-50.171429 3.314286 8.8 28.228571 66.628571 6.285714 134.857143 37.028571 42.057143 55.885714 94.514286 55.885714 151.2 0 116.8-67.428571 214.971429-228.571428 243.314286a145.714286 145.714286 0 0 1 43.542857 104v128.571428c0.914286 10.285714 0 20.457143 17.142857 20.457143 202.4-68.228571 348.114286-259.428571 348.114286-484.685714 0-282.514286-229.028571-511.2-511.428572-511.2z" p-id="4188"></path></svg>
\ No newline at end of file
+<svg height="32" aria-hidden="true" viewBox="0 0 16 16" version="1.1" width="32" data-view-component="true"
+ class="octicon octicon-mark-github v-align-middle">
+ <path fill-rule="evenodd"
+ d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"></path>
+</svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/icons/svg/language.svg b/ruoyi-ui/src/assets/icons/svg/language.svg
index 0082b57..8d39a5a 100644
--- a/ruoyi-ui/src/assets/icons/svg/language.svg
+++ b/ruoyi-ui/src/assets/icons/svg/language.svg
@@ -1 +1 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M84.742 36.8c2.398 7.2 5.595 12.8 11.19 18.4 4.795-4.8 7.992-11.2 10.39-18.4h-21.58zm-52.748 40h20.78l-10.39-28-10.39 28z"/><path d="M111.916 0H16.009C7.218 0 .025 7.2.025 16v96c0 8.8 7.193 16 15.984 16h95.907c8.791 0 15.984-7.2 15.984-16V16c0-8.8-6.394-16-15.984-16zM72.754 103.2c-1.598 1.6-3.197 1.6-4.795 1.6-.8 0-2.398 0-3.197-.8-.8-.8-1.599 0-1.599-.8s-.799-1.6-1.598-3.2c-.8-1.6-.8-2.4-1.599-4l-3.196-8.8H28.797L25.6 96c-1.598 3.2-2.398 5.6-3.197 7.2-.8 1.6-2.398 1.6-4.795 1.6-1.599 0-3.197-.8-4.796-1.6-1.598-1.6-2.397-2.4-2.397-4 0-.8 0-1.6.799-3.2.8-1.6.8-2.4 1.598-4l17.583-44.8c.8-1.6.8-3.2 1.599-4.8.799-1.6 1.598-3.2 2.397-4 .8-.8 1.599-2.4 3.197-3.2 1.599-.8 3.197-.8 4.796-.8 1.598 0 3.196 0 4.795.8 1.598.8 2.398 1.6 3.197 3.2.799.8 1.598 2.4 2.397 4 .8 1.6 1.599 3.2 2.398 5.6l17.583 44c1.598 3.2 2.398 5.6 2.398 7.2-.8.8-1.599 2.4-2.398 4zM116.711 72c-8.791-3.2-15.185-7.2-20.78-12-5.594 5.6-12.787 9.6-21.579 12l-2.397-4c8.791-2.4 15.984-5.6 21.579-11.2C87.939 51.2 83.144 44 81.545 36h-7.992v-3.2h21.58c-1.6-2.4-3.198-5.6-4.796-8l2.397-.8c1.599 2.4 3.997 5.6 5.595 8.8h19.98v4h-7.992c-2.397 8-6.393 15.2-11.189 20 5.595 4.8 11.988 8.8 20.78 11.2l-3.197 4z"/></svg>
\ No newline at end of file
+<svg t="1635255864557" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1907" width="32" height="32"><path d="M568.25 483.78125h-8.0625l30.9375 172.5c20.53125-7.40625 39.09375-18.1875 55.5-32.53125-16.78125-20.53125-30.65625-43.3125-41.15625-67.6875l32.625-4.21875c9 18.46875 19.3125 34.78125 30.9375 48.84375 24.09375-29.25 42.65625-68.25 55.59375-117l-156.375 0.09375z m123.1875 140.0625c18.5625 16.125 39.75 27.84375 63.5625 35.15625l14.90625 4.59375-8.71875 31.78125-14.90625-4.59375c-28.59375-8.71875-54.9375-23.71875-77.25-43.6875-20.90625 18.75-45.375 33.09375-72 42L617.9375 805.25H493.71875l-16.6875 75.9375h389.25c18.28125 0 33.09375-14.8125 33.09375-33.09375V285.125c0-18.28125-14.8125-33.09375-33.09375-33.09375H518.5625l25.875 144.28125-1.03125-0.375 3 15.84375 0.46875-2.0625 7.3125 41.0625h80.25v-33.09375h62.0625v33.09375h103.5V483.875h-43.125c-14.4375 58.125-36.1875 104.90625-65.4375 139.96875zM459.78125 805.0625H157.71875c-36.5625 0-66.1875-29.625-66.1875-66.1875V175.90625c0-36.5625 29.625-66.1875 66.1875-66.1875h331.125l20.8125 109.21875h356.53125c36.5625 0 66.1875 29.625 66.1875 66.1875v562.96875c0 36.5625-29.625 66.1875-66.1875 66.1875H435.78125l24-109.21875z m-156.46875-255v-34.78125h-65.4375v-51.28125h60.84375V429.5h-60.84375v-43.6875h65.4375v-34.5H199.8125v198.65625h103.5z m159.9375 0V450.96875c0-18-4.125-31.78125-12.375-41.4375-8.25-9.5625-20.4375-14.34375-36.375-14.34375-9.375 0-17.71875 1.875-25.03125 5.625-7.3125 3.75-13.3125 9.46875-17.25 16.6875h-2.0625l-5.0625-19.40625h-28.6875v151.96875h37.5v-71.53125c0-17.90625 2.34375-30.75 7.03125-38.53125 4.59375-7.78125 12.28125-11.625 22.78125-11.625 7.6875 0 13.3125 2.71875 16.78125 8.25 3.5625 5.53125 5.34375 13.6875 5.34375 24.65625v88.78125H463.25z" p-id="1908"></path></svg>
\ No newline at end of file
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index d2b9b00..8a89a9a 100644
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -1,6 +1,63 @@
import Vue from 'vue'
-
+import TRTC from 'trtc-js-sdk';
+import '@/utils/aegis.js';
import Cookies from 'js-cookie'
+
+import '@/assets/style/global.css';
+import '@/assets/icons';
+import '@/assets/style/theme/index.css';
+import { isMobile } from '@/utils/utils';
+
+import {
+ Collapse,
+ CollapseItem,
+ Select,
+ Option,
+ Input,
+ Button,
+ Message,
+ MessageBox,
+ Tooltip,
+ Alert,
+} from 'element-ui';
+import i18n from './locales/i18n';
+const showMessage = Symbol('showMessage');
+class DonMessage {
+ success(options, single = true) {
+ this[showMessage]('success', options, single);
+ }
+ warning(options, single = true) {
+ this[showMessage]('warning', options, single);
+ }
+ info(options, single = true) {
+ this[showMessage]('info', options, single);
+ }
+ error(options, single = true) {
+ this[showMessage]('error', options, single);
+ }
+ [showMessage](type, options) {
+ Message[type](options);
+ }
+}
+
+
+//import i18n from './locales/i18n';
+Vue.use(Collapse);
+Vue.use(CollapseItem);
+Vue.use(Select);
+Vue.use(Option);
+Vue.use(Input);
+Vue.use(Button);
+Vue.use(Tooltip);
+Vue.use(Alert);
+Vue.prototype.$alert = MessageBox.alert;
+Vue.prototype.$message = new DonMessage();
+Vue.prototype.$isMobile = isMobile;
+
+
+
+
+
import Element from 'element-ui'
import './assets/styles/element-variables.scss'
@@ -87,6 +144,7 @@
el: '#app',
router,
store,
+ i18n,
Base64,
render: h => h(App)
})
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 1716239..dbc362c 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -208,7 +208,7 @@
{
path: 'webcastInfo/',
// path: 'webcastInfo/:id(\\d+)',
- component: () => import('@/views/meeting/webcastInfo'),
+ component: () => import('@/views/meeting/Home'),
name: 'webcastInfo',
meta: { title: '鐩存挱璇︽儏',activeMenu: '/meeting/webcastInfo'}
}
--
Gitblit v1.9.1