0624教师发展进行中修改

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

@@ -21,7 +21,7 @@
               </el-breadcrumb-item>
             </el-breadcrumb>
           </div>
-          <div class="r_pub_button_retrun" @click="retrunCourse">返回</div>
+          <div v-if="!peopleId" class="r_pub_button_retrun" @click="retrunCourse">返回</div>
         </div>
         <div class="step_box" ref="stepBox" v-loading="pdfLoading">
           <div class="test_title" :style="!isDesktop?'justify-content: center;':''">
@@ -42,22 +42,24 @@
                 </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>

src/components/pages/test/examine/conpoments/targetPage.vue

@@ -898,7 +898,7 @@ export default {
         //       dep: ["行政事务中心"],
         //       score: 5,
         //       selfSummary: "",
-        //       type: 1,
+        //       type: 2,
         //       testid: {
         //         type: 1,
         //         test: []
@@ -922,7 +922,7 @@ export default {
         //       dep: ["行政事务中心"],
         //       score: 5,
         //       selfSummary: "",
-        //       type: 1,
+        //       type: 2,
         //       testid: {
         //         type: 1,
         //         test: []
@@ -1206,7 +1206,7 @@ export default {
       //         cogSum: "",
       //         selfSummary: "",
       //         dep: [],
-      //         type: 1,
+      //         type: 2,
       //         testid: {
       //           type: 1,
       //           test: []
@@ -1230,7 +1230,7 @@ export default {
       //         cogSum: "",
       //         selfSummary: "",
       //         dep: [],
-      //         type: 1,
+      //         type: 2,
       //         testid: {
       //           type: 1,
       //           test: []
@@ -1259,9 +1259,6 @@ export default {
     // 提交
     Submit(val) {
       console.log("Submit", val);
-      // if (val.cogSco != '' && val.cogSco==0) {
-
-      // }
       // val.cogSco = !val.cogSco ? 0 : val.cogSco;
 
       if (val.cogSco > val.score) {

src/components/pages/testPerson/examine/index.vue

@@ -18,16 +18,16 @@
         </div>
       </div>
       <div style="margin-right: 30px;display: flex;">
-        <el-button
+        <!-- <el-button
           type="primary"
           size="mini"
           style="margin-right: 15px;"
           @click="saveTab"
           v-if="allData.type == 1"
           >保存</el-button
-        >
+        > -->
         <el-button
-          v-if="!allData.rjson"
+          v-if="allData.type != 2"
           type="primary"
           size="mini"
           @click="Submit"
@@ -35,8 +35,9 @@
         >
       </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="table_title">
           <div>一级指标</div>
@@ -60,15 +61,32 @@
                 </div>
                 <div>{{ k.score }}</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 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 v-if="!k.testid.test.length">/</div>
@@ -104,7 +122,7 @@
       </div>
     </div>
 
-    <div v-if="pType == 1" v-loading="tabLoad">
+    <!-- <div v-if="pType == 1" v-loading="tabLoad">
       <div class="sBox_table">
         <div class="table_title2">
           <div>一级指标</div>
@@ -163,7 +181,7 @@
           </div>
         </div>
       </div>
-    </div>
+    </div> -->
 
     <!-- 点击数据来源 -->
     <el-dialog
@@ -216,6 +234,10 @@ export default {
     }
   },
   computed: {},
+  activated() {
+    // 当组件被激活时调用
+    this.getPageBase();
+  },
   mounted() {
     this.getPageBase();
     // console.log(JSON.stringify(this.TeaTabJson));
@@ -223,7 +245,7 @@ export default {
   methods: {
     goFillIn(val) {
       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/#/test?userid=${this.userid}&oid=45facc0a-1211-11ec-80ad-005056b86db5&org=&role=0`;
@@ -247,7 +269,7 @@ export default {
         }
       }
 
-      this.$confirm("确认提交？", "提示", {
+      this.$confirm("提交后无法修改，是否确定提交？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: " info"
@@ -283,48 +305,38 @@ export default {
     },
     // 保存
     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) {
           if (k.testid.test.length > 0) {
             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);
         });
     },
     // 切换专任，班主任
@@ -427,7 +439,7 @@ export default {
     computedTest(val) {
       let params = [
         {
-          uid: this.uid,
+          uid: this.userid,
           testId: val.join(",")
         }
       ];
@@ -470,12 +482,40 @@ export default {
   box-sizing: border-box;
   padding: 5px;
 }
+.tArea > div > textarea {
+  border: none;
+  width: 100%;
+  height: 100%;
+  resize: none;
+  outline-style: none;
+}
 .testPersonExamine > .testTit {
   height: 100px;
   display: flex;
   justify-content: space-between;
   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 {
   display: flex;
 }