#

src/components/pages/components/exportDataDialog.vue

@@ -119,6 +119,10 @@
               />
             </div>
             <div class="zhBlockCon2">
+              <div>
+               <span v-for="(i,index) in subject" :key="index">{{ i }}</span>
+
+              </div>
               <!-- <span>语文</span>
               <span>数学</span>
               <span>英语</span>
@@ -273,6 +277,8 @@ export default {
       // 处理过的分组
       TeaStuInt2: [1, 3, 5, 4, 10, 13, 15],
 
+      subject:[],
+
       data3: [],
       data4: [],
       data5: [],
@@ -472,6 +478,7 @@ export default {
       });
     },
     async getData() {
+      this.subject=[]
       let params = {
         cid: this.cid,
         uid: this.worksDialogCon2.userid,
@@ -484,6 +491,9 @@ export default {
             this.cState = res.data[0][0].state;
             this.courseTit = res.data[0][0].title;
 
+            let sub = res.data[9][0].subject
+            this.subject = sub.split(',')
+
             this.imgList.forEach(e => {
               if (e.schoolId == this.oid) {
                 this.schoolImg = e;
@@ -1524,10 +1534,27 @@ export default {
 }
 .zhBlockCon2 {
   display: flex;
-  flex-wrap: wrap;
+  flex-direction: column;
+  justify-content: space-between;
+  /* flex-wrap: wrap; */
   overflow: hidden;
 }
-.zhBlockCon2 > span {
+.zhBlockCon2 > div {
+  /* font-size: 8px;
+  font-weight: 400;
+  color: rgba(0, 0, 0, 0.9);
+  background-color: rgba(243, 247, 253, 1);
+  border-radius: 2px;
+  padding: 1px 4px;
+  box-sizing: border-box;
+  margin-right: 4px;
+  margin-bottom: 2px; */
+  display: flex;
+  flex-wrap: wrap;
+
+  flex: 1;
+}
+.zhBlockCon2 > div >span{
   font-size: 8px;
   font-weight: 400;
   color: rgba(0, 0, 0, 0.9);

src/components/pages/components/worksDetail2.vue

@@ -1408,10 +1408,18 @@
 
                             <el-rate
                               class="rate_size"
+                              v-if="worksDetail[sIndex].state == 5"
                               style="min-width: 120px"
                               v-model="worksDetail[sIndex].rateList[item.detail]"
                               @change="getStar(sIndex)"
                             ></el-rate>
+                            <el-rate
+                              class="rate_size"
+                              v-else
+                              style="min-width: 120px"
+                              v-model="worksDetail[sIndex].rateList[item.value]"
+                              @change="getStar(sIndex)"
+                            ></el-rate>
                           </div>
                         </div>
                         <div class="worksTarget" v-if="isShow(worksDetail[sIndex].eList)"><span>目标</span></div>
@@ -2713,7 +2721,11 @@ export default {
                 result[l].eList = eList;
                 for (var i = 0; i < eList.length; i++) {
                   _ooption.push({ value: 0, name: eList[i].value });
-                  result[l].rateList[eList[i].detail] = 0;
+                  if (this.DState == 5) {
+                    result[l].rateList[eList[i].detail] = 0;                          
+                  }else{
+                    result[l].rateList[eList[i].value] = 0;                          
+                  }
                 }
                 result[l].rateList.content = "";
                 this.ooption[l] = _ooption;
@@ -2766,7 +2778,11 @@ export default {
                     
                       for (var i = 0; i < eList.length; i++) {
                         _ooption.push({ value: 0, name: eList[i].value });
-                        result[l].rateList[eList[i].detail] = 0;
+                        if (this.DState == 5) {
+                          result[l].rateList[eList[i].detail] = 0;                          
+                        }else{
+                          result[l].rateList[eList[i].value] = 0;                          
+                        }
                       }
                       result[l].rateList.content = "";
                       this.ooption[l] = _ooption;
@@ -3195,7 +3211,7 @@ export default {
     },
     updatePj() {
       for (var i = 0; i < this.worksDetail.length; i++) {
-        if (!this.worksDetail[i].eList.length) {
+        if (this.worksDetail[i].eList && !this.worksDetail[i].eList.length) {
           continue;
         }
         this.updateWorks(
@@ -3243,6 +3259,8 @@ export default {
         rate: rateList,
         uid: this.studentId,
       };
+      // return console.log('params',params);
+      
       const k = i;
       this.ajax
         .get(this.$store.state.api + "updateWorksEva", params)