提交 58ca12e3 编写于 作者: huangwensu's avatar huangwensu

添加footer组件

上级 522f4a48
......@@ -8,7 +8,7 @@
<meta name="format-detection" content="telephone=no">
<meta name="full-screen" content="yes">
<meta name="x5-fullscreen" content="true">
<title>云鹊·医</title>
<title>云鹊医工作站</title>
</head>
<body id="appBody">
<div id="app">
......
......@@ -12,19 +12,24 @@
<transition name="router-fade" mode="out-in">
<router-view v-if="!$route.meta.keepAlive"></router-view>
</transition>
<v-footer></v-footer>
</div>
</el-container>
</div>
</template>
<script>
import VHeader from './views/layout/header.vue'
import VSlidebar from './views/layout/slidebar.vue'
import VFooter from './views/layout/footer.vue'
let vm = null
export default {
components:{
VHeader,
VSlidebar
VSlidebar,
VFooter
},
data() {
return {
......
<template>
<div class="bread-crumb">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb separator="/">
<el-breadcrumb-item>{{curmbFirst}}</el-breadcrumb-item>
<el-breadcrumb-item v-if="curmbSecond" :to="{ path: jumPathThird }">{{curmbSecond}}</el-breadcrumb-item>
<el-breadcrumb-item v-if="curmbThird">{{curmbThird}}</el-breadcrumb-item>
......
......@@ -124,13 +124,17 @@ html,body{
@media screen and (min-width:1240px) and (max-width:1900px){
.screenSet{
width: 163vh !important;
height: 70vh !important;
height: 66vh !important;
margin: 88px 30px 0px;
overflow: auto;
}
}
@media screen and (min-width:1900px){
.screenSet{
width: 167vh !important;
height: 77vh !important;
width: 166vh !important;
height: 78vh !important;
overflow: auto;
margin: 88px 30px 0px;
}
}
......@@ -167,4 +171,18 @@ html,body{
// 消息推送
.el-notification.right {
top: 130px !important;
}
// 按钮样式
.el-button--default {
}
.el-button--primary {
line-height: 40px;
background: #449284 !important;
border: 1px solid #449284 !important;
}
.el-pagination.is-background .el-pager li:not(.disabled).active {
background: #449284 !important;
}
\ No newline at end of file
......@@ -12,7 +12,8 @@ export const envConfig = {
// baseUrl: 'https://test1-sc.yunqueyi.com/',
// apiUrl: 'https://test1-api.yunqueyi.com/',
// webPageUrl: 'https://test1-phome.yunqueyi.com/'
baseUrl: 'https://uat-sc.yunqueyi.com/',
//baseUrl: 'https://uat-sc.yunqueyi.com/',
baseUrl: 'http://localhost:11905/portal',
apiUrl: 'https://uat-api.yunqueyi.com/',
webPageUrl: 'https://uat-phome.yunqueyi.com/',
qiniuUrl: "http://localhost:10201/contents/admin/qiniu/token",
......@@ -21,16 +22,16 @@ export const envConfig = {
qiniuImgUrl: "https://test1-file.yunqueyi.com"
},
dev: {
baseUrl: 'https://dev-sc.yunqueyi.com/',
baseUrl: 'https://dev-sc.yunqueyi.com/portal',
apiUrl: 'https://dev-api.yunqueyi.com/',
webPageUrl: 'https://dev-phome.yunqueyi.com/',
qiniuUrl: "http://localhost:10201/contents/admin/qiniu/token",
qiniuFileUrl: "http://localhost:10201/contents/admin/qiniu/token1",
qiniuUrl: "http://localhost:11905/contents/admin/qiniu/token",
qiniuFileUrl: "http://localhost:11905/contents/admin/qiniu/token1",
qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
qiniuImgUrl: "https://test1-file.yunqueyi.com"
},
test: {
baseUrl: 'https://test1-sc.yunqueyi.com/',
baseUrl: 'https://test1-sc.yunqueyi.com/portal',
apiUrl: 'https://test1-api.yunqueyi.com/',
webPageUrl: 'https://test1-phome.yunqueyi.com/',
qiniuUrl: "https://test1-sc.yunqueyi.com/contents/admin/qiniu/token",
......@@ -39,7 +40,7 @@ export const envConfig = {
qiniuImgUrl: "https://test1-file.yunqueyi.com"
},
uat: {
baseUrl: 'https://uat-sc.yunqueyi.com/',
baseUrl: 'https://uat-sc.yunqueyi.com/portal',
apiUrl: 'https://uat-api.yunqueyi.com/',
webPageUrl: 'https://uat-phome.yunqueyi.com/',
qiniuUrl: "https://uat-sc.yunqueyi.com/contents/admin/qiniu/token",
......@@ -48,7 +49,7 @@ export const envConfig = {
qiniuImgUrl: "https://file.yunqueyi.com"
},
pro: {
baseUrl: 'https://sc.yunqueyi.com/',
baseUrl: 'https://sc.yunqueyi.com/portal',
apiUrl: 'https://api.yunqueyi.com/',
webPageUrl: 'https://phome.yunqueyi.com/',
qiniuUrl: "https://sc.yunqueyi.com/contents/admin/qiniu/token",
......
......@@ -11,17 +11,20 @@ const service = axios.create({
// request拦截器
service.interceptors.request.use(config => {
if (config.data && config.data.setEntry) {
config.headers['sysCode'] = config.data.sysCode || 10
if(config.data.token){
config.headers['token'] = config.data.token || '63C3FA92AF8A45A48B31EB7FD97B95EB'
}
config.headers['sysCode'] = 12
config.headers['token'] = 'C1C5360EEC754092B9EC244147B35BB7'
config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
// if (config.data && config.data.setEntry) {
// config.headers['sysCode'] = config.data.sysCode || 10
// if(config.data.token){
// config.headers['token'] = config.data.token || '63C3FA92AF8A45A48B31EB7FD97B95EB'
// }
config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
}
// config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
// }
return config
}, error => {
logger.debug('service.interceptors.request: ', error)
// logger.debug('service.interceptors.request: ', error)
Promise.reject(error)
})
......@@ -40,7 +43,7 @@ service.interceptors.response.use(
}
},
error => {
logger.error('err' + error)
// logger.error('err' + error)
return Promise.reject(error)
}
)
......
......@@ -106,13 +106,6 @@ const vueFilter = {
}
}
},
columnPageType: (value,data) => { // 页面类型
for(let key in data) {
if(value == key) {
return data[key]
}
}
},
columnPositionType: (value,data) => { // 位置
for(let key in data) {
if(value == key) {
......@@ -120,19 +113,17 @@ const vueFilter = {
}
}
},
columnCreatedType: (value,data) => { // 创建人
for(let i = 0;i < data.length; i++) {
if(value == data[i].id) {
return data[i].name
}
}
},
columnSubmitedType: (value,data) => { // 提交人
for(let i = 0;i < data.length; i++) {
if(value == data[i].id) {
return data[i].name
}
}
// 项目组件
statusFileter: (value) => {
if(value == 1) {
return '草稿'
}else if(value == 2) {
return '未启用'
}else if(value == 3) {
return '已启用'
}else {
return '已禁用'
}
}
}
export default vueFilter
\ No newline at end of file
......@@ -4,10 +4,6 @@ import { getBaseUrl, getApiUrl } from '@/utils/index'
module.exports = {
data: function () {
return {
// isIpx: Utils.env.isIPhoneX(),//是不是iphoneX
// isAndroid: Utils.env.isAndroid(),
// isIOS: false,
// isWeb: false,
token: null
}
},
......@@ -148,7 +144,7 @@ module.exports = {
// 通用GET请求
GET(api, para, callback,str) {
para.token = para.token || this.token || '00175A13D70D4234822D90AC3C74202C'
// para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"
let url = api + this.getUrlPara(para)
return fetch({
url: getBaseUrl(url),
......@@ -159,7 +155,7 @@ module.exports = {
// 通用POST请求
POST(api, para, callback) {
para.token = para.token || this.token || '00175A13D70D4234822D90AC3C74202C'
// para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"
return fetch({
url: getBaseUrl(api),
method: 'post',
......
......@@ -568,7 +568,6 @@ export default {
</script>
<style lang="scss">
.create-component-wrap {
margin: 84px 20px 20px;
.create-content {
background: #fff;
}
......
......@@ -37,11 +37,15 @@
<el-table :data="tableData" style="width: 100%">
<el-table-column prop="id" label="ID编号" min-width="100" align="center"></el-table-column>
<el-table-column prop="name" label="组件名称" min-width="200" align="center"></el-table-column>
<el-table-column prop="person" label="发起人" min-width="100" align="center"></el-table-column>
<el-table-column prop="status" label="状态" min-width="80" align="center"></el-table-column>
<el-table-column prop="createdName" label="发起人" min-width="100" align="center"></el-table-column>
<el-table-column prop="status" label="状态" min-width="80" align="center">
<template slot-scope="scope">
<span>{{ scope.row.status | statusFileter }}</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" min-width="200">
<template slot-scope="scope">
<el-button type="primary" size="small">编辑</el-button>
<el-button type="primary" size="small" @click="editComponentList(scope.row)">编辑</el-button>
<el-button type="primary" size="small" disabled>启用</el-button>
<el-button type="primary" size="small">禁用</el-button>
<el-button type="primary" size="small">删除</el-button>
......@@ -79,15 +83,12 @@ export default {
curmbSecond: '项目组件',
searchParam: {
name: '',
status: ''
status: '',
pageNo: 1,
pageSize: 15
},
statuSelect: [],
tableData: [{
id: '233425',
name: '国际基本公共卫生服务项目',
person: '张三',
status: '草稿'
}],
tableData: [],
totalRows: 0,
basicRule: {
"name": [
......@@ -107,11 +108,30 @@ export default {
},
created() {
vm = this
vm.search()
},
methods: {
// 列表查询
search() {
let req = {
name: '',
pageNo: 1,
pageSize: 15
}
vm.GET('/portalComponent/queryPortalComponent',req).then((res) => {
if( res.code == '000000' ) {
vm.tableData = res.data.queryList
vm.totalRows = res.data.total
}
})
},
// 新建组件
createComponent() {
vm.$router.push({path: 'create-component'})
},
// 编辑
editComponentList(row) {
},
handleSizeChange() {
......@@ -127,7 +147,7 @@ export default {
.component-content {
padding: 10px;
background: #fff;
margin: 84px 20px 20px;
// margin: 84px 20px 20px;
.search-title {
padding: 10px 12px;
font-size: 12px;
......
<template>
<div class="home-wrap">
<bread-crumb :curmbFirst="curmbFirst"></bread-crumb>
<div class="message-content">
<div class="message-content screenSet">
<el-row>
<el-col class="visitor" :span="24">
<div class="visitor-title">
......@@ -34,7 +34,7 @@
</div>
</div>
<div v-else>
</div>
</el-col>
</el-row>
......@@ -101,12 +101,11 @@ export default {
<style lang="scss">
.home-wrap {
.message-content {
margin-top: 50px;
padding:20px;
.visitor {
padding: 0 25px 30px;
margin-top: 20px;
margin-bottom: 20px;
background: #fff;
// min-height: 348px;
.visitor-title {
height: 80px;
line-height: 80px;
......@@ -131,8 +130,8 @@ export default {
}
.message {
padding: 0 25px 30px;
margin-top: 20px;
background: #fff;
// min-height: 436px;
.message-title {
font-size: 20px;
height: 80px;
......
<template>
<div class="footer-wrap">
<span>Copyright© 2019 云鹊医疗科技 (上海) 有限公司</span>
<span>沪ICP:16018581号-1</span>
<span>京ICP:14044861号</span>
</div>
</template>
<script>
export default {
}
</script>
<style lang="scss">
.footer-wrap {
text-align: center;
height: 75px;
line-height: 75px;
font-size: 12px;
color: #838486;
}
</style>
......@@ -32,31 +32,28 @@ export default {
},{
title: '教培项目',
icon: 'el-icon-message',
index: '1',
index: 'item',
subs: [
{
title: '项目组件',
icon: 'el-icon-setting',
index: 'item-component',
subs: []
index: 'item-component'
},
{
title: '项目管理',
icon: 'el-icon-setting',
index: 'item-manager',
subs: []
index: 'item-manager'
}
]
},{
title: '系统管理',
icon: 'el-icon-menu',
index: '2',
index: 'system',
subs: [
{
title: '角色管理',
icon: 'el-icon-setting',
index: 'role',
subs: []
index: 'role'
}
]
}
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册