切换学生

src/components/pages/kindStudentEva/index.vue

@@ -1,11 +1,20 @@
 <template>
   <div class="tp_body">
     <div class="tp_left">
-      <infoA :userid="suid" :oid="oid" :org="org"></infoA>
-      <panelA :userid="suid" :oid="oid" :org="org"></panelA>
+      <infoA
+        :userid="suid"
+        :teaId="userid"
+        :oid="oid"
+        :org="org"
+        :cid="cid"
+        :role="role"
+        :key="suid+'a'"
+        @updateUid="updateUid"
+      ></infoA>
+      <panelA :userid="suid" :oid="oid" :org="org" :key="suid+'b'"></panelA>
     </div>
     <div class="tp_right">
-      <testA :userid="suid" :oid="oid" :org="org" :cid="cid"></testA>
+      <testA :userid="suid" :oid="oid" :org="org" :cid="cid" :key="suid+'c'"></testA>
     </div>
   </div>
 </template>
@@ -19,8 +28,9 @@ export default {
   components: {
     infoA,
     panelA,
-    testA,
+    testA
   },
+
   data() {
     return {
       userid: this.$route.query.userid,
@@ -31,7 +41,21 @@ export default {
       role: this.$route.query.role,
     };
   },
-  methods: {},
+  // watch: {
+  //   $route(to, from) {
+  //     console.log("bbbbbbbbbbbbbbbbbbbbb刷新了");
+  //     // 监听$route变化，当参数发生变化时执行逻辑
+  //     // this.$forceUpdate();
+  //     this.$router.go(0);
+  //     // window.location.reload();
+  //   }
+  // },
+  methods: {
+    updateUid(e){
+      console.log('更新',e);
+      this.suid = e
+    }
+  }
 };
 </script>
 
@@ -57,4 +81,4 @@ export default {
   margin: 0 0 0 10px;
   height: 100%;
 }
-</style>
+</style>

src/components/pages/kindStudentEva/info/index.vue

@@ -7,10 +7,24 @@
       <div class="name">
         <span>{{ info.username }}</span>
       </div>
+      <div
+        style="position: absolute;top: 50%;left: 0;"
+        @click="upStu"
+        v-if="num"
+      >
+        <i class="el-icon-arrow-left" style="font-size: 25px;cursor: pointer;"></i>
+      </div>
+      <div
+        style="position: absolute;top: 50%;right: 0;"
+        @click="nextStu"
+        v-if="num != stuList.length - 1"
+      >
+        <i class="el-icon-arrow-right" style="font-size: 25px;cursor: pointer;"></i>
+      </div>
     </div>
     <div class="i_bottom">
       <div class="i_bottom_span">
-        <span>班级</span>
+        <span style="text-align: left;">班级</span>
         <el-tooltip
           :content="info.cname ? info.cname : '暂无'"
           placement="top"
@@ -20,7 +34,7 @@
         </el-tooltip>
       </div>
       <div class="i_bottom_span">
-        <span>备注</span>
+        <span style="text-align: left;">备注</span>
         <el-tooltip
           :content="info.intro ? info.intro : '暂无'"
           placement="top"
@@ -47,50 +61,148 @@ import avator from "../../../../assets/icon/test/teacher.jpg";
 import infoDialog from "./infoDialog/index.vue";
 export default {
   components: {
-    infoDialog,
+    infoDialog
   },
   props: {
     userid: {
-      type: String,
+      type: String
+    },
+    teaId: {
+      type: String
     },
     oid: {
-      type: String,
+      type: String
     },
+    cid: {
+      type: String
+    },
+    org: {
+      type: String
+    },
+    role: {
+      type: String
+    }
   },
   data() {
     return {
       avator: avator,
       info: {},
       dialogVisibleInfo: false,
+      // 班级学生列表
+      stuList: [],
+      // 处在班级的第几个位置
+      num: ""
     };
   },
   watch: {
     dialogVisibleInfo(newValue, oldValue) {
       this.getData();
-    },
+    }
   },
   methods: {
+    upStu() {
+      console.log("qqqqqq", this.num);
+      this.num = this.num * 1 - 1;
+      // this.$router.replace(
+      //   `/kindStudentEva?userid=${this.teaId}&oid=${this.oid}&org=${
+      //     this.org
+      //   }&suid=${this.stuList[this.num]}&cid=${this.cid}&role=${this.role}`
+      // );
+      // this.$router.replace({
+      //   path: this.$route.path, // 当前页面的路径
+      //   // params: currentParams, // 重新传递之前的参数
+      //   query: {
+      //     userid: this.teaId,
+      //     oid: this.oid,
+      //     org: this.org,
+      //     suid: this.stuList[this.num],
+      //     cid: this.cid,
+      //     role: this.role
+      //   }
+      // });
+      this.$emit("updateUid", this.stuList[this.num]);
+
+    },
+    nextStu() {
+      // console.log("this.userid", this.teaId);
+      // console.log("this.oid", this.oid);
+      // console.log("this.org", this.org);
+      // console.log("this.cid", this.cid);
+      // console.log("this.role", this.role);
+      // console.log("this.suid", this.stuList[this.num]);
+
+      this.num = this.num * 1 + 1;
+      // this.$router.push({ params: { suid: this.stuList[this.num] } });
+      // this.$router.replace({
+      //   path: this.$route.path, // 当前页面的路径
+      //   // params: currentParams, // 重新传递之前的参数
+      //   query: {
+      //     userid: this.teaId,
+      //     oid: this.oid,
+      //     org: this.org,
+      //     suid: this.stuList[this.num],
+      //     cid: this.cid,
+      //     role: this.role
+      //   }
+      // });
+      this.$emit("updateUid", this.stuList[this.num]);
+
+    },
+    // 获取班学生列表
+    getStuList() {
+      this.stuList = [];
+      const data2 = {
+        cid: this.cid
+      };
+
+      this.ajax
+        .get(this.$store.state.api + "selectClassStudent", data2)
+        .then(res => {
+          console.log(res.data[0]);
+          let data = res.data[0];
+          data.forEach(e => {
+            this.stuList.push(e.id);
+          });
+          this.num = this.stuList.indexOf(this.userid);
+          console.log("oooooo", this.stuList, this.num);
+        })
+        .catch(err => {
+          console.error(err);
+        });
+
+      // selectClassStudent(data2).then(res => {
+      //   res[0].forEach(e => {
+      //     this.stuList.push(e.id);
+      //   });
+      //   // console.log('获取班学生列表', this.stuList)
+      //   // 查询学生在数组中的位置
+      //   this.num = this.stuList.indexOf(this.userid);
+      //   console.log('oooooo', this.stuList, this.num);
+      // });
+    },
     getData() {
       let params = {
-        uid: this.userid,
+        uid: this.userid
       };
       this.ajax
         .get(this.$store.state.api + "selectSDetail", params)
-        .then((res) => {
+        .then(res => {
           this.info = res.data[0][0];
+          console.log("this.info ", this.info);
           // 用于存储归类后的数据的对象
         })
-        .catch((err) => {
+        .catch(err => {
           console.error(err);
         });
     },
     openInfo() {
       this.dialogVisibleInfo = true;
-    },
+    }
   },
   mounted() {
     this.getData();
-  },
+    this.getStuList();
+  }
 };
 </script>
 
@@ -103,6 +215,8 @@ export default {
   border-radius: 10px;
   margin-bottom: 10px;
   overflow: hidden;
+  box-sizing: border-box;
+  padding: 0 15px;
 }
 
 .i_top {
@@ -116,6 +230,7 @@ export default {
   align-items: center;
   box-sizing: border-box;
   border-bottom: 1px solid #efefef;
+  position: relative;
 }
 
 .i_top > .img {
@@ -179,7 +294,7 @@ export default {
 .i_bottom > .i_bottom_span > span:nth-child(2) {
   width: calc(100% - 30px);
   overflow: hidden;
-  margin-left: 20px;
+  /* margin-left: 20px; */
   white-space: nowrap;
   text-overflow: ellipsis;
 }
@@ -208,4 +323,4 @@ export default {
   background-image: url("../../../../assets/icon/test/edit-icon.png");
   margin-right: 10px;
 }
-</style>
+</style>

src/components/pages/kindStudentEva/test/component/fieldMap.vue

@@ -36,7 +36,7 @@
           >
             {{ proofIsShow ? "关键证据" : "点击查看关联证据" }}
           </div>
-          <div class="proofCells" v-if="proofIsShow">
+          <!-- <div class="proofCells" v-if="proofIsShow">
             <div
               class="proofCell"
               @click="proofBtn"
@@ -44,13 +44,13 @@
             >
               {{ i.recordDate }}-{{ i.recordTit }}-观察笔记
             </div>
-          </div>
+          </div> -->
         </div>
       </div>
     </div>
 
     <el-dialog
-      title="健康记录"
+      :title="tit+'记录'"
       :visible.sync="dialogVisible"
       :before-close="handleClose"
       center
@@ -125,13 +125,16 @@ export default {
   },
   methods: {
     proofJudge() {
-      this.proofIsShow = !this.proofIsShow;
-    },
-    proofBtn() {
+      this.proofIsShow = true;
       this.dialogVisible = true;
     },
+    // proofBtn() {
+      
+    // },
     handleClose() {
       this.dialogVisible = false;
+      this.proofIsShow = false;
+
     },
     // 获取关键证据数据
     getEvidence() {

src/components/pages/kindStudentEva/test/diary.vue

@@ -96,7 +96,7 @@
           prop="create_at"
           label="创建时间"
           align="center"
-          width="120"
+          width="150"
         >
           <!-- <template slot-scope="scope">{{ scope.row.date }}</template> -->
         </el-table-column>
@@ -104,13 +104,14 @@
           prop="recordTit"
           label="观察内容"
           align="center"
-          width="120"
+          width="170"
         >
         </el-table-column>
         <el-table-column
           prop="place"
           label="观察地点"
           align="center"
+          width="120"
           show-overflow-tooltip
         >
         </el-table-column>
@@ -118,6 +119,7 @@
           prop="tname"
           label="维度"
           align="center"
+          width="260"
           show-overflow-tooltip
         >
         </el-table-column>
@@ -505,7 +507,7 @@ export default {
         _json["观察地点"] = res[i].place;
         _json["观察内容"] = res[i].recordTit;
         _json["内容"] = res[i].recordContent;
-        _json["创建时间"] = res[i].create_at;
+        // _json["创建时间"] = res[i].create_at;
 
         array.push(_json);
       }
@@ -523,7 +525,7 @@ export default {
         { wch: 30 },
         { wch: 30 },
         { wch: 30 },
-        { wch: 30 },
+        // { wch: 30 }
       ];
       XLSX.utils.book_append_sheet(workbook, ws, "sheet1"); //把sheet添加到workbook里，第三个参数是sheet名
       XLSX.writeFile(workbook, "观察日记.xlsx");

src/components/pages/kindStudentEva/test/index.vue

@@ -16,7 +16,7 @@
           class="title_item"
         >
           <div></div>
-          <div>期末打分</div>
+          <div>综合评分</div>
         </div>
         <div
           @click="checkType(3)"

src/components/pages/kindStudentEva/test/report.vue

@@ -29,10 +29,11 @@
         style="font-size: 20px;width: 100%;height: 200px;display: flex;justify-content: center;"
         v-if="isShow"
       >
+
         暂无数据
       </div>
 
-      <div class="content" v-if="!isShow">
+      <div class="content" v-if="chartData.length">
         <!-- <div class="conTitle" >
           <div>综合评价:</div>
           <div class="txt">表现优异，再接再厉!</div>
@@ -58,7 +59,7 @@
       </div>
       <div></div>
 
-      <div v-if="!isShow">
+      <div v-if="chartData.length">
         <div v-for="(i, index) in VeidooList" :key="i.id">
           <fieldMap
             :tid="i.id"
@@ -107,14 +108,13 @@ export default {
       termList: [],
       // dialogVisible: false,
       // 平均分柱状图数据
-      croColumnarData: [1],
+      croColumnarData: [],
 
       // 雷达图数据
       chartData: [], //数据
-      categories: ["1"], //标签    雷达图与平均分共用
+      categories: [], //标签    雷达图与平均分共用
 
       value: "",
-
       VeidooList: [], //大分类
       VeidooJsonList: [], //小分类
 
@@ -273,7 +273,6 @@ export default {
             this.isShow = true;
             return;
           }
-
           this.isShow = false;
           let data = res.data[0][0];
           // console.log(JSON.parse(data.json));
@@ -454,7 +453,7 @@ export default {
   height: 100%;
   box-sizing: border-box;
   padding: 15px;
-  
+
   overflow-y: scroll;
   overflow-x: hidden;
   /* overflow: hidden; */

src/components/pages/kindStudentEva/test/score.vue

@@ -23,7 +23,7 @@
       <div class="table_title">
         <div>学习领域</div>
         <div>一级发展目标</div>
-        <div>学期开始评分</div>
+        <div>学期初始评分</div>
         <div>期中评分</div>
         <div>期末评分</div>
         <div>平均分</div>
@@ -90,7 +90,7 @@
           </div>
         </div>
         <div @click="saveSRJson" class="saveBox">
-          <div>保存</div>
+          <div style="box-sizing: border-box;padding: 3px 10px;">保存评分</div>
         </div>
       </div>
     </div>
@@ -527,8 +527,8 @@ export default {
 }
 
 .saveBox > div {
-  width: 70px;
-  height: 30px;
+  /* width: 70px; */
+  /* height: 30px; */
   color: #fff;
   background: #3681fc;
   text-align: center;