开发管理0304修改页面

src/views/eva/components/ImageComponent.vue

@@ -1,10 +1,5 @@
 <template>
   <div class="imgBox">
-    <div @click="addImg($event)" class="imgItem">
-      <img src="@/assets/images/eva/camera.png" alt="" />
-      <input type="file" accept="image/*" multiple style="display: none" @change="beforeUpload($event)" />
-    </div>
-
     <!-- <div class="imgList"> -->
     <div v-for="(item, index) in imgList" :key="index" class="imgItem">
       <div class="itemImg" @click="previewImg(item)">
@@ -22,7 +17,10 @@
         <el-progress :text-inside="true" :stroke-width="20" :percentage="progress" style="width: 80%"></el-progress>
       </div>
     </div>
-
+    <div @click="addImg($event)" class="imgItem">
+      <img src="@/assets/images/eva/camera.png" alt="" />
+      <input type="file" accept="image/*" multiple style="display: none" @change="beforeUpload($event)" />
+    </div>
     <pop v-show="repShowMask">
       <template v-slot:tit>提示</template>
       <template v-slot:con>确定删除吗</template>
@@ -176,7 +174,7 @@ export default {
     .itemImg {
       height: 100%;
       // height: 66px;
-      z-index: 1;
+      // z-index: 1;
       > img {
         width: 100%;
         height: 100%;
@@ -197,7 +195,7 @@ export default {
       padding: 1px;
       border-end-start-radius: 4px;
       background-color: rgba(0, 0, 0, 0.4);
-      z-index: 9;
+      // z-index: 9;
       > img {
         width: 95%;
         height: 95%;

src/views/eva/components/radioSelect.vue

@@ -13,7 +13,7 @@
     </div>
 
     <div class="ico">
-      <van-icon size="14px" :name="ico ? 'arrow-left' : 'arrow-down'" />
+      <van-icon size="14px" :name="ico ? 'arrow-down' : 'arrow-left'" />
     </div>
 
     <div class="list" v-if="!ico">
@@ -56,6 +56,7 @@ export default {
     // 判断弹出选项列表
     icoIsShow() {
       this.ico = !this.ico
+      this.$emit('selBtn')
     },
     // 判断学生是否被选中
     cho(e) {

src/views/eva/components/selects.vue

@@ -16,7 +16,7 @@
     </div>
 
     <div class="ico">
-      <van-icon size="14px" :name="ico ? 'arrow-left' : 'arrow-down'" />
+      <van-icon size="14px" :name="ico ? 'arrow-down' : 'arrow-left'" />
     </div>
 
     <div class="list" v-if="!ico">
@@ -58,6 +58,7 @@ export default {
     // 判断弹出选项列表
     icoIsShow() {
       this.ico = !this.ico
+      this.$emit('selBtn')
     },
     // 判断学生是否被选中
     choose(e) {
@@ -75,7 +76,6 @@ export default {
       this.choosePer.splice(iii, 1)
       //   console.log()
     },
-
     // 此方法在父元素中被调用
     fuClick() {
       // console.log(111)
@@ -122,7 +122,7 @@ export default {
     background-color: #fff;
     width: 100%;
     box-shadow: 0px 1px 6px 0px rgba(0, 0, 0, 0.1);
-    z-index: 100;
+    z-index: 1000;
     border-radius: 8px;
     .ol {
       height: 40px;

src/views/eva/studentDetail.vue

@@ -63,11 +63,17 @@
             <div class="btnBack" v-if="num" @click="upStu">
               <img class="img" src="../../assets/images/eva/zuo01.png" alt="" />
             </div>
+            <div class="btnBack" v-else>
+              <img class="img" src="../../assets/images/eva/zuo01.png" alt="" />
+            </div>
           </div>
           <div>
             <div class="btnBack" v-if="num != stuList.length - 1" @click="nextStu">
               <img class="img" src="../../assets/images/eva/you02.png" alt="" />
             </div>
+            <div class="btnBack" v-else>
+              <img class="img" src="../../assets/images/eva/you02.png" alt="" />
+            </div>
           </div>
         </div>
       </div>
@@ -169,15 +175,15 @@ import { selectTerm } from '@/api/eva'
 
 import { updateRecord } from '@/api/eva'
 // 单选
-import selectStyle from './components/selectStyle.vue'
+// import selectStyle from './components/selectStyle.vue'
 import bar from './components/bar.vue'
 // 弹窗组件
 import pop from './components/pop.vue'
 export default {
   components: {
     bar,
-    pop,
-    selectStyle
+    pop
+    // selectStyle
   },
   data() {
     return {
@@ -677,7 +683,7 @@ export default {
   align-items: center;
   justify-content: space-between;
   box-sizing: border-box;
-  padding: 0 15%;
+  padding: 5px 15%;
   border-bottom: 1px solid #e7e7e7;
 }
 /deep/.van-dropdown-menu__bar {
@@ -754,7 +760,7 @@ export default {
 .observe_content {
   // margin: 0 10px;
   width: 100%;
-  min-height: 95px;
+  min-height: 100px;
   // max-height: 95px;
   border-bottom: 1px solid #e7e7e7;
   box-sizing: border-box;
@@ -791,7 +797,7 @@ export default {
     text-align: left;
     font-family: PingFangSC-regular;
     display: -webkit-box;
-    -webkit-line-clamp: 3;
+    -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -856,6 +862,8 @@ export default {
           font-family: PingFangSC-regular;
           box-sizing: border-box;
           padding-right: 35px;
+          display: flex;
+          align-items: center;
         }
         .sInfoList {
           position: absolute;
@@ -904,7 +912,7 @@ export default {
       .cla {
         overflow: hidden;
         width: 100%;
-        font-weight: 50;
+        font-weight: 200;
         // overflow-wrap: break-word;
         white-space: nowrap;
         text-overflow: ellipsis;

src/views/eva/studentEvaluate.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 学生评价 -->
-  <div class="studentEvaluate" @click="col">
+  <div class="studentEvaluate">
     <bar :tit="'学生评价'" :num="1">
       <template v-slot:back>
         <van-icon @click="SaveBack" name="arrow-left" />
@@ -11,10 +11,12 @@
       </template>
     </bar>
 
-    <div style="height: 50px;z-index: 30;"></div>
+    <div style="height: 50px;z-index: 30;display: block;"></div>
 
     <!-- <div class="bigBlock"> -->
     <div class="bigBlock" style="">
+      <!-- 遮罩层 -->
+      <div class="popCSS" ref="popCss" @click="col"></div>
       <div
         v-if="placeShow"
         @click="placeShow = false"
@@ -31,18 +33,30 @@
         </div>
       </div>
 
-      <div class="claName">
+      <div class="claName" style="z-index: 100;">
         <!-- <div class="relevanceStudent"> -->
         <div class="tit">关联</div>
         <div class="studentName">
-          <selects ref="StuSel" :listContent="studentList" :tit="'请选择关联学生'" :choosePer="selectSData"></selects>
+          <selects
+            ref="StuSel"
+            @selBtn="selBtn"
+            :listContent="studentList"
+            :tit="'请选择关联学生'"
+            :choosePer="selectSData"
+          ></selects>
         </div>
         <!-- </div> -->
       </div>
       <div class="claName">
         <div class="tit">学期</div>
         <div class="studentName" style="position: relative;">
-          <radioSelect ref="claSel" :listCont="termList" :tit="'请选择学期'" :choose="termData"></radioSelect>
+          <radioSelect
+            @selBtn="selBtn"
+            ref="claSel"
+            :listCont="termList"
+            :tit="'请选择学期'"
+            :choose="termData"
+          ></radioSelect>
           <div v-show="term" style="position: absolute;bottom: -100%; color: red;font-size: 10px;">请选择学期</div>
         </div>
       </div>
@@ -51,7 +65,13 @@
       <div class="claName">
         <div class="tit">维度</div>
         <div class="studentName" style="position: relative;">
-          <selects ref="WeiSel" :listContent="weiList" :tit="'请选择评价维度'" :choosePer="selectWData"></selects>
+          <selects
+            @selBtn="selBtn"
+            ref="WeiSel"
+            :listContent="weiList"
+            :tit="'请选择评价维度'"
+            :choosePer="selectWData"
+          ></selects>
           <div v-show="wei" style="position: absolute;bottom: -100%; color: red;font-size: 10px;">请选择评价维度</div>
         </div>
       </div>
@@ -121,12 +141,12 @@
         </div>
       </div>
       <div class="claName">
-        <div style="width: 70px;">观察内容</div>
+        <div style="width: 70px;line-height: 40px;">观察内容</div>
         <div class="inpBlock studentName">
           <input type="text" v-model="observeCon" class="inp" placeholder="请输入" />
         </div>
       </div>
-      <div class="claName">
+      <div style="height: 40px;line-height: 40px;">
         观察记录
       </div>
       <div class="EvaluateTxt">
@@ -146,8 +166,8 @@
         <!-- <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" @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>
@@ -169,7 +189,7 @@
 
     <pop v-show="addNewShowMask">
       <template v-slot:tit>提示</template>
-      <template v-slot:con v-if="!shareShow"> 是否添加新纪录 ?</template>
+      <template v-slot:con v-if="!shareShow"> 是否添加为新纪录 ?</template>
       <template v-slot:con v-else> 是否保存当前纪录 ?</template>
 
       <template v-slot:btn1>
@@ -190,7 +210,7 @@
 
     <pop v-show="repShowMask">
       <template v-slot:tit>提示</template>
-      <template v-slot:con>确定重复添加吗？</template>
+      <template v-slot:con>确定新增本条吗？</template>
       <template v-slot:btn1>
         <div class="btn" style="color: rgba(136,136,136,1);" @click="repShowMask = false">
           取消
@@ -324,6 +344,13 @@ 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()
+    },
     classEsp() {
       this.classEspNum = !this.classEspNum
       // console.log('点击了');
@@ -346,6 +373,7 @@ export default {
         // console.log('获取班学生列表', data2)
         selectManyClassStudent(data2).then(res => {
           this.studentList = res[0]
+          console.log('班级同学列表', this.studentList)
         })
       })
       // 获取纬度筛选框
@@ -436,9 +464,11 @@ export default {
     },
     // 调用子元素selects中的方法隐藏选项列表
     col() {
+      this.$refs.popCss.style.display = 'none'
+
+      this.$refs.claSel.fuClick()
       this.$refs.StuSel.fuClick()
       this.$refs.WeiSel.fuClick()
-      this.$refs.claSel.fuClick()
     },
     // 选择照片
     getImage(imgList) {
@@ -986,6 +1016,18 @@ export default {
   padding-bottom: 80px;
   min-height: 120vh;
   background-image: linear-gradient(to bottom, #005ccd 1%, #005ccd 12%, #f6f5f8 35%, #f6f5f8 100%);
+  .popCSS {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    padding: 0 20px;
+    transform: translate(-20px, 0);
+    height: 130%;
+    display: none;
+    // background-color: #005ccd;
+    z-index: 1;
+  }
   .rl {
     position: absolute;
     top: 50%;
@@ -1055,10 +1097,10 @@ export default {
     color: #101010;
     display: flex;
     justify-content: space-between;
-    align-items: center;
+    // align-items: center;
     .tit {
       width: 40px;
-      min-height: 40px;
+      height: 40px;
       display: flex;
       align-items: center;
     }
@@ -1080,10 +1122,13 @@ export default {
       flex: 1;
       width: 100%;
       min-height: 40px;
-      line-height: 40px;
+      // line-height: 40px;
       display: flex;
       align-items: center;
       border-bottom: 1px solid #e7e7e7;
+      /deep/.van-cell__value {
+        display: flex;
+      }
     }
     /deep/ .van-cell {
       padding: 0;