|
|
@@ -16,12 +16,12 @@
|
|
|
<!-- <div class="bigBlock"> -->
|
|
|
<div class="bigBlock" style="">
|
|
|
<!-- 遮罩层 -->
|
|
|
- <div class="popCSS" ref="popCss" @click="col"></div>
|
|
|
- <div
|
|
|
+ <div class="popCSS" v-if="popCssNum" ref="popCss" @click="col"></div>
|
|
|
+ <!-- <div
|
|
|
v-if="placeShow"
|
|
|
@click="placeShow = false"
|
|
|
style="position:absolute;top: 0;left: 0;width: 100%;height: 100%;z-index: 10;"
|
|
|
- ></div>
|
|
|
+ ></div> -->
|
|
|
<div class="claName">
|
|
|
<div class="tit">学生</div>
|
|
|
<div class="studentName">{{ studentInfo.name }}</div>
|
|
|
@@ -40,6 +40,7 @@
|
|
|
<selects
|
|
|
ref="StuSel"
|
|
|
@selBtn="selBtn"
|
|
|
+ :num="2"
|
|
|
:listContent="studentList"
|
|
|
:tit="'请选择关联学生'"
|
|
|
:choosePer="selectSData"
|
|
|
@@ -50,13 +51,22 @@
|
|
|
<div class="claName">
|
|
|
<div class="tit">学期</div>
|
|
|
<div class="studentName" style="position: relative;">
|
|
|
- <radioSelect
|
|
|
+ <!-- <radioSelect
|
|
|
@selBtn="selBtn"
|
|
|
ref="claSel"
|
|
|
+ :num="0"
|
|
|
:listCont="termList"
|
|
|
:tit="'请选择学期'"
|
|
|
:choose="termData"
|
|
|
- ></radioSelect>
|
|
|
+ ></radioSelect> -->
|
|
|
+ <selects
|
|
|
+ ref="claSel"
|
|
|
+ @selBtn="selBtn"
|
|
|
+ :num="1"
|
|
|
+ :listContent="termList"
|
|
|
+ :tit="'请选择学期'"
|
|
|
+ :choosePer="termData"
|
|
|
+ ></selects>
|
|
|
<div v-show="term" style="position: absolute;bottom: -100%; color: red;font-size: 10px;">请选择学期</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -68,6 +78,7 @@
|
|
|
<selects
|
|
|
@selBtn="selBtn"
|
|
|
ref="WeiSel"
|
|
|
+ :num="0"
|
|
|
:listContent="weiList"
|
|
|
:tit="'请选择评价维度'"
|
|
|
:choosePer="selectWData"
|
|
|
@@ -114,7 +125,7 @@
|
|
|
|
|
|
<div class="claName" style="position: relative;">
|
|
|
<div class="tit">地点</div>
|
|
|
- <div class="inpBlock studentName">
|
|
|
+ <div class="inpBlock studentName" style="z-index: 1;">
|
|
|
<!-- <radioSelect ref="claSel" :listCont="placeList" :tit="'请选择地点'" :choose="termData"></radioSelect> -->
|
|
|
<!-- <div > -->
|
|
|
<!-- :readonly="placeId != 1" -->
|
|
|
@@ -162,14 +173,14 @@
|
|
|
<image-component @getImage="getImage" :imgList.sync="imgList"></image-component>
|
|
|
</div>
|
|
|
<!-- 上传图片结束 -->
|
|
|
- <div class="submitBtn">
|
|
|
+ <div class="submitBtn" @click="col">
|
|
|
<!-- <div class="btn" @click="isShowMask = true">删除</div> -->
|
|
|
<!-- <div class="btn" v-if="shareShow" @click="repPop">重复添加</div>
|
|
|
<div class="btn" v-if="shareShow" @click="repetitionSave">添加新纪录</div> -->
|
|
|
- <div class="btn" @click="repPop(0)">新增本条</div>
|
|
|
- <div class="btn" @click="repetitionSave(1)">新增空白</div>
|
|
|
- <div class="btn" v-if="!shareShow" @click="save">发布并返回</div>
|
|
|
- <div class="btn" v-else @click="amend">修改并返回</div>
|
|
|
+ <div class="btn" @click.stop="repPop(0)">新增本条</div>
|
|
|
+ <div class="btn" @click.stop="repetitionSave(1)">新增空白</div>
|
|
|
+ <div class="btn" v-if="!shareShow" @click.stop="save">发布并返回</div>
|
|
|
+ <div class="btn" v-else @click.stop="amend">修改并返回</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- </div> -->
|
|
|
@@ -221,18 +232,6 @@
|
|
|
<div class="btn" style="color: rgba(251,67,25,1);" @click="repAddRecord">确认</div>
|
|
|
</template>
|
|
|
</pop>
|
|
|
-
|
|
|
- <!-- <pop v-show="repAddShowMask">
|
|
|
- <template v-slot:tit>提示</template>
|
|
|
- <template v-slot:con>确定重复添加吗？</template>
|
|
|
- <template v-slot:btn1>
|
|
|
- <div class="btn" style="color: rgba(136,136,136,1);" @click="repAddShowMask = false">取消</div>
|
|
|
- </template>
|
|
|
- <template v-slot:btn2>
|
|
|
- <div class="btn" style="color: rgba(251,67,25,1);" @click="repAddShowMaskRecord">确认</div>
|
|
|
- </template>
|
|
|
- </pop> -->
|
|
|
-
|
|
|
<pop v-show="backShowMask">
|
|
|
<template v-slot:tit>提示</template>
|
|
|
<template v-slot:con>是否放弃当前编辑内容？</template>
|
|
|
@@ -252,7 +251,7 @@ import bar from './components/bar.vue'
|
|
|
// 多选框组件
|
|
|
import selects from './components/selects.vue'
|
|
|
// 单选
|
|
|
-import radioSelect from './components/radioSelect.vue'
|
|
|
+// import radioSelect from './components/radioSelect.vue'
|
|
|
|
|
|
// 上传图片组件
|
|
|
import imageComponent from './components/ImageComponent.vue'
|
|
|
@@ -277,8 +276,8 @@ export default {
|
|
|
bar,
|
|
|
selects,
|
|
|
imageComponent,
|
|
|
- pop,
|
|
|
- radioSelect
|
|
|
+ pop
|
|
|
+ // radioSelect
|
|
|
},
|
|
|
|
|
|
data() {
|
|
|
@@ -286,6 +285,9 @@ export default {
|
|
|
studentInfo: {},
|
|
|
classEspNum: false,
|
|
|
repShowMask: false,
|
|
|
+ popCssNum: 0,
|
|
|
+ // 判断多选框展示（不关闭哪个）
|
|
|
+ tyNum: 0,
|
|
|
// // 重复添加弹出框判断
|
|
|
// repMaskNum: 0,
|
|
|
// 添加新纪录弹框判断
|
|
|
@@ -344,16 +346,36 @@ export default {
|
|
|
},
|
|
|
|
|
|
methods: {
|
|
|
- selBtn() {
|
|
|
- console.log(1111)
|
|
|
- this.$refs.popCss.style.display = 'block'
|
|
|
- // this.$refs.claSel.fuClick()
|
|
|
- // this.$refs.StuSel.fuClick()
|
|
|
- // this.$refs.WeiSel.fuClick()
|
|
|
+ selBtn(e, i) {
|
|
|
+ this.tyNum = e
|
|
|
+ // this.$refs.popCss.style.display = 'block'
|
|
|
+ this.popCssNum = true
|
|
|
+
|
|
|
+ if (e == 2) {
|
|
|
+ this.$refs.claSel.fuClick()
|
|
|
+ this.$refs.WeiSel.fuClick()
|
|
|
+ this.placeShow = false
|
|
|
+ if (!i) {
|
|
|
+ this.popCssNum = false
|
|
|
+ }
|
|
|
+ } else if (e == 1) {
|
|
|
+ this.$refs.StuSel.fuClick()
|
|
|
+ this.$refs.WeiSel.fuClick()
|
|
|
+ this.placeShow = false
|
|
|
+ if (!i) {
|
|
|
+ this.popCssNum = false
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ this.$refs.claSel.fuClick()
|
|
|
+ this.$refs.StuSel.fuClick()
|
|
|
+ this.placeShow = false
|
|
|
+ if (!i) {
|
|
|
+ this.popCssNum = false
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
classEsp() {
|
|
|
this.classEspNum = !this.classEspNum
|
|
|
- // console.log('点击了');
|
|
|
},
|
|
|
getData() {
|
|
|
// 获取学生信息
|
|
|
@@ -372,7 +394,9 @@ export default {
|
|
|
}
|
|
|
// console.log('获取班学生列表', data2)
|
|
|
selectManyClassStudent(data2).then(res => {
|
|
|
- this.studentList = res[0]
|
|
|
+ this.studentList = res[0].filter(i => {
|
|
|
+ return i.id !== localStorage.getItem('userId')
|
|
|
+ })
|
|
|
console.log('班级同学列表', this.studentList)
|
|
|
})
|
|
|
})
|
|
|
@@ -381,29 +405,6 @@ export default {
|
|
|
this.getWei()
|
|
|
|
|
|
this.getTermData()
|
|
|
- // selectVeiDoo().then(res => {
|
|
|
- // this.weiList = res[0]
|
|
|
- // // console.log('this.weiList', this.weiList)
|
|
|
- // })
|
|
|
-
|
|
|
- // console.log('获取筛选项22222222', data3)
|
|
|
-
|
|
|
- // 获取学期筛选框
|
|
|
-
|
|
|
- // 获取班学生列表
|
|
|
- // const data2 = {
|
|
|
- // cid: this.$route.query.cid
|
|
|
- // }
|
|
|
- // selectClassStudent(data2).then(res => {
|
|
|
- // res[0].forEach(e => {
|
|
|
- // if (e.id === this.$route.query.uid) {
|
|
|
- // this.stuName = e
|
|
|
- // } else {
|
|
|
- // this.studentList.push(e)
|
|
|
- // }
|
|
|
- // })
|
|
|
- // console.log('this.studentList', this.studentList)
|
|
|
- // })
|
|
|
},
|
|
|
// 获取学期筛选框
|
|
|
getTermData() {
|
|
|
@@ -464,7 +465,9 @@ export default {
|
|
|
},
|
|
|
// 调用子元素selects中的方法隐藏选项列表
|
|
|
col() {
|
|
|
- this.$refs.popCss.style.display = 'none'
|
|
|
+ // this.$refs.popCss.style.display = 'none'
|
|
|
+ this.popCssNum = false
|
|
|
+ this.placeShow = false
|
|
|
|
|
|
this.$refs.claSel.fuClick()
|
|
|
this.$refs.StuSel.fuClick()
|
|
|
@@ -485,10 +488,7 @@ export default {
|
|
|
this.wei = true
|
|
|
isOk = 1
|
|
|
}
|
|
|
- // if (this.visitTime === '') {
|
|
|
- // this.tim = true
|
|
|
- // isOk = 1
|
|
|
- // }
|
|
|
+
|
|
|
if (isOk === 1) return
|
|
|
|
|
|
this.isShowMask = true
|
|
|
@@ -562,8 +562,11 @@ export default {
|
|
|
console.log(isOk)
|
|
|
}
|
|
|
if (isOk) {
|
|
|
- console.log('111')
|
|
|
- this.AddNewRecord()
|
|
|
+ this.noSave()
|
|
|
+ this.shareShow = 0
|
|
|
+ this.col()
|
|
|
+
|
|
|
+ // this.AddNewRecord()
|
|
|
return
|
|
|
}
|
|
|
this.addNewShowMask = 1
|
|
|
@@ -599,38 +602,17 @@ export default {
|
|
|
} else {
|
|
|
this.placeList = ptype
|
|
|
}
|
|
|
-
|
|
|
- // if (fotype.length == 0 && sotype.length == 0) {
|
|
|
- // if (fctype.length == 0 && sctype.length == 0) {
|
|
|
- // for (var i = 0; i < ftype.length; i++) {
|
|
|
- // allfType.push(ftype[i])
|
|
|
- // }
|
|
|
- // for (var i = 0; i < stype.length; i++) {
|
|
|
- // allsType.push(stype[[i]])
|
|
|
- // }
|
|
|
- // } else {
|
|
|
- // for (var i = 0; i < fctype.length; i++) {
|
|
|
- // allfType.push(fctype[i])
|
|
|
- // }
|
|
|
- // for (var i = 0; i < sctype.length; i++) {
|
|
|
- // allsType.push(sctype[[i]])
|
|
|
- // }
|
|
|
- // }
|
|
|
- // } else {
|
|
|
- // for (var i = 0; i < fotype.length; i++) {
|
|
|
- // allfType.push(fotype[i])
|
|
|
- // }
|
|
|
- // for (var i = 0; i < sotype.length; i++) {
|
|
|
- // allsType.push(sctysotypepe[[i]])
|
|
|
- // }
|
|
|
- // }
|
|
|
- // console.log('分类分类分类', res)
|
|
|
- // this.weiList = allsType
|
|
|
})
|
|
|
},
|
|
|
// 显示地点选择框
|
|
|
selectPlace() {
|
|
|
- this.placeShow = true
|
|
|
+ // this.$refs.popCss.style.display = 'block'
|
|
|
+ this.popCssNum = !this.placeShow
|
|
|
+ this.placeShow = !this.placeShow
|
|
|
+
|
|
|
+ this.$refs.claSel.fuClick()
|
|
|
+ this.$refs.StuSel.fuClick()
|
|
|
+ this.$refs.WeiSel.fuClick()
|
|
|
},
|
|
|
// 选择地点点击事件
|
|
|
cho(i) {
|
|
|
@@ -700,6 +682,7 @@ export default {
|
|
|
insertRecord(data).then(res => {
|
|
|
// console.log(res)
|
|
|
if (res === 1) {
|
|
|
+ this.placeShow = false
|
|
|
this.$toast({
|
|
|
message: '重复添加成功',
|
|
|
type: 'success'
|
|
|
@@ -708,6 +691,8 @@ export default {
|
|
|
this.recordCon = ''
|
|
|
this.imgList = []
|
|
|
this.getPresentDate()
|
|
|
+ this.col()
|
|
|
+
|
|
|
// this.selectSData = []
|
|
|
// this.selectWData = []
|
|
|
// this.getPresentDate()
|
|
|
@@ -726,6 +711,8 @@ export default {
|
|
|
AddNewRecord() {
|
|
|
this.addNewShowMask = 0
|
|
|
this.shareShow = 0
|
|
|
+ this.getPresentDate()
|
|
|
+
|
|
|
const data = [
|
|
|
{
|
|
|
// uid: localStorage.getItem('userId'),
|
|
|
@@ -750,6 +737,8 @@ export default {
|
|
|
insertRecord(data).then(res => {
|
|
|
// console.log(res)
|
|
|
if (res === 1) {
|
|
|
+ this.placeShow = false
|
|
|
+
|
|
|
this.$toast({
|
|
|
message: '添加新纪录成功',
|
|
|
type: 'success'
|
|
|
@@ -762,6 +751,7 @@ export default {
|
|
|
this.recordCon = ''
|
|
|
this.imgList = []
|
|
|
this.placeId = 1
|
|
|
+ this.col()
|
|
|
// setTimeout(() => {
|
|
|
// this.$router.replace('/studentDetail')
|
|
|
// }, 1000)
|
|
|
@@ -803,6 +793,7 @@ export default {
|
|
|
})
|
|
|
setTimeout(() => {
|
|
|
this.$router.replace('/studentDetail')
|
|
|
+ this.col()
|
|
|
|
|
|
// if (this.$route.query.ser || 0) {
|
|
|
// this.$router.replace(`/searchstuDetail?cid=${this.$route.query.cid}&cName=${this.$route.query.CName}`)
|
|
|
@@ -841,6 +832,7 @@ export default {
|
|
|
})
|
|
|
setTimeout(() => {
|
|
|
this.$router.replace('/studentDetail')
|
|
|
+ this.col()
|
|
|
|
|
|
// if (this.$route.query.ser || 0) {
|
|
|
// this.$router.replace(`/studentDetail?cid=${this.$route.query.cid}&cName=${this.$route.query.CName}`)
|
|
|
@@ -870,6 +862,9 @@ export default {
|
|
|
if (allData.type !== '') {
|
|
|
this.selectWData = allData.type.split(',')
|
|
|
}
|
|
|
+
|
|
|
+ console.log('this.selectSData', this.selectSData)
|
|
|
+
|
|
|
this.studentInfo.name = allData.name
|
|
|
this.studentInfo.cname = allData.cname
|
|
|
this.studentInfo.classid = allData.classid
|
|
|
@@ -891,7 +886,9 @@ export default {
|
|
|
}
|
|
|
// console.log('获取班学生列表', data2)
|
|
|
selectManyClassStudent(data2).then(res => {
|
|
|
- this.studentList = res[0]
|
|
|
+ this.studentList = res[0].filter(i => {
|
|
|
+ return i.id !== allData.sid
|
|
|
+ })
|
|
|
})
|
|
|
|
|
|
// console.log('selectWData', this.selectWData)
|
|
|
@@ -1024,9 +1021,8 @@ export default {
|
|
|
width: 100%;
|
|
|
padding: 0 20px;
|
|
|
transform: translate(-20px, 0);
|
|
|
- height: 130%;
|
|
|
- display: none;
|
|
|
- // background-color: #005ccd;
|
|
|
+ height: 100%;
|
|
|
+ background-color: #005ccd;
|
|
|
z-index: 1;
|
|
|
}
|
|
|
.rl {
|
|
|
@@ -1163,7 +1159,7 @@ export default {
|
|
|
background-color: #fff;
|
|
|
width: 100%;
|
|
|
box-shadow: 0px 1px 6px 0px rgba(0, 0, 0, 0.1);
|
|
|
- z-index: 30;
|
|
|
+ z-index: 40;
|
|
|
border-radius: 8px;
|
|
|
.ol {
|
|
|
height: 40px;
|
yuanyiming