diff --git a/anrui-riskcenter-ui/src/layout/components/Sidebar/index.vue b/anrui-riskcenter-ui/src/layout/components/Sidebar/index.vue index eaa757ccdd..b50913ffa6 100644 --- a/anrui-riskcenter-ui/src/layout/components/Sidebar/index.vue +++ b/anrui-riskcenter-ui/src/layout/components/Sidebar/index.vue @@ -35,7 +35,7 @@ YongHuid: [], routes: [], params: { - sourceSid: 'ede8c71e-8351-4d58-810b-620852b6f9af', + sourceSid: '20221d77-239e-4e4a-bdec-3266478dfdc3', userSid: '', } } diff --git a/anrui-riskcenter-ui/src/layout/index.vue b/anrui-riskcenter-ui/src/layout/index.vue index 077cd13264..a8f77411f0 100644 --- a/anrui-riskcenter-ui/src/layout/index.vue +++ b/anrui-riskcenter-ui/src/layout/index.vue @@ -11,7 +11,7 @@
平台首页 - 行政管理 + 风控管理
diff --git a/anrui-riskcenter-ui/src/main.js b/anrui-riskcenter-ui/src/main.js index 9d7101a5b7..35adacd3a7 100644 --- a/anrui-riskcenter-ui/src/main.js +++ b/anrui-riskcenter-ui/src/main.js @@ -1,42 +1,104 @@ import 'babel-polyfill' import Vue from 'vue' import 'normalize.css/normalize.css' // A modern alternative to CSS resets - import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' -Vue.use(ElementUI) - import '@/styles/index.scss' // global css - import App from './App' import store from './store' import router from './router' import '@/icons' // icon +// 全局自定义组件 +import Pagination from '@/components/pagination/index.vue' +import tabsearch from '@/components/tab-search/index.vue' +import eimage from '@/components/E-image/index.vue' +import Print from '@/utils/print' // 引入附件的js文件 +import { setStorage, setDefaultOrgPathName, setDefaultOrgPath } from './utils/auth.js' +import VueAMap from 'vue-amap' import request from '@/utils/request' + +Vue.use(ElementUI) + // import '@/permission' //权限控制 Vue.prototype.$userInfo = null // 用户信息 -// 全局自定义组件 -import Pagination from '@/components/pagination/index.vue' + Vue.component('Pagination', Pagination) -import tabsearch from '@/components/tab-search/index.vue' + Vue.component('tab-search', tabsearch) -import eimage from '@/components/E-image/index.vue' + Vue.component('eimage', eimage) -import Print from '@/utils/print' // 引入附件的js文件 Vue.use(Print) // 注册 +Vue.use(VueAMap) +VueAMap.initAMapApiLoader({ + key: 'ccda12d8bffc72e9f1a32c599323a876', // 此处的key,在高德开放平台申请 + plugin: ['AMap.Scale', 'AMap.OverView', 'AMap.ToolBar', 'AMap.MapType', 'AMap.PlaceSearch', 'AMap.Geolocation', 'AMap.Geocoder'], // 此处的插件按需添加 + v: '1.4.4', + uiVersion: '1.0' +}) + +Vue.config.productionTip = false -import { setStorage, getStorage } from './utils/auth.js' let token = null token = GetQueryString('token') +// token = getQueryVariable('token') if (token) { -setStorage(token) -let href = window.location.href -// href = href.split(`token=${token}`)[0] -// window.location.href = href.slice(0, href.length - 1) + setStorage(token) + let href = window.location.href + // href = href.split(`token=${token}`)[0] + // window.location.href = href.slice(0, href.length - 1) +} + +function GetQueryString(name) { + var one = window.location.href.indexOf('?token=') + 7 + if (one < 7) + return null + var two = window.location.href.lastIndexOf('&') // + 1 + var data = window.location.href.substr(one) + if (two > one) { + data = window.location.href.slice(one, two) + console.log('token', data) + } + if (data) { + return data + } + return null + // var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)') + // var se = window.location.search.substr(1) + // var hr = window.location.href.substr(window.location.href.indexOf("?")+1) + // var r = hr.match( reg) + // if (r != null) + // return unescape(r[2]); + // return null +} + +function getQueryVariable(variable) { + var query = window.location.search.substring(1) + // console.log('main:query'+ query) + var vars = query.split('&') + for (var i = 0; i < vars.length; i++) { + var pair = vars[i].split('=') + // console.log('main:pair-0', pair[0]) + // console.log('main:pair-1', pair[1]) + if (pair[0] == variable) { + return pair[1] + } + } + return (false) +} + +var one = window.location.href.indexOf('&organizationData') + 18 +if (parseInt(one) > 18) { + const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用 + var data1 = decodeURIComponent(data) + if (data1 !== undefined) { + const obj = JSON.parse(data1) + setDefaultOrgPath(obj.defaultOrgPath) + setDefaultOrgPathName(obj.defaultOrgPathName) + } } // 获取登录用户信息 @@ -63,9 +125,9 @@ function getUserInfo() { dwjb: data.dwjb, orgNamePath: data.orgNamePath, // 使用组织全路径名称 orgSidPath: data.orgSidPath, // 使用组织全路径Sid - pNameAndDepartmentNameAndPostName:data.pNameAndDepartmentNameAndPostName + pNameAndDepartmentNameAndPostName: data.pNameAndDepartmentNameAndPostName } - // 结果存入缓存 + //结果存入缓存 window.sessionStorage.setItem('staffSid', user.staffSid) window.sessionStorage.setItem('userSid', user.userSid) window.sessionStorage.setItem('Orgname', user.Orgname) @@ -89,39 +151,4 @@ function getUserInfo() { getUserInfo() -function GetQueryString(name) { - var one = window.location.href.indexOf('?token=') + 7 - if(one<7) - return null; - var two = window.location.href.lastIndexOf('&') //+ 1 - var data = window.location.href.substr(one) - if (two > one) { - data = window.location.href.slice(one, two) - console.log('token', data) - } - if (data) { - return data - } - return null - // var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)') - // var r = window.location.search.substr(1).match(reg) - // if (r != null) return unescape(r[2]); return null -} - -import VueAMap from 'vue-amap' -Vue.use(VueAMap) -VueAMap.initAMapApiLoader({ - key: 'ccda12d8bffc72e9f1a32c599323a876', // 此处的key,在高德开放平台申请 - plugin: ['AMap.Scale', 'AMap.OverView', 'AMap.ToolBar', 'AMap.MapType', 'AMap.PlaceSearch', 'AMap.Geolocation', 'AMap.Geocoder'], // 此处的插件按需添加 - v: '1.4.4', - uiVersion: '1.0' -}) - -Vue.config.productionTip = false - -new Vue({ - el: '#app', - router, - store, - render: h => h(App) -}) +export default getUserInfo() diff --git a/anrui-riskcenter-ui/src/router/index.js b/anrui-riskcenter-ui/src/router/index.js index e2bb93b113..a93de48f0a 100644 --- a/anrui-riskcenter-ui/src/router/index.js +++ b/anrui-riskcenter-ui/src/router/index.js @@ -21,16 +21,6 @@ export const constantRoutes = [ path: '/', redirect: 'index' }, - /*{ - path: '/login', - component: () => import('@/views/login/login.vue') - },*/ -/* { - path: '/home', - component: () => import('@/views/Home/Home.vue'), - name: 'home' - - },*/ { path: '/index', component: Layout, @@ -48,33 +38,31 @@ export const constantRoutes = [ }] }, { - path: '/sysstaffinfo', + path: '/404', + component: () => + import('@/views/404'), + hidden: true + }, + { + path: '/capital', component: Layout, - redirect: '/sysstaffinfo', + redirect: '/capital', meta: { - title: '员工信息管理' + title: '资方管理' }, children: [ { - path: '/yuangongguanli', - component: () => import('@/views/sysstaffinfo/yuangongguanli.vue'), - name: 'yuangongguanli', - meta: { title: '员工信息管理',noCache:false } - }, + path: '/capital', + component: () => import('@/views/capital/capital.vue'), + name: 'Capital', + meta: { title: '资方管理', noCache: true } + } ] - }, - { - path: '/404', - component: () => - import('@/views/404'), - hidden: true - } + } // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } ] -import componentsRouter from '@/router/modules/components' - const createRouter = () => new Router({ // mode: 'history', // require service support scrollBehavior: () => ({ y: 0 }), diff --git a/anrui-riskcenter-ui/src/styles/index.scss b/anrui-riskcenter-ui/src/styles/index.scss index 2370ac7844..9221c2ce02 100644 --- a/anrui-riskcenter-ui/src/styles/index.scss +++ b/anrui-riskcenter-ui/src/styles/index.scss @@ -66,11 +66,11 @@ div:focus { } // main-container global css .container{ - min-height: 100%; + min-height: 100%; height: 100%; - background-color: #FFFFFF; - box-sizing: border-box; - padding: 10px 0; + background-color: #FFFFFF; + box-sizing: border-box; + padding: 10px 0; } .fl{ @@ -90,26 +90,63 @@ div:focus { padding-bottom: 10px; } -.pd-y40{ +.pd-y40 { padding: 40px 0; } -.pd-y20{ + +.pd-y20 { padding: 20px 0; } -.fs20{ +.fs20 { font-size: 20px; } +// 页面上的button按钮 +.app-container { + .el-button--medium { + padding: 10px 14px; + font-size: 16px; + } + + .el-button--small { + padding: 8px 12px; + font-size: 14px; + } + + .el-button--mini { + padding: 7px 10px; + font-size: 12px; + } +} // 添加样式 -.app-container {margin: 5px; +.app-container { + margin: 5px 0 5px 0; background-color: #fff; } +// 设置了滚动区域 .main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 200px);padding: 0 20px;} .listcon{height: calc(100vh - 425px);overflow-y: auto;overflow-x: hidden;} .listconadd{height: calc(100vh - 200px);overflow-y: auto;overflow-x: hidden;} -.listconsub{height: calc(100vh - 310px);overflow-y: auto;overflow-x: hidden;} -.listconsubjxs{height: calc(100vh - 300px);overflow-y: auto;overflow-x: hidden;} +.listconadd{ + .titwu { + font-size: 28px; + text-align: center; + padding: 30px 0 20px 0; + } +} +.listconsub { + height: calc(100vh - 310px); + overflow-y: auto; + overflow-x: hidden; +} + +.listconsubjxs { + height: calc(100vh - 300px); + overflow-y: auto; + overflow-x: hidden; +} + // 搜索的 .webtop { // position: fixed;top: 110px;width: calc(100% - 240px);z-index: 6000; @@ -117,13 +154,35 @@ div:focus { display: flex !important; flex-direction: row; justify-content: space-between !important; - align-items: center; margin-bottom: 0px !important; + align-items: center; + margin-bottom: 0px !important; + font-size: 20px; +} + +// 设置了页面头部的内边距和背景色 +.tab-header { + font-size: 20px; + font-weight: bold; +} +// 设置了搜索条件里的样式 +.search { + .tab-header { + .el-form-item { + margin-right: 16px; + .el-form-item__label { + font-size: 16px; + font-weight: 500; + } + } + } } .filter-item { padding: 0 10px; - width: 168px; + width: 220px; display: inline-block; } + +// 设置列表页面内容布局 .listtop { display: flex; flex-direction: row; @@ -145,12 +204,13 @@ div:focus { margin: 0; padding: 0; } + .pages { display: flex; flex-direction: row; justify-content: flex-end; align-items: flex-end; - padding: 0px 0px 15px 15px; + padding: 0 0 15px 15px; } .pages .tit{font-weight: bold;} .pages .pagination{margin: 0;} @@ -158,84 +218,179 @@ div:focus { // .listeltable{overflow-y: auto;height: calc(100vh - 420px);} .formadd { - padding: 20px 0; + padding: 10px 40px 0 40px; + font-size: 16px; // height: calc(100vh - 200px);overflow-y: auto; - .title { - padding: 10px;font-weight: bold; - font-size: 20px; + .title { + padding: 12px; + font-weight: bold; + font-size: 16px; background-color: $header-bg; - text-align: center; + text-align: left; color: #ffffff; - } + } + .first_row{ + border-top: 1px solid $table-border-color; + } .el-row { - display:flex; - flex-wrap: wrap; - border-left: 1px solid $table-border-color; - .el-col{ - border-right: 1px solid $table-border-color; - border-bottom: 1px solid $table-border-color; - padding: 5px 15px 5px 15px !important; - min-height: 50px; - line-height: 1; - .el-form-item{ - margin-bottom: 0; - // .addinputw{width: 400px;} - .addinputw{width: 80%;} + display: flex; + flex-wrap: wrap; + border-left: 1px solid $table-border-color; + .el-col { + border-right: 1px solid $table-border-color; + border-bottom: 1px solid $table-border-color; + padding: 0 15px; + min-height: 42px; + line-height: 1; + + .el-form-item { + margin-bottom: 0; + line-height: 42px; + // .addinputw{width: 400px;} + .addinputw { + width: 80%; + line-height: 42px; + } + .el-input__inner { + height: 36px; } } - - } - .footer{margin: 20px;} + } + } + .footer{margin: 20px;} } -.forminfo { - padding: 20px 0; - .title { - padding: 10px;font-weight: bold; - font-size: 20px; - background-color: $header-bg; - text-align: center; +.formaddcopy02 { + padding: 10px 40px 0 40px; + .title { + padding: 12px; + font-weight: bold; + font-size: 16px; + background-color: #0294d7; color: #ffffff; - } + text-align: left; + } + .el-row { - display:flex; - flex-wrap: wrap; - border-left: 1px solid $table-border-color; - .trightb{ text-align: right;font-weight: bold;color: #606266; } - .tleft{ text-align: left; } - .el-col{ - border-right: 1px solid $table-border-color; - border-bottom: 1px solid $table-border-color; - padding: 0px 15px 0px 15px !important; - min-height: 50px; - line-height: 50px; + display: flex; + flex-wrap: wrap; + border-left: 1px solid $table-border-color; + + .el-col { + border-right: 1px solid $table-border-color; + border-bottom: 1px solid $table-border-color; + min-height: 42px; + padding: 0 15px; + line-height: 42px; + position: relative; + .span-sty { + position: absolute; + top: 0; + bottom: 0; + left: 0; + line-height: 42px; + text-align: right; font-size: 14px; + color: #606266; + font-weight: 600; + width: 70px; + padding-right: 5px; + border-right: 1px solid #e0e3eb; + } + + .el-form-item { + margin-bottom: 0; + line-height: 42px; + .addinputw { + //padding: 5px 0; + width: 65%; + margin-left: 80px; + line-height: 42px; + } + + .addinputInfo { + margin-left: 80px; + line-height: 42px; + } + .el-input__inner { + height: 36px; + } } + } + + } + + .footer { + margin: 20px; + } +} + +.forminfo { + padding: 10px 40px 0 40px; + font-size: 16px; + .title { + padding: 12px; + font-weight: bold; + font-size: 16px; + background-color: $header-bg; + text-align: left; + color: #ffffff; + } + .el-row { + display:flex; + flex-wrap: wrap; + border-left: 1px solid $table-border-color; + .trightb{ text-align: right;font-weight: bold;color: #606266; } + .tleft{ text-align: left; } + .el-col{ + border-right: 1px solid $table-border-color; + border-bottom: 1px solid $table-border-color; + padding: 0 15px 0 15px !important; + min-height: 50px; + line-height: 50px; + font-size: 14px; + } - } - .footer{margin: 20px;} + } + .footer{margin: 20px;} } .el-form-item__error { - z-index: 100; + z-index: 100; } -.bluezi{color: $header-bg;} +.bluezi{color: $header-bg; cursor: pointer} // 经销商添加样式 .titcon{ - display: flex;flex-direction: row;justify-content: space-around; background-color: #0294d7;flex: 3; + display: flex; + flex-direction: row; + justify-content: space-around; + background-color: #0294d7; + flex: 3; } -.titcon .title{ - padding: 10px;font-weight: bold; - font-size: 20px; - text-align: center; - color: #ffffff; + +.titcon .title { + padding: 10px; + font-weight: bold; + font-size: 20px; + text-align: center; + color: #ffffff; } -.titcon .baocun{text-align: right;flex: 2;padding: 5px 20px;} -.addinputwda{width: 600px;} + +.titcon .baocun { + text-align: right; + flex: 2; + padding: 5px 20px; +} + +.addinputwda { + width: 600px; +} + //.searchcon{margin: 0px 0 10px 0;} -//.searchcon .searchbtn{margin: 10px 0;} +//.searchcon .searchbtn{margin: 10px 0;border: #2cab69 1px solid;color: #2cab69;} +// 隐藏显示按钮 .main-content { .searchcon { .searchbtn { @@ -246,6 +401,7 @@ div:focus { } } + .search .btn { padding: 5px 0; border: 1px solid #e0e3eb; @@ -253,18 +409,19 @@ div:focus { margin-bottom: 5px; } + // 弹出窗口按钮 .btnCancel{ - background: #e84026 !important;outline: none;border: none;color: #fff !important; + background: #e84026 !important;outline: none;border: none;color: #fff !important; } .btnCancel:hover{ - background: #ed6651 !important; + background: #ed6651 !important; } .btnFalses{ - background: #2cab69 !important;outline: none;border: none; + background: #2cab69 !important;outline: none;border: none; } .btnFalses:hover{ - background: #3dc47e !important; + background: #3dc47e !important; } .btntopblueline{background-color: #066bc9 !important;} .btntopblueline:hover{background-color: #34a1db !important;} diff --git a/anrui-riskcenter-ui/src/utils/auth.js b/anrui-riskcenter-ui/src/utils/auth.js index 81df9ea509..5c6d8f6629 100644 --- a/anrui-riskcenter-ui/src/utils/auth.js +++ b/anrui-riskcenter-ui/src/utils/auth.js @@ -24,6 +24,14 @@ export function setStorage(session) { return sessionStorage.setItem('token', session) } +export function setDefaultOrgPathName(data) { + return sessionStorage.setItem('defaultOrgPathName', data) +} + +export function setDefaultOrgPath(data) { + return sessionStorage.setItem('defaultOrgPath', data) +} + export function removeStorage() { return sessionStorage.removeItem('token') }