提交 cfec0e0e 编写于 作者: zhentian.jia's avatar zhentian.jia

Merge branch 'dev-eduadmin-20190222' into 'release'

Dev eduadmin 20190222



See merge request !8
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
> >
<div class="img-delete" v-show="imgMouseOver" @click.stop="deleteImg(1)" @mouseout.stop="imgMouseOver=false"><i class="el-icon-delete"></i></div> <div class="img-delete" v-show="imgMouseOver" @click.stop="deleteImg(1)" @mouseout.stop="imgMouseOver=false"><i class="el-icon-delete"></i></div>
<div class="limit-text"> <div class="limit-text">
<p>尺寸:115*86</p> <p>尺寸:230*172</p>
<p>限制大小: 500Kb</p> <p>限制大小: 500Kb</p>
<p>支持.jpg,.png格式</p> <p>支持.jpg,.png格式</p>
</div> </div>
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
> >
<div class="img-delete" v-show="imgMouseOver2" @click.stop="deleteImg(2)" @mouseout.stop="imgMouseOver2=false"><i class="el-icon-delete"></i></div> <div class="img-delete" v-show="imgMouseOver2" @click.stop="deleteImg(2)" @mouseout.stop="imgMouseOver2=false"><i class="el-icon-delete"></i></div>
<div v-show="formData.type == 1" class="limit-text"> <div v-show="formData.type == 1" class="limit-text">
<p>尺寸:375*210</p> <p>尺寸:750*420</p>
<p>限制大小: 2.0 Mb</p> <p>限制大小: 2.0 Mb</p>
<p>支持.jpg,.png格式</p> <p>支持.jpg,.png格式</p>
</div> </div>
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
:reserve-selection="true" :reserve-selection="true"
></el-table-column> ></el-table-column>
<el-table-column prop="name" label="医院名称" min-width="100" align="center"></el-table-column> <el-table-column prop="name" label="医院名称" min-width="100" align="center"></el-table-column>
<el-table-column prop="hospitalLevel" label="医院级别" align="center"></el-table-column> <el-table-column prop="hospitalLevelName" label="医院级别" align="center"></el-table-column>
<el-table-column prop="provinceName" label="所属省份" align="center"></el-table-column> <el-table-column prop="provinceName" label="所属省份" align="center"></el-table-column>
<el-table-column prop="cityName" label="所属城市" align="center"></el-table-column> <el-table-column prop="cityName" label="所属城市" align="center"></el-table-column>
<el-table-column prop="countyName" label="所属区县" align="center"></el-table-column> <el-table-column prop="countyName" label="所属区县" align="center"></el-table-column>
...@@ -1322,8 +1322,8 @@ export default { ...@@ -1322,8 +1322,8 @@ export default {
//上传列表图片 //上传列表图片
beforeUploadListPic(file) { beforeUploadListPic(file) {
let fileLimit = { let fileLimit = {
width: 115, width: 230,
height: 86, height: 172,
size: 0.5, size: 0.5,
sizeText: "500K", sizeText: "500K",
key: "attachmentUrl1", key: "attachmentUrl1",
...@@ -1335,8 +1335,8 @@ export default { ...@@ -1335,8 +1335,8 @@ export default {
//上传封面图片 //上传封面图片
beforeUploadCoverPic(file) { beforeUploadCoverPic(file) {
let fileLimit = { let fileLimit = {
width: 375, width: 750,
height: 210, height: 420,
size: 2, size: 2,
sizeText: "2.0M", sizeText: "2.0M",
key: "attachmentUrl2", key: "attachmentUrl2",
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册