update

src/App.vue

@@ -391,4 +391,8 @@ html::-webkit-scrollbar-thumb {
   border-color: #5c549f !important;
   background-color: #dbd7ff !important;
 }
+
+.text_tooltip{
+  max-width: 350px;
+}
 </style>

src/components/pages/CaseDesignS.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="cd_body">
     <div class="pb_content_body" style="
-                    background: #fff;
-                    padding: 0px 25px;
-                    box-sizing: border-box;
-                    border-radius: 5px;
-                    width: 95%;
-                  ">
+                      background: #fff;
+                      padding: 0px 25px;
+                      box-sizing: border-box;
+                      border-radius: 5px;
+                      width: 95%;
+                    ">
       <div class="pb_head">
         <span>项目数据看板</span>
         <div style="display: flex;align-items: center;">
@@ -18,16 +18,17 @@
       <div class="student_head">
         <div class="head_left">
           <span>筛选：</span>
-          <el-select v-model="choose" @change="isLoadng = true, getData" style="margin-right: 10px;">
+          <el-select v-model="choose" @change="isLoading = true, getData()" style="margin-right: 10px;">
             <el-option label="默认排序" value=""> </el-option>
             <el-option label="学校名称" value="school"> </el-option>
             <el-option label="任务数量" value="task"> </el-option>
+            <el-option label="评审结果" value="score"> </el-option>
             <!-- <el-option label="评价" value="eval"> </el-option> -->
             <el-option label="工具" value="tool"> </el-option>
             <el-option label="字数" value="font"> </el-option>
           </el-select>
 
-          <el-select v-model="ttype" @change="isLoading = true, getData">
+          <el-select v-model="ttype" @change="page=1,isLoading = true, getData()">
             <el-option label="全部" value=""></el-option>
             <el-option v-for="item in courseTypeId" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
@@ -41,9 +42,9 @@
       <el-table ref="table" :data="tableData" border :fit="true" v-loading="isLoading" style="width: 100%"
         :header-cell-style="{ background: '#f1f1f1', fontSize: '17px' }" :row-class-name="tableRowClassName"
         class="table">
-        <el-table-column label="序号" prop="number" min-width="5" align="center">
+        <el-table-column label="序号" prop="number" width="70px" align="center">
         </el-table-column>
-        <el-table-column label="项目" min-width="15" align="center">
+        <el-table-column label="项目" width="150px" align="center">
           <template slot-scope="scope">
             <div style="max-height: 180px; overflow: auto">
               <div v-for="(item, index) in scope.row.course" :key="index" class="cd_course" @click="jump(item.courseId)">
@@ -54,22 +55,22 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="分类" prop="typename" min-width="15" align="center">
+        <el-table-column label="分类" prop="typename" width="130px" align="center">
         </el-table-column>
-        <el-table-column label="学校" prop="school" min-width="15" align="center">
+        <el-table-column label="学校" prop="school" width="100px" align="center">
         </el-table-column>
-        <el-table-column label="负责人" prop="username" min-width="8" align="center">
+        <el-table-column label="负责人" prop="username" width="80px" align="center">
         </el-table-column>
-        <el-table-column label="协同人员" prop="cteacher" min-width="8" align="center">
+        <el-table-column label="协同人员" prop="cteacher" width="100px" align="center">
           <template slot-scope="scope">
             <div>{{ scope.row.cteacher ? scope.row.cteacher : '—' }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" prop="ctime" min-width="12" align="center">
+        <el-table-column label="创建时间" prop="ctime" width="85px" align="center">
         </el-table-column>
-        <el-table-column label="更新时间" prop="time" min-width="12" align="center">
+        <el-table-column label="更新时间" prop="time" width="85px" align="center">
         </el-table-column>
-        <el-table-column label="总计" min-width="15" align="center">
+        <el-table-column label="总计" width="85px" align="center">
           <template slot-scope="scope">
             <div class="cd_d_span">
               <div>
@@ -90,7 +91,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="阶段1" v-if="mode" min-width="15" align="center">
+        <el-table-column label="阶段1" v-if="mode" width="85px" align="center">
           <template slot-scope="scope">
             <div v-if="scope.row.jd1">
               <div class="cd_d_span">
@@ -112,7 +113,7 @@
             <div v-else>—</div>
           </template>
         </el-table-column>
-        <el-table-column label="阶段2" v-if="mode" min-width="15" align="center">
+        <el-table-column label="阶段2" v-if="mode" width="85px" align="center">
           <template slot-scope="scope">
             <div v-if="scope.row.jd2">
               <div class="cd_d_span">
@@ -134,7 +135,7 @@
             <div v-else>—</div>
           </template>
         </el-table-column>
-        <el-table-column label="阶段3" v-if="mode" min-width="15" align="center">
+        <el-table-column label="阶段3" v-if="mode" width="85px" align="center">
           <template slot-scope="scope">
             <div v-if="scope.row.jd3">
               <div class="cd_d_span">
@@ -156,7 +157,7 @@
             <div v-else>—</div>
           </template>
         </el-table-column>
-        <el-table-column label="阶段4" v-if="mode" min-width="15" align="center">
+        <el-table-column label="阶段4" v-if="mode" width="85px" align="center">
           <template slot-scope="scope">
             <div v-if="scope.row.jd4">
               <div class="cd_d_span">
@@ -178,7 +179,7 @@
             <div v-else>—</div>
           </template>
         </el-table-column>
-        <el-table-column label="阶段5" v-if="mode" min-width="15" align="center">
+        <el-table-column label="阶段5" v-if="mode" width="85px" align="center">
           <template slot-scope="scope">
             <div v-if="scope.row.jd5">
               <div class="cd_d_span">
@@ -200,7 +201,7 @@
             <div v-else>—</div>
           </template>
         </el-table-column>
-        <el-table-column label="阶段6" v-if="mode" min-width="15" align="center">
+        <el-table-column label="阶段6" v-if="mode" width="85px" align="center">
           <template slot-scope="scope">
             <div v-if="scope.row.jd6">
               <div class="cd_d_span">
@@ -222,23 +223,33 @@
             <div v-else>—</div>
           </template>
         </el-table-column>
-        <el-table-column label="项目简介" v-if="!mode" min-width="15" align="center">
+        <el-table-column label="项目简介" v-if="!mode" min-width="80px" align="center">
           <template slot-scope="scope">
-            <div v-if="scope.row.brief">
-              <!-- <el-tooltip :content="scope.row.brief"> -->
-              <span>{{ scope.row.brief }}</span>
-              <!-- </el-tooltip> -->
+            <div v-if="scope.row.brief" class="tooltip">
+              <el-tooltip :content="scope.row.brief" class="my-tooltip-class" popper-class="text_tooltip">
+                <span>{{ scope.row.brief }}</span>
+              </el-tooltip>
             </div>
             <div v-else>
               —
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="项目所处阶段" prop="lastTask" min-width="15" align="center">
+        <el-table-column label="项目所处阶段" prop="lastTask" width="130px" align="center">
           <template slot-scope="scope">
             <div>{{ scope.row.lastTask ? scope.row.lastTask : '—' }}</div>
           </template>
         </el-table-column>
+        <el-table-column label="评审状态" prop="lastTask" width="80px" align="center">
+          <template slot-scope="scope">
+            <div>{{ scope.row.score ? '已评分' : '未评分' }}</div>
+          </template>
+        </el-table-column>        
+        <el-table-column label="评审结果" prop="lastTask" width="80px" align="center">
+          <template slot-scope="scope">
+            <div>{{ scope.row.score }}分</div>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" width="150px" align="center">
           <template slot-scope="scope">
             <!-- <div
@@ -252,15 +263,8 @@
         </el-table-column>
       </el-table>
       <div class="student_page">
-        <el-pagination
-          background
-          layout="prev, pager, next"
-          :page-size="pageSize"
-          :total="total"
-          v-if="page && tableData.length"
-          style="padding: 0px"
-          @current-change="handleCurrentChange"
-        ></el-pagination>
+        <el-pagination background layout="prev, pager, next, sizes" :page-size="pageSize" :page-sizes="[10, 50, 100, 200]" :total="total"
+          v-if="page && tableData.length" style="padding: 0px" @current-change="handleCurrentChange" @size-change="handleSizeChange"></el-pagination>
       </div>
     </div>
     <el-dialog title="查看" :visible.sync="dialogVisible" :append-to-body="true" width="620px" :before-close="handleClose"
@@ -374,8 +378,8 @@ export default {
         org: this.org,
         oid: this.oid,
         type: this.ttype,
-        page:this.page,
-        pageSize:this.pageSize
+        page: this.page,
+        pageSize: this.pageSize
         // this.org
       };
       this.ajax
@@ -460,7 +464,13 @@ export default {
                 break;
               }
             }
-
+            if(_res[i].score){
+              var psJson = JSON.parse(_res[i].score)
+              _res[i].score = psJson.cxx + psJson.sjyyssm + psJson.jsygn + psJson.yhty +
+                  psJson.zpwcdygfx
+            }else{
+              _res[i].score = 0
+            }
           }
           if (this.search) {
             _res = _res.filter((a) => {
@@ -487,7 +497,15 @@ export default {
               item.number = index + 1
               return item;
             });;
-          } else if (this.choose == "font") {
+          } else if (this.choose == "score") {
+            let array = _res.sort(function (a, b) {
+              return b.score - a.score;
+            });
+            this.tableData = array.filter((item, index) => {
+              item.number = index + 1
+              return item;
+            });;
+          }  else if (this.choose == "font") {
             let array = _res.sort(function (a, b) {
               //   return a.jdz.fontC - b.jdz.fontC;
               return b.jdz.fontC - a.jdz.fontC;
@@ -529,6 +547,13 @@ export default {
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.page = val;
+      this.isLoading = true
+      this.getData();
+    },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.page = 1;
+      this.isLoading = true
       this.getData();
     },
     selectAllType() {
@@ -639,7 +664,7 @@ export default {
       let _detail = `<h2>项目详情：${course.brief}</h2>`
       let _jdZ = `<h2>项目阶段数量：${JSON.parse(course.chapters).length} 项目任务任数量：${course.jdz.taskC}</h2>`
       let _lasttask = ''
-      if(course.lastTask){
+      if (course.lastTask) {
         _lasttask = `<h2>项目所处阶段：${course.lastTask}</h2>`
       }
 
@@ -668,27 +693,27 @@ export default {
           let _tool = taskJson[j].toolArray
           for (var tool = 0; tool < _tool.length; tool++) {
             if (_tool[tool].tool == 1) {
-              chapterHTML+=`<h4>步骤${tool+1}:电子白板</h4>`
+              chapterHTML += `<h4>步骤${tool + 1}:电子白板</h4>`
             } else if (_tool[tool].tool == 3) {
-              chapterHTML+=`<h4>步骤${tool+1}:思维导图</h4>`
+              chapterHTML += `<h4>步骤${tool + 1}:思维导图</h4>`
             } else if (_tool[tool].tool == 6) {
-              chapterHTML+=`<h4>步骤${tool+1}:协同文档</h4>`
+              chapterHTML += `<h4>步骤${tool + 1}:协同文档</h4>`
             } else if (_tool[tool].tool == 15) {
-              chapterHTML+=`<h4>步骤${tool+1}:问答工具</h4>`
+              chapterHTML += `<h4>步骤${tool + 1}:问答工具</h4>`
             } else if (_tool[tool].tool == 53) {
-              chapterHTML+=`<h4>步骤${tool+1}:文件上传</h4>`
+              chapterHTML += `<h4>步骤${tool + 1}:文件上传</h4>`
             } else if (_tool[tool].tool == 54) {
-              chapterHTML+=`<h4>步骤${tool+1}:拍照</h4>`
+              chapterHTML += `<h4>步骤${tool + 1}:拍照</h4>`
             } else if (_tool[tool].tool == 55) {
-              chapterHTML+=`<h4>步骤${tool+1}:压缩文件</h4>`
+              chapterHTML += `<h4>步骤${tool + 1}:压缩文件</h4>`
             } else if (_tool[tool].tool == 56) {
-              chapterHTML+=`<h4>步骤${tool+1}:投票</h4>`
+              chapterHTML += `<h4>步骤${tool + 1}:投票</h4>`
             } else if (_tool[tool].tool == 48) {
-              chapterHTML+=`<h4>步骤${tool+1}:表格</h4>`
+              chapterHTML += `<h4>步骤${tool + 1}:表格</h4>`
             } else if (_tool[tool].tool == 52) {
-              chapterHTML+=`<h4>步骤${tool+1}:文档</h4>`
+              chapterHTML += `<h4>步骤${tool + 1}:文档</h4>`
             }
-            if(_tool[tool].toolDetail){
+            if (_tool[tool].toolDetail) {
               chapterHTML += `<div>工具描述</div>`
               chapterHTML += `<div>${_tool[tool].toolDetail}</div>`
             }
@@ -696,7 +721,7 @@ export default {
         }
       }
 
-      var _html = _course + _people + _cteacher + _time +_type +_detail +_jdZ +_lasttask +chapterHTML;
+      var _html = _course + _people + _cteacher + _time + _type + _detail + _jdZ + _lasttask + chapterHTML;
       this.generate(course, _html);
     },
     getMan(manAarray, people) {
@@ -946,7 +971,19 @@ export default {
   width: 100%;
   margin: 20px auto;
 }
+
 /* .table >>> .el-table .cell, .table >>> .el-table--border td:first-child .cell, .table >>> .el-table--border th:first-child .cell{
   padding: 0 3px;
 } */
+
+.tooltip>>>.my-tooltip-class {
+  display: -webkit-box;
+  overflow: hidden;
+  white-space: normal !important;
+  text-overflow: ellipsis;
+  word-wrap: break-word;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical
+}
+
 </style>

src/components/pages/student/addCourse.vue

@@ -4421,7 +4421,7 @@ export default {
         let params = [
           {
             cid: this.cid,
-            chapters: JSON.stringify(this.unitJson).replaceAll(/%/g, "%25"),
+            chapters: JSON.stringify(this.unitJson),
             uid: this.userid,
             unitIndex: _unitIndex,
           },