修改样式及功能

src/components/pages/munAdmin/anliList.vue

@@ -53,12 +53,12 @@
         </div>
       </div>
     </div>
-    <div class="anliBox">
+    <div class="anliBox" v-if="tableData.length">
       <div v-for="(a, aIndex) in tableData" :key="aIndex" class="anLi">
-        <div class="anliImg"><img :src="a.info.cover[0].url" alt="" /></div>
+        <div class="anliImg"><img :src="a.info.cover.length > 0 ? a.info.cover[0].url : noBanner " alt="" /></div>
         <div class="anliBot">
           <div class="detailBox">
-            <div>{{ a.info.title }}</div>
+            <div>{{ a.info.title != "" ? a.info.title : "暂无" }}</div>
             <div>{{ a.time }}</div>
           </div>
           <div class="anliButton">
@@ -295,6 +295,7 @@ export default {
       dialogVisibleMember: false,
       dialogVisibleScore: false,
       dialogVisibleRecommend: false,
+      noBanner: require("../../../assets/noBanner.jpg"),
       scoreDetail: [
         {
           id: "",

src/components/pages/munAdmin/school.vue

@@ -44,7 +44,7 @@
           </el-table-column>
           <el-table-column label="电话" min-width="10" align="center">
             <template slot-scope="scope">
-              <div>{{ scope.row.phone ? scope.row.phone : "" }}</div>
+              <div>{{ scope.row.phone ? scope.row.phone : "-" }}</div>
             </template>
           </el-table-column>
           <el-table-column

src/components/pages/munAdmin/score.vue

@@ -71,39 +71,51 @@
           </el-table-column>
           <el-table-column label="项目案例" min-width="10" align="center">
             <template slot-scope="scope">
-              <div>{{ scope.row.info.title }}</div>
+              <div>
+                {{ scope.row.info.title ? scope.row.info.title : "暂无名称" }}
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="评委" min-width="10" align="center">
             <template slot-scope="scope">
-              <div>{{ scope.row.scoreName ? scope.row.scoreName : '-' }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="评分结果" min-width="10" align="center">
-            <template slot-scope="scope">
-              <div>{{ scope.row.sum ? scope.row.sum : '-' }}</div>
+              <div>{{ scope.row.scoreName ? scope.row.scoreName : "-" }}</div>
             </template>
           </el-table-column>
           <el-table-column label="评分结果" min-width="10" align="center">
             <template slot-scope="scope">
-              <div>{{ scope.row.sum ? scope.row.sum : '-' }}</div>
+              <div>{{ scope.row.sum ? scope.row.sum : "-" }}</div>
             </template>
           </el-table-column>
           <el-table-column label="省级评奖" min-width="10" align="center">
             <template slot-scope="scope">
-              <div>{{ scope.row.award == 1 ? '特等奖' : scope.row.award == 2 ? '一等奖' : scope.row.award == 3 ? '二等奖' : scope.row.award == 4 ? '三等奖' : scope.row.award == 5 ? '四等奖' : '-' }}</div>
+              <div>
+                {{
+                  scope.row.award == 1
+                    ? "特等奖"
+                    : scope.row.award == 2
+                    ? "一等奖"
+                    : scope.row.award == 3
+                    ? "二等奖"
+                    : scope.row.award == 4
+                    ? "三等奖"
+                    : scope.row.award == 5
+                    ? "四等奖"
+                    : "-"
+                }}
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="时间" min-width="10" align="center">
             <template slot-scope="scope">
-              <div>{{ scope.row.scoreTime ? scope.row.scoreTime : '-' }}</div>
+              <div>{{ scope.row.scoreTime ? scope.row.scoreTime : "-" }}</div>
             </template>
           </el-table-column>
           <el-table-column label="操作" min-width="20">
             <template slot-scope="scope">
               <div class="tableButton">
-                <el-button @click="upUser(scope.row)">修改</el-button>
-                <el-button @click="deUser(scope.row.userid)">删除</el-button>
+                <div @click="lookDetail(scope.row.id)">案例详情</div>
+                <div>评分修改</div>
+                <div>推荐</div>
               </div>
             </template>
           </el-table-column>
@@ -509,8 +521,8 @@ export default {
         typec: typec != undefined ? typec : "",
         typed: typed != undefined ? typed : "",
         typeE: typeE.join(","),
-        cid: rc ? rc : "",
         cn: this.anliBox == "" ? 0 : this.anliBox,
+        cid: rc ? rc : "",
         page: this.page,
       };
       this.ajax
@@ -525,7 +537,7 @@ export default {
             this.tableData[i].proact = JSON.parse(this.tableData[i].proact);
             this.tableData[i].proexc = JSON.parse(this.tableData[i].proexc);
             this.tableData[i].results = JSON.parse(this.tableData[i].results);
-            if (this.tableData[i].score != "") {
+            if (this.tableData[i].score != null) {
               var point = JSON.parse(this.tableData[i].score);
               var a = parseInt(point.first);
               var b = parseInt(point.second);
@@ -770,6 +782,9 @@ export default {
           console.error(err);
         });
     },
+    lookDetail(aid) {
+      window.open(window.origin + "/#/anliDetail?aid=" + aid);
+    },
   },
   created() {
     // this.getAnliList();

src/components/pages/munAdmin/user.vue

@@ -44,7 +44,7 @@
           </el-table-column>
           <el-table-column label="电话" min-width="10" align="center">
             <template slot-scope="scope">
-              <div>{{ scope.row.phone ? scope.row.phone : "" }}</div>
+              <div>{{ scope.row.phone ? scope.row.phone : "-" }}</div>
             </template>
           </el-table-column>
           <el-table-column
@@ -53,7 +53,17 @@
             min-width="10"
             align="center"
             ><template slot-scope="scope">
-              <div>{{ scope.row.type == 4 ? "评审员" : "暂无" }}</div>
+              <div>
+                {{
+                  scope.row.type == 4
+                    ? "评审员"
+                    : scope.row.type == 1
+                    ? "教师"
+                    : scope.row.type == 2
+                    ? "市级管理"
+                    : "暂无"
+                }}
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="操作" min-width="20">
@@ -111,6 +121,7 @@
         </el-form-item>
         <el-form-item label="权限" :label-width="formLabelWidth">
           <el-select v-model="sType" placeholder="请选择权限">
+            <el-option label="教师" value="1">教师</el-option>
             <el-option label="评审员" value="4">评审员</el-option>
           </el-select>
         </el-form-item>

src/components/pages/race/addRace.vue

@@ -87,7 +87,7 @@
         <el-button
           type="primary"
           @click="dialogVisible1 = true"
-          v-if="steps ==2"
+          v-if="steps == 2"
           >跳过</el-button
         >
         <el-button type="primary" @click="lastSteps" v-if="steps != 1"
@@ -124,9 +124,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button
-          type="primary"
-          @click="goTo('/eventCenter?steps=' + '2')"
+        <el-button type="primary" @click="goTo('/eventCenter?steps=' + '2')"
           >确 定</el-button
         >
       </span>
@@ -145,9 +143,9 @@
         </div>
         <div class="cresteMessage">
           案例征集必填内容已提交，您确定要跳过网页端填写吗？
-          <div style="color: #9a9a9a"
-            >建议：网页端填写便于平台留存与展示，建议填写。</div
-          >
+          <div style="color: #9a9a9a">
+            建议：网页端填写便于平台留存与展示，建议填写。
+          </div>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -236,21 +234,33 @@ export default {
       this.$router.push(path);
     },
     checkSteps(steps) {
-      this.steps = steps;
+      if (steps > 1) {
+        if (this.raceInfo.title == "") {
+          this.$message.error("标题不能为空");
+          return;
+        } else if (this.raceInfo.data.length == 0) {
+          this.$message.error("上传文件不能为空");
+          return;
+        }else{
+          this.steps = steps;
+        }
+      } else {
+        this.steps = steps;
+      }
     },
     nextSteps() {
       if (this.steps == 1) {
         if (this.raceInfo.title == "") {
           this.$message.error("请填写案例名称!");
           return;
-        } else if(this.raceInfo.data.length == 0) {
+        } else if (this.raceInfo.data.length == 0) {
           this.$message.error("文件上传不能为空!");
           return;
         } else {
           this.dialogVisible1 = true;
           this.steps++;
         }
-      }else{
+      } else {
         this.steps++;
       }
       //  else if(2 <= this.steps < 6) {
@@ -330,9 +340,7 @@ export default {
               message: "新增成功",
               type: "success",
             });
-            this.goTo(
-              "/eventCenter?steps=" + '2'
-            );
+            this.goTo("/eventCenter?steps=" + "2");
             this.dialogVisible1 = false;
           } else {
             console.log("下一步");
@@ -374,9 +382,7 @@ export default {
               message: "修改成功",
               type: "success",
             });
-            this.goTo(
-              "/eventCenter?steps=" + '2'
-            );
+            this.goTo("/eventCenter?steps=" + "2");
             this.dialogVisible1 = false;
           } else {
             console.log("下一步");

src/components/pages/race/addRace/projectActpro.vue

@@ -14,6 +14,14 @@
             </div>
             <div class="stepRightNav" @click="jump('jd' + staIndex + 1)">
               <div>阶段{{ staIndex + 1 }}</div>
+              <div
+                v-if="
+                  sta.brief != '' && sta.data.length > 0
+                "
+                class="isFinish"
+              >
+                <img src="../../../../assets/icon/race/finish.png" alt="" />
+              </div>
             </div>
           </div>
         </div>
@@ -685,4 +693,13 @@ export default {
   width: 80px;
   padding: 20px 0 20px 30px;
 }
+.isFinish {
+  width: 30px;
+  height: 30px;
+  margin-top: 5px;
+}
+.isFinish > img {
+  width: 100%;
+  height: 100%;
+}
 </style>

src/components/pages/race/addRace/projectEffect.vue

@@ -10,6 +10,14 @@
             </div>
             <div class="stepRightNav">
               <div>项目成效与反思</div>
+              <div
+                v-if="
+                  raceEff.brief != '' && raceEff.data.length > 0
+                "
+                class="isFinish"
+              >
+                <img src="../../../../assets/icon/race/finish.png" alt="" />
+              </div>
             </div>
           </div>
         </div>
@@ -721,4 +729,13 @@ export default {
   width: 90%;
   margin-top: 25px;
 }
+.isFinish {
+  width: 30px;
+  height: 30px;
+  margin-top: 5px;
+}
+.isFinish > img {
+  width: 100%;
+  height: 100%;
+}
 </style>

src/components/pages/race/addRace/projectExceva.vue

@@ -10,6 +10,14 @@
             </div>
             <div class="stepRightNav">
               <div>项目成果交流与评价</div>
+              <div
+                v-if="
+                  raceExc.brief != '' && raceExc.data.length > 0
+                "
+                class="isFinish"
+              >
+                <img src="../../../../assets/icon/race/finish.png" alt="" />
+              </div>
             </div>
           </div>
         </div>
@@ -721,4 +729,13 @@ export default {
   width: 90%;
   margin-top: 25px;
 }
+.isFinish {
+  width: 30px;
+  height: 30px;
+  margin-top: 5px;
+}
+.isFinish > img {
+  width: 100%;
+  height: 100%;
+}
 </style>

src/components/pages/race/addRace/projectProcess.vue

@@ -14,6 +14,14 @@
             </div>
             <div class="stepRightNav" @click="jump('jd' + staIndex + 1)">
               <div>阶段{{ staIndex + 1 }}</div>
+              <div
+                v-if="
+                  sta.staTitle != ''
+                "
+                class="isFinish"
+              >
+                <img src="../../../../assets/icon/race/finish.png" alt="" />
+              </div>
             </div>
           </div>
         </div>
@@ -1489,4 +1497,13 @@ export default {
   align-items: center;
   margin-left: 10px;
 }
+.isFinish {
+  width: 30px;
+  height: 30px;
+  margin-top: 5px;
+}
+.isFinish > img {
+  width: 100%;
+  height: 100%;
+}
 </style>

src/components/pages/race/addRace/raceDetail.vue

@@ -11,6 +11,12 @@
             <div class="stepRightNav" @click="jump('first')">
               <div>案例活动信息</div>
               <div>说明</div>
+              <div
+                v-if="raceDetail.title != '' && raceDetail.type.length > 0"
+                class="isFinish"
+              >
+                <img src="../../../../assets/icon/race/finish.png" alt="" />
+              </div>
             </div>
           </div>
           <div class="steps">
@@ -20,6 +26,12 @@
             <div class="stepRightNav" @click="jump('second')">
               <div>封面</div>
               <div>说明</div>
+              <div
+                v-if="raceDetail.cover.length > 0"
+                class="isFinish"
+              >
+                <img src="../../../../assets/icon/race/finish.png" alt="" />
+              </div>
             </div>
           </div>
           <div class="steps">
@@ -29,6 +41,12 @@
             <div class="stepRightNav" @click="jump('third')">
               <div>成员信息</div>
               <div>协同人员</div>
+              <div
+                v-if="raceDetail.tableData.length > 0"
+                class="isFinish"
+              >
+                <img src="../../../../assets/icon/race/finish.png" alt="" />
+              </div>
             </div>
           </div>
           <div class="steps">
@@ -38,15 +56,27 @@
             <div class="stepRightNav" @click="jump('fouth')">
               <div>项目说明</div>
               <div>项目简介</div>
+              <div
+                v-if="raceDetail.courseText != ''"
+                class="isFinish"
+              >
+                <img src="../../../../assets/icon/race/finish.png" alt="" />
+              </div>
             </div>
           </div>
           <div class="steps">
             <div>
               <img src="../../../../assets/icon/race/progress.png" alt="" />
             </div>
-            <div class="stepRightNav" @click="jump('fouth')">
+            <div class="stepRightNav" @click="jump('fivth')">
               <div>文件上传</div>
               <div>项目资料</div>
+              <div
+                v-if="raceDetail.data.length > 0"
+                class="isFinish"
+              >
+                <img src="../../../../assets/icon/race/finish.png" alt="" />
+              </div>
             </div>
           </div>
         </div>
@@ -281,7 +311,7 @@
           </div>
           <div class="whiteBg" style="border-radius: 0">
             <div class="right_first">
-              <div class="right_title" id="fouth">文件上传</div>
+              <div class="right_title" id="fivth">文件上传</div>
               <div class="secondTop">
                 <div>
                   <div class="basic_box1" style="width: 100%">
@@ -1868,4 +1898,13 @@ export default {
   margin-left: 3px;
   border-radius: 3px;
 }
+.isFinish {
+  width: 30px;
+  height: 30px;
+  margin-top: 5px;
+}
+.isFinish > img {
+  width: 100%;
+  height: 100%;
+}
 </style>

src/components/pages/race/addRace/raceOverview.vue

@@ -20,6 +20,15 @@
             <div class="stepRightNav" @click="jump('first')">
               <div>驱动问题</div>
               <div>说明</div>
+              <div
+                v-if="
+                  raceOver.driQuestion.brief != '' &&
+                  raceOver.driQuestion.data.length > 0
+                "
+                class="isFinish"
+              >
+                <img src="../../../../assets/icon/race/finish.png" alt="" />
+              </div>
             </div>
           </div>
           <div class="steps">
@@ -29,6 +38,15 @@
             <div class="stepRightNav" @click="jump('second')">
               <div>学习目标</div>
               <div>说明</div>
+              <div
+                v-if="
+                  raceOver.tarDesign.brief != '' &&
+                  raceOver.tarDesign.data.length > 0
+                "
+                class="isFinish"
+              >
+                <img src="../../../../assets/icon/race/finish.png" alt="" />
+              </div>
             </div>
           </div>
           <div class="steps">
@@ -38,6 +56,15 @@
             <div class="stepRightNav" @click="jump('third')">
               <div>评价设计</div>
               <div>说明</div>
+              <div
+                v-if="
+                  raceOver.actiDesign.brief != '' &&
+                  raceOver.actiDesign.data.length > 0
+                "
+                class="isFinish"
+              >
+                <img src="../../../../assets/icon/race/finish.png" alt="" />
+              </div>
             </div>
           </div>
           <!-- <div class="steps">
@@ -959,7 +986,7 @@ export default {
   height: 40px;
   cursor: pointer;
 }
-.stepRightNav:hover{
+.stepRightNav:hover {
   color: #999;
 }
 .line,
@@ -1247,7 +1274,7 @@ export default {
   margin-top: 20px;
 }
 .stepBg .steps:nth-child(1) ::after,
-.stepBg .steps:nth-child(2) ::after{
+.stepBg .steps:nth-child(2) ::after {
   content: "";
   height: 100%;
   background: #eee;
@@ -1325,4 +1352,13 @@ export default {
   width: 87%;
   color: #a19f9f;
 }
+.isFinish {
+  width: 30px;
+  height: 30px;
+  margin-top: 5px;
+}
+.isFinish > img {
+  width: 100%;
+  height: 100%;
+}
 </style>

src/components/pages/race/eventCenter/anliDetail.vue

@@ -100,10 +100,27 @@
       </div>
 
       <div
-        class="messageBox"
-        v-if="anliBox[0]"
-        :class="{ isMessageBox: isNavTop >= 300 }"
+        class="isNoMessage"
+        v-if="
+          (anliBox[0].overview.driQuestion.brief == '' ||
+            anliBox[0].overview.driQuestion.imgBox.length == 0) &&
+          (anliBox[0].overview.tarDesign.brief == '' ||
+            anliBox[0].overview.tarDesign.imgBox.length == 0) &&
+          (anliBox[0].overview.actiDesign.brief == '' ||
+            anliBox[0].overview.actiDesign.imgBox.length == 0) &&
+          anliBox[0].process.stageBox[0].staTitle == '' &&
+          anliBox[0].process.stageBox[0].actBox[0].actName == '' &&
+          anliBox[0].process.stageBox[0].brief == '' &&
+          anliBox[0].process.stageBox[0].data.length == 0 &&
+          (anliBox[0].proexc.brief == '' ||
+            anliBox[0].proexc.imgBox.length == 0) &&
+          (anliBox[0].results.brief == '' ||
+            anliBox[0].results.imgBox.length == 0)
+        "
       >
+        <img src="../../../../assets/icon/race/isNoMessage.png" alt />
+      </div>
+      <div class="messageBox" v-else :class="{ isMessageBox: isNavTop >= 300 }">
         <div
           class="proOverCss"
           id="first"
@@ -220,8 +237,35 @@
         </div>
         <div>
           <div
-            class="proOverCss"
+            class="jdTopBox"
             id="second"
+            v-if="
+              (anliBox[0].overview.driQuestion.brief != '' ||
+                anliBox[0].overview.driQuestion.imgBox.length > 0) &&
+              anliBox[0].overview.driQuestion.data.length &&
+              (anliBox[0].overview.tarDesign.brief != '' ||
+                anliBox[0].overview.tarDesign.imgBox.length > 0) &&
+              anliBox[0].overview.tarDesign.data.length &&
+              (anliBox[0].overview.actiDesign.brief != '' ||
+                anliBox[0].overview.actiDesign.imgBox.length > 0)
+            "
+          >
+            <div class="jdTopNav" style="font-size: 18px">
+              <div class="jdLeftNav">
+                <div class="jdImg">
+                  <img
+                    src="../../../../assets/icon/anliDetail/jdTitle.png"
+                    alt=""
+                  />
+                </div>
+                <div class="jdLeftTitle">
+                  <div>项目概况</div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="proOverCss"
             v-if="
               (anliBox[0].overview.driQuestion.brief != '' ||
                 anliBox[0].overview.driQuestion.imgBox.length > 0) &&
@@ -572,13 +616,34 @@
             </div>
           </div>
 
+          <div
+            class="jdTopBox"
+            v-if="
+              anliBox[0].process.stageBox[0].staTitle != '' &&
+              anliBox[0].process.stageBox[0].actBox[0].actName != ''
+            "
+            id="third"
+          >
+            <div class="jdTopNav" style="font-size: 18px">
+              <div class="jdLeftNav">
+                <div class="jdImg">
+                  <img
+                    src="../../../../assets/icon/anliDetail/jdTitle.png"
+                    alt=""
+                  />
+                </div>
+                <div class="jdLeftTitle">
+                  <div>项目安排</div>
+                </div>
+              </div>
+            </div>
+          </div>
           <div
             v-for="(jd, jdIndex) in anliBox[0].process.stageBox"
             :key="jdIndex"
-            style="margin-top: 30px"
-            id="third"
+            style="margin-top: 20px"
           >
-            <div class="jdTopBox">
+            <div class="jdTopBox" v-if="jd.staTitle != ''">
               <div class="jdTopNav" style="font-size: 18px">
                 <div class="jdLeftNav">
                   <div class="jdImg">
@@ -602,7 +667,11 @@
               :key="hdIndex"
               style="margin-top: 20px"
             >
-              <div class="jdTopBox" style="padding: 10px">
+              <div
+                class="jdTopBox"
+                style="padding: 10px"
+                v-if="hd.actName != ''"
+              >
                 <div class="jdTopNav">
                   <div class="jdLeftNav">
                     <div class="jdImg">
@@ -1071,7 +1140,14 @@
             </div>
           </div>
 
-          <div class="jdTopBox" id="fouth">
+          <div
+            class="jdTopBox"
+            id="fouth"
+            v-if="
+              anliBox[0].process.stageBox[0].brief != '' &&
+              anliBox[0].process.stageBox[0].data.length > 0
+            "
+          >
             <div class="jdTopNav" style="font-size: 18px">
               <div class="jdLeftNav">
                 <div class="jdImg">
@@ -1178,7 +1254,15 @@
             </div>
           </div>
 
-          <div class="jdTopBox" id="fivth">
+          <div
+            class="jdTopBox"
+            id="fivth"
+            v-if="
+              (anliBox[0].proexc.brief != '' ||
+                anliBox[0].proexc.imgBox.length > 0) &&
+              anliBox[0].proexc.data.length
+            "
+          >
             <div class="jdTopNav" style="font-size: 18px">
               <div class="jdLeftNav">
                 <div class="jdImg">
@@ -1299,7 +1383,15 @@
             </div>
           </div>
 
-          <div class="jdTopBox" id="sixth">
+          <div
+            class="jdTopBox"
+            id="sixth"
+            v-if="
+              (anliBox[0].results.brief != '' ||
+                anliBox[0].results.imgBox.length > 0) &&
+              anliBox[0].results.data.length
+            "
+          >
             <div class="jdTopNav" style="font-size: 18px">
               <div class="jdLeftNav">
                 <div class="jdImg">
@@ -1423,6 +1515,7 @@
           </div>
         </div>
       </div>
+
       <!-- <div class="fixBottom">
         <div class="returnAnLi" style="width: 100px" @click="goToX()">
           前往评分
@@ -1795,7 +1888,12 @@ export default {
     jump(t) {
       var a = document.getElementById(t);
       var b = this.$refs["cenBox"];
-      b.scrollTop = a.offsetTop;
+      if(this.isNavTop >= 300){
+        b.scrollTop = a.offsetTop - 50;
+      }else{
+        b.scrollTop = a.offsetTop + 50;
+      }
+      
     },
     allScrollTop(ev) {
       console.log(ev.target.scrollTop);
@@ -1946,7 +2044,7 @@ body {
   position: fixed;
   left: 50%;
   transform: translateX(-50%);
-  top: 7%;
+  top: 5%;
   box-shadow: 2px 2px 11px 1px #bdbdbd;
   width: 100%;
   z-index: 999;
@@ -2368,4 +2466,13 @@ body {
 .Autor {
   margin: 0 5px;
 }
+.isNoMessage {
+  width: 20%;
+  margin: 5% auto 0;
+}
+
+.isNoMessage > img {
+  width: 100%;
+  height: 100%;
+}
 </style>