智能表单

src/components/pages/classroomObservation/index.vue

@@ -544,10 +544,10 @@ export default {
           }
           i.dataList.sort((a, b) => a.tIndex - b.tIndex);
           tagHtml += `<h1 style="font-size:16pt;margin-bottom:-1in">${
-            this.tag[i.value]
+            this.tag[c]
           }、${i.name}</h1>`;
           dire += `<p style="font-size:14pt;margin-bottom:-0.8in">${
-            this.tag[i.value]
+            this.tag[c]
           }、${i.name}</p>`;
 
           for (let d = 0; d < i.dataList.length; d++) {

src/components/pages/classroomObservation/tools/mixin.js

@@ -2006,6 +2006,7 @@ CH：${_CH}
 
           let analysisHtml = ``;
 
+
           // console.log("开始处理文件")
           for (let c = 0; c < tagList.length; c++) {
             // console.log(tagList[c],"tagList[c]")
@@ -2016,9 +2017,9 @@ CH：${_CH}
               i.dataList = i.dataList.filter(i2 => i2.tIndex != 2);
             }
             i.dataList.sort((a, b) => a.tIndex - b.tIndex);
-            tagHtml += `<h1 style="font-size:16pt;margin-bottom:-1in">${this.tag[i.value]
+            tagHtml += `<h1 style="font-size:16pt;margin-bottom:-1in">${this.tag[c]
               }、${i.name}</h1>`;
-            dire += `<p style="font-size:14pt;margin-bottom:-0.8in">${this.tag[i.value]
+            dire += `<p style="font-size:14pt;margin-bottom:-0.8in">${this.tag[c]
               }、${i.name}</p>`;
 
             for (let d = 0; d < i.dataList.length; d++) {

src/components/pages/liyuan/page/examine/index.vue

@@ -181,7 +181,12 @@
           </div>
         </div>
       </div>
+      <div class="brief" v-if="brief">
+      <span v-html="brief" style="white-space: pre-wrap;word-break: break-all;"></span>
     </div>
+    </div>
+
+
 
     <!-- 点击数据来源 -->
     <el-dialog
@@ -401,8 +406,6 @@ export default {
         .post(this.$store.state.api + "addTestExamineWorks2", params)
         .then(res => {
           console.log("addTestExamineWorks2", res);
-          // this.getData();
-          // this.handleData();
         })
         .catch(error => {
           console.log(error);
@@ -423,10 +426,12 @@ export default {
       this.ajax
         .get(this.$store.state.api + "getTestExamineByUserId2", params)
         .then(res => {
-          console.log("getTestExamineByUserId", res);
+          // console.log("getTestExamineByUserId", res);
 
           if (res.data[0].length > 0) {
+
             this.allData = res.data[0][0];
+
             let val = JSON.parse(res.data[0][0].json);
 
             this.PageBaseData.forEach(e => {
@@ -445,22 +450,15 @@ export default {
                 }
               });
             });
-            // console.log('this.PageBaseData2222222',this.PageBaseData);
+
             this.handleData();
             return (this.tabLoad = false);
           } else {
             this.allData.type = 1;
             this.allData.rjson = "";
             this.handleData();
-            // console.log('this.PageBaseData3333',this.PageBaseData);
             this.tabLoad = false;
           }
-          // this.$forceUpdate();
-          //  else {
-          //   this.allData.type = 1;
-          //   this.getPageBase();
-          //   this.tabLoad = false;
-          // }
         })
         .catch(error => {
           console.log(error);
@@ -480,21 +478,19 @@ export default {
           // console.log("resresresres", res.data[0]);
           // this.allData = res.data[0][0];
           let testExamineBaseList = res.data[0];
-          // console.log("res.data[0][0]", res.data[0][0]);
+          console.log("res.data[0][0]", res.data[0][0]);
+          this.brief = res.data[0][0].brief;
           this.testExamineBaseList = testExamineBaseList;
-          // console.log("selectTestExamineBase", res.data[0][0]);
+          console.log("selectTestExamineBase", res.data[0][0]);
           this.PageBaseData = JSON.parse(res.data[0][0].json);
-          // console.log('this.PageBaseData1111111111111111',this.PageBaseData);
           // 先获取基础模板，然后再获取用户又没有填写过，填写过就开始循环赋值给基础模板，最后提交基础模板
           this.getData();
-
-          // this.handleData();
         })
         .catch(error => {
           console.log(error);
         });
     },
-    // 获取页面基础ui信息，年度筛选框数据和展示哪个页面
+    // 获取页面基础ui信息
     getPageBase2(type) {
       let params = {
         typ: type,
@@ -511,10 +507,10 @@ export default {
             if(this.timeListA.length>0)this.timeA = this.timeListA[0].value;
           }else {
             this.bArray = res.data[0];
-            this.timeListB = this.bArray.map(i=>{return {value:i.time,label:i.timeLabel}}) //获取年度筛选框数据
-            if(this.timeListB.length>0)this.timeB = this.timeListB[0].value; //默认选择最新年度
-            if(!this.bArray.length){    
-              this.pType = 1    //显示专任教室页面
+            this.timeListB = this.bArray.map(i=>{return {value:i.time,label:i.timeLabel}})
+            if(this.timeListB.length>0)this.timeB = this.timeListB[0].value;
+            if(!this.bArray.length){
+              this.pType = 1
             }
           }
         })
@@ -522,7 +518,7 @@ export default {
           console.log(error);
         });
     },
-    async handleData() {  //获取数据来源数据
+    async handleData() {
       for (const e of this.PageBaseData) {
         for (const k of e.children) {
           if (k.testid.test.length > 0) {
@@ -532,8 +528,6 @@ export default {
       }
     },
     computedTest(val) {
-      // console.log('val',val);
-      
       let params = [
         {
           uid: this.userid,
@@ -554,7 +548,7 @@ export default {
     // 查看数据来源
     lookPrize(val) {
       // return;
-      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}&tType=${this.pType}&examineId=${this.testExamineBaseList[0].id}`;
+      this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?userid=${this.userid}&cid=${val}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${this.userid}&tType=${this.pType}&examineId=${this.testExamineBaseList[0].id}`;
       // 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.diaIframe = true;
     },
@@ -571,7 +565,7 @@ export default {
 .testPersonExamine {
   width: 100%;
   min-width: calc(100px * 10);
-  height: 100%;
+  height: calc(100%);
   /* overflow-x: scroll; */
   /* overflow: auto; */
   display: flex;
@@ -580,7 +574,7 @@ export default {
   box-sizing: border-box;
   background-color: #fff;
 	/* margin: 10px 0; */
-	border-radius: 5px;
+	/* border-radius: 5px; */
 }
 /* .tArea { */
   /* box-sizing: border-box; */
@@ -688,9 +682,9 @@ export default {
   width: 100%;
   min-width: 1300px;
   margin: 0 auto;
-  height: 100%;
+  height: auto;
   box-sizing: border-box;
-  padding-bottom: 60px;
+  padding-bottom: 10px;
   font-size: 14px;
 }
 

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

@@ -229,7 +229,7 @@
 
 
                  <el-popover
-                 v-if="stype == 2"
+                 v-if="stype == 2 && ((peopleId && review==1) || (!peopleId && !review))"
                   placement="top-start"
                   width="320"
                   ref="popover1"
@@ -242,7 +242,7 @@
                           小可努力生成中，请稍等片刻<img style="width: 50px;" src="../../../../assets/KekeLoading.gif" alt="">
                         </div>
                         <div style="display: flex;justify-content: space-between;align-items: center;">
-                          <div class="TopTit">智能分析列</div>
+                          <div class="TopTit">智能评分</div>
                           <el-popover
                             placement="bottom"
                             @click.native.stop
@@ -373,7 +373,7 @@
                       slot="reference"
                       class="btnA"
                     >
-                      智能分析列
+                      智能评分
                     </div>
                 </el-popover>
 

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

@@ -228,7 +228,7 @@
                             :key="item2.courseId"
                             class="orgData"
                           >
-                            <div @click="lookUserPrize(item2.courseId)">
+                            <div :style="item2.status==2?`color:red`:''" @click="lookUserPrize(item2.courseId)">
                               {{ item2.title }}:{{ item2.num }}份
                             </div>
                           </div>
@@ -593,6 +593,7 @@ export default {
               testData.forEach(i=>{
                 _isReviewNum+=i.isReviewNum;
                 _num+=i.num;
+
               })
               if(_num>0){
                 if(_num==_isReviewNum){
@@ -604,9 +605,7 @@ export default {
                 data[i].isReview = 2;
               }
 
-              console.log("data=>",testData)
-              console.log("_isReviewNum=>",_isReviewNum)
-              console.log("_num=>",_num)
+
             }
           }
 
@@ -1116,7 +1115,23 @@ export default {
         this.ajax
           .post(this.$store.state.api + _fnStr, params)
           .then(res => {
-            resolve(res.data[0]);
+
+            let _data = res.data[0];
+
+            _data.forEach(i=>{
+              if(i.num>0){
+                if(i.num==i.isReviewNum){
+                  i.status = 1;
+                }else{
+                  i.status = 2;
+                }
+              }else{
+                i.status = 0;
+              }
+            })
+            console.log("_data",_data)
+
+            resolve(_data);
           })
           .catch(error => {
             console.log(error);