Commit d0886e23 authored by 周远喜's avatar 周远喜

portal 提交

parent 8770a249
This diff is collapsed.
...@@ -89,7 +89,7 @@ export default { ...@@ -89,7 +89,7 @@ export default {
*/ */
axios: {}, axios: {},
server: { server: {
port: 3006, // default: 3000 port: 3005, // default: 3000
// host: '0.0.0.0' // default: localhost, // host: '0.0.0.0' // default: localhost,
}, },
/* /*
......
...@@ -13132,6 +13132,11 @@ ...@@ -13132,6 +13132,11 @@
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
}, },
"particles.js": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/particles.js/-/particles.js-2.0.0.tgz",
"integrity": "sha1-IThsQyjWx/lngKIB6W7t/AnHNvY="
},
"pascalcase": { "pascalcase": {
"version": "0.1.1", "version": "0.1.1",
"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
...@@ -18210,6 +18215,15 @@ ...@@ -18210,6 +18215,15 @@
"resolved": "https://registry.npmjs.org/vue-no-ssr/-/vue-no-ssr-1.1.1.tgz", "resolved": "https://registry.npmjs.org/vue-no-ssr/-/vue-no-ssr-1.1.1.tgz",
"integrity": "sha512-ZMjqRpWabMPqPc7gIrG0Nw6vRf1+itwf0Itft7LbMXs2g3Zs/NFmevjZGN1x7K3Q95GmIjWbQZTVerxiBxI+0g==" "integrity": "sha512-ZMjqRpWabMPqPc7gIrG0Nw6vRf1+itwf0Itft7LbMXs2g3Zs/NFmevjZGN1x7K3Q95GmIjWbQZTVerxiBxI+0g=="
}, },
"vue-particles": {
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/vue-particles/-/vue-particles-1.0.9.tgz",
"integrity": "sha1-KdnMK+AVffHAqH7DuWyW8zJ5Um4=",
"requires": {
"particles.js": "^2.0.0",
"vue": "^2.2.6"
}
},
"vue-quill-editor": { "vue-quill-editor": {
"version": "3.0.6", "version": "3.0.6",
"resolved": "https://registry.npmjs.org/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz", "resolved": "https://registry.npmjs.org/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz",
......
...@@ -12,19 +12,23 @@ ...@@ -12,19 +12,23 @@
}, },
"dependencies": { "dependencies": {
"@nuxtjs/axios": "^5.3.6", "@nuxtjs/axios": "^5.3.6",
"@svgdotjs/svg.draggable.js": "^3.0.2",
"@svgdotjs/svg.js": "^3.0.16",
"area-data": "^5.0.6",
"awe-dnd": "^0.3.4", "awe-dnd": "^0.3.4",
"better-scroll": "^1.12.1", "better-scroll": "^1.12.1",
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
"dayjs": "^1.8.22", "dayjs": "^1.8.22",
"echarts": "^4.7.0", "echarts": "^4.7.0",
"echarts-liquidfill": "^2.0.5", "echarts-liquidfill": "^2.0.5",
"gojs": "^2.1.10",
"iview-loader": "^1.3.0", "iview-loader": "^1.3.0",
"iview-pro": "file:./iview-pro", "iview-pro": "file:./iview-pro",
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",
"less": "^3.10.3", "less": "^3.10.3",
"less-loader": "^5.0.0", "less-loader": "^5.0.0",
"lodash.chunk": "^4.2.0",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"lodash.chunk": "^4.2.0",
"lowdb": "^1.0.0", "lowdb": "^1.0.0",
"marked": "^0.3.9", "marked": "^0.3.9",
"mockjs": "^1.0.1-beta3", "mockjs": "^1.0.1-beta3",
...@@ -32,22 +36,19 @@ ...@@ -32,22 +36,19 @@
"nuxt": "^2.10.2", "nuxt": "^2.10.2",
"oidc-client": "^1.9.1", "oidc-client": "^1.9.1",
"qs": "^6.6.0", "qs": "^6.6.0",
"gojs": "^2.1.10",
"screenfull": "^5.0.2", "screenfull": "^5.0.2",
"area-data": "^5.0.6",
"xlsx": "^0.15.1",
"@svgdotjs/svg.draggable.js": "^3.0.2",
"@svgdotjs/svg.js": "^3.0.16",
"ua-parser-js": "^0.7.18", "ua-parser-js": "^0.7.18",
"view-design": "^4.1.3", "view-design": "^4.1.3",
"vue-echarts": "^4.0.3", "vue-echarts": "^4.0.3",
"vue-i18n": "^8.15.5", "vue-i18n": "^8.15.5",
"vue-json-viewer": "^2.2.8", "vue-json-viewer": "^2.2.8",
"vue-particles": "^1.0.9",
"vue-quill-editor": "^3.0.6", "vue-quill-editor": "^3.0.6",
"vue-ueditor-wrap": "^2.4.1", "vue-ueditor-wrap": "^2.4.1",
"vue2-editor": "^2.10.2", "vue2-editor": "^2.10.2",
"vuedraggable": "^2.23.0", "vuedraggable": "^2.23.0",
"vuex-along": "^1.2.10" "vuex-along": "^1.2.10",
"xlsx": "^0.15.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/plugin-transform-runtime": "^7.2.0", "@babel/plugin-transform-runtime": "^7.2.0",
......
<template> <template>
<div class="account"> <div class="account">
<Carousel v-model="value1" autoplay :autoplay-speed="5000" loop class="zmd"> <vue-particles color="#dedede"></vue-particles>
<CarouselItem> <div class="login">
<div class="bg bg0">1</div> <div class="page-account-top">
</CarouselItem> <div class="page-account-top-logo tc">
<CarouselItem> <img src="@/assets/images/logo.png" alt="logo" />
<div class="bg bg1">1</div>
</CarouselItem>
<CarouselItem>
<div class="bg bg2">1</div>
</CarouselItem>
<CarouselItem>
<div class="bg bg3">1</div>
</CarouselItem>
</Carousel>
<div v-if="showI18n" class="page-account-header">
<i-header-i18n />
</div>
<div class="main">
<div class="ad">
<img src="@/assets/images/login/ad.png" />
</div>
<div class="login">
<div class="page-account-top">
<div class="page-account-top-logo tc">
<img src="@/assets/images/logo.png" alt="logo" />
</div>
<!-- <div class="page-account-top-desc tc">SaaS MES 制造执行系统</div> -->
</div> </div>
<h3 class="mb20">用户登陆</h3> <div class="tc">SaaS MES 制造执行---系统管理</div>
<Login @on-submit="handleSubmit">
<UserName name="username" value="13211111111" />
<Password name="password" value="1" enter-to-submit />
<div class="page-account-auto-login mb20">
<Checkbox v-model="autoLogin">{{ $t('page.login.remember') }}</Checkbox>
<a href>{{ $t('page.login.forgot') }}</a>
</div>
<div class="mt20">
<Submit class="shadown">{{ $t('page.login.submit') }}</Submit>
</div>
</Login>
</div> </div>
<h3 class="mb20">用户登陆</h3>
<Login @on-submit="handleSubmit">
<UserName name="username" value="13211111111" />
<Password name="password" value="1" enter-to-submit />
<div class="page-account-auto-login mb20">
<Checkbox v-model="autoLogin">{{ $t('page.login.remember') }}</Checkbox>
<a href>{{ $t('page.login.forgot') }}</a>
</div>
<div class="mt20">
<Submit class="shadown">{{ $t('page.login.submit') }}</Submit>
</div>
</Login>
</div> </div>
</div> </div>
</template> </template>
...@@ -61,6 +40,16 @@ export default { ...@@ -61,6 +40,16 @@ export default {
autoLogin: true autoLogin: true
}; };
}, },
head(){
return {
title: 'SaaS MES 制造执行---系统管理',
meta: [{
hid: "description",
name: "description",
content: "funny jokes page"
}]
}
},
created() { created() {
// this.oidc(); // this.oidc();
}, },
...@@ -102,13 +91,13 @@ export default { ...@@ -102,13 +91,13 @@ export default {
let info = res.result; let info = res.result;
info.auth = ["admin"]; info.auth = ["admin"];
info.avatar = info.avatarUrl; info.avatar = info.avatarUrl;
info.userId=info.id; info.userId = info.id;
info.name=info.userName; info.name = info.userName;
this.$store.dispatch("admin/user/set", info, { this.$store.dispatch("admin/user/set", info, {
root: true root: true
}); });
// setUserInfo // setUserInfo
this.$store.commit("setUserInfo",info) this.$store.commit("setUserInfo", info);
this.$router.replace(this.$route.query.redirect || "/"); this.$router.replace(this.$route.query.redirect || "/");
} else { } else {
this.$Message.error("用户信息22查询失败!"); this.$Message.error("用户信息22查询失败!");
...@@ -125,64 +114,34 @@ export default { ...@@ -125,64 +114,34 @@ export default {
width: 100%; width: 100%;
top: 0; top: 0;
bottom: 0; bottom: 0;
.zmd { background-image: url("../../../assets/images/login/login_bg.jpg");
z-index: 1; background-size: cover;
#particles-js{
z-index: 2;
position: absolute; position: absolute;
top: 0;
bottom: 0;
width: 100%;
}
.bg {
width: 100%; width: 100%;
height: 100vh; height: 100vh;
background-size: 100% auto;
} }
.bg0 { .login {
background-image: url("../../../assets/images/login/bg0.png");
}
.bg1 {
background-image: url("../../../assets/images/login/bg1.jpg");
}
.bg2 {
background-image: url("../../../assets/images/login/bg2.jpg");
}
.bg3 {
background-image: url("../../../assets/images/login/bg3.jpg");
}
.main {
position: absolute; position: absolute;
z-index: 55; z-index: 99;
top: @jianju; background-color: #214f5f;
left: @jianju; width: 500px;
right: @jianju; height: 540px;
bottom: @jianju; padding: 20px 50px;
background: rgba(38, 128, 235, 0.3); margin: 200px auto auto;
display: flex; border-radius: 10px;
.ad { left: 50%;
flex: 1; margin-left: -250px;;
text-align: center; color: #ddd;
img { box-shadow: 1px 15px 35px #022d36;
margin-top: 400px; .mt20 {
margin-top: 50px;
.shadown {
box-shadow: 1px -5px -15px #2680eb;
} }
} .ivu-btn-large {
.login { height: 50px !important;
background-color: white;
width: 600px;
padding: 150px 90px;
// background-image: url("../../../assets/images/login/33.png");
// background-repeat: no-repeat;
// background-position-y: 525px;
.ivu-input-wrapper {
margin-bottom: 5px;
}
.mt20 {
margin-top: 50px;
.shadown {
box-shadow: 1px 5px 15px #2680eb;
}
.ivu-btn-large {
height: 50px !important;
}
} }
} }
} }
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
</div> </div>
</template> </template>
<script> <script>
import iview from './crm/statistical/index.vue' import iview from './crm/statistical/index.vue'
export default { export default {
......
...@@ -2,6 +2,8 @@ import Vue from 'vue' ...@@ -2,6 +2,8 @@ import Vue from 'vue'
import ViewUI from 'view-design' import ViewUI from 'view-design'
import VueI18n from 'vue-i18n'; import VueI18n from 'vue-i18n';
import Languages from '@/i18n/locale'; import Languages from '@/i18n/locale';
import VueParticles from 'vue-particles'
// 插件 // 插件
import util from '@/libs/util'; import util from '@/libs/util';
import { includeArray } from '@/libs/system'; import { includeArray } from '@/libs/system';
...@@ -92,7 +94,7 @@ Vue.component("DepartmentSelect", DepartmentSelect) ...@@ -92,7 +94,7 @@ Vue.component("DepartmentSelect", DepartmentSelect)
Vue.component("ProductNumberSelect", ProductNumberSelect) Vue.component("ProductNumberSelect", ProductNumberSelect)
Vue.component("DTSpan", DTSpan) Vue.component("DTSpan", DTSpan)
Vue.component("DTSearch", DTSearch) Vue.component("DTSearch", DTSearch)
Vue.use(VueParticles)
//注入mock //注入mock
// require("../mock") // require("../mock")
Vue.prototype.$api=request; Vue.prototype.$api=request;
......
...@@ -42,7 +42,7 @@ const Setting = { ...@@ -42,7 +42,7 @@ const Setting = {
// 侧边栏风格,可选值为 dark 或 light // 侧边栏风格,可选值为 dark 或 light
siderTheme: 'dark', siderTheme: 'dark',
// 顶栏风格,可选值为 light、dark 或 primary // 顶栏风格,可选值为 light、dark 或 primary
headerTheme: 'light', headerTheme: 'dark',
// 顶栏是否置顶,开启后会覆盖侧边栏,需开启 headerFix // 顶栏是否置顶,开启后会覆盖侧边栏,需开启 headerFix
headerStick: false, headerStick: false,
// 是否开启多 Tabs 页签 // 是否开启多 Tabs 页签
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment