update

src/components/pages/CaseDesignS.vue

@@ -10,6 +10,7 @@
       <div class="pb_head">
         <span>项目数据看板</span>
         <div style="display: flex;align-items: center;">
+          <!-- <el-button type="primary" size="small" @click="exportHtml" style="margin-right: 10px;">导出html</el-button> -->
           <el-button type="primary" size="small" @click="exportExcel" style="margin-right: 10px;">导出Excel</el-button>
           <el-switch v-model="mode" active-text="详情模式" inactive-text="简易模式">
           </el-switch>
@@ -240,16 +241,21 @@
             <div>{{ scope.row.lastTask ? scope.row.lastTask : '—' }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="评审状态" prop="lastTask" width="80px" align="center">
+        <el-table-column label="评审状态" 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">
+        <el-table-column label="评审结果" prop="score" width="80px" align="center">
           <template slot-scope="scope">
             <div>{{ scope.row.score }}分</div>
           </template>
         </el-table-column>
+        <el-table-column label="评审类型" prop="psType" width="80px" align="center">
+          <template slot-scope="scope">
+            <div>{{ scope.row.psType == '1' ? '造型结构' : scope.row.psType == '2' ? '开源硬件' :   scope.row.psType == '3' ? '软件设计' :  scope.row.psType == '4' ? '总分' : '—' }}</div>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" width="150px" align="center">
           <template slot-scope="scope">
             <!-- <div
@@ -466,8 +472,20 @@ export default {
             }
             if(_res[i].score){
               var psJson = JSON.parse(_res[i].score)
-              _res[i].score = psJson.cxx + psJson.sjyyssm + psJson.jsygn + psJson.yhty +
-                  psJson.zpwcdygfx
+              if(_res[i].psType == '1'){
+                _res[i].score = psJson.cxx + psJson.yssm + psJson.jsygn + psJson.kxdy +
+                  psJson.zpwcd
+              }else if(_res[i].psType == '2'){
+                _res[i].score = psJson.cxx + psJson.yssm + psJson.jsygn + psJson.kxdd +
+                  psJson.zpwcd
+              }else if(_res[i].psType == '3'){
+                _res[i].score = psJson.cxx + psJson.yssm + psJson.jsygn + psJson.kxdd +
+                psJson.zpwcd
+              }else if(_res[i].psType == '4'){
+                _res[i].score = psJson.z
+              }
+              
+              
             }else{
               _res[i].score = 0
             }
@@ -501,6 +519,7 @@ export default {
             let array = _res.sort(function (a, b) {
               return b.score - a.score;
             });
+            console.log(array);
             this.tableData = array.filter((item, index) => {
               item.number = index + 1
               return item;
@@ -615,10 +634,9 @@ export default {
         _json["项目"] = res[i].course[0].title;
         _json["分类"] = res[i].typename;
         _json["学校"] = res[i].school;
-        _json["负责人"] = res[i].username;
         _json["协同人员"] = res[i].cteacher ? res[i].cteacher : '—';
         _json["创建时间"] = res[i].ctime;
-        _json["更新事件"] = res[i].time;
+        _json["更新时间"] = res[i].time;
         _json["总计"] = `${res[i].jdz.taskC}任务 ${res[i].jdz.toolC}工具 ${res[i].jdz.fontC}字数`;
         if (this.mode) {
           _json["阶段1"] = res[i].jd1 ? res[i].brief : '—';
@@ -631,6 +649,9 @@ export default {
           _json["项目简介"] = res[i].brief ? res[i].brief : '—';
         }
         _json["项目所处阶段"] = res[i].lastTask ? res[i].lastTask : '—';
+        _json["评审状态"] = res[i].score ? '已评分' : '未评分';
+        _json["评审结果"] = res[i].score + '分';
+        _json["评审类型"] = res[i].psType == '1' ? '造型结构' : res[i].psType == '2' ? '开源硬件' :   res[i].psType == '3' ? '软件设计' :  res[i].psType == '4' ? '总分' : '—';
         array.push(_json);
       }
 
@@ -653,12 +674,18 @@ export default {
         type: "success",
       });
     },
+    async exportHtml(){
+      let res = this.tableData;
+      for (let i = 0; i < res.length; i++) {
+        await this.setMan(res[i])
+      }
+    },
     exportCourse(course, Man) {
       // 项目名称、项目创建人、协同人员、创建时间、修改时间、所属赛道、所属主题、项目详情简介；项目阶段数量、项目任务数量、项目进展
       // if possible 项目所处阶段、各阶段负责人/任务周期/协同者/任务描述/项目方案
       let _course = `<h1>${course.course[0].title}</h1>`
       let _people = `<h2>负责人：${course.username}</h2>`
-      let _cteacher = `<h3>负责人：${course.cteacher}</h3>`
+      let _cteacher = `<h3>协同人员：${course.cteacher ? course.cteacher : '—'}</h3>`
       let _time = `<h2>创建时间：${course.ctime} 修改时间：${course.time}</h2>`
       let _type = `<h2>分类：${course.typename}</h2>`
       let _detail = `<h2>项目详情：${course.brief}</h2>`
@@ -671,7 +698,7 @@ export default {
       let _chapter = JSON.parse(course.chapters)
       let chapterHTML = ''
       for (var i = 0; i < _chapter.length; i++) {
-        chapterHTML += `<h2>第${i + 1}阶段-${_chapter[i].dyName}</h2>`
+        chapterHTML += `<h2 style="border-top: 1px solid #ddd;padding: 10px 0 0 0;">第${i + 1}阶段-${_chapter[i].dyName}</h2>`
         let taskJson = _chapter[i].chapterInfo[0].taskJson
         for (var j = 0; j < taskJson.length; j++) {
           chapterHTML += `<h3>任务${j + 1}-${taskJson[j].task}</h3>`
@@ -736,7 +763,7 @@ export default {
       }
       return _people ? _people : "";
     },
-    setMan(course) {
+    async setMan(course) {
       // let teacherJuri = this.teacherJuri2;
       this.ManAarray = [];
       let array = course.course_teacher.split(",")
@@ -746,14 +773,8 @@ export default {
       let params = {
         uid: array.join(","),
       };
-      this.ajax
-        .get(this.$store.state.api + "getAllUserById", params)
-        .then((res) => {
-          this.exportCourse(course, res.data[0])
-        })
-        .catch((err) => {
-          console.error(err);
-        });
+      const res = await this.ajax.get(this.$store.state.api + "getAllUserById", params)
+      this.exportCourse(course, res.data[0])
     },
     async generate(a, html) {
       // 将html文件中需要用到的数据挂载到store上

src/components/pages/addCourse.vue

@@ -2490,6 +2490,90 @@
                                 </div>
                               </div>
                             </div>
+                            <div class="tool">
+                              <div
+                                class="whiteBIcon"
+                                @click="addTools(58, itemTaskIndex, toolIndex)"
+                              >
+                                <img
+                                  src="../../assets/icon/fourthToolList/car.png"
+                                  alt
+                                />
+                                <div style="margin: 5px 0">学科工具</div>
+                              </div>
+                              <div
+                                class="check"
+                                @click="addTools(58, itemTaskIndex, toolIndex)"
+                              >
+                                <img
+                                  src="../../assets/icon/checkNo.png"
+                                  alt
+                                  v-if="itemTool.tool.indexOf(58) == -1"
+                                />
+                                <div class="checkDiv" v-else>
+                                  <img
+                                    src="../../assets/icon/checkedIs.png"
+                                    alt
+                                  /><span>已选择</span>
+                                </div>
+                              </div>
+                            </div>
+                            <div class="tool">
+                              <div
+                                class="whiteBIcon"
+                                @click="addTools(59, itemTaskIndex, toolIndex)"
+                              >
+                                <img
+                                  src="../../assets/icon/fourthToolList/lineSearch.png"
+                                  alt
+                                />
+                                <div style="margin: 5px 0">路径搜索</div>
+                              </div>
+                              <div
+                                class="check"
+                                @click="addTools(59, itemTaskIndex, toolIndex)"
+                              >
+                                <img
+                                  src="../../assets/icon/checkNo.png"
+                                  alt
+                                  v-if="itemTool.tool.indexOf(59) == -1"
+                                />
+                                <div class="checkDiv" v-else>
+                                  <img
+                                    src="../../assets/icon/checkedIs.png"
+                                    alt
+                                  /><span>已选择</span>
+                                </div>
+                              </div>
+                            </div>
+                            <div class="tool">
+                              <div
+                                class="whiteBIcon"
+                                @click="addTools(60, itemTaskIndex, toolIndex)"
+                              >
+                                <img
+                                  src="../../assets/icon/fourthToolList/deepLearning.png"
+                                  alt
+                                />
+                                <div style="margin: 5px 0">深度学习</div>
+                              </div>
+                              <div
+                                class="check"
+                                @click="addTools(60, itemTaskIndex, toolIndex)"
+                              >
+                                <img
+                                  src="../../assets/icon/checkNo.png"
+                                  alt
+                                  v-if="itemTool.tool.indexOf(60) == -1"
+                                />
+                                <div class="checkDiv" v-else>
+                                  <img
+                                    src="../../assets/icon/checkedIs.png"
+                                    alt
+                                  /><span>已选择</span>
+                                </div>
+                              </div>
+                            </div>
                           </div>
                           <div class="toolSort" v-if="itemTool.toolType == 4">
                             <div class="tool">
@@ -5763,7 +5847,10 @@ export default {
                 _this.unitJson[unitIndex].chapterInfo[0].taskJson[
                   itemTaskIndex
                 ].chapterData.push({
-                  name: file.name,
+                  // name: file.name,
+                  name: string+''+(_this.unitJson[unitIndex].chapterInfo[0].taskJson[
+                  itemTaskIndex
+                ].chapterData.length+1),
                   url: data.Location,
                   uid: file.uid,
                   type: type,
@@ -5774,7 +5861,10 @@ export default {
                 _this.unitJson[_this.unitIndex].chapterInfo[0].taskJson[
                   itemTaskIndex
                 ].fileList1.push({
-                  name: file.name,
+                  // name: file.name,
+                  name: string+''+(_this.unitJson[unitIndex].chapterInfo[0].taskJson[
+                  itemTaskIndex
+                ].chapterData.length+1),
                   url: data.Location,
                   uid: file.uid,
                 });
@@ -5783,7 +5873,10 @@ export default {
                 _this.unitJson[_this.unitIndex].chapterInfo[0].taskJson[
                   itemTaskIndex
                 ].homeworkList.push({
-                  name: file.name,
+                  // name: file.name,
+                  name: string+''+(_this.unitJson[unitIndex].chapterInfo[0].taskJson[
+                  itemTaskIndex
+                ].chapterData.length+1),
                   url: data.Location,
                   uid: file.uid,
                 });

src/components/pages/scourse.vue

@@ -15,13 +15,14 @@
     <div class="pb_content_body" style="height: 100%">
       <div class="student_head">
         <div class="choose">
-          <!-- <div class="student_search">
+          <div class="student_search">
             <span>项目筛选</span>
             <el-select v-model="groupA" @change="search">
               <el-option value="0" label="我的项目"></el-option>
-              <el-option value="1" label="他人项目"></el-option>
+              <el-option value="1" label="协同项目"></el-option>
+              <el-option value="2" label="他人项目"></el-option>
             </el-select>
-          </div> -->
+          </div>
           <div class="all_choose" v-for="(item, index) in CourseType[0]" :key="index">
             <span v-if="CourseTypeJson[item.id].length">{{ item.name }}</span>
             <el-select v-if="CourseTypeJson[item.id].length" v-model="courseTypeId[item.id]" placeholder="请选择" @change="getTypeName">
@@ -59,13 +60,6 @@
                   : mr
               " alt />
             </div>
-            <!-- <div class="bottom_box">
-              <div>{{ item.title }}</div>
-              <div class="kc_t" v-if="groupA == '1'">
-                创建老师：{{ item.uname }}
-              </div>
-              <div class="kc_time">{{ item.time }}</div>
-            </div> -->
             <div class="bottom_box">
               <div>{{ item.title }}</div>
               <div class="kc_t">
@@ -79,36 +73,14 @@
               </div>
             </div>
             <div class="three_bottom">
-              <div @click="goToCourse2(item.courseId)" v-if="org != '150e3120-9195-11ed-b13d-005056b86db5'">编辑</div>
+              <div @click="goToCourse2(item.courseId)" v-if="org != '150e3120-9195-11ed-b13d-005056b86db5' && groupA != '2'">编辑</div>
               <div @click="get(item.courseId)">预览</div>
               <!-- 项目进展 -->
               <div @click="getA(item.courseId)">进展</div>
               <div @click="jump(item.courseId)">评论</div>
-
-              <!-- <div v-if="groupA == '0'" @click="
-                goTo(
-                  '/works?cid=' +
-                  item.courseId +
-                  '&userid=' +
-                  userid +
-                  '&oid=' +
-                  oid +
-                  '&org=' +
-                  org
-                )
-              ">
-                报告
-              </div> -->
               <div v-if="(item.userid == userid)" @click="deleteCourse(item.courseId)">
                 删除
               </div>
-              <!-- <div class="more">
-                <span style="font-size:18px;font-weight:700">...</span>
-                <div>
-                  <span @click="copyCourse(item.courseId)">复制</span>
-                  <span @click="get(item.courseId)">查看</span>
-                </div>
-              </div> -->
             </div>
           </div>
           <div class="course_empty" v-if="course.length == 0">暂无数据</div>
@@ -216,7 +188,7 @@ export default {
       now: "",
       courseDetail: {},
       addCourse: {},
-      groupA: "2",
+      groupA: "0",
       classX: "",
       course: [],
       courseName: "",
@@ -447,7 +419,7 @@ export default {
         pageSize: this.pageSize,
       };
       this.ajax
-        .get(this.$store.state.api + "selectStudentCourseNew22", params)
+        .get(this.$store.state.api + "selectStudentCourseNew222", params)
         .then((res) => {
           this.isLoading = false;
           this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
@@ -752,7 +724,8 @@ export default {
 .student_search {
   display: flex;
   align-items: center;
-  width: calc(100% / 3);
+  /* width: calc(100% / 3); */
+  width: 190px;
 }
 
 .student_search span {
@@ -1054,10 +1027,10 @@ export default {
   width: 32.33333%;
 }
 
-/* .choose>div:nth-child(4) {
-  margin-right: 1%;
+.choose>div:nth-child(3) {
+  margin-left: 1%;
   width: 32.33333%;
-} */
+}
 
 .choose>div:nth-child(5) {
   margin: 5px 0 0 1%;