|
|
@@ -65,7 +65,15 @@
|
|
|
v-for="(i, index) in CampusF.GroupImgList"
|
|
|
:key="index"
|
|
|
>
|
|
|
- <img
|
|
|
+
|
|
|
+ <el-image
|
|
|
+ style="width: 100%;
|
|
|
+ object-fit: contain;
|
|
|
+ border-radius: 10px;"
|
|
|
+ :src="i"
|
|
|
+ :preview-src-list="CampusF.GroupImgList">
|
|
|
+ </el-image>
|
|
|
+ <!-- <img
|
|
|
style="
|
|
|
width: 100%;
|
|
|
height: 100%;
|
|
|
@@ -74,7 +82,7 @@
|
|
|
"
|
|
|
:src="i"
|
|
|
alt=""
|
|
|
- />
|
|
|
+ /> -->
|
|
|
</el-carousel-item>
|
|
|
</el-carousel>
|
|
|
</div>
|
|
|
@@ -237,7 +245,7 @@
|
|
|
|
|
|
<div>
|
|
|
<div style="display: flex;justify-content: space-between;gap: 30px;">
|
|
|
- <div class="diaFea" style="height: 122px;width: 30%;min-width: 200px;max-width: 300px;">
|
|
|
+ <div class="diaFea" @click="openNewWindow(item)" style="height: 122px;width: 30%;min-width: 200px;max-width: 300px;cursor: pointer;">
|
|
|
<img v-if="editIndex == index" style="border:1px #0663fe solid;padding: 3px;box-sizing: border-box;" class="diaFeaImgT" @click="uploadisBtn(3,index)" :src="item.setIcon ? item.setIcon : item.json.icon" alt="">
|
|
|
<img v-else class="diaFeaImgT" :src="item.setIcon ? item.setIcon : item.json.icon" alt="">
|
|
|
|
|
|
@@ -277,13 +285,13 @@
|
|
|
style="padding: 0"
|
|
|
v-if="editIndex == index"
|
|
|
>
|
|
|
- <span @click="feaClo(index)">取消</span>
|
|
|
+ <span style="color: #000;" @click="feaClo(index)">取消</span>
|
|
|
<span
|
|
|
style="
|
|
|
background: #fff;
|
|
|
- border: 1px #0663fe solid;
|
|
|
- color: #0663fe;
|
|
|
"
|
|
|
+ :style="{border: editBtnType==1 ? '1px #9747FF solid':'1px #0663fe solid',
|
|
|
+ color: editBtnType==1 ? '#9747FF' : '#0663fe'}"
|
|
|
@click="setJsonL(index)"
|
|
|
>保存</span
|
|
|
>
|
|
|
@@ -291,7 +299,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="FedialogJIa" style="display: flex;" @click="lookMore()">
|
|
|
- <div style="width: 100%;">
|
|
|
+ <div style="width: 100%;border: 1px #000 dashed;cursor: pointer;">
|
|
|
<img src="../../../assets/kanban/jia.svg" alt="" />
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -363,6 +371,7 @@
|
|
|
>
|
|
|
<div
|
|
|
class="diaFea"
|
|
|
+ :style="{border: editIndex == index ? '1px dashed #3681FC' :''}"
|
|
|
v-for="(i, index) in CampusF.feature"
|
|
|
:key="index + 'b'"
|
|
|
>
|
|
|
@@ -370,7 +379,7 @@
|
|
|
<el-input
|
|
|
v-if="editIndex == index"
|
|
|
resize="none"
|
|
|
- style="border-radius: 10px"
|
|
|
+ style="border-radius: 10px;"
|
|
|
placeholder="请输入内容"
|
|
|
v-model="i.name"
|
|
|
>
|
|
|
@@ -387,7 +396,7 @@
|
|
|
<img
|
|
|
@click="editFea(index)"
|
|
|
class="topTitEdit"
|
|
|
- :src="editIndex == index ? require('../../../assets/kanban/bz.svg') : require('../../../assets/kanban/feaB.svg')"
|
|
|
+ :src="editIndex == index ? editBtnType == 1? require('../../../assets/kanban/bz.svg') : require('../../../assets/kanban/lj.svg') : require('../../../assets/kanban/feaB.svg')"
|
|
|
alt=""
|
|
|
/>
|
|
|
<img
|
|
|
@@ -399,12 +408,11 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div>
|
|
|
- <i
|
|
|
- v-if="!i.icon"
|
|
|
- style="height: 30px; width: 30px"
|
|
|
- @click="uploadisBtn(isBtn, index)"
|
|
|
- class="el-icon-picture-outline"
|
|
|
- ></i>
|
|
|
+ <div v-if="!i.icon"
|
|
|
+ class="djjC"
|
|
|
+ @click="uploadisBtn(isBtn, index)">
|
|
|
+ <img src="../../../assets/kanban/djj.svg" alt="">
|
|
|
+ </div>
|
|
|
<img
|
|
|
style="cursor: pointer"
|
|
|
v-else-if="editIndex == index"
|
|
|
@@ -419,7 +427,8 @@
|
|
|
<el-input
|
|
|
:disabled="editIndex != index"
|
|
|
resize="none"
|
|
|
- style="border-radius: 10px"
|
|
|
+ :style="{border: editIndex == index ? '1px dashed #3681FC' :''}"
|
|
|
+ style="border-radius: 10px;overflow: hidden;"
|
|
|
type="textarea"
|
|
|
:rows="4"
|
|
|
placeholder="请输入内容"
|
|
|
@@ -431,13 +440,13 @@
|
|
|
style="padding: 0"
|
|
|
v-if="editIndex == index"
|
|
|
>
|
|
|
- <span @click="feaClo(index)">取消</span>
|
|
|
+ <span style="color: #000;" @click="feaClo(index)">取消</span>
|
|
|
<span
|
|
|
style="
|
|
|
background: #fff;
|
|
|
- border: 1px #0663fe solid;
|
|
|
- color: #0663fe;
|
|
|
"
|
|
|
+ :style="{border: editBtnType==1 ? '1px #9747FF solid':'1px #0663fe solid',
|
|
|
+ color: editBtnType==1 ? '#9747FF' : '#0663fe'}"
|
|
|
@click="setJsonL(0)"
|
|
|
>保存</span
|
|
|
>
|
|
|
@@ -451,7 +460,7 @@
|
|
|
style="display: flex; flex-direction: column; gap: 10px"
|
|
|
v-if="isBtn === 2"
|
|
|
>
|
|
|
- <div class="diaFea">
|
|
|
+ <div class="diaFea" :style="{border: editIndex == 'bri' ? '1px dashed #3681FC' :''}">
|
|
|
<div style="display: flex; justify-content: space-between">
|
|
|
<div></div>
|
|
|
<div
|
|
|
@@ -464,7 +473,7 @@
|
|
|
<img
|
|
|
@click="editFea('bri')"
|
|
|
class="topTitEdit"
|
|
|
- :src="editIndex == 'bri' ? require('../../../assets/kanban/bz.svg') : require('../../../assets/kanban/feaB.svg')"
|
|
|
+ :src="editIndex == 'bri' ? editBtnType == 1 ? require('../../../assets/kanban/bz.svg') : require('../../../assets/kanban/lj.svg') : require('../../../assets/kanban/feaB.svg')"
|
|
|
alt=""
|
|
|
/>
|
|
|
</div>
|
|
|
@@ -473,9 +482,10 @@
|
|
|
<el-input
|
|
|
:disabled="editIndex != 'bri'"
|
|
|
resize="none"
|
|
|
- style="border-radius: 10px"
|
|
|
+ style="border-radius: 10px;overflow: hidden;"
|
|
|
type="textarea"
|
|
|
:rows="4"
|
|
|
+ :style="{border: editIndex == 'bri' ? '1px dashed #3681FC' :''}"
|
|
|
placeholder="请输入内容"
|
|
|
v-model="CampusF.teacherN.teaBri"
|
|
|
>
|
|
|
@@ -485,13 +495,13 @@
|
|
|
style="padding: 0"
|
|
|
v-if="editIndex == 'bri'"
|
|
|
>
|
|
|
- <span @click="feaClo()">取消</span>
|
|
|
+ <span style="color: #000;" @click="feaClo()">取消</span>
|
|
|
<span
|
|
|
style="
|
|
|
background: #fff;
|
|
|
- border: 1px #0663fe solid;
|
|
|
- color: #0663fe;
|
|
|
"
|
|
|
+ :style="{border: editBtnType==1 ? '1px #9747FF solid':'1px #0663fe solid',
|
|
|
+ color: editBtnType==1 ? '#9747FF' : '#0663fe'}"
|
|
|
@click="setJsonL(0)"
|
|
|
>保存</span
|
|
|
>
|
|
|
@@ -500,6 +510,7 @@
|
|
|
</div>
|
|
|
<div
|
|
|
class="diaFea"
|
|
|
+ :style="{border: editIndex == index ? '1px dashed #3681FC' :''}"
|
|
|
v-for="(i, index) in CampusF.teacherN.list"
|
|
|
:key="index + 'b'"
|
|
|
>
|
|
|
@@ -524,7 +535,7 @@
|
|
|
<img
|
|
|
@click="editFea(index)"
|
|
|
class="topTitEdit"
|
|
|
- :src="editIndex == index ? require('../../../assets/kanban/bz.svg') : require('../../../assets/kanban/feaB.svg')"
|
|
|
+ :src="editIndex == index ? editBtnType == 1? require('../../../assets/kanban/bz.svg') : require('../../../assets/kanban/lj.svg') : require('../../../assets/kanban/feaB.svg')"
|
|
|
alt=""
|
|
|
/>
|
|
|
<img
|
|
|
@@ -539,7 +550,8 @@
|
|
|
<el-input
|
|
|
:disabled="editIndex != index"
|
|
|
resize="none"
|
|
|
- style="border-radius: 10px"
|
|
|
+ :style="{border: editIndex == index ? '1px dashed #3681FC' :''}"
|
|
|
+ style="border-radius: 10px;overflow: hidden;"
|
|
|
type="textarea"
|
|
|
:rows="4"
|
|
|
placeholder="请输入内容"
|
|
|
@@ -551,13 +563,13 @@
|
|
|
style="padding: 0"
|
|
|
v-if="editIndex == index"
|
|
|
>
|
|
|
- <span @click="feaClo(index)">取消</span>
|
|
|
+ <span style="color: #000;" @click="feaClo(index)">取消</span>
|
|
|
<span
|
|
|
style="
|
|
|
background: #fff;
|
|
|
- border: 1px #0663fe solid;
|
|
|
- color: #0663fe;
|
|
|
"
|
|
|
+ :style="{border: editBtnType==1 ? '1px #9747FF solid':'1px #0663fe solid',
|
|
|
+ color: editBtnType==1 ? '#9747FF' : '#0663fe'}"
|
|
|
@click="setJsonL(0)"
|
|
|
>保存</span
|
|
|
>
|
|
|
@@ -569,6 +581,7 @@
|
|
|
</div>
|
|
|
<div
|
|
|
v-if="isBtn === 1 || isBtn === 2"
|
|
|
+ @click="additem()"
|
|
|
style="
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
@@ -578,10 +591,10 @@
|
|
|
"
|
|
|
>
|
|
|
<img src="../../../assets/kanban/feaJ.svg" alt="" />
|
|
|
- <span @click="additem()" style="color: #0560fd">添加</span>
|
|
|
+ <span style="color: #0560fd">添加</span>
|
|
|
</div>
|
|
|
- <div class="diaBtn">
|
|
|
- <span @click="handleClose">取 消</span>
|
|
|
+ <div class="diaBtn" style="padding-bottom: 10px !important;">
|
|
|
+ <span style="color: #000;" @click="handleClose"> {{isBtn === 0?'返 回':'取 消' }}</span>
|
|
|
<span
|
|
|
type="primary"
|
|
|
style="background: #0663fe; color: #fff"
|
|
|
@@ -621,7 +634,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="diaBtn" style="height: 5%;">
|
|
|
+ <div class="diaBtn" style="height: 5%;padding-bottom: 10px;">
|
|
|
<span @click="dialogVisible = false">取 消</span>
|
|
|
<span
|
|
|
type="primary"
|
|
|
@@ -656,6 +669,8 @@ export default {
|
|
|
return {
|
|
|
dialogVisible:false,
|
|
|
|
|
|
+ // 0默认颜色 1编辑 2添加
|
|
|
+ editBtnType:0,
|
|
|
// 添加与编辑弹框显示
|
|
|
editVisible: false,
|
|
|
// app应用列表
|
|
|
@@ -753,6 +768,7 @@ export default {
|
|
|
},
|
|
|
// 添加数据
|
|
|
additem() {
|
|
|
+ this.editBtnType = 2
|
|
|
if (this.isBtn == 1) {
|
|
|
this.CampusF.feature.push({ bri: "", icon: "", name: "" });
|
|
|
this.editIndex = this.CampusF.feature.length - 1;
|
|
|
@@ -787,6 +803,7 @@ export default {
|
|
|
},
|
|
|
// 编辑弹框数据条中的图片
|
|
|
editFea(ind) {
|
|
|
+ this.editBtnType = 1
|
|
|
this.CampusF = JSON.parse(JSON.stringify(this.Alldata.admin.CampusF));
|
|
|
this.editIndex = ind;
|
|
|
},
|
|
|
@@ -889,6 +906,7 @@ export default {
|
|
|
},
|
|
|
// 办学特色取消
|
|
|
feaClo(ind) {
|
|
|
+ this.editBtnType = 0
|
|
|
this.editIndex = null;
|
|
|
|
|
|
let data = JSON.parse(
|
|
|
@@ -993,7 +1011,7 @@ export default {
|
|
|
.then(async (res) => {
|
|
|
let _data = res.data;
|
|
|
if (_data == 1) {
|
|
|
- this.$message.success("修改权限成功");
|
|
|
+ this.$message.success("修改成功");
|
|
|
|
|
|
this.getSchFacility();
|
|
|
|
|
|
@@ -1589,11 +1607,11 @@ export default {
|
|
|
display: flex;
|
|
|
justify-content: flex-end;
|
|
|
gap: 10px;
|
|
|
- height: 40px;
|
|
|
+ /* height: 40px; */
|
|
|
align-items: center;
|
|
|
- padding: 0 20px;
|
|
|
+ padding: 10px 20px 0 !important;
|
|
|
box-sizing: border-box;
|
|
|
- min-height: 60px;
|
|
|
+ /* min-height: 60px; */
|
|
|
}
|
|
|
.diaBtn > span {
|
|
|
background: #e7e7e7;
|
|
|
@@ -1630,6 +1648,7 @@ export default {
|
|
|
}
|
|
|
.imgBoc {
|
|
|
position: relative;
|
|
|
+ border: none !important;
|
|
|
}
|
|
|
.imgBoc > .el-icon-circle-close {
|
|
|
position: absolute;
|
|
|
@@ -1661,8 +1680,8 @@ export default {
|
|
|
}
|
|
|
|
|
|
.diaFeaImg {
|
|
|
- height: 30px;
|
|
|
- width: 30px;
|
|
|
+ height: 40px;
|
|
|
+ width: 40px;
|
|
|
object-fit: contain;
|
|
|
border-radius: 5px;
|
|
|
border: 1px solid #0663fe;
|
|
|
@@ -1738,4 +1757,13 @@ export default {
|
|
|
overflow: hidden;
|
|
|
text-overflow: ellipsis;
|
|
|
}
|
|
|
+.djjC{
|
|
|
+ display: flex;align-items: center;justify-content: center;
|
|
|
+ width: 40px;
|
|
|
+ height: 40px;
|
|
|
+ border-radius: 8px;
|
|
|
+ border-width: 1px;
|
|
|
+ cursor: pointer;
|
|
|
+ border: 1px dashed #3681FC;
|
|
|
+}
|
|
|
</style>
|
11wqe1
