yuanyiming 1 年之前
父节点
当前提交
633fa678c8

+ 1 - 1
src/views/eva/components/radioSelect.vue

@@ -18,7 +18,7 @@
 
     <div class="list" v-if="!ico">
       <div class="ol" v-for="(i, index) in listCont" :key="index + 'w'" @click="cho(i)">
-        <div>
+        <div :style="{ color: choose.includes(i.id) ? '#3894FF' : 'none' }">
           {{ i.name }}
         </div>
         <div>

+ 1 - 1
src/views/eva/components/selectStyle.vue

@@ -17,7 +17,7 @@
 
     <div class="list" v-if="ico">
       <div class="ol" v-for="(i, index) in listCont" :key="index + 'w'" @click.stop="cho(i)">
-        <div>
+        <div :style="{ color: choose.includes(i.id) ? '#3894FF' : 'none' }">
           {{ i.name }}
         </div>
         <div>

+ 1 - 1
src/views/eva/components/selects.vue

@@ -20,7 +20,7 @@
     </div>
 
     <div class="list" v-if="!ico">
-      <div class="ol" v-for="(i, index) in listContent" :key="index + 'w'" @click="choose(i)">
+      <div class="ol" v-for="(i, index) in listContent" :key="index + 'w'" @click.stop="choose(i)">
         <div :style="{ color: choosePer.includes(i.id) ? 'blue' : '' }">
           {{ i.name }}
         </div>

+ 8 - 1
src/views/eva/index.vue

@@ -18,7 +18,7 @@
     </div>
 
     <div>
-      <van-tabs @change="ggg" v-if="!searchList.length" swipeable @click="spread">
+      <van-tabs @change="ggg" v-if="!searchList.length" :swipeable="true" :lazy-render="true" @click="spread">
         <van-tab v-for="(e, index) in classLists" :key="index + 't'" :name="e.id" :title="e.name">
           <!-- <classList :claName="i"></classList> -->
           <div class="students">
@@ -144,13 +144,20 @@ export default {
 
 /deep/ .van-tab__pane {
   height: calc(100vh - 150px);
+  overflow-y: auto;
+  overflow-x: hidden;
+  width: 100%;
 }
 
 .searchPage {
   width: 100%;
+  height: calc(100vh - 125px);
+  // background-color: #4a8efc;
   box-sizing: border-box;
   margin-top: 20px;
   min-height: 300px;
+  overflow-y: auto;
+  overflow-x: hidden;
 }
 
 .search {

+ 7 - 7
src/views/eva/searchStudentEva.vue

@@ -3,7 +3,7 @@
   <div class="studentEvaluate" @click="col">
     <bar :tit="'学生评价'" :num="1">
       <template v-slot:btn>
-        <div v-if="!shareShow" @click="save">保存</div>
+        <div v-if="!shareShow" @click="save">发布</div>
         <div v-else @click="amend">修改</div>
       </template>
     </bar>
@@ -39,10 +39,10 @@
       <div v-show="term" style="height: 10px;"></div>
 
       <div class="claName">
-        <div class="tit">度</div>
+        <div class="tit">度</div>
         <div class="studentName" style="position: relative;">
-          <selects ref="WeiSel" :listContent="weiList" :tit="'请选择评价度'" :choosePer="selectWData"></selects>
-          <div v-show="wei" style="position: absolute;bottom: -100%; color: red;font-size: 10px;">请选择评价度</div>
+          <selects 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>
       <div v-show="wei" style="height: 10px;"></div>
@@ -120,13 +120,13 @@
       <!-- <div class="btn" @click="isShowMask = true">删除</div> -->
       <!-- <div class="btn" @click="isShowMask = true">重复添加</div>
       <div class="btn">添加新记录</div> -->
-      <div class="btn" v-if="!shareShow" @click="save">保存并返回</div>
+      <div class="btn" v-if="!shareShow" @click="save">发布并返回</div>
       <div class="btn" v-else @click="amend">修改并返回</div>
     </div>
 
     <pop v-show="isShowMask">
       <template v-slot:tit>确定</template>
-      <template v-slot:con>确定{{ shareShow ? '修改' : '保存' }}吗</template>
+      <template v-slot:con>确定{{ shareShow ? '修改' : '发布' }}吗</template>
       <template v-slot:btn1>
         <div class="btn" style="color: rgba(136,136,136,1);" @click="isShowMask = false">取消</div>
       </template>
@@ -336,7 +336,7 @@ export default {
         console.log(res)
         if (res === 1) {
           this.$toast({
-            message: '保存成功',
+            message: '发布成功',
             type: 'success'
           })
           setTimeout(() => {

+ 3 - 3
src/views/eva/searchstuDetail.vue

@@ -54,7 +54,7 @@
         <!-- </div> -->
       </div>
       <!-- 观察内容开始 -->
-      <van-swipe-cell v-show="conList.length" v-for="(i, index) in conList" :key="index">
+      <van-swipe-cell :swipeable="true" v-show="conList.length" v-for="(i, index) in conList" :key="index">
         <div class="observe_content" @click="recordContinue(i.rid)">
           <div class="observe_contentTit">
             <!-- {{ i.recordTit }} -->
@@ -306,7 +306,7 @@ export default {
         trm: this.termData[0],
         txt: ''
       }
-      console.log(' 获取所有学生记录aaaaaaaaaaaaaaaaaaaaaaa', data4)
+      // console.log(' 获取所有学生记录aaaaaaaaaaaaaaaaaaaaaaa', data4)
       selectRecord(data4).then(res => {
         console.log('获取所有学生记录', res)
         this.TermRecord = res[0]
@@ -381,7 +381,7 @@ export default {
   top: 0;
   left: 0;
   width: 100%;
-  height: 60vh;
+  height: 90vh;
   z-index: 99;
 }
 .delete-button {

+ 6 - 7
src/views/eva/studentDetail.vue

@@ -73,8 +73,8 @@
         <!-- </div> -->
       </div>
       <!-- 观察内容开始 -->
-      <van-swipe-cell v-show="conList.length" v-for="(i, index) in conList" :key="index">
-        <div class="observe_content" @click="recordContinue(i.rid)">
+      <van-swipe-cell :swipeable="true" v-show="conList.length" v-for="(i, index) in conList" :key="index">
+        <div class="observe_content" @click.stop="recordContinue(i.rid)">
           <div class="observe_contentTit">
             <!-- {{ i.recordTit }} -->
             观察内容
@@ -202,7 +202,9 @@ export default {
     },
     touchend(e) {
       // 清除定时器
+
       clearTimeout(this.timeOutEvent)
+      console.log(this.timeOutEvent)
       if (this.timeOutEvent !== 0) {
         // 这里写要执行的内容(尤如onclick事件)
         console.log('你这是点击,不是长按')
@@ -212,9 +214,6 @@ export default {
           target.style.display = 'none'
         }, 1000)
       }
-      // if (condition) {
-
-      // }
     },
     // 获取基础数据
     getData() {
@@ -445,7 +444,7 @@ export default {
   line-height: 20px;
   display: none;
   position: absolute;
-  // min-width: 120px;
+  min-width: 80px;
   text-wrap: nowrap;
   font-size: 12px;
   border-radius: 5px;
@@ -465,7 +464,7 @@ export default {
   top: 0;
   left: 0;
   width: 100%;
-  height: 60vh;
+  height: 90vh;
   z-index: 99;
 }
 // .shade {

+ 7 - 7
src/views/eva/studentEvaluate.vue

@@ -3,7 +3,7 @@
   <div class="studentEvaluate" @click="col">
     <bar :tit="'学生评价'" :num="1">
       <template v-slot:btn>
-        <div v-if="!shareShow" @click="save">保存</div>
+        <div v-if="!shareShow" @click="save">发布</div>
         <div v-else @click="amend">修改</div>
       </template>
     </bar>
@@ -39,10 +39,10 @@
       <div v-show="term" style="height: 10px;"></div>
 
       <div class="claName">
-        <div class="tit">度</div>
+        <div class="tit">度</div>
         <div class="studentName" style="position: relative;">
-          <selects ref="WeiSel" :listContent="weiList" :tit="'请选择评价度'" :choosePer="selectWData"></selects>
-          <div v-show="wei" style="position: absolute;bottom: -100%; color: red;font-size: 10px;">请选择评价度</div>
+          <selects 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>
       <div v-show="wei" style="height: 10px;"></div>
@@ -120,13 +120,13 @@
       <!-- <div class="btn" @click="isShowMask = true">删除</div> -->
       <!-- <div class="btn" @click="isShowMask = true">重复添加</div>
       <div class="btn">添加新记录</div> -->
-      <div class="btn" v-if="!shareShow" @click="save">保存并返回</div>
+      <div class="btn" v-if="!shareShow" @click="save">发布并返回</div>
       <div class="btn" v-else @click="amend">修改并返回</div>
     </div>
 
     <pop v-show="isShowMask">
       <template v-slot:tit>确定</template>
-      <template v-slot:con>确定{{ shareShow ? '修改' : '保存' }}吗</template>
+      <template v-slot:con>确定{{ shareShow ? '修改' : '发布' }}吗</template>
       <template v-slot:btn1>
         <div class="btn" style="color: rgba(136,136,136,1);" @click="isShowMask = false">取消</div>
       </template>
@@ -347,7 +347,7 @@ export default {
         console.log(res)
         if (res === 1) {
           this.$toast({
-            message: '保存成功',
+            message: '发布成功',
             type: 'success'
           })
           setTimeout(() => {