diff --git a/src/components/publicModule/lkyDialog.vue b/src/components/publicModule/lkyDialog.vue new file mode 100644 index 0000000..24592b8 --- /dev/null +++ b/src/components/publicModule/lkyDialog.vue @@ -0,0 +1,47 @@ + + + + \ No newline at end of file diff --git a/src/components/publicModule/lkyPagination.vue b/src/components/publicModule/lkyPagination.vue new file mode 100644 index 0000000..e0b53b0 --- /dev/null +++ b/src/components/publicModule/lkyPagination.vue @@ -0,0 +1,112 @@ + + + + \ No newline at end of file diff --git a/src/components/publicModule/lkyTable.vue b/src/components/publicModule/lkyTable.vue new file mode 100644 index 0000000..b203ddf --- /dev/null +++ b/src/components/publicModule/lkyTable.vue @@ -0,0 +1,432 @@ + + + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 9a4957a..1124cae 100644 --- a/src/main.js +++ b/src/main.js @@ -6,10 +6,13 @@ import router from './router' import store from './store' import Message from './components/message'; import erupload from "./components/upload"; +import lkyTable from "./components/publicModule/lkyTable" // 本组件样式包含普通表格、分页 +import lkyPagination from "./components/publicModule/lkyPagination" // 本组件单独抽离分页样式 Vue.use(ElementUI); Vue.use(Message) Vue.component('erupload', erupload) - +Vue.component('lkyTable', lkyTable) +Vue.component('lkyPagination',lkyPagination) const vm = new Vue({ el: '#app', router, diff --git a/src/router/index.js b/src/router/index.js index d1ad40b..f1401dd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4,6 +4,7 @@ import box from '../components/box' // import Home from '../views/Home.vue' Vue.use(VueRouter) import systemManagement from './routes/systemManagement' +import module from './routes/module' const routes = [ { @@ -67,12 +68,19 @@ const routes = [ name: 'closeLoopDispose', component: () => import('@/views/closeLoopDispose'), }, - // 应用超市 + // 安商惠企 { path:'applySupermarket', name:'applySupermarket', component: () => import('@/views/applySupermarket'), }, + // 封装演示模块 + ...module, + // { + // path:'module', + // name:'module', + // component: () => import('@/views/module'), + // }, ] }, { diff --git a/src/router/routes/module.js b/src/router/routes/module.js new file mode 100644 index 0000000..56f942d --- /dev/null +++ b/src/router/routes/module.js @@ -0,0 +1,26 @@ +import Vue from 'vue' +import VueRouter from 'vue-router' +// import Home from '../views/Home.vue' +Vue.use(VueRouter) +// 系统管理 +export default [ + { + path: 'module', + name: 'module', + component: () => import('@/views/module'), + children: [ + // 表格分页 + { + path: 'tableModule', + name: 'tableModule', + component: () => import('@/views/module/components/tableModule'), + }, + // 单独分页 + { + path: 'paginationModule', + name: 'paginationModule', + component: () => import('@/views/module/components/paginationModule'), + }, + ] + } +] \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index bbddc92..56dd381 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,8 +7,8 @@ const request = axios.create({ //baseURL: 'http://172.18.113.50:8080/zhapi', //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强 //baseURL: 'http://192.168.0.188:8888/zhapi', - //baseURL: 'http://121.41.91.94:12002/zhapi', - baseURL: `http://${window.location.host}/zhapi`, + baseURL: 'http://121.41.91.94:12002/zhapi', + //baseURL: `http://${window.location.host}/zhapi`, timeout: 50000, headers: { 'content-type': 'application/json' }, }) diff --git a/src/views/applySupermarket/personBack/index.vue b/src/views/applySupermarket/personBack/index.vue index b9c0e43..85a890d 100644 --- a/src/views/applySupermarket/personBack/index.vue +++ b/src/views/applySupermarket/personBack/index.vue @@ -115,7 +115,7 @@ export default { res.rows[i].abnormal_num = res.rows[ i ].examinationResultDetail.substring( - res.rows[i].examinationResultDetail.indexOf("正常,") + 3, + res.rows[i].examinationResultDetail.indexOf("正常,") + 3, res.rows[i].examinationResultDetail.indexOf("人异常") ); console.log(res.rows[i].abnormal_num); @@ -326,54 +326,38 @@ export default { height: 6vh; display: flex; flex-direction: row-reverse; - // border: 0.1px solid #2f6363; - // background: #3c4b4a; - /deep/.el-pagination { - margin-top: 1vh; - margin-right: 1vw; - .el-pagination__total { - color: #fff; - } - /* 显示多少条/页和在哪页的input样式 */ - .el-input__inner { - border-radius: 4px; - border: 2px solid #28847e; - background: #3c4b4a; - color: #fff; - } - .btn-prev { - border-radius: 0px; - border: 0.1px solid #28847e; - background: #3c4b4a; - color: #fff; - } - ul { - li { - border: 0.1px solid #28847e; - background: #3c4b4a; - color: #fff; - } - } - .btn-next { - border: 0.1px solid #28847e; - border-radius: 0px; - background: #3c4b4a; - color: #fff; - } - .el-pager { - li { - border: 0.1px solid #28847e; - background: #3c4b4a !important; - } - } - .el-pagination__jump { - color: #fff; - } + /deep/.el-pagination.is-background .btn-next, + /deep/.el-pagination.is-background .btn-prev, + /deep/.el-pagination.is-background .el-pager li { + margin: 0 5px; + background-color: rgba(255, 255, 255, 0); + color: #eaeff7; + min-width: 30px; + border-radius: 2px; + border: 1px solid rgba(40, 132, 126, 1); + } + /deep/.el-pagination__total { + color: #fff; } + /deep/.el-input__inner { + background-color: rgba(255, 255, 255, 0); + border: 1px solid rgba(40, 132, 126, 1); + color: #eaeff7; + } /deep/.el-pagination.is-background .el-pager li:not(.disabled).active { - border: 0.1px solid #76eae4; + background-color: rgba(64, 158, 255, 0); + color: #ccc; + border: 1px solid #76eae4; + } + /deep/.btn-prev { + margin: 0 5px; + background-color: rgba(255, 255, 255, 0); + color: #eaeff7; + min-width: 30px; + border-radius: 2px; + border: 1px solid rgba(40, 132, 126, 1); } - /deep/.el-pagination.is-background .el-pager li:not(.disabled):hover { + /deep/.el-pagination__jump { color: #fff; } } diff --git a/src/views/module/components/leftNav.vue b/src/views/module/components/leftNav.vue new file mode 100644 index 0000000..cea0268 --- /dev/null +++ b/src/views/module/components/leftNav.vue @@ -0,0 +1,130 @@ + + + + \ No newline at end of file diff --git a/src/views/module/components/paginationModule.vue b/src/views/module/components/paginationModule.vue new file mode 100644 index 0000000..42e5d58 --- /dev/null +++ b/src/views/module/components/paginationModule.vue @@ -0,0 +1,37 @@ + + + \ No newline at end of file diff --git a/src/views/module/components/tableModule.vue b/src/views/module/components/tableModule.vue new file mode 100644 index 0000000..4111b8b --- /dev/null +++ b/src/views/module/components/tableModule.vue @@ -0,0 +1,203 @@ + + + \ No newline at end of file diff --git a/src/views/module/index.vue b/src/views/module/index.vue new file mode 100644 index 0000000..8d370c8 --- /dev/null +++ b/src/views/module/index.vue @@ -0,0 +1,43 @@ + + + + \ No newline at end of file diff --git a/src/views/systemManagement/safeIndex/index.vue b/src/views/systemManagement/safeIndex/index.vue index 51ae748..daabed9 100644 --- a/src/views/systemManagement/safeIndex/index.vue +++ b/src/views/systemManagement/safeIndex/index.vue @@ -324,7 +324,7 @@ export default { /* card统一样式 */ .el-card.box-card.is-always-shadow { border: 0px; - height: 88.5vh; /* 控制card布局高度,用于适配 */ + height: 88vh; /* 控制card布局高度,用于适配 */ position: relative; background: url("~@/assets/companyFile/22136.png") no-repeat !important; background-size: 100% 100% !important;