zengyicheng 2 rokov pred
rodič
commit
b7fb69b33e

+ 18 - 5
src/components/pages/race/addRace/projectActpro.vue

@@ -15,12 +15,15 @@
             <div class="stepRightNav" @click="jump('jd' + staIndex + 1)">
               <div>阶段{{ staIndex + 1 }}</div>
               <div
+                class="isFinishCss"
                 v-if="
-                  sta.brief != '' && sta.data.length > 0
+                  sta.brief != ''
                 "
-                class="isFinish"
               >
-                <img src="../../../../assets/icon/race/finish.png" alt="" />
+                <div class="isFinish">
+                  <img src="../../../../assets/icon/race/finish.png" alt="" />
+                </div>
+                <div>已填写</div>
               </div>
             </div>
           </div>
@@ -693,9 +696,19 @@ export default {
   width: 80px;
   padding: 20px 0 20px 30px;
 }
+.isFinishCss {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: flex-end;
+}
+.isFinishCss > div:nth-child(2) {
+  margin-left: 5px;
+  color: #939393;
+}
 .isFinish {
-  width: 30px;
-  height: 30px;
+  width: 16px;
+  height: 16px;
   margin-top: 5px;
 }
 .isFinish > img {

+ 18 - 5
src/components/pages/race/addRace/projectEffect.vue

@@ -11,12 +11,15 @@
             <div class="stepRightNav">
               <div>项目成效与反思</div>
               <div
+                class="isFinishCss"
                 v-if="
-                  raceEff.brief != '' && raceEff.data.length > 0
+                  raceEff.brief != ''
                 "
-                class="isFinish"
               >
-                <img src="../../../../assets/icon/race/finish.png" alt="" />
+                <div class="isFinish">
+                  <img src="../../../../assets/icon/race/finish.png" alt="" />
+                </div>
+                <div>已填写</div>
               </div>
             </div>
           </div>
@@ -729,9 +732,19 @@ export default {
   width: 90%;
   margin-top: 25px;
 }
+.isFinishCss {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: flex-end;
+}
+.isFinishCss > div:nth-child(2) {
+  margin-left: 5px;
+  color: #939393;
+}
 .isFinish {
-  width: 30px;
-  height: 30px;
+  width: 16px;
+  height: 16px;
   margin-top: 5px;
 }
 .isFinish > img {

+ 18 - 5
src/components/pages/race/addRace/projectExceva.vue

@@ -11,12 +11,15 @@
             <div class="stepRightNav">
               <div>项目成果交流与评价</div>
               <div
+                class="isFinishCss"
                 v-if="
-                  raceExc.brief != '' && raceExc.data.length > 0
+                  raceExc.brief != ''
                 "
-                class="isFinish"
               >
-                <img src="../../../../assets/icon/race/finish.png" alt="" />
+                <div class="isFinish">
+                  <img src="../../../../assets/icon/race/finish.png" alt="" />
+                </div>
+                <div>已填写</div>
               </div>
             </div>
           </div>
@@ -729,9 +732,19 @@ export default {
   width: 90%;
   margin-top: 25px;
 }
+.isFinishCss {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: flex-end;
+}
+.isFinishCss > div:nth-child(2) {
+  margin-left: 5px;
+  color: #939393;
+}
 .isFinish {
-  width: 30px;
-  height: 30px;
+  width: 16px;
+  height: 16px;
   margin-top: 5px;
 }
 .isFinish > img {

+ 17 - 4
src/components/pages/race/addRace/projectProcess.vue

@@ -15,12 +15,15 @@
             <div class="stepRightNav" @click="jump('jd' + staIndex + 1)">
               <div>阶段{{ staIndex + 1 }}</div>
               <div
+                class="isFinishCss"
                 v-if="
                   sta.staTitle != ''
                 "
-                class="isFinish"
               >
-                <img src="../../../../assets/icon/race/finish.png" alt="" />
+                <div class="isFinish">
+                  <img src="../../../../assets/icon/race/finish.png" alt="" />
+                </div>
+                <div>已填写</div>
               </div>
             </div>
           </div>
@@ -1497,9 +1500,19 @@ export default {
   align-items: center;
   margin-left: 10px;
 }
+.isFinishCss {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: flex-end;
+}
+.isFinishCss > div:nth-child(2) {
+  margin-left: 5px;
+  color: #939393;
+}
 .isFinish {
-  width: 30px;
-  height: 30px;
+  width: 16px;
+  height: 16px;
   margin-top: 5px;
 }
 .isFinish > img {

+ 37 - 27
src/components/pages/race/addRace/raceDetail.vue

@@ -11,11 +11,11 @@
             <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 class="isFinishCss" v-if="raceDetail.title != '' && raceDetail.type.length > 0">
+                <div class="isFinish">
+                  <img src="../../../../assets/icon/race/finish.png" alt="" />
+                </div>
+                <div>已填写</div>
               </div>
             </div>
           </div>
@@ -26,11 +26,11 @@
             <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 class="isFinishCss" v-if="raceDetail.cover.length > 0">
+                <div class="isFinish">
+                  <img src="../../../../assets/icon/race/finish.png" alt="" />
+                </div>
+                <div>已填写</div>
               </div>
             </div>
           </div>
@@ -41,11 +41,11 @@
             <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 class="isFinishCss" v-if="raceDetail.tableData.length > 0">
+                <div class="isFinish">
+                  <img src="../../../../assets/icon/race/finish.png" alt="" />
+                </div>
+                <div>已填写</div>
               </div>
             </div>
           </div>
@@ -56,11 +56,11 @@
             <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 class="isFinishCss" v-if="raceDetail.courseText != ''">
+                <div class="isFinish">
+                  <img src="../../../../assets/icon/race/finish.png" alt="" />
+                </div>
+                <div>已填写</div>
               </div>
             </div>
           </div>
@@ -71,11 +71,11 @@
             <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 class="isFinishCss" v-if="raceDetail.data.length > 0">
+                <div class="isFinish">
+                  <img src="../../../../assets/icon/race/finish.png" alt="" />
+                </div>
+                <div>已填写</div>
               </div>
             </div>
           </div>
@@ -1898,9 +1898,19 @@ export default {
   margin-left: 3px;
   border-radius: 3px;
 }
+.isFinishCss {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: flex-end;
+}
+.isFinishCss > div:nth-child(2) {
+  margin-left: 5px;
+  color: #939393;
+}
 .isFinish {
-  width: 30px;
-  height: 30px;
+  width: 16px;
+  height: 16px;
   margin-top: 5px;
 }
 .isFinish > img {

+ 30 - 14
src/components/pages/race/addRace/raceOverview.vue

@@ -21,13 +21,15 @@
               <div>驱动问题</div>
               <div>说明</div>
               <div
+                class="isFinishCss"
                 v-if="
-                  raceOver.driQuestion.brief != '' &&
-                  raceOver.driQuestion.data.length > 0
+                  raceOver.driQuestion.brief != ''
                 "
-                class="isFinish"
               >
-                <img src="../../../../assets/icon/race/finish.png" alt="" />
+                <div class="isFinish">
+                  <img src="../../../../assets/icon/race/finish.png" alt="" />
+                </div>
+                <div>已填写</div>
               </div>
             </div>
           </div>
@@ -39,13 +41,15 @@
               <div>学习目标</div>
               <div>说明</div>
               <div
+                class="isFinishCss"
                 v-if="
-                  raceOver.tarDesign.brief != '' &&
-                  raceOver.tarDesign.data.length > 0
+                  raceOver.tarDesign.brief != ''
                 "
-                class="isFinish"
               >
-                <img src="../../../../assets/icon/race/finish.png" alt="" />
+                <div class="isFinish">
+                  <img src="../../../../assets/icon/race/finish.png" alt="" />
+                </div>
+                <div>已填写</div>
               </div>
             </div>
           </div>
@@ -57,13 +61,15 @@
               <div>评价设计</div>
               <div>说明</div>
               <div
+                class="isFinishCss"
                 v-if="
-                  raceOver.actiDesign.brief != '' &&
-                  raceOver.actiDesign.data.length > 0
+                  raceOver.actiDesign.brief != ''
                 "
-                class="isFinish"
               >
-                <img src="../../../../assets/icon/race/finish.png" alt="" />
+                <div class="isFinish">
+                  <img src="../../../../assets/icon/race/finish.png" alt="" />
+                </div>
+                <div>已填写</div>
               </div>
             </div>
           </div>
@@ -1352,9 +1358,19 @@ export default {
   width: 87%;
   color: #a19f9f;
 }
+.isFinishCss {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: flex-end;
+}
+.isFinishCss > div:nth-child(2) {
+  margin-left: 5px;
+  color: #939393;
+}
 .isFinish {
-  width: 30px;
-  height: 30px;
+  width: 16px;
+  height: 16px;
   margin-top: 5px;
 }
 .isFinish > img {

+ 27 - 2
src/components/pages/race/eventCenter/anliDetail.vue

@@ -122,7 +122,7 @@
       </div>
       <div class="messageBox" v-else :class="{ isMessageBox: isNavTop >= 300 }">
         <div
-          class="proOverCss"
+          class="jdTopBox"
           id="first"
           v-if="
             anliBox[0].info.courseText != '' ||
@@ -132,6 +132,31 @@
               anliBox[0].info.data &&
               anliBox[0].info.data.length)
           "
+        >
+          <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].info.courseText != '' ||
+            anliBox[0].info.imgBox.length > 0 ||
+            (anliBox &&
+              anliBox[0].info &&
+              anliBox[0].info.data &&
+              anliBox[0].info.data.length)
+          "
         >
           <div class="whiteBg whiteLeft">
             <div class="navBgTop">
@@ -2087,7 +2112,7 @@ body {
 }
 .messageBox {
   width: 80%;
-  margin: 0 auto;
+  margin: 1% auto;
 }
 .whiteBg {
   width: 100%;