diff --git a/.env.development b/.env.development index e6abb72d8..b3eeabdfd 100644 --- a/.env.development +++ b/.env.development @@ -11,4 +11,5 @@ VUE_APP_API_SERVER = http://192.168.1.140/api VUE_APP_NODE_ENV=dev_sdtdt # VUE_APP_NODE_ENV=dev #项目根路径 -VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file +VUE_APP_PUBLIC_PATH=epmet-oper +VUE_APP_CUSTOMER=yantai \ No newline at end of file diff --git a/.env.production b/.env.production index 5b72f6d9d..242b46892 100644 --- a/.env.production +++ b/.env.production @@ -2,3 +2,4 @@ NODE_ENV=production VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api VUE_APP_NODE_ENV=prod VUE_APP_PUBLIC_PATH=epmet-oper +VUE_APP_CUSTOMER=yantai diff --git a/.env.production.sit b/.env.production.sit index b0c600ea6..9edee48dd 100644 --- a/.env.production.sit +++ b/.env.production.sit @@ -2,4 +2,5 @@ NODE_ENV=production # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api VUE_APP_API_SERVER = http://192.168.1.140/api VUE_APP_NODE_ENV=prod:sit -VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file +VUE_APP_PUBLIC_PATH=epmet-oper +VUE_APP_CUSTOMER=yantai \ No newline at end of file diff --git a/.env.production.uat b/.env.production.uat index 83e93d4d1..7b14d657d 100644 --- a/.env.production.uat +++ b/.env.production.uat @@ -2,4 +2,5 @@ NODE_ENV=production # VUE_APP_API_SERVER = http://120.27.18.76/api VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api VUE_APP_NODE_ENV=prod:uat -VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file +VUE_APP_PUBLIC_PATH=epmet-oper +VUE_APP_CUSTOMER=yantai diff --git a/package.json b/package.json index 799ec0ed1..636a2262a 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "mint-ui": "^2.2.13", "node-sass": "^4.12.0", "ol": "^6.9.0", + "particles.js": "^2.0.0", "portfinder": "^1.0.21", "proj4": "^2.8.0", "qs": "^6.7.0", diff --git a/src/App.vue b/src/App.vue index c0bb9fb65..7acbfab9d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -194,24 +194,4 @@ export default { flex-direction: column; justify-content: center; } - -::-webkit-scrollbar { - // display: none; - width: 8px; - height: 8px; - background-color: #EBEEF5; -} -::-webkit-scrollbar-thumb { - box-shadow: inset 0 0 6px rgba(0, 0, 0, .3); - -webkit-box-shadow: inset 0 0 6px rgba(243, 236, 236, 0.3); - background-color: #ccc; - border-radius: 8px; -} -::-webkit-scrollbar-track { - box-shadow: inset 0 0 6px rgba(0,0,0, .2); - /*滚动条的轨道*/ - border-radius: 8px; - background: rgba(255, 255, 255, 1); -} - diff --git a/src/assets/img/yantai/index/bg.png b/src/assets/img/yantai/index/bg.png new file mode 100644 index 000000000..82f6f5d03 Binary files /dev/null and b/src/assets/img/yantai/index/bg.png differ diff --git a/src/assets/img/yantai/index/db.png b/src/assets/img/yantai/index/db.png new file mode 100644 index 000000000..679fd8724 Binary files /dev/null and b/src/assets/img/yantai/index/db.png differ diff --git a/src/assets/img/yantai/index/guanli.png b/src/assets/img/yantai/index/guanli.png new file mode 100644 index 000000000..c596ecf24 Binary files /dev/null and b/src/assets/img/yantai/index/guanli.png differ diff --git a/src/assets/img/yantai/index/shuju.png b/src/assets/img/yantai/index/shuju.png new file mode 100644 index 000000000..c57b52e0c Binary files /dev/null and b/src/assets/img/yantai/index/shuju.png differ diff --git a/src/assets/img/yantai/index/you.png b/src/assets/img/yantai/index/you.png new file mode 100644 index 000000000..7eb7242ce Binary files /dev/null and b/src/assets/img/yantai/index/you.png differ diff --git a/src/assets/img/yantai/index/yuanhu-you.png b/src/assets/img/yantai/index/yuanhu-you.png new file mode 100644 index 000000000..7ba616c01 Binary files /dev/null and b/src/assets/img/yantai/index/yuanhu-you.png differ diff --git a/src/assets/img/yantai/index/yuanhu-zuo.png b/src/assets/img/yantai/index/yuanhu-zuo.png new file mode 100644 index 000000000..f32150814 Binary files /dev/null and b/src/assets/img/yantai/index/yuanhu-zuo.png differ diff --git a/src/assets/img/yantai/index/zuo.png b/src/assets/img/yantai/index/zuo.png new file mode 100644 index 000000000..8a9b1952a Binary files /dev/null and b/src/assets/img/yantai/index/zuo.png differ diff --git a/src/assets/img/yantai/login/bg.jpg b/src/assets/img/yantai/login/bg.jpg new file mode 100644 index 000000000..99e746c23 Binary files /dev/null and b/src/assets/img/yantai/login/bg.jpg differ diff --git a/src/assets/img/yantai/login/bg.png b/src/assets/img/yantai/login/bg.png new file mode 100644 index 000000000..b66d4a657 Binary files /dev/null and b/src/assets/img/yantai/login/bg.png differ diff --git a/src/assets/scss/main-shuju.scss b/src/assets/scss/main-shuju.scss index a87d382e7..a74a552f5 100644 --- a/src/assets/scss/main-shuju.scss +++ b/src/assets/scss/main-shuju.scss @@ -159,13 +159,6 @@ } } } - - &.z-iframe { - padding-top: 0; - .aui-content--tabs { - padding-top: 0; - } - } } /* Navbar diff --git a/src/assets/scss/pages/yantai-index.scss b/src/assets/scss/pages/yantai-index.scss new file mode 100644 index 000000000..d72f4162d --- /dev/null +++ b/src/assets/scss/pages/yantai-index.scss @@ -0,0 +1,185 @@ +@import "~@/assets/scss/c/config.scss"; +@import "~@/assets/scss/c/function.scss"; + +.g-cnt { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-image: url(~@/assets/img/yantai/index/bg.png); + background-size: cover; + background-position: center; +} + +.m-top { + position: absolute; + top: 0; + width: 1920px; + left: -1000px; + right: -1000px; + margin: 0 auto; + + .name { + position: absolute; + top: 0; + left: 0; + text-align: center; + width: 100%; + line-height: 90px; + font-size: 42px; + font-weight: bold; + color: #fff; + background-image: -webkit-linear-gradient(bottom, rgb(23, 222, 238), rgb(23, 222, 238), #fff, #fff); + background-clip: text; + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + } +} + +.m-list { + position: absolute; + top: 50%; + left: 0; + right: 0; + margin: auto; + transform: translateY(-50%); + + .list { + display: flex; + justify-content: space-around; + align-items: center; + width: 100%; + margin: 0 auto; + + .menu { + position: relative; + + .menu-list { + position: absolute; + top: 50px; + width: 100%; + left: 0; + + .menu-item { + position: relative; + margin-bottom: 40px; + width: 150px; + height: 70px; + line-height: 70px; + color: rgba(#fff, 0.6); + font-size: 20px; + border-radius: 60px; + text-align: center; + transition: all 0.2s ease; + cursor: pointer; + + &.z-zuo { + left: 60px; + background: linear-gradient(to left, rgba(rgb(67, 67, 210), 0.3), rgba(#00a, 0)); + box-shadow: -4px 4px 6px 0 inset rgba(#fff, 0.2); + &:nth-child(2), + &:nth-child(6) { + margin-left: 20px; + } + &:nth-child(3), + &:nth-child(5) { + margin-left: 20px * 2; + } + &:nth-child(4) { + margin-left: 20px * 2 + 1px; + } + } + + &.z-you { + left: 70px; + background: linear-gradient(to right, rgba(rgb(67, 67, 210), 0.3), rgba(#00a, 0)); + box-shadow: 4px 4px 6px 0 inset rgba(#fff, 0.2); + + &:nth-child(2), + &:nth-child(6) { + margin-left: -20px; + } + &:nth-child(3), + &:nth-child(5) { + margin-left: -20px * 2; + } + &:nth-child(4) { + margin-left: -20px * 2 - 1px; + } + } + + &:hover, + &.z-on { + transform: scale(1.15); + color: rgba(#fff, 0.95); + } + } + } + } + + .arrow { + width: 60px; + margin: 0 20px; + } + + .item { + position: relative; + margin: 0 50px; + width: 420px; + + .item-wrap { + text-align: center; + cursor: pointer; + transition: all 0.2s ease; + &:hover { + transform: scale(1.1); + } + } + + &.z-on { + .name { + color: #ffffff; + background-color: transparent; + border-color: #ffffff; + &::before { + background-color: #ffffff; + } + } + } + .logo { + width: 100%; + } + .name { + position: absolute; + top: 12%; + left: 0; + width: 100%; + font-size: 36px; + line-height: 40px; + color: #fff; + } + } + } +} + +.m-footer { + position: absolute; + bottom: 0; + left: 0; + right: 0; + padding: 20px; + color: rgba(255, 255, 255, 0.6); + text-align: center; + p { + margin: 10px 0; + } + a { + padding: 0 5px; + color: rgba(255, 255, 255, 0.6); + &:focus, + &:hover { + color: #fff; + } + } +} diff --git a/src/assets/scss/pages/yantai-login.scss b/src/assets/scss/pages/yantai-login.scss new file mode 100644 index 000000000..beb4978f9 --- /dev/null +++ b/src/assets/scss/pages/yantai-login.scss @@ -0,0 +1,210 @@ +@import "~@/assets/scss/c/config.scss"; +@import "~@/assets/scss/c/function.scss"; + +.g-bd { + &::before, + &::after { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: -1; + content: ""; + } + &::before { + background-image: url(~@/assets/img/yantai/login/bg.jpg); + background-size: cover; + } + &::after { + // background-color: rgba(38, 50, 56, 0.1); + } +} + +.m-snow-box { + position: absolute; + top: 20vh; + width: 35vw; + height: 50vh; + left: 13vw; + border-radius: 40%; + // overflow: hidden; +} + +.m-fm { + position: absolute; + top: 0; + bottom: 0; + right: 13%; + margin: auto; + width: 484px; + height: 429px; + background: rgba(#fff, 1); + box-shadow: 0px 0px 20px 2px rgba(150, 150, 200, 0.6); + border-radius: 12px 12px 12px 12px; + + &:hover { + opacity: 1; + background: rgba(#fff, 1); + } + + .wrap { + padding-top: 5px; + + .title { + margin: 0 auto; + width: 400px; + line-height: 80px; + border-bottom: 1px solid #d4d4d4; + font-size: 34px; + font-family: PingFang SC; + font-weight: bold; + color: #000000; + text-align: center; + } + .fm { + padding: 15px 30px; + + .fm-item { + box-sizing: border-box; + margin: 0 auto; + margin-top: 16px; + width: 400px; + height: 46px; + line-height: 46px; + border: 1px solid #c6c6c6; + border-radius: 4px; + display: flex; + align-items: center; + + .input { + width: 85%; + + input { + display: block; + padding-left: 15px; + line-height: 44px; + height: 44px; + width: 100%; + border: none; + } + } + + .ico { + position: relative; + width: 35px; + height: 46px; + + img { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + margin: auto; + } + } + } + + .fm-captcha { + box-sizing: border-box; + margin: 0 auto; + margin-top: 16px; + width: 400px; + display: flex; + align-items: center; + + .fm-item { + margin: 0; + width: 200px; + } + + .captcha { + position: relative; + margin-left: auto; + width: 180px; + height: 46px; + + img { + display: block; + width: 100%; + height: 100%; + background-color: #eee; + border: none; + } + } + } + + .fm-btn { + box-sizing: border-box; + margin: 0 auto; + margin-top: 40px; + width: 400px; + height: 56px; + line-height: 56px; + background: linear-gradient(90deg, #1a5afd, #26c4ff); + border-radius: 4px; + font-size: 23px; + font-family: PingFang SC; + font-weight: 500; + color: #ffffff; + text-align: center; + cursor: pointer; + } + } + .hint { + display: none; + padding-left: 40px; + color: rgb(255, 80, 80); + } + } +} + +.m-footer { + position: absolute; + bottom: 0; + left: 0; + right: 0; + padding: 20px; + color: rgba(255, 255, 255, 0.6); + text-align: center; + p { + margin: 10px 0; + } + a { + padding: 0 5px; + color: rgba(255, 255, 255, 0.6); + &:focus, + &:hover { + color: #fff; + } + } +} + +.m-pop { + height: auto; + + .div_row { + height: 50px; + text-align: center; + line-height: 50px; + + &:hover { + color: rgb(2, 119, 173); + font-weight: bold; + text-decoration: underline; + } + + .i_icon { + width: 15px; + height: 15px; + margin-right: 10px; + float: left; + } + .span_name { + font-size: 18px; + cursor: pointer; + /* color: rgb(37, 156, 235); */ + } + } +} diff --git a/src/assets/scss/people-info.scss b/src/assets/scss/people-info.scss index b0aca9ec0..5aeac2e12 100644 --- a/src/assets/scss/people-info.scss +++ b/src/assets/scss/people-info.scss @@ -20,6 +20,7 @@ width: 1180px; overflow-y: auto; overflow-x: hidden; + position: relative; } .title { @@ -40,6 +41,12 @@ } } + .div_tuomin{ + position: absolute; + top:25px; + right:40px; + } + .btn-close { position: absolute; z-index: 2; diff --git a/src/router/index.js b/src/router/index.js index eca051a0d..32e11d48f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -27,7 +27,11 @@ export const pageRoutes = [ }, { path: "/login", - component: () => import("@/views/pages/login"), + component: () => { + return CUSTOMER == "yantai" + ? import("@/views/pages/yantai-login") + : import("@/views/pages/login"); + }, name: "login", meta: { title: "登录", @@ -36,7 +40,11 @@ export const pageRoutes = [ { path: "/", name: "index", - component: () => import("@/views/pages/index"), + component: () => { + return CUSTOMER == "yantai" + ? import("@/views/pages/yantai-index") + : import("@/views/pages/index"); + }, }, { path: "/indexWork", @@ -176,7 +184,10 @@ export const moduleShujuRoutes = { component: () => import("@/views/main-shuju/main"), name: "main-shuju", redirect: { - path:"/main-shuju/visual-basicinfo-basicInfoMain", + path: + CUSTOMER == "yantai" && process.env.VUE_APP_NODE_ENV == "prod" + ? "/main-shuju/i-1536625421829599234" + : "/main-shuju/visual-basicinfo-basicInfoMain", }, meta: { title: "主入口布局", diff --git a/src/utils/index.js b/src/utils/index.js index ec577e6cb..9567f50d6 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -43,10 +43,8 @@ export function getDictLabel(dictType, dictValue) { * 清除登录信息 */ export function clearLoginInfo() { - console.log('==========clearLoginInfo') store.commit("resetStore"); localStorage.removeItem("token"); - localStorage.setItem('thePageAtExit', location.href); window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] = false; } @@ -166,11 +164,7 @@ export function computedCard(idCard) { if (sex % 2 === 0) sex = "0"; // 性别代码 1代表男，0代表女，暂时不涉及其他类型性别 else sex = "1"; - return { - age, - sex, - birth - }; + return { age, sex, birth }; } // 将数组分成小块数组的集合 export function spliceIntoChunks(arr, chunkSize) { @@ -209,4 +203,4 @@ export function encryptedData(key, data) { encryptor.setPublicKey(key); // 加密数据 return encryptor.encrypt(data); -} \ No newline at end of file +} diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 075118bfe..abcd89837 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -8,10 +8,10 @@

{{ - customerName + $store.state.user.agencyName }} {{ - customerName.slice(0, 2) + $store.state.user.agencyName .slice(0, 2) }}

diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue index 2672b6952..94e303e02 100644 --- a/src/views/main-shuju/main-navbar.vue +++ b/src/views/main-shuju/main-navbar.vue @@ -3,9 +3,9 @@