diff --git a/src/App.vue b/src/App.vue index a66e61c..bf3387e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,11 +11,14 @@ import autofit from "autofit.js"; export default { name: "App", mounted() { - // 初始化 + //获取当前屏幕可视区域宽度与高度 + var screenWidth = window.innerWidth; + var screenHeight = window.innerHeight; + // 初始化(适配) autofit.init( { - dh: 1080, - dw: 1920, + dh: screenHeight, + dw: screenWidth, el: "#app", resize: true, }, diff --git a/src/assets/icons/svg/AD-S.svg b/src/assets/icons/svg/AD-S.svg new file mode 100644 index 0000000..bc6721c --- /dev/null +++ b/src/assets/icons/svg/AD-S.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/AD.svg b/src/assets/icons/svg/AD.svg new file mode 100644 index 0000000..b30e8d1 --- /dev/null +++ b/src/assets/icons/svg/AD.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/lianwang.svg b/src/assets/icons/svg/lianwang.svg new file mode 100644 index 0000000..a829b5e --- /dev/null +++ b/src/assets/icons/svg/lianwang.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/net.svg b/src/assets/icons/svg/net.svg new file mode 100644 index 0000000..00dcab0 --- /dev/null +++ b/src/assets/icons/svg/net.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/shanghu.svg b/src/assets/icons/svg/shanghu.svg new file mode 100644 index 0000000..c7e3f8e --- /dev/null +++ b/src/assets/icons/svg/shanghu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/VideoUpload/index.vue b/src/components/VideoUpload/index.vue new file mode 100644 index 0000000..f346a96 --- /dev/null +++ b/src/components/VideoUpload/index.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/src/main.js b/src/main.js index 13c6cf2..d78c226 100644 --- a/src/main.js +++ b/src/main.js @@ -1,67 +1,77 @@ -import Vue from 'vue' +import Vue from "vue"; -import Cookies from 'js-cookie' +import Cookies from "js-cookie"; -import Element from 'element-ui' -import './assets/styles/element-variables.scss' +import Element from "element-ui"; +import "./assets/styles/element-variables.scss"; -import '@/assets/styles/index.scss' // global css -import '@/assets/styles/ruoyi.scss' // ruoyi css -import App from './App' -import store from './store' -import router from './router' -import directive from './directive' // directive -import plugins from './plugins' // plugins -import { download } from '@/utils/request' +import "@/assets/styles/index.scss"; // global css +import "@/assets/styles/ruoyi.scss"; // ruoyi css +import App from "./App"; +import store from "./store"; +import router from "./router"; +import directive from "./directive"; // directive +import plugins from "./plugins"; // plugins +import { download } from "@/utils/request"; -import './assets/icons' // icon -import './permission' // permission control +import "./assets/icons"; // icon +import "./permission"; // permission control import { getDicts } from "@/api/system/dict/data"; import { getConfigKey } from "@/api/system/config"; -import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"; +import { + parseTime, + resetForm, + addDateRange, + selectDictLabel, + selectDictLabels, + handleTree, +} from "@/utils/ruoyi"; // 分页组件 import Pagination from "@/components/Pagination"; // 自定义表格工具组件 -import RightToolbar from "@/components/RightToolbar" +import RightToolbar from "@/components/RightToolbar"; // 富文本组件 -import Editor from "@/components/Editor" +import Editor from "@/components/Editor"; // 文件上传组件 -import FileUpload from "@/components/FileUpload" +import FileUpload from "@/components/FileUpload"; // 图片上传组件 -import ImageUpload from "@/components/ImageUpload" +import ImageUpload from "@/components/ImageUpload"; // 图片预览组件 -import ImagePreview from "@/components/ImagePreview" +import ImagePreview from "@/components/ImagePreview"; // 字典标签组件 -import DictTag from '@/components/DictTag' +import DictTag from "@/components/DictTag"; // 头部标签组件 -import VueMeta from 'vue-meta' +import VueMeta from "vue-meta"; // 字典数据组件 -import DictData from '@/components/DictData' +import DictData from "@/components/DictData"; +//上传视频 +import VideoUpload from "@/components/VideoUpload"; // 全局方法挂载 -Vue.prototype.getDicts = getDicts -Vue.prototype.getConfigKey = getConfigKey -Vue.prototype.parseTime = parseTime -Vue.prototype.resetForm = resetForm -Vue.prototype.addDateRange = addDateRange -Vue.prototype.selectDictLabel = selectDictLabel -Vue.prototype.selectDictLabels = selectDictLabels -Vue.prototype.download = download -Vue.prototype.handleTree = handleTree +Vue.prototype.getDicts = getDicts; +Vue.prototype.getConfigKey = getConfigKey; +Vue.prototype.parseTime = parseTime; +Vue.prototype.resetForm = resetForm; +Vue.prototype.addDateRange = addDateRange; +Vue.prototype.selectDictLabel = selectDictLabel; +Vue.prototype.selectDictLabels = selectDictLabels; +Vue.prototype.download = download; +Vue.prototype.handleTree = handleTree; // 全局组件挂载 -Vue.component('DictTag', DictTag) -Vue.component('Pagination', Pagination) -Vue.component('RightToolbar', RightToolbar) -Vue.component('Editor', Editor) -Vue.component('FileUpload', FileUpload) -Vue.component('ImageUpload', ImageUpload) -Vue.component('ImagePreview', ImagePreview) +Vue.component("DictTag", DictTag); +Vue.component("Pagination", Pagination); +Vue.component("RightToolbar", RightToolbar); +Vue.component("Editor", Editor); +Vue.component("FileUpload", FileUpload); +Vue.component("ImageUpload", ImageUpload); +Vue.component("ImagePreview", ImagePreview); +Vue.component("VideoUpload", VideoUpload); -Vue.use(directive) -Vue.use(plugins) -Vue.use(VueMeta) -DictData.install() +Vue.use(directive); +Vue.use(plugins); +Vue.use(VueMeta); +DictData.install(); /** * If you don't want to use mock-server @@ -73,14 +83,14 @@ DictData.install() */ Vue.use(Element, { - size: Cookies.get('size') || 'medium' // set element-ui default size -}) + size: Cookies.get("size") || "Default", // set element-ui default size +}); -Vue.config.productionTip = false +Vue.config.productionTip = false; new Vue({ - el: '#app', + el: "#app", router, store, - render: h => h(App) -}) + render: (h) => h(App), +}); diff --git a/src/views/netEwm/poster/index.vue b/src/views/netEwm/poster/index.vue index 9525071..d752b19 100644 --- a/src/views/netEwm/poster/index.vue +++ b/src/views/netEwm/poster/index.vue @@ -196,7 +196,8 @@ - + +