Home Explore Help
Sign In
CocoRoboLabs
/
pbl-student-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table into beta

SanHQin 11 months ago
parent
ce535e4b1d 5487265b91
commit
6a64dd5701
15 changed files with 383 additions and 34 deletions
Unified View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.0179b5dd6c0d3a13816d66a91174e412.css
  3. 0 0
      dist/static/css/app.0179b5dd6c0d3a13816d66a91174e412.css.map
  4. 0 0
      dist/static/css/app.6dd8bc050a2bab8972dfe1f97816eb11.css
  5. 0 0
      dist/static/css/app.6dd8bc050a2bab8972dfe1f97816eb11.css.map
  6. 0 0
      dist/static/js/app.673cdcd89f3c07a81099.js
  7. 0 0
      dist/static/js/app.673cdcd89f3c07a81099.js.map
  8. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  9. 11 2
      src/components/courseDetail.vue
  10. 9 9
      src/components/easy2/studyStudent.vue
  11. 7 7
      src/components/easy3/studyStudent.vue
  12. 33 4
      src/components/index.vue
  13. 285 0
      src/components/scoreZong/get.vue
  14. 31 5
      src/components/scoreZong/index.vue
  15. 6 6
      src/components/studyStudent.vue

+ 1 - 1
dist/index.html
View File 

@@ -27,7 +27,7 @@
 
     html,
 
     html,
 
     body{
 
     body{
 
       font-family: '黑体';
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.0179b5dd6c0d3a13816d66a91174e412.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.733814fc48c2bd2222aa.js></script><script type=text/javascript src=./static/js/app.05ebd51d0ab694bbfae2.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.6dd8bc050a2bab8972dfe1f97816eb11.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.733814fc48c2bd2222aa.js></script><script type=text/javascript src=./static/js/app.673cdcd89f3c07a81099.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.0179b5dd6c0d3a13816d66a91174e412.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.0179b5dd6c0d3a13816d66a91174e412.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.6dd8bc050a2bab8972dfe1f97816eb11.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.6dd8bc050a2bab8972dfe1f97816eb11.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.673cdcd89f3c07a81099.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.673cdcd89f3c07a81099.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 11 - 2
src/components/courseDetail.vue
View File 

@@ -226,9 +226,9 @@
 
               <span :class="{ active: type == 1 }" @click="getCTwo"
 
               <span :class="{ active: type == 1 }" @click="getCTwo"
 
                 >课程分析</span
 
                 >课程分析</span
 
               >
 
               >
 
-              <!-- <span :class="{ active: type == 3 }" @click="getCThree"
 
+              <span :class="{ active: type == 3 }" @click="getCThree"
 
                 >课程评价</span
 
                 >课程评价</span
 
-              > -->
 
+              >
 
             </div>
 
             </div>
 
             <div
 
             <div
 
               v-if="((tType == 1 || tType == 4) && type == 2) || tType == 2"
 
               v-if="((tType == 1 || tType == 4) && type == 2) || tType == 2"
 
@@ -994,6 +994,13 @@
 
                 {{ '时间:' + item + '次数:' + chaptersJson.time[item] }}</div> -->
 
                 {{ '时间:' + item + '次数:' + chaptersJson.time[item] }}</div> -->
 
               <!-- <div>实施时间：{{ chaptersJson.startTime }}</div> -->
 
               <!-- <div>实施时间：{{ chaptersJson.startTime }}</div> -->
 
             </div>
 
             </div>
 
+            <div
 
+              v-if="(type == 3)"
 
+              :class="courseDetail.brief != '' ? 'rightTd' : 'noBRight'"
 
+              style="width: 100%; padding-top: 20px"
 
+            >
 
+              <scoreZong :courseid="id"></scoreZong>
 
+            </div>
 
           </div>
 
           </div>
 
         </div>
 
         </div>
 
 
 
@@ -1081,6 +1088,7 @@ import { tools } from "../common/tools";
 
 import axios from "axios";
 
 import axios from "axios";
 
 import JSZip from "jszip";
 
 import JSZip from "jszip";
 
 import FileSaver from "file-saver";
 
 import FileSaver from "file-saver";
 
+import scoreZong from './scoreZong/get.vue'
 
 
 
 const getFile = (url) => {
 
 const getFile = (url) => {
 
   return new Promise((resolve, reject) => {
 
   return new Promise((resolve, reject) => {
 
@@ -1136,6 +1144,7 @@ export default {
 
   components: {
 
   components: {
 
     Heatmap,
 
     Heatmap,
 
     Group,
 
     Group,
 
+    scoreZong
 
   },
 
   },
 
   data() {
 
   data() {
 
     return {
 
     return {

+ 9 - 9
src/components/easy2/studyStudent.vue
View File 

@@ -244,7 +244,7 @@
 
               </div>
 
               </div>
 
             </el-tooltip>
 
             </el-tooltip>
 
           </div>
 
           </div>
 
-          <div class="btnAll" v-show="!['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5'].includes(org)">
 
+          <div class="btnAll" v-show="!['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5','884c5665-a453-46f3-b7b6-01d575290aa9'].includes(org)">
 
             <div class="btnLeft">
 
             <div class="btnLeft">
 
               <el-tooltip effect="light" content="刷新" placement="top">
 
               <el-tooltip effect="light" content="刷新" placement="top">
 
                 <div class="reBtnIcon" @click="refreshCourse">
 
                 <div class="reBtnIcon" @click="refreshCourse">
 
@@ -8040,8 +8040,8 @@
 
         </el-dialog>
 
         </el-dialog>
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
-		<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5'" -->
 
-		<classRoomHelper v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5'" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="2" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
+		<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
 
+		<classRoomHelper v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="2" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
                     '/courseDetail?userid=' +
 
                     '/courseDetail?userid=' +
 
                       userid +
 
                       userid +
 
                       '&oid=' +
 
                       '&oid=' +
 
@@ -8073,16 +8073,16 @@
 
           <img src="../../assets/close1.png" alt="" />
 
           <img src="../../assets/close1.png" alt="" />
 
         </div> -->
 
         </div> -->
 
         <div class="checkbox">
 
         <div class="checkbox">
 
-           <!-- <div class="check" style="font-size: 25px; position: unset">
 
+          <!-- <div class="check" style="font-size: 25px; position: unset">
 
             评论
 
             评论
 
           </div> -->
 
           </div> -->
 
 					<div class="cb-tabList">
 
 					<div class="cb-tabList">
 
 						<div :class="[commentTagShow==0?'cb-tabItem':'']" @click="commentTagShow=0">评论</div>
 
 						<div :class="[commentTagShow==0?'cb-tabItem':'']" @click="commentTagShow=0">评论</div>
 
-						<div :class="[commentTagShow==1?'cb-tabItem':'']" @click="commentTagShow=1">评分</div>
 
-                        <!-- v-show="oid == '4c686762-1d0a-11ed-8c78-005056b86db5'" -->
 
+						<!-- <div :class="[commentTagShow==1?'cb-tabItem':'']" @click="commentTagShow=1">评分</div> -->
 
+            <!-- v-show="oid == '4c686762-1d0a-11ed-8c78-005056b86db5'" -->
 
 						<div :class="[commentTagShow==2?'cb-tabItem':'']" @click="commentTagShow=2">总评</div>
 
 						<div :class="[commentTagShow==2?'cb-tabItem':'']" @click="commentTagShow=2">总评</div>
 
 					</div>
 
 					</div>
 
-          <el-select v-model="pzStype" @change="selectPz" class="selectBox">
 
+          <el-select v-model="pzStype" @change="selectPz" class="selectBox" v-show="commentTagShow == 0">
 
             <el-option label="时间降序" :value="1"></el-option>
 
             <el-option label="时间降序" :value="1"></el-option>
 
             <el-option label="时间升序" :value="2"></el-option>
 
             <el-option label="时间升序" :value="2"></el-option>
 
             <el-option label="我的评课" :value="3"></el-option>
 
             <el-option label="我的评课" :value="3"></el-option>
 
@@ -19896,7 +19896,7 @@ export default {
 
       };
 
       };
 
     },
 
     },
 
 		commentRight(){
 
 		commentRight(){
 
-			if(!['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5'].includes(this.org)){
 
+			if(!['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5','884c5665-a453-46f3-b7b6-01d575290aa9'].includes(this.org)){
 
 				return "35px";
 
 				return "35px";
 
 			}
 
 			}
 
 			return `calc(${this.classRoomHelperWidth} + 5px)`
 
 			return `calc(${this.classRoomHelperWidth} + 5px)`
 
@@ -22702,7 +22702,7 @@ export default {
 
 
 
 .newDialogCss>.scoreList{
 
 .newDialogCss>.scoreList{
 
 	width:100%;
 
 	width:100%;
 
-	height:auto;
 
+	height:100%;
 
 	box-sizing:border-box;
 
 	box-sizing:border-box;
 
 	padding:10px 15px;
 
 	padding:10px 15px;
 
 	overflow:auto;
 
 	overflow:auto;

+ 7 - 7
src/components/easy3/studyStudent.vue
View File 

@@ -245,7 +245,7 @@
 
             </el-tooltip>
 
             </el-tooltip>
 
           </div>
 
           </div>
 
 					<!-- v-show="org !== '1973f6c7-1561-11ee-91d8-005056b86db5' || org !== '777559d2-7239-11ee-b98c-005056b86db5'" -->
 
 					<!-- v-show="org !== '1973f6c7-1561-11ee-91d8-005056b86db5' || org !== '777559d2-7239-11ee-b98c-005056b86db5'" -->
 
-          <div class="btnAll" v-show="!['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5'].includes(org)">
 
+          <div class="btnAll" v-show="!['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5','884c5665-a453-46f3-b7b6-01d575290aa9'].includes(org)">
 
             <div class="btnLeft">
 
             <div class="btnLeft">
 
               <el-tooltip effect="light" content="刷新" placement="top">
 
               <el-tooltip effect="light" content="刷新" placement="top">
 
                 <div class="reBtnIcon" @click="refreshCourse">
 
                 <div class="reBtnIcon" @click="refreshCourse">
 
@@ -8028,8 +8028,8 @@
 
         </el-dialog>
 
         </el-dialog>
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
-				<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5'" -->
 
-		<classRoomHelper v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5'" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="3" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
+				<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
 
+		<classRoomHelper v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="3" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
                     '/courseDetail?userid=' +
 
                     '/courseDetail?userid=' +
 
                       userid +
 
                       userid +
 
                       '&oid=' +
 
                       '&oid=' +
 
@@ -8066,11 +8066,11 @@
 
           </div> -->
 
           </div> -->
 
 					<div class="cb-tabList">
 
 					<div class="cb-tabList">
 
 						<div :class="[commentTagShow==0?'cb-tabItem':'']" @click="commentTagShow=0">评论</div>
 
 						<div :class="[commentTagShow==0?'cb-tabItem':'']" @click="commentTagShow=0">评论</div>
 
-						<div :class="[commentTagShow==1?'cb-tabItem':'']" @click="commentTagShow=1">评分</div>
 
-                        <!-- v-show="oid == '4c686762-1d0a-11ed-8c78-005056b86db5'" -->
 
+						<!-- <div :class="[commentTagShow==1?'cb-tabItem':'']" @click="commentTagShow=1">评分</div> -->
 
+            <!-- v-show="oid == '4c686762-1d0a-11ed-8c78-005056b86db5'" -->
 
 						<div :class="[commentTagShow==2?'cb-tabItem':'']" @click="commentTagShow=2">总评</div>
 
 						<div :class="[commentTagShow==2?'cb-tabItem':'']" @click="commentTagShow=2">总评</div>
 
 					</div>
 
 					</div>
 
-          <el-select v-model="pzStype" @change="selectPz" class="selectBox">
 
+          <el-select v-model="pzStype" @change="selectPz" class="selectBox" v-show="commentTagShow == 0">
 
             <el-option label="时间降序" :value="1"></el-option>
 
             <el-option label="时间降序" :value="1"></el-option>
 
             <el-option label="时间升序" :value="2"></el-option>
 
             <el-option label="时间升序" :value="2"></el-option>
 
             <el-option label="我的评课" :value="3"></el-option>
 
             <el-option label="我的评课" :value="3"></el-option>
 
@@ -19913,7 +19913,7 @@ export default {
 
       };
 
       };
 
     },
 
     },
 
 		commentRight(){
 
 		commentRight(){
 
-			if(!['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5'].includes(this.org)){
 
+			if(!['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5','884c5665-a453-46f3-b7b6-01d575290aa9'].includes(this.org)){
 
 				return "35px";
 
 				return "35px";
 
 			}
 
 			}
 
 			return `calc(${this.classRoomHelperWidth} + 5px)`
 
 			return `calc(${this.classRoomHelperWidth} + 5px)`

+ 33 - 4
src/components/index.vue
View File 

@@ -92,7 +92,14 @@
 
                   " alt="" />
 
                   " alt="" />
 
                 </div>
 
                 </div>
 
                 <div class="middle_white">
 
                 <div class="middle_white">
 
-                  <div class="textOverflow">{{ item.title }}</div>
 
+                  <div class="textOverflow">
 
+                    <el-tooltip effect="light" :content="item.title" placement="top">
 
+                      <span class="utitle">{{ item.title }}</span>
 
+                    </el-tooltip>
 
+                    <el-tooltip effect="light" :content="item.uname" placement="top">
 
+                      <span class="uname">{{ item.uname }}</span>
 
+                    </el-tooltip>
 
+                  </div>
 
                   <div class="nameAndLength">
 
                   <div class="nameAndLength">
 
                     <el-tooltip class="typeN" effect="light" :content="item.typename" placement="top">
 
                     <el-tooltip class="typeN" effect="light" :content="item.typename" placement="top">
 
                       <div>{{ item.typename }}</div>
 
                       <div>{{ item.typename }}</div>
 
@@ -161,7 +168,14 @@
 
                       " alt="" />
 
                       " alt="" />
 
                     </div>
 
                     </div>
 
                     <div class="middle_white">
 
                     <div class="middle_white">
 
-                      <div class="textOverflow">{{ item.title }}</div>
 
+                      <div class="textOverflow">
 
+                        <el-tooltip effect="light" :content="item.title" placement="top">
 
+                          <span class="utitle">{{ item.title }}</span>
 
+                        </el-tooltip>
 
+                        <el-tooltip effect="light" :content="item.uname" placement="top">
 
+                          <span class="uname">{{ item.uname }}</span>
 
+                        </el-tooltip>
 
+                      </div>
 
                       <div class="nameAndLength">
 
                       <div class="nameAndLength">
 
                         <el-tooltip class="typeN" effect="light" :content="item.typename" placement="top">
 
                         <el-tooltip class="typeN" effect="light" :content="item.typename" placement="top">
 
                           <div>{{ item.typename }}</div>
 
                           <div>{{ item.typename }}</div>
 
@@ -1030,12 +1044,27 @@ export default {
 
 
 
 .textOverflow {
 
 .textOverflow {
 
   padding: 0 5px 0 0px;
 
   padding: 0 5px 0 0px;
 
-  width: 95%;
 
+  width: 100%;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: space-between;
 
+  font-size: 16px;
 
+}
 
+
 
+.textOverflow > .utitle{
 
+  max-width: calc(100% - 100px);
 
   overflow: hidden;
 
   overflow: hidden;
 
   white-space: nowrap;
 
   white-space: nowrap;
 
   text-overflow: ellipsis;
 
   text-overflow: ellipsis;
 
   font-weight: bold;
 
   font-weight: bold;
 
-  font-size: 16px;
 
+  display: block;
 
+}
 
+.textOverflow > .uname{
 
+  max-width: 90px;
 
+  overflow: hidden;
 
+  white-space: nowrap;
 
+  text-overflow: ellipsis;
 
+  display: block;
 
 }
 
 }
 
 
 
 .student_page {
 
 .student_page {

+ 285 - 0
src/components/scoreZong/get.vue
View File 

@@ -0,0 +1,285 @@
 
+<template>
 
+    <div class="sz_body" v-loading="loading">
 
+        <div style="font-size: 18px;margin-bottom: 20px;">评分人数：<span class="color">{{ num }}</span>人  总平均分：<span class="color">{{ num ? score ? (score / num).toFixed(1) : 0 : 0 }}</span></div>
 
+        <div class="test_box" v-for="(item, index) in testList" :key="index">
 
+            <div class="testTitle">{{ item.title }}</div>
 
+            <div class="testContent" v-if="item.type == '1'" v-for="(item2, index2) in item.array"
 
+                :key="index + '-' + index2">
 
+                <div class="testContent_title">{{ index2 + 1 }}、{{ item2.title }}</div>
 
+                <div class="testContent_input">
 
+                    <!-- <el-input v-model="item2.uscore" class="c_input" @change="numberPan(index, index2, item2.score)"
 
+                        placeholder="请输入评分" /> -->
 
+                    <span>平均分：</span>
 
+                    <span class="color">{{ num ? item2.uscore ? (item2.uscore / num).toFixed(2) : 0 : 0 }}</span>
 
+                </div>
 
+            </div>
 
+            <div v-if="item.type == '2'">
 
+                <div class="test_ping" v-for="(answer, index2) in item.answerArray" :key="index + '-' + index2">
 
+                    <span style="    min-width: fit-content;">{{ index2 + 1  }}.</span>
 
+                    <span>{{ answer  }}</span>
 
+                </div>
 
+            </div>
 
+        </div>
 
+    </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+    props: {
 
+        courseid: {
 
+            type: String,
 
+            default: ''
 
+        },
 
+        userid: {
 
+            type: String,
 
+            default: ''
 
+        },
 
+    },
 
+    data() {
 
+        return {
 
+            testList: [
 
+                {
 
+                    title: '教学目标（5分）',
 
+                    type: '1',
 
+                    array: [
 
+                        {
 
+                            title: '目标结构完整，能够清晰地表达学生的学习过程与预期成果。目标符合学情，具有可行性与逻辑递进性。目标体现学生本位与素养导向，不单纯停留在知识与技能层面。',
 
+                            score: 5,
 
+                            uscore: 0,
 
+                        }
 
+                    ],
 
+                },
 
+                {
 
+                    title: '教学内容（5分）',
 
+                    type: '1',
 
+                    array: [
 
+                        {
 
+                            title: '重难点突出，符合课标与教材要求，不超纲。符合学情特点，贴近学生生活，体现积极向上的育人价值观。关注学生学习的最近发展区，有意识地展现因材施教的意图。',
 
+                            score: 5,
 
+                            uscore: 0,
 
+                        }
 
+                    ],
 
+                },
 
+                {
 
+                    title: '教学过程（30分）',
 
+                    type: '1',
 
+                    array: [
 
+                        {
 
+                            title: '课堂结构合理、紧密，层次清楚，突出重难点的解决。（10分）',
 
+                            score: 10,
 
+                            uscore: 0,
 
+                        },
 
+                        {
 
+                            title: '强调“学”的活动设计，教与学有机结合。（10分）',
 
+                            score: 10,
 
+                            uscore: 0,
 
+                        },
 
+                        {
 
+                            title: '课堂管理有序，教学语言清晰准确，能及时、合理地解决课堂问题，体现良好的教学素养。（10分）',
 
+                            score: 10,
 
+                            uscore: 0,
 
+                        }
 
+                    ],
 
+                },
 
+                {
 
+                    title: '教学方法与策略（20分）',
 
+                    type: '1',
 
+                    array: [
 
+                        {
 
+                            title: '符合教学内容与学科特点。落实有效，能体现出学生的学习成效，不流于形式。具有一定的新意，展现教师的独立思考与探究意识。',
 
+                            score: 20,
 
+                            uscore: 0,
 
+                        }
 
+                    ],
 
+                },
 
+                {
 
+                    title: '教学工具（15分）',
 
+                    type: '1',
 
+                    array: [
 
+                        {
 
+                            title: '合理、科学地使用信息化技术、学习单、自制教学道具、辅助性资源等教学工具。',
 
+                            score: 15,
 
+                            uscore: 0,
 
+                        }
 
+                    ],
 
+                },
 
+                {
 
+                    title: '教学评价（10分）',
 
+                    type: '1',
 
+                    array: [
 
+                        {
 
+                            title: '重视评价，有合理的评价手段与工具。评价落实有效，体现针对性和专业性。',
 
+                            score: 10,
 
+                            uscore: 0,
 
+                        }
 
+                    ],
 
+                },
 
+                {
 
+                    title: '创新意识（10分）',
 
+                    type: '1',
 
+                    array: [
 
+                        {
 
+                            title: '教学空间的选择、布置有独特想法，且合理有效。敢于尝试多样化的教学形式，如主题式、大单元、项目式、游戏化等。开发特色有效的教学策略与手段，如小组合作探究、跨学科展演等，教师特色鲜明。',
 
+                            score: 10,
 
+                            uscore: 0,
 
+                        }
 
+                    ],
 
+                },
 
+                {
 
+                    title: '教学效果（5分）',
 
+                    type: '1',
 
+                    array: [
 
+                        {
 
+                            title: '达成目标，整个过程有资源的生成。学习过程中学生有满足、成功与喜悦等体验，对后续学习更有信心，能力得到发展。',
 
+                            score: 5,
 
+                            uscore: 0,
 
+                        }
 
+                    ],
 
+                },
 
+                {
 
+                    title: '加分项（10分）',
 
+                    type: '1',
 
+                    array: [
 
+                        {
 
+                            title: '某项优点特别突出，如教学风貌、教学理念、教学特色、教学手段等。',
 
+                            score: 10,
 
+                            uscore: 0,
 
+                        }
 
+                    ],
 
+                },
 
+                {
 
+                    title: '评语',
 
+                    type: '2',
 
+                    answer: '',
 
+                    answerArray: [],
 
+
 
+                },
 
+            ],
 
+            num: 0,
 
+            score: 0,
 
+            loading: false
 
+        }
 
+    },
 
+    mounted () {
 
+        this.getList();
 
+    },
 
+    methods: {
 
+        numberPan(index, index2, score) {
 
+            let _score = this.testList[index].array[index2].uscore
 
+            if (/[^\d]/.test(_score) || _score < 0) {
 
+                this.$message.error('请输入大于0的整数')
 
+                this.testList[index].array[index2].uscore = 0
 
+            }
 
+            if (parseInt(_score) > parseInt(score)) {
 
+                this.$message.error('不能输入大于得分的整数')
 
+                this.testList[index].array[index2].uscore = score
 
+            }
 
+            this.$forceUpdate();
 
+        },
 
+        confirm() {
 
+            let params = [
 
+                {
 
+                    cid: this.courseid,
 
+                    uid: this.userid,
 
+                    json: JSON.stringify(this.testList),
 
+                },
 
+            ];
 
+            this.ajax
 
+                .post(this.$store.state.api + "opCourseScore", params)
 
+                .then((res) => {
 
+                    console.log(res.data);
 
+                    this.$message({
 
+                        message: "添加成功",
 
+                        type: "success",
 
+                    });
 
+                    this.getList();
 
+                    this.$forceUpdate();
 
+                })
 
+                .catch((err) => {
 
+                    console.error(err);
 
+                });
 
+        },
 
+        getList() {
 
+            let params =
 
+            {
 
+                cid: this.courseid,
 
+            };
 
+            this.loading = true
 
+            this.ajax
 
+                .get(this.$store.state.api + "getCourseScore", params)
 
+                .then((res) => {
 
+                    console.log(res.data);
 
+                    if(res.data[0].length > 0){
 
+                        // this.testList = JSON.parse(res.data[0][0].json)
 
+                        let data = res.data[0]
 
+                        this.num = data.length
 
+                        let sum = 0
 
+                        for(var i = 0; i < data.length; i++){
 
+                            let item = data[i]
 
+                            let _json = JSON.parse(item.json)
 
+                            for(var j = 0; j < this.testList.length; j++){
 
+                                let test = this.testList[j]
 
+                                if(test.type == '2'){
 
+                                    if(_json[j].answer){
 
+                                        test.answerArray.push(_json[j].answer)
 
+                                    }
 
+                                }else{
 
+                                    for(var k = 0; k < test.array.length; k++){
 
+                                        let _item = test.array[k]
 
+                                        _item.uscore += _item.score / 5 * parseInt(_json[j].array[k].uscore)
 
+                                        _item.num++
 
+                                        sum += _item.score / 5 * parseInt(_json[j].array[k].uscore)
 
+                                    }
 
+                                } 
+                            }
 
+                        }
 
+                        this.score = sum
 
+                    }
 
+                    this.loading = false
 
+                    this.$forceUpdate();
 
+                })
 
+                .catch((err) => {
 
+                    this.loading = false
 
+                    console.error(err);
 
+                });
 
+        }
 
+    },
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+.sz_body {
 
+    width: 100%;
 
+    height: 100%;
 
+    overflow: auto;
 
+}
 
+
 
+.test_box {
 
+    margin-bottom: 20px;
 
+}
 
+
 
+.testTitle {
 
+    font-size: 16px;
 
+    font-weight: 600;
 
+}
 
+
 
+.testContent {}
 
+
 
+.testContent_title {
 
+    margin-top: 10px;
 
+}
 
+
 
+.testContent_input {
 
+    margin-top: 5px;
 
+}
 
+
 
+.test_ping{
 
+    margin-top: 5px;
 
+    display: flex;
 
+    word-break: break-all;
 
+}
 
+
 
+.color{
 
+    color:#3681fc;
 
+}
 
+</style>

+ 31 - 5
src/components/scoreZong/index.vue
View File 

@@ -6,8 +6,10 @@
 
                 :key="index + '-' + index2">
 
                 :key="index + '-' + index2">
 
                 <div class="testContent_title">{{ index2 + 1 }}、{{ item2.title }}</div>
 
                 <div class="testContent_title">{{ index2 + 1 }}、{{ item2.title }}</div>
 
                 <div class="testContent_input">
 
                 <div class="testContent_input">
 
-                    <el-input v-model="item2.uscore" class="c_input" @change="numberPan(index, index2, item2.score)"
 
-                        placeholder="请输入评分" />
 
+                    <!-- <el-input v-model="item2.uscore" class="c_input" @change="numberPan(index, index2, item2.score)"
 
+                        placeholder="请输入评分" /> -->
 
+                    <el-rate v-model="item2.uscore" :allow-half="false" class="custom-rate"></el-rate>
 
+                    
                 </div>
 
                 </div>
 
             </div>
 
             </div>
 
             <div v-if="item.type == '2'">
 
             <div v-if="item.type == '2'">
 
@@ -16,7 +18,7 @@
 
             </div>
 
             </div>
 
         </div>
 
         </div>
 
         <div class="btn">
 
         <div class="btn">
 
-            <el-button type="primary" size="default" @click="confirm">确认</el-button>
 
+            <el-button type="primary" size="default" @click="confirm">提交</el-button>
 
 
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
@@ -60,7 +62,7 @@ export default {
 
                     ],
 
                     ],
 
                 },
 
                 },
 
                 {
 
                 {
 
-                    title: '教学内容（30分）',
 
+                    title: '教学过程（30分）',
 
                     type: '1',
 
                     type: '1',
 
                     array: [
 
                     array: [
 
                         {
 
                         {
 
@@ -140,7 +142,7 @@ export default {
 
                     type: '1',
 
                     type: '1',
 
                     array: [
 
                     array: [
 
                         {
 
                         {
 
-                            title: '某项优点特别突出，如教学风貌、教学理念、教学特色、教学手段等，酌情加5-10分。',
 
+                            title: '某项优点特别突出，如教学风貌、教学理念、教学特色、教学手段等。',
 
                             score: 10,
 
                             score: 10,
 
                             uscore: 0,
 
                             uscore: 0,
 
                         }
 
                         }
 
@@ -285,5 +287,29 @@ export default {
 
 
 
 .btn {
 
 .btn {
 
     text-align: right;
 
     text-align: right;
 
+    position: sticky;
 
+    left: 0;
 
+    bottom: 15px;
 
+    width: fit-content;
 
+    display: flex;
 
+    justify-content: flex-end;
 
+    margin-left: calc(100% - 80px);
 
+}
 
+
 
+.custom-rate{
 
+    height: auto;
 
+    margin-top: 10px;
 
+}
 
+
 
+.custom-rate >>> .el-rate__icon {
 
+  font-size: 28px;
 
+  margin-right: 5px;
 
+}
 
+.custom-rate >>> .el-icon-star-on:before{
 
+  font-size: 32px;
 
+}
 
+
 
+.custom-rate >>> .el-rate__icon.hover{
 
+    transform: scale(1);
 
 }
 
 }
 
 </style>
 
 </style>

+ 6 - 6
src/components/studyStudent.vue
View File 

@@ -257,7 +257,7 @@
 
               </div>
 
               </div>
 
             </el-tooltip>
 
             </el-tooltip>
 
           </div>
 
           </div>
 
-          <div class="btnAll"  v-show="!['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5'].includes(org)"><!--v-show="org !== '1973f6c7-1561-11ee-91d8-005056b86db5' || org !== '777559d2-7239-11ee-b98c-005056b86db5'"-->
 
+          <div class="btnAll"  v-show="!['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5','884c5665-a453-46f3-b7b6-01d575290aa9'].includes(org)"><!--v-show="org !== '1973f6c7-1561-11ee-91d8-005056b86db5' || org !== '777559d2-7239-11ee-b98c-005056b86db5'"-->
 
             <div class="btnLeft">
 
             <div class="btnLeft">
 
               <el-tooltip effect="light" content="刷新" placement="top">
 
               <el-tooltip effect="light" content="刷新" placement="top">
 
                 <div class="reBtnIcon" @click="refreshCourse">
 
                 <div class="reBtnIcon" @click="refreshCourse">
 
@@ -8037,8 +8037,8 @@
 
           </div>
 
           </div>
 
         </el-dialog>
 
         </el-dialog>
 
       </div>
 
       </div>
 
-			<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5'" -->
 
-      <classRoomHelper v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5'"  ref="classRoomHelperRef" :courseDetail="courseDetail" :tType='1' @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
+			<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
 
+      <classRoomHelper v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'"  ref="classRoomHelperRef" :courseDetail="courseDetail" :tType='1' @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
                     '/courseDetail?userid=' +
 
                     '/courseDetail?userid=' +
 
                       userid +
 
                       userid +
 
                       '&oid=' +
 
                       '&oid=' +
 
@@ -8076,11 +8076,11 @@
 
           </div> -->
 
           </div> -->
 
 					<div class="cb-tabList">
 
 					<div class="cb-tabList">
 
 						<div :class="[commentTagShow==0?'cb-tabItem':'']" @click="commentTagShow=0">评论</div>
 
 						<div :class="[commentTagShow==0?'cb-tabItem':'']" @click="commentTagShow=0">评论</div>
 
-						<div :class="[commentTagShow==1?'cb-tabItem':'']" @click="commentTagShow=1">评分</div>
 
+						<!-- <div :class="[commentTagShow==1?'cb-tabItem':'']" @click="commentTagShow=1">评分</div> -->
 
             <!-- v-show="oid == '4c686762-1d0a-11ed-8c78-005056b86db5'" -->
 
             <!-- v-show="oid == '4c686762-1d0a-11ed-8c78-005056b86db5'" -->
 
 						<div :class="[commentTagShow==2?'cb-tabItem':'']" @click="commentTagShow=2">总评</div>
 
 						<div :class="[commentTagShow==2?'cb-tabItem':'']" @click="commentTagShow=2">总评</div>
 
 					</div>
 
 					</div>
 
-          <el-select v-model="pzStype" @change="selectPz" class="selectBox">
 
+          <el-select v-model="pzStype" @change="selectPz" class="selectBox" v-show="commentTagShow == 0">
 
             <el-option label="时间降序" :value="1"></el-option>
 
             <el-option label="时间降序" :value="1"></el-option>
 
             <el-option label="时间升序" :value="2"></el-option>
 
             <el-option label="时间升序" :value="2"></el-option>
 
             <el-option label="我的评课" :value="3"></el-option>
 
             <el-option label="我的评课" :value="3"></el-option>
 
@@ -19881,7 +19881,7 @@ export default {
 
       };
 
       };
 
     },
 
     },
 
 		commentRight(){
 
 		commentRight(){
 
-			if(!['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5'].includes(this.org)){
 
+			if(!['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5','884c5665-a453-46f3-b7b6-01d575290aa9'].includes(this.org)){
 
 				return "35px";
 
 				return "35px";
 
 			}
 
 			}
 
 			return `calc(${this.classRoomHelperWidth} + 5px)`
 
 			return `calc(${this.classRoomHelperWidth} + 5px)`

Some files were not shown because too many files changed in this diff