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

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

SanHQin 1 year ago
parent
342431066d 6291e43baf
commit
dc675338c3
11 changed files with 142 additions and 111 deletions
Unified View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.3c25b2d027e024a333b4bad92a88f0b3.css
  3. 0 0
      dist/static/css/app.3c25b2d027e024a333b4bad92a88f0b3.css.map
  4. 0 0
      dist/static/js/app.c32188fb568806cc8f05.js
  5. 0 0
      dist/static/js/app.c32188fb568806cc8f05.js.map
  6. 0 0
      dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
  7. 3 3
      src/components/pages/aiAddCourse/addCourse.vue
  8. 1 1
      src/components/pages/aiAddCourse/templateDialog.vue
  9. 26 22
      src/components/pages/test/check/index.vue
  10. 21 24
      src/components/pages/test/examine/conpoments/targetPage.vue
  11. 90 60
      src/components/pages/testPerson/examine/index.vue

+ 1 - 1
dist/index.html
View File 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.3877b9a0d1a66beb4223094c408fea1f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.d5f0d79dbb0d92c052d4.js></script><script type=text/javascript src=./static/js/app.630f75399a6bfb02e0aa.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.3c25b2d027e024a333b4bad92a88f0b3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.d5f0d79dbb0d92c052d4.js></script><script type=text/javascript src=./static/js/app.c32188fb568806cc8f05.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.3c25b2d027e024a333b4bad92a88f0b3.css


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


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


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


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


+ 3 - 3
src/components/pages/aiAddCourse/addCourse.vue
View File 

@@ -12997,9 +12997,9 @@ export default {
 
       this.$forceUpdate();
 
       this.$forceUpdate();
 
     },
 
     },
 
     openAiDialog(clickType, type, callback, index, tindex) {
 
     openAiDialog(clickType, type, callback, index, tindex) {
 
-      // if(clickType == 1){
 
-      //   return;
 
-      // }
 
+      if(clickType == 1){
 
+        return;
 
+      }
 
       if (this.courseName == "") {
 
       if (this.courseName == "") {
 
         this.$message.error("请补充填写课程名称");
 
         this.$message.error("请补充填写课程名称");
 
         return;
 
         return;

+ 1 - 1
src/components/pages/aiAddCourse/templateDialog.vue
View File 

@@ -10,7 +10,7 @@
 
                 </el-input>
 
                 </el-input>
 
             </div>
 
             </div>
 
             <div class="a-d-t-right">
 
             <div class="a-d-t-right">
 
-                <el-button @click="open2()" type="primary" size="small" style="margin-right: 10px;">设置模板</el-button>
 
+                <!-- <el-button @click="open2()" type="primary" size="small" style="margin-right: 10px;">设置模板</el-button> -->
 
                 <span @click.stop="close">×</span>
 
                 <span @click.stop="close">×</span>
 
             </div>
 
             </div>
 
         </div>
 
         </div>

+ 26 - 22
src/components/pages/test/check/index.vue
View File 

@@ -21,7 +21,7 @@
 
               </el-breadcrumb-item>
 
               </el-breadcrumb-item>
 
             </el-breadcrumb>
 
             </el-breadcrumb>
 
           </div>
 
           </div>
 
-          <div class="r_pub_button_retrun" @click="retrunCourse">返回</div>
 
+          <div v-if="!peopleId" class="r_pub_button_retrun" @click="retrunCourse">返回</div>
 
         </div>
 
         </div>
 
         <div class="step_box" ref="stepBox" v-loading="pdfLoading">
 
         <div class="step_box" ref="stepBox" v-loading="pdfLoading">
 
           <div class="test_title" :style="!isDesktop?'justify-content: center;':''">
 
           <div class="test_title" :style="!isDesktop?'justify-content: center;':''">
 
@@ -42,22 +42,24 @@
 
                 </div>
 
                 </div>
 
               </div>
 
               </div>
 
             </div>
 
             </div>
 
-            <div class="right" v-if="isDesktop">
 
-              <div class="data_box">
 
-                <span>提交数量</span>
 
-                <span><span class="big">{{ works.length }}</span>份</span>
 
-              </div>
 
-              <div class="data_box" v-if="testJson.juriP">
 
-                <span>表单完成率</span>
 
-                <span><span class="big">{{ (iscount / pcount * 100).toFixed(0) }}</span>%</span>
 
-              </div>
 
-              <div class="data_box" v-if="testJson.juriP">
 
-                <span>未完成人数</span>
 
-                <span><span class="big">{{ pcount - iscount }}</span></span>
 
-              </div>
 
-              <div class="btn_box" @click="dialogVisibleShare = true">
 
-                <span></span>
 
-                <span>提醒</span>
 
+            <div v-if="!peopleId">
 
+              <div class="right" v-if="isDesktop">
 
+                <div class="data_box">
 
+                  <span>提交数量</span>
 
+                  <span><span class="big">{{ works.length }}</span>份</span>
 
+                </div>
 
+                <div class="data_box" v-if="testJson.juriP">
 
+                  <span>表单完成率</span>
 
+                  <span><span class="big">{{ (iscount / pcount * 100).toFixed(0) }}</span>%</span>
 
+                </div>
 
+                <div class="data_box" v-if="testJson.juriP">
 
+                  <span>未完成人数</span>
 
+                  <span><span class="big">{{ pcount - iscount }}</span></span>
 
+                </div>
 
+                <div class="btn_box" @click="dialogVisibleShare = true">
 
+                  <span></span>
 
+                  <span>提醒</span>
 
+                </div>
 
               </div>
 
               </div>
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
@@ -2026,7 +2028,8 @@ export default {
 
         .then((res) => {
 
         .then((res) => {
 
           console.log('111111111111111111111',res.data[0][0]);
 
           console.log('111111111111111111111',res.data[0][0]);
 
           // 用于存储归类后的数据的对象
 
           // 用于存储归类后的数据的对象
 
-          this.checkDataType(2)
 
+          // this.checkDataType(2)
 
+          this.stype = 2
 
           this.courseName = res.data[0][0].name
 
           this.courseName = res.data[0][0].name
 
           this.searchCourse()
 
           this.searchCourse()
 
         })
 
         })
 
@@ -2040,15 +2043,16 @@ export default {
 
     window.removeEventListener("resize", this.checkScreenSize);
 
     window.removeEventListener("resize", this.checkScreenSize);
 
   },
 
   },
 
   mounted() {
 
   mounted() {
 
-    if(this.peopleId){
 
-      this.getUserInfo();
 
-    }
 
     this.checkScreenSize();
 
     this.checkScreenSize();
 
     window.addEventListener("resize", this.checkScreenSize);
 
     window.addEventListener("resize", this.checkScreenSize);
 
     document.getElementsByTagName('html')[0].scrollTop = 0
 
     document.getElementsByTagName('html')[0].scrollTop = 0
 
     document.getElementsByTagName('html')[0].style.overflow = 'hidden'
 
     document.getElementsByTagName('html')[0].style.overflow = 'hidden'
 
     this.$nextTick(function () {
 
     this.$nextTick(function () {
 
-      this.getData();
 
+      if(this.peopleId){
 
+        this.getUserInfo();
 
+      }else{
 
+        this.getData();
 
+      }
 
       // this.getClass2()
 
       // this.getClass2()
 
       this.changeHeight()
 
       this.changeHeight()
 
     });
 
     });

+ 21 - 24
src/components/pages/test/examine/conpoments/targetPage.vue
View File 

@@ -269,8 +269,8 @@ export default {
 
       oid: this.$route.query.oid, //学校id
 
       oid: this.$route.query.oid, //学校id
 
       org: this.$route.query.org, //组织id
 
       org: this.$route.query.org, //组织id
 
       allData: [], //获取全部提交的表单
 
       allData: [], //获取全部提交的表单
 
+      // 基础页面数据
 
       tableJsonCon: [
 
       tableJsonCon: [
 
-        //基础页面数据
 
         // {
 
         // {
 
         //   id: "q",
 
         //   id: "q",
 
         //   name: "师德师风",
 
         //   name: "师德师风",
 
@@ -603,7 +603,7 @@ export default {
 
         //       type: 1,
 
         //       type: 1,
 
         //       testid: {
 
         //       testid: {
 
         //         type: 1,
 
         //         type: 1,
 
-        //         test: ["2adfec67-b674-11ee-b534-005056b86db5"]
 
+        //         test: []
 
         //       }
 
         //       }
 
         //     }
 
         //     }
 
         //   ]
 
         //   ]
 
@@ -646,7 +646,7 @@ export default {
 
         //       type: 1,
 
         //       type: 1,
 
         //       testid: {
 
         //       testid: {
 
         //         type: 1,
 
         //         type: 1,
 
-        //         test: []
 
+        //         test: ["9547874d-2fb3-11ef-bf55-005056b86db5"]
 
         //       }
 
         //       }
 
         //     },
 
         //     },
 
         //     {
 
         //     {
 
@@ -665,7 +665,7 @@ export default {
 
         //       type: 1,
 
         //       type: 1,
 
         //       testid: {
 
         //       testid: {
 
         //         type: 1,
 
         //         type: 1,
 
-        //         test: []
 
+        //         test: ["73546fa2-2f67-11ef-bf55-005056b86db5"]
 
         //       }
 
         //       }
 
         //     },
 
         //     },
 
         //     {
 
         //     {
 
@@ -703,7 +703,7 @@ export default {
 
         //       type: 1,
 
         //       type: 1,
 
         //       testid: {
 
         //       testid: {
 
         //         type: 1,
 
         //         type: 1,
 
-        //         test: []
 
+        //         test: ["218ae830-2f6c-11ef-bf55-005056b86db5"]
 
         //       }
 
         //       }
 
         //     },
 
         //     },
 
         //     {
 
         //     {
 
@@ -721,7 +721,7 @@ export default {
 
         //       type: 1,
 
         //       type: 1,
 
         //       testid: {
 
         //       testid: {
 
         //         type: 1,
 
         //         type: 1,
 
-        //         test: []
 
+        //         test: ["ad02ca32-2f6c-11ef-bf55-005056b86db5"]
 
         //       }
 
         //       }
 
         //     },
 
         //     },
 
         //     {
 
         //     {
 
@@ -734,7 +734,7 @@ export default {
 
         //       sco2: "",
 
         //       sco2: "",
 
         //       cogSum: "",
 
         //       cogSum: "",
 
         //       name: "教师获奖",
 
         //       name: "教师获奖",
 
-        //       dep: ["教师发展中心", "教学服务中心"],
 
+        //       dep: ["教师发展中心", "教学服务中心","课程与创新中心"],
 
         //       score: 5,
 
         //       score: 5,
 
         //       selfSummary: "",
 
         //       selfSummary: "",
 
         //       type: 1,
 
         //       type: 1,
 
@@ -756,13 +756,13 @@ export default {
 
         //       sco2: "",
 
         //       sco2: "",
 
         //       cogSum: "",
 
         //       cogSum: "",
 
         //       name: "指导学生获奖",
 
         //       name: "指导学生获奖",
 
-        //       dep: ["教师发展中心", "教学服务中心"],
 
+        //       dep: ["教师发展中心", "教学服务中心","课程与创新中心"],
 
         //       score: 5,
 
         //       score: 5,
 
         //       selfSummary: "",
 
         //       selfSummary: "",
 
         //       type: 1,
 
         //       type: 1,
 
         //       testid: {
 
         //       testid: {
 
         //         type: 1,
 
         //         type: 1,
 
-        //         test: ["d47a6ab6-8a75-11ee-b98c-005056b86db5"]
 
+        //         test: ["06870865-2fb1-11ef-bf55-005056b86db5"]
 
         //       }
 
         //       }
 
         //     }
 
         //     }
 
         //   ]
 
         //   ]
 
@@ -800,12 +800,12 @@ export default {
 
         //       cogSum: "",
 
         //       cogSum: "",
 
         //       name: "新闻通讯",
 
         //       name: "新闻通讯",
 
         //       dep: ["党建融媒中心"],
 
         //       dep: ["党建融媒中心"],
 
-        //       score: 3,
 
+        //       score: 5,
 
         //       selfSummary: "",
 
         //       selfSummary: "",
 
         //       type: 1,
 
         //       type: 1,
 
         //       testid: {
 
         //       testid: {
 
         //         type: 1,
 
         //         type: 1,
 
-        //         test: []
 
+        //         test: ["e65b399b-304a-11ef-b873-005056b86db5"]
 
         //       }
 
         //       }
 
         //     },
 
         //     },
 
         //     {
 
         //     {
 
@@ -822,7 +822,7 @@ export default {
 
         //       type: 1,
 
         //       type: 1,
 
         //       testid: {
 
         //       testid: {
 
         //         type: 1,
 
         //         type: 1,
 
-        //         test: []
 
+        //         test: ["500f1ca5-3047-11ef-b873-005056b86db5"]
 
         //       }
 
         //       }
 
         //     },
 
         //     },
 
         //     {
 
         //     {
 
@@ -841,7 +841,7 @@ export default {
 
         //       type: 1,
 
         //       type: 1,
 
         //       testid: {
 
         //       testid: {
 
         //         type: 1,
 
         //         type: 1,
 
-        //         test: []
 
+        //         test: ["c6efea26-304b-11ef-b873-005056b86db5"]
 
         //       }
 
         //       }
 
         //     },
 
         //     },
 
         //     {
 
         //     {
 
@@ -859,7 +859,7 @@ export default {
 
         //       type: 1,
 
         //       type: 1,
 
         //       testid: {
 
         //       testid: {
 
         //         type: 1,
 
         //         type: 1,
 
-        //         test: []
 
+        //         test: ["04087db9-3048-11ef-b873-005056b86db5"]
 
         //       }
 
         //       }
 
         //     },
 
         //     },
 
         //     {
 
         //     {
 
@@ -878,7 +878,7 @@ export default {
 
         //       type: 1,
 
         //       type: 1,
 
         //       testid: {
 
         //       testid: {
 
         //         type: 1,
 
         //         type: 1,
 
-        //         test: []
 
+        //         test: ["23f351d6-304a-11ef-b873-005056b86db5"]
 
         //       }
 
         //       }
 
         //     }
 
         //     }
 
         //   ]
 
         //   ]
 
@@ -891,14 +891,14 @@ export default {
 
         //       id: "1f",
 
         //       id: "1f",
 
         //       sco1: "", //自评分
 
         //       sco1: "", //自评分
 
         //       evaStandard: "科组长综合考量师德师风、教学成效等维度进行打分。", //评价标准
 
         //       evaStandard: "科组长综合考量师德师风、教学成效等维度进行打分。", //评价标准
 
-        //       evaMethod: "优秀：5良好：4合格：3不合格：1", //评价方法
 
+        //       evaMethod: "优秀:5 良好:4 合格:3 不合格:1", //评价方法
 
         //       sco2: "",
 
         //       sco2: "",
 
         //       cogSum: "",
 
         //       cogSum: "",
 
         //       name: "学科组长打分",
 
         //       name: "学科组长打分",
 
         //       dep: ["行政事务中心"],
 
         //       dep: ["行政事务中心"],
 
         //       score: 5,
 
         //       score: 5,
 
         //       selfSummary: "",
 
         //       selfSummary: "",
 
-        //       type: 1,
 
+        //       type: 2,
 
         //       testid: {
 
         //       testid: {
 
         //         type: 1,
 
         //         type: 1,
 
         //         test: []
 
         //         test: []
 
@@ -915,14 +915,14 @@ export default {
 
         //       sco1: "", //自评分
 
         //       sco1: "", //自评分
 
         //       evaStandard:
 
         //       evaStandard:
 
         //         "行政随机抽查，综合考量师德师风、教学成效等维度进行打分，取所有行政的平均值。", //评价标准
 
         //         "行政随机抽查，综合考量师德师风、教学成效等维度进行打分，取所有行政的平均值。", //评价标准
 
-        //       evaMethod: "优秀：5良好：4合格：3不合格：1", //评价方法
 
+        //       evaMethod: "优秀:5 良好:4 合格:3 不合格:1", //评价方法
 
         //       sco2: "",
 
         //       sco2: "",
 
         //       cogSum: "",
 
         //       cogSum: "",
 
         //       name: "随机巡查",
 
         //       name: "随机巡查",
 
         //       dep: ["行政事务中心"],
 
         //       dep: ["行政事务中心"],
 
         //       score: 5,
 
         //       score: 5,
 
         //       selfSummary: "",
 
         //       selfSummary: "",
 
-        //       type: 1,
 
+        //       type: 2,
 
         //       testid: {
 
         //       testid: {
 
         //         type: 1,
 
         //         type: 1,
 
         //         test: []
 
         //         test: []
 
@@ -1206,7 +1206,7 @@ export default {
 
       //         cogSum: "",
 
       //         cogSum: "",
 
       //         selfSummary: "",
 
       //         selfSummary: "",
 
       //         dep: [],
 
       //         dep: [],
 
-      //         type: 1,
 
+      //         type: 2,
 
       //         testid: {
 
       //         testid: {
 
       //           type: 1,
 
       //           type: 1,
 
       //           test: []
 
       //           test: []
 
@@ -1230,7 +1230,7 @@ export default {
 
       //         cogSum: "",
 
       //         cogSum: "",
 
       //         selfSummary: "",
 
       //         selfSummary: "",
 
       //         dep: [],
 
       //         dep: [],
 
-      //         type: 1,
 
+      //         type: 2,
 
       //         testid: {
 
       //         testid: {
 
       //           type: 1,
 
       //           type: 1,
 
       //           test: []
 
       //           test: []
 
@@ -1259,9 +1259,6 @@ export default {
 
     // 提交
 
     // 提交
 
     Submit(val) {
 
     Submit(val) {
 
       console.log("Submit", val);
 
       console.log("Submit", val);
 
-      // if (val.cogSco != '' && val.cogSco==0) {
 
-
 
-      // }
 
       // val.cogSco = !val.cogSco ? 0 : val.cogSco;
 
       // val.cogSco = !val.cogSco ? 0 : val.cogSco;
 
 
 
       if (val.cogSco > val.score) {
 
       if (val.cogSco > val.score) {

+ 90 - 60
src/components/pages/testPerson/examine/index.vue
View File 

@@ -18,16 +18,16 @@
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
       <div style="margin-right: 30px;display: flex;">
 
       <div style="margin-right: 30px;display: flex;">
 
-        <el-button
 
+        <!-- <el-button
 
           type="primary"
 
           type="primary"
 
           size="mini"
 
           size="mini"
 
           style="margin-right: 15px;"
 
           style="margin-right: 15px;"
 
           @click="saveTab"
 
           @click="saveTab"
 
           v-if="allData.type == 1"
 
           v-if="allData.type == 1"
 
           >保存</el-button
 
           >保存</el-button
 
-        >
 
+        > -->
 
         <el-button
 
         <el-button
 
-          v-if="!allData.rjson"
 
+          v-if="allData.type != 2"
 
           type="primary"
 
           type="primary"
 
           size="mini"
 
           size="mini"
 
           @click="Submit"
 
           @click="Submit"
 
@@ -35,8 +35,9 @@
 
         >
 
         >
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
-
 
-    <div v-if="pType == 2" v-loading="tabLoad">
 
+    <div class="notes">注：评价积分周期为2023年6月30日至2024年6月30日</div>
 
+    <!-- v-if="pType == 2" -->
 
+    <div v-loading="tabLoad">
 
       <div class="sBox_table">
 
       <div class="sBox_table">
 
         <div class="table_title">
 
         <div class="table_title">
 
           <div>一级指标</div>
 
           <div>一级指标</div>
 
@@ -60,15 +61,32 @@
 
                 </div>
 
                 </div>
 
                 <div>{{ k.score }}</div>
 
                 <div>{{ k.score }}</div>
 
                 <div>
 
                 <div>
 
-                  <el-input-number
 
-                    v-model="k.sco1"
 
-                    :controls="false"
 
-                    :min="0"
 
-                    :max="k.score"
 
-                  ></el-input-number>
 
+                  <div v-if="k.type == 1" class="ScoreStep">
 
+                    <input
 
+                      v-if="allData.type * 1 != 2"
 
+                      type="number"
 
+                      @blur="
 
+                        saveTab(k.sco1 > k.score ? (k.sco1 = k.score) : '')
 
+                      "
 
+                      v-model="k.sco1"
 
+                    />
 
+                    <div v-else>{{ k.sco1 }}</div>
 
+                  </div>
 
+                  <div v-else class="ScoreStep">/</div>
 
                 </div>
 
                 </div>
 
                 <div class="tArea">
 
                 <div class="tArea">
 
-                  <textarea v-model.trim="k.selfSummary" />
 
+                  <div
 
+                    v-if="k.type == 1"
 
+                    style="height: 100%;height: 100%;width: 100%;text-align: left;"
 
+                  >
 
+                    <textarea
 
+                      v-if="allData.type * 1 != 2"
 
+                      @blur="saveTab"
 
+                      v-model.trim="k.selfSummary"
 
+                    />
 
+                    <div v-else>{{ k.selfSummary }}</div>
 
+                  </div>
 
+                  <div v-else class="ScoreStep">/</div>
 
                 </div>
 
                 </div>
 
                 <div>
 
                 <div>
 
                   <div v-if="!k.testid.test.length">/</div>
 
                   <div v-if="!k.testid.test.length">/</div>
 
@@ -104,7 +122,7 @@
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
 
 
-    <div v-if="pType == 1" v-loading="tabLoad">
 
+    <!-- <div v-if="pType == 1" v-loading="tabLoad">
 
       <div class="sBox_table">
 
       <div class="sBox_table">
 
         <div class="table_title2">
 
         <div class="table_title2">
 
           <div>一级指标</div>
 
           <div>一级指标</div>
 
@@ -163,7 +181,7 @@
 
           </div>
 
           </div>
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
-    </div>
 
+    </div> -->
 
 
 
     <!-- 点击数据来源 -->
 
     <!-- 点击数据来源 -->
 
     <el-dialog
 
     <el-dialog
 
@@ -216,6 +234,10 @@ export default {
 
     }
 
     }
 
   },
 
   },
 
   computed: {},
 
   computed: {},
 
+  activated() {
 
+    // 当组件被激活时调用
 
+    this.getPageBase();
 
+  },
 
   mounted() {
 
   mounted() {
 
     this.getPageBase();
 
     this.getPageBase();
 
     // console.log(JSON.stringify(this.TeaTabJson));
 
     // console.log(JSON.stringify(this.TeaTabJson));
 
@@ -223,7 +245,7 @@ export default {
 
   methods: {
 
   methods: {
 
     goFillIn(val) {
 
     goFillIn(val) {
 
       this.$router.push(
 
       this.$router.push(
 
-        `/doTest?cid=${val}&userid=${this.userid}&oid=${this.oid}&org=${this.org}&type=3&role=${this.role}`
 
+        `/doTest?cid=${val}&org=${this.org}&type=3&role=${this.role}&isN=&oid=${this.oid}&userid=${this.userid}`
 
       );
 
       );
 
       // this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${val}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${this.userid}`;
 
       // this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${val}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${this.userid}`;
 
       // this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/test?userid=${this.userid}&oid=45facc0a-1211-11ec-80ad-005056b86db5&org=&role=0`;
 
       // this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/test?userid=${this.userid}&oid=45facc0a-1211-11ec-80ad-005056b86db5&org=&role=0`;
 
@@ -247,7 +269,7 @@ export default {
 
         }
 
         }
 
       }
 
       }
 
 
 
-      this.$confirm("确认提交？", "提示", {
 
+      this.$confirm("提交后无法修改，是否确定提交？", "提示", {
 
         confirmButtonText: "确定",
 
         confirmButtonText: "确定",
 
         cancelButtonText: "取消",
 
         cancelButtonText: "取消",
 
         type: " info"
 
         type: " info"
 
@@ -283,48 +305,36 @@ export default {
 
     },
 
     },
 
     // 保存
 
     // 保存
 
     saveTab() {
 
     saveTab() {
 
-      for (const e of this.PageBaseData) {
 
+      let PageBaseDataCopy = JSON.parse(JSON.stringify(this.PageBaseData));
 
+
 
+      for (const e of PageBaseDataCopy) {
 
         for (const k of e.children) {
 
         for (const k of e.children) {
 
           if (k.testid.test.length > 0) {
 
           if (k.testid.test.length > 0) {
 
             k.testid.test = k.testid.test.map(item => item.courseId);
 
             k.testid.test = k.testid.test.map(item => item.courseId);
 
           }
 
           }
 
         }
 
         }
 
       }
 
       }
 
-      this.$confirm("确认保存？", "提示", {
 
-        confirmButtonText: "确定",
 
-        cancelButtonText: "取消",
 
-        type: " info"
 
-      })
 
-        .then(() => {
 
-          let params = [
 
-            {
 
-              uid: this.userid,
 
-              oid: this.oid,
 
-              org: this.org,
 
-              type: this.pType,
 
-              json: JSON.stringify(this.PageBaseData),
 
-              ttype: 1
 
-            }
 
-          ];
 
-          this.ajax
 
-            .post(this.$store.state.api + "addTestExamineWorks", params)
 
-            .then(res => {
 
-              console.log("addTestExamineWorks", res);
 
-              this.getData();
 
-              // console.log();
 
-              // console.log("resresresres", res.data[0]);
 
-            })
 
-            .catch(error => {
 
-              console.log(error);
 
-            });
 
-        })
 
-        .catch(() => {
 
-          this.handleData();
 
 
 
-          this.$message({
 
-            type: "info",
 
-            message: "已取消保存"
 
-          });
 
+      let params = [
 
+        {
 
+          uid: this.userid,
 
+          oid: this.oid,
 
+          org: this.org,
 
+          type: this.pType,
 
+          json: JSON.stringify(PageBaseDataCopy),
 
+          ttype: 1
 
+        }
 
+      ];
 
+      // return console.log(params);
 
+      this.ajax
 
+        .post(this.$store.state.api + "addTestExamineWorks", params)
 
+        .then(res => {
 
+          console.log("addTestExamineWorks", res);
 
+          // this.getData();
 
+          // this.handleData();
 
+        })
 
+        .catch(error => {
 
+          console.log(error);
 
         });
 
         });
 
     },
 
     },
 
     // 切换专任，班主任
 
     // 切换专任，班主任
 
@@ -350,21 +360,13 @@ export default {
 
             this.PageBaseData.forEach(e => {
 
             this.PageBaseData.forEach(e => {
 
               val.forEach(i => {
 
               val.forEach(i => {
 
                 if (e.id == i.id) {
 
                 if (e.id == i.id) {
 
-                  e.name = i.name;
 
                   e.children.forEach(a => {
 
                   e.children.forEach(a => {
 
                     i.children.forEach(b => {
 
                     i.children.forEach(b => {
 
                       if (a.id == b.id) {
 
                       if (a.id == b.id) {
 
-                        a.name = b.name;
 
-                        a.score = b.score;
 
                         a.sco1 = b.sco1;
 
                         a.sco1 = b.sco1;
 
                         a.sco2 = b.sco2;
 
                         a.sco2 = b.sco2;
 
-                        a.evaStandard = b.evaStandard;
 
-                        a.evaMethod = b.evaMethod;
 
                         a.cogSum = b.cogSum;
 
                         a.cogSum = b.cogSum;
 
                         a.selfSummary = b.selfSummary;
 
                         a.selfSummary = b.selfSummary;
 
-                        a.dep = b.dep;
 
-                        a.type = b.type;
 
-                        a.testid = b.testid;
 
                       }
 
                       }
 
                     });
 
                     });
 
                   });
 
                   });
 
@@ -427,7 +429,7 @@ export default {
 
     computedTest(val) {
 
     computedTest(val) {
 
       let params = [
 
       let params = [
 
         {
 
         {
 
-          uid: this.uid,
 
+          uid: this.userid,
 
           testId: val.join(",")
 
           testId: val.join(",")
 
         }
 
         }
 
       ];
 
       ];
 
@@ -470,12 +472,40 @@ export default {
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
   padding: 5px;
 
   padding: 5px;
 
 }
 
 }
 
+.tArea > div > textarea {
 
+  border: none;
 
+  width: 100%;
 
+  height: 100%;
 
+  resize: none;
 
+  outline-style: none;
 
+}
 
 .testPersonExamine > .testTit {
 
 .testPersonExamine > .testTit {
 
   height: 100px;
 
   height: 100px;
 
   display: flex;
 
   display: flex;
 
   justify-content: space-between;
 
   justify-content: space-between;
 
   align-items: center;
 
   align-items: center;
 
 }
 
 }
 
+.notes {
 
+  color: #fb5a3f;
 
+  font-weight: 600;
 
+  font-size: 20px;
 
+}
 
+.ScoreStep {
 
+  height: 100%;
 
+  display: flex;
 
+  width: 100%;
 
+  align-items: center;
 
+  justify-content: center;
 
+}
 
+.ScoreStep > input {
 
+  height: 100% !important;
 
+  outline-style: none;
 
+  width: 100%;
 
+  padding: 5px;
 
+  box-sizing: border-box;
 
+  border-radius: 4px;
 
+  border: 1px solid #dcdfe6 !important;
 
+}
 
 .teaLis {
 
 .teaLis {
 
   display: flex;
 
   display: flex;
 
 }
 
 }

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