页面修改

src/pages/teacher/assessmentType.vue

@@ -30,8 +30,7 @@
           <template :props="props" v-for="(col,cIndex) in props.row.SubtypeList">
             <template v-if="cIndex==0">
               <q-tr :key="cIndex+(props.rowIndex*10000)">
-                <q-td key="TypeName" :props="props" :rowspan="props.row.SubtypeList.length"
-                  class="assessmentType_td">
+                <q-td key="TypeName" :props="props" :rowspan="props.row.SubtypeList.length" class="assessmentType_td">
                   {{ props.row.TypeName }}
                 </q-td>
                 <q-td class="assessmentType_td">
@@ -39,14 +38,14 @@
                 </q-td>
                 <template v-for="(subItem,subIndex) in props.row.SubtypeList[cIndex].OptionList">
                   <q-td :key="subIndex+200000" class="assessmentType_td">
-                    <div style="width:150px;white-space:normal; "> {{subItem.LevelDesc}} <q-badge color="green">
+                    <div style="width:150px;white-space:normal; "> {{subItem.LevelDesc}} <q-badge color="green" v-if="subItem.LevelScore>0">
                         {{subItem.LevelScore}}分
                       </q-badge>
                     </div>
                   </q-td>
                 </template>
-                <q-td key="Id" :props="props" :rowspan="props.row.SubtypeList.length"
-                  class="assessmentType_td" style="border-right: 1px solid rgba(0, 0, 0, 0.12);">
+                <q-td key="Id" :props="props" :rowspan="props.row.SubtypeList.length" class="assessmentType_td"
+                  style="border-right: 1px solid rgba(0, 0, 0, 0.12);">
                   <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
                     @click="AddMsg(props.row)" />
                   <q-btn flat size="xs" icon="delete" color="negative" class="q-mr-xs" label="删除"
@@ -61,7 +60,7 @@
                 </q-td>
                 <template v-for="(subItem,subIndex) in props.row.SubtypeList[cIndex].OptionList">
                   <q-td :key="subIndex+400000" class="assessmentType_td">
-                    <div style="width:150px;white-space:normal; "> {{subItem.LevelDesc}} <q-badge color="green">
+                    <div style="width:150px;white-space:normal; "> {{subItem.LevelDesc}} <q-badge color="green" v-if="subItem.LevelScore>0">
                         {{subItem.LevelScore}}分
                       </q-badge>
                     </div>
@@ -111,39 +110,13 @@
     methods: {
       getAssessmentTypeList() {
         this.loading = true;
-        this.columns=[];
+        this.columns = [];
         queryAssessmentTypeList(this.msg).then(res => {
           this.loading = false;
+          console.log("res", res);
           if (res.Code == 1) {
-            this.dataList = res.Data;
-            this.columns.push({
-              name: "TypeName",
-              label: "类别",
-              field: "TypeName",
-              align: "left"
-            });
-            this.columns.push({
-              name: "SubtypeList",
-              label: "内容",
-              field: "SubtypeList",
-              align: "left"
-            });
-            if (this.dataList && this.dataList.length > 0) {
-              this.dataList[0].SubtypeList[0].OptionList.forEach(item => {
-                this.columns.push({
-                  name: item.LevelTitle,
-                  label: item.LevelTitle,
-                  field: item.LevelTitle,
-                  align: "left"
-                })
-              })
-            }
-            this.columns.push({
-              name: 'Id',
-              label: '操作',
-              field: row => row.Id
-            })
-
+            this.dataList = res.Data.result;
+            this.columns = res.Data.header;
           }
         })
       },

src/pages/teacher/jobEvaluation.vue

@@ -69,10 +69,12 @@
           <tr v-for="(sItem,sIndex) in item.SubtypeList" :key="sIndex">
             <td>{{sItem.SubTypeName}}</td>
             <td v-for="(cItem,cIndex) in sItem.OptionList" style="position:relative;" :key="cIndex">
+              <template v-if="cItem.LevelDesc!=''&&cItem.LevelScore>0">
                 <el-tooltip class="item" effect="dark" :content="cItem.LevelDesc" placement="top-start">
                   <i style="position:absolute;left:3px;top:3px;" class="iconfont icon-bangzhu"></i>
                 </el-tooltip>
                 <q-checkbox v-model="cItem.IsCheck" @input="changeStatus(sItem,cItem)" val="teal" color="green" />
+              </template>
             </td>
             <td>{{sItem.CheckScore}}</td>
           </tr>

src/pages/teacher/teacherAssessment.vue

@@ -31,10 +31,12 @@
           <tr v-for="(sItem,sIndex) in item.SubtypeList" :key="sIndex">
             <td>{{sItem.SubTypeName}}</td>
             <td v-for="(cItem,cIndex) in sItem.OptionList" style="position:relative;" :key="cIndex">
+              <template v-if="cItem.LevelDesc!=''&&cItem.LevelScore>0">
                 <el-tooltip class="item" effect="dark" :content="cItem.LevelDesc" placement="top-start">
                   <i style="position:absolute;left:3px;top:3px;" class="iconfont icon-bangzhu"></i>
                 </el-tooltip>
                 <q-checkbox v-model="cItem.IsCheck" disable val="teal" color="green" />
+              </template>
             </td>
             <td>{{sItem.S_TeacherScore}}</td>
             <td>{{sItem.S_JiaoWuScore}}</td>
@@ -229,7 +231,7 @@
           if (res.Code == 1) {
             var tempData = res.Data;
             this.saveObj = tempData;
-            this.teacherDate=this.saveObj.YearStr+"-"+this.saveObj.MonthStr;
+            this.teacherDate = this.saveObj.YearStr + "-" + this.saveObj.MonthStr;
           }
         })
       },