Commit 8dd15c5d by yuanfeng

Merge remote-tracking branch 'origin/20210819' into yuanfeng

parents e219957a 33ac272d
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>张謇教育</title> <title>张謇企业家学院管理平台</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
......
...@@ -22,7 +22,7 @@ export default { ...@@ -22,7 +22,7 @@ export default {
props: { props: {
title: { title: {
type: String, type: String,
default: '徐汇区教师队伍整体发展情况分析' default: ''
} }
}, },
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="item course"> <div class="item course">
<title-line :con="'发展历程'"></title-line> <title-line :con="'发展历程'"></title-line>
<div class="courseModal"> <div class="courseModal">
2021年1月6日成立 2021年1月6日成立<br />
全省民营企业家学习弘扬张謇 全省民营企业家学习弘扬张謇
精神高级研修班同日开班 精神高级研修班同日开班
</div> </div>
...@@ -244,6 +244,7 @@ export default { ...@@ -244,6 +244,7 @@ export default {
padding: 10px 15px; padding: 10px 15px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
box-sizing: border-box;
.item { .item {
width: 50%; width: 50%;
height: 100%; height: 100%;
......
<template> <template>
<div class="index-page"> <div class="index-page">
<layout :layoutConf="layoutSize"> <layout :layoutConf="layoutSize">
<page-head title="张謇教育基地管理平台" slot="header" /> <page-head title="张謇企业家学院管理平台" slot="header" />
<template v-if="fetchSuccess"> <template v-if="fetchSuccess">
<!-- left --> <!-- left -->
<left :leftData="leftData" slot="left" /> <left :leftData="leftData" slot="left" />
......
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