0715Commit

pc/src/api/getApiRes.js

@@ -1006,4 +1006,14 @@ export function BodyNodeEdit(postdata) {
 export function BodyNodeStatusEdit(postdata) {
     let url = headapi + 'v1/Score/BodyNodeStatusEdit';
     return getApiBasic(url, postdata);
+}
+//课程综合评分查询
+export function ScoreClassQuery(postdata) {
+    let url = headapi + 'v1/ScoreClass/ScoreClassQuery';
+    return getApiBasic(url, postdata);
+}
+//课程动作评分详情查询
+export function ScoreClassDetailQuery(postdata) {
+    let url = headapi + 'v1/ScoreClass/ScoreClassDetailQuery';
+    return getApiBasic(url, postdata);
 }

pc/src/views/ActionScore.vue

@@ -79,33 +79,33 @@
         ></el-table-column>
 
         <el-table-column
-            prop="Phone"
+            prop="Usercode"
             label="手机号"
             width="120"
             sortable
         />
 
         <el-table-column
-            prop="Phone"
+            prop="Scores"
             label="评价"
             width="110"
             sortable
         >
           <template slot-scope="scope">
-            <el-radio-group v-model="scope.row.defaultScore" @change="editMemberRow(scope.row)">
-              <el-radio :label="1" style="width: 110px;">优秀</el-radio>
-              <el-radio :label="2" style="width: 110px;">不达标</el-radio>
-              <el-radio :label="3" style="width: 110px;">未完成</el-radio>
+            <el-radio-group v-model="scope.row.EaScoreLevel" @change="editMemberRow(scope.row)">
+              <el-radio :label=2 style="width: 110px;">优秀</el-radio>
+              <el-radio :label=1 style="width: 110px;">不达标</el-radio>
+              <el-radio :label=0 style="width: 110px;">未完成</el-radio>
             </el-radio-group>
           </template>
         </el-table-column>
 
         <el-table-column
-            v-for="item in bodyList" :key="item.BnId" :label="item.BnName" :prop="item.BnName">
+            v-for="item in bodyList" :key="item.BnId" :label="item.BnName" :prop="''+item.BnId">
           <template slot-scope="scope">
             <el-switch
-                v-model="scope.row.actions[item.index][item.BnName]"
-                :disabled="scope.row.defaultScore ==3"
+                v-model="scope.row.BodyNodeRs[''+item.BnId]"
+                :disabled="scope.row.EaScoreLevel == 0"
                 inactive-color="#13ce66"
                 active-color="#ff4949"
                 inactive-text="优秀"
@@ -128,7 +128,7 @@
 <script>
 import Global from "../Global.js";
 import {
-  ClassOverDetailListQuery,
+  ScoreClassDetailQuery,
   AGDetailQuery,
   ENRelationQuery,
 } from "../api/getApiRes";
@@ -152,35 +152,8 @@ export default {
       dialogTitle: "新增会员",
       current: getNowDate(),
       cur_page: 1,
-      bodyList: [{
-        "index": 0,
-        "EnId": 5,
-        "EaId": 3,
-        "BnId": 5,
-        "Weight": 5,
-        "DefScore": 5,
-        "Status": 1,
-        "BnName": "左脚"
-      }, {
-        "index": 1,
-        "EnId": 6,
-        "EaId": 3,
-        "BnId": 6,
-        "Weight": 6,
-        "DefScore": 6,
-        "Status": 1,
-        "BnName": "右脚"
-      }],
-      memberList: [{
-        "head": "http://xhead.beswell.com/GoAllOut160749884317982.png",
-        "Name": "jayChou",
-        "defaultScore": 2,
-        "Phone": "15313278006",
-        "actions": [
-          {"右脚": false},
-          {"左脚": true}
-        ]
-      }],
+      bodyList: [],
+      memberList: [],
       // panel 配置项目
       panel: {
         draw: 1,
@@ -208,7 +181,6 @@ export default {
   },
   mounted() {
     this.getActionQuery();
-    this.getTableQuery();
     this.AgId = this.$route.query.AgId;
     this.ClassType = this.$route.query.ClassType;
     this.PkNum = this.$route.query.PkNum;
@@ -221,10 +193,9 @@ export default {
         this.$route.query.EndStr;
   },
   methods: {
-    handleClick(histType) {
+    handleClick(actionId) {
       let that = this;
-      console.log("========histType===" + histType);
-      that.getActionBodyNode(histType);
+      that.getActionBodyNode(actionId);
     },
     handleSelectionChange(val) {
       let row = "";
@@ -246,9 +217,9 @@ export default {
       ENRelationQuery(postdata).then((res) => {
         let json = res;
         if (json.Code == 0) {
-          that.loading = false;
           if (json.Rs) {
-            // that.bodyList = json.Rs;
+            that.bodyList = json.Rs;
+            that.getTableQuery();
           } else {
             that.bodyList = [];
           }
@@ -256,7 +227,6 @@ export default {
           that.$message.error(json.Memo + " 错误码：" + json.Code);
         }
       });
-
     },
     postPageMember() {
       let that = this;
@@ -266,7 +236,7 @@ export default {
       for (let i = 0; i < this.tableData.length; i++) {
         thisRow = this.tableData[i];
         thisRow.LessonIndex = parseInt(i + 1);
-        thisRow.EndStr = thisRow.Phone;
+        thisRow.EndStr = thisRow.CsId;
         this.$delete(thisRow, 'LessonIndex');
         scoreRs.push(thisRow);
       }
@@ -286,21 +256,20 @@ export default {
     },
     editMemberRow(row) {
       let that = this;
-      console.log(row.defaultScore);
-
-      if (row.defaultScore == 1) {
+      //默认等级优秀
+      if (row.EaScoreLevel == 2) {
         for (let tempBody in that.bodyList) {
-          row.actions[tempBody][that.bodyList[tempBody]["BnName"]] = false;
+          row.BodyNodeRs[that.bodyList[tempBody]["BnId"]] = false;
         }
       }
-      if (row.defaultScore == 2) {
+      //默认等级不达标
+      if (row.EaScoreLevel == 1) {
         for (let tempBody in that.bodyList) {
-          row.actions[tempBody][that.bodyList[tempBody]["BnName"]] = true;
+          row.BodyNodeRs[that.bodyList[tempBody]["BnId"]] = true;
         }
       }
-      if (row.defaultScore == 3) {
+      if (row.EaScoreLevel == 0) {
       }
-      console.log(row);
     },
     clearForm() {
       // clear
@@ -322,6 +291,8 @@ export default {
         if (json.Code == 0) {
           if (json.Rs) {
             that.actionList = json.Rs;
+            that.action = json.Rs[0].EaId;
+            that.getActionBodyNode(that.action);
           } else {
             that.actionList = [];
           }
@@ -330,21 +301,6 @@ export default {
         }
       });
     },
-    // 查询按钮
-    query() {
-      let that = this;
-      that.searchBtnStatus = true;
-      let totalTime = 2;
-      let clock = window.setInterval(() => {
-        totalTime--;
-        if (totalTime < 0) {
-          totalTime = 2;
-          that.searchBtnStatus = false;
-        }
-      }, 1000);
-      this.getTableQuery();
-      this.$message.success("查询完毕");
-    },
     goBack() {
       this.$router.push({
         path: "/courses",
@@ -357,27 +313,25 @@ export default {
       that.loading = true;
       let param = {
         token: localStorage.token,
-        stdId: this.$route.query.StdId,
-        start: 1, //
-        tableMax: 9999, //
+        eaId: 1,
+        stdId: this.$route.query.StdId
       };
       that.allTableData = [];
       that.tableData = [];
       that.recordsTotal = 0;
       let postdata = qs.stringify(param);
-      ClassOverDetailListQuery(postdata).then((res) => {
+      ScoreClassDetailQuery(postdata).then((res) => {
         let json = res;
         if (json.Code == 0) {
           that.loading = false;
           if (json.Rs) {
-            that.allTableData = that.memberList;
-            that.recordsTotal = that.memberList.length;
+            that.allTableData = json.Rs;
+            that.recordsTotal = json.Rs.length;
           } else {
             that.allTableData = [];
             that.recordsTotal = 0;
           }
-          that.allTableData = that.memberList;
-          that.recordsTotal = that.memberList.length;
+          console.log(that.allTableData);
 
           // 设置分页数据
           that.setPagination();
@@ -404,7 +358,6 @@ export default {
         return index < that.pagination.pageItem;
       });
       that.draw = that.pagination.pageItem;
-      // that.getTableQuery();
     },
     // 翻页
     pageChange(pageIndex) {
@@ -422,7 +375,6 @@ export default {
         this.tableData = tables;
       }
       that.start = index * that.draw;
-      // that.getTableQuery();
     },
     goType(url) {
       this.$router.push({
@@ -443,7 +395,6 @@ export default {
     $route(to) {
       if (to.name == "actionScore") {
         this.getActionQuery();
-        this.getTableQuery();
         this.AgId = this.$route.query.AgId;
         this.FinishClass = this.$route.query.FinishClass;
         this.ClassType = this.$route.query.ClassType;

pc/src/views/courseEdit.vue

@@ -1141,7 +1141,9 @@ export default {
       let std = [];
       if (this.tableData) {
         this.tableData.map(function (item) {
-          std.push(item.UserId);
+          if (item.IsTmpUser != 1) {
+            std.push(item.UserId);
+          }
         });
       }
       that.dialogAcrossValue = std;
@@ -1185,6 +1187,7 @@ export default {
         stdId: this.$route.query.StdId,
         userlist: userlist,
       };
+      console.log(that.dialogValue);
       let postdata = qs.stringify(param);
       // 下课记录详情添加
       ClassOverDetailAdd(postdata).then((res) => {
@@ -1217,6 +1220,8 @@ export default {
         stdId: this.$route.query.StdId,
         tmpuserlist: userlist,
       };
+      console.log(that.dialogTempValue);
+
       let postdata = qs.stringify(param);
       // 下课记录详情添加
       ClassOverTmpDetailAdd(postdata).then((res) => {
@@ -1250,6 +1255,7 @@ export default {
         stdId: this.$route.query.StdId,
         userlist: userlist,
       };
+      console.log(that.dialogAcrossValue);
       let postdata = qs.stringify(param);
       // 下课记录详情添加
       ClassOverDetailAdd(postdata).then((res) => {