Home Explore Help
Sign In
jack
/
EvenManage
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of https://git.cocorobo.cn/jack/EvenManage

lsc 2 years ago
parent
0a47859dec d1c0a2baa2
commit
866e272ebb
16 changed files with 440 additions and 33 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.b3216e4fa16e9602bf0e164ce228aad4.css
  3. 0 0
      dist/static/css/app.b3216e4fa16e9602bf0e164ce228aad4.css.map
  4. 0 0
      dist/static/css/app.e437be8bfcda366f4b75007c8765dc8c.css.map
  5. 0 0
      dist/static/js/app.1facf559dc09a82cd916.js
  6. 0 0
      dist/static/js/app.1facf559dc09a82cd916.js.map
  7. 0 0
      dist/static/js/app.dcd6eb29b7d274057fd2.js
  8. 0 0
      dist/static/js/app.dcd6eb29b7d274057fd2.js.map
  9. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  10. 18 7
      src/components/pages/munAdmin/anliList.vue
  11. 89 1
      src/components/pages/race/addRace/projectActpro.vue
  12. 72 1
      src/components/pages/race/addRace/projectEffect.vue
  13. 72 1
      src/components/pages/race/addRace/projectExceva.vue
  14. 135 6
      src/components/pages/race/addRace/projectProcess.vue
  15. 47 15
      src/components/pages/race/addRace/raceOverview.vue
  16. 6 1
      src/components/pages/race/eventCenter/myAnli.vue

+ 1 - 1
dist/index.html
View File 

@@ -25,4 +25,4 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.e437be8bfcda366f4b75007c8765dc8c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1ad0555965871ff5ead4.js></script><script type=text/javascript src=./static/js/app.1facf559dc09a82cd916.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>
 
+    }</style><link href=./static/css/app.b3216e4fa16e9602bf0e164ce228aad4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1ad0555965871ff5ead4.js></script><script type=text/javascript src=./static/js/app.dcd6eb29b7d274057fd2.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.b3216e4fa16e9602bf0e164ce228aad4.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.b3216e4fa16e9602bf0e164ce228aad4.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.e437be8bfcda366f4b75007c8765dc8c.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.1facf559dc09a82cd916.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.1facf559dc09a82cd916.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.dcd6eb29b7d274057fd2.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.dcd6eb29b7d274057fd2.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 18 - 7
src/components/pages/munAdmin/anliList.vue
View File 

@@ -55,7 +55,12 @@
 
     </div>
 
     <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.length > 0 ? a.info.cover[0].url : noBanner " 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 != "" ? a.info.title : "暂无" }}</div>
 
@@ -63,9 +68,7 @@
 
           </div>
 
           <div class="anliButton">
 
             <div>
 
-              <el-button @click="lookDetail(a.id)"
 
-                >查看</el-button
 
-              >
 
+              <el-button @click="lookDetail(a.id)">查看</el-button>
 
             </div>
 
             <div>
 
               <el-button @click="openScore(a, 1)">评分</el-button>
 
@@ -260,7 +263,10 @@
 
         </div>
 
         <div class="reScore">
 
           <div>当前得分</div>
 
-          <div><span>{{ r.sumScore }}</span>分</div>
 
+          <div>
 
+            <span>{{ r.sumScore }}</span
 
+            >分
 
+          </div>
 
         </div>
 
         <div class="reBottom">
 
           <div>提示:点击确定提交，即可推送到省级进行评奖</div>
 
@@ -641,7 +647,7 @@ export default {
 
         });
 
     },
 
     addRecommend() {
 
-      if(this.scoreDetail[0].sumScore == 0){
 
+      if (this.scoreDetail[0].sumScore == 0) {
 
         this.$message.error("还未评审，不可推荐");
 
         return;
 
       }
 
@@ -663,7 +669,12 @@ export default {
 
         });
 
     },
 
     lookDetail(aid) {
 
-      window.open(window.origin + "/#/anliDetail?aid=" + aid);
 
+      window.open(
 
+        window.location.origin +
 
+          window.location.pathname +
 
+          "/#/anliDetail?aid=" +
 
+          aid
 
+      );
 
     },
 
   },
 
   created() {

+ 89 - 1
src/components/pages/race/addRace/projectActpro.vue
View File 

@@ -32,11 +32,17 @@
 
             <div class="right_title">阶段{{ saIndex + 1 }}</div>
 
             <div class="saBox">
 
               <div class="saLittleBox">
 
-                <div>
 
+                <div style="position: relative">
 
                   <editor-bar
 
                     v-model="sa.brief"
 
                     @change="upRaceAct"
 
                   ></editor-bar>
 
+                  <div
 
+                    class="fullCss"
 
+                    @click="fullTools(sa.brief, 1, '', saIndex)"
 
+                  >
 
+                    全屏编辑
 
+                  </div>
 
                 </div>
 
                 <div>
 
                   <div class="basic_box">
 
@@ -137,6 +143,20 @@
 
         </div>
 
       </div>
 
     </div>
 
+    <el-dialog
 
+      title="编辑富文本"
 
+      :visible.sync="full"
 
+      :append-to-body="true"
 
+      width="100%"
 
+      :before-close="handleClose"
 
+      class="dialog_diy fullEditor"
 
+    >
 
+      <editor-bar v-model="fullBrief" :placeholder="plaText"></editor-bar>
 
+      <span slot="footer" class="dialog-footer">
 
+        <el-button @click="full = false">取 消</el-button>
 
+        <el-button type="primary" @click="addFullText">确定</el-button>
 
+      </span>
 
+    </el-dialog>
 
   </div>
 
 </template>
 
 
@@ -167,6 +187,11 @@ export default {
 
           },
 
         ],
 
       },
 
+      fullBrief: "",
 
+      plaText: "",
 
+      isBrief: 0,
 
+      full: false,
 
+      jdIndex: 0,
 
       stage: 0,
 
     };
 
   },
 
@@ -174,6 +199,9 @@ export default {
 
     upRaceAct() {
 
       this.$emit("upRaceAct", this.raceAct);
 
     },
 
+    handleClose(done) {
 
+      done();
 
+    },
 
     addImg(e) {
 
       var el = e.currentTarget;
 
       el.getElementsByTagName("input")[0].click();
 
@@ -328,6 +356,30 @@ export default {
 
           });
 
       }
 
     },
 
+    fullTools(b, t, text,i) {
 
+      this.fullBrief = b;
 
+      this.isBrief = t;
 
+      this.plaText = text;
 
+      this.jdIndex = i;
 
+      this.full = !this.full;
 
+    },
 
+    addFullText() {
 
+      if (this.isBrief == 1) {
 
+        this.raceAct.stageBox[this.jdIndex].brief = this.fullBrief;
 
+      } else if (this.isBrief == 2) {
 
+        this.raceAct.stageBox[this.jdIndex].brief = this.fullBrief;
 
+      } else if (this.isBrief == 3) {
 
+        this.raceAct.stageBox[this.jdIndex].brief = this.fullBrief;
 
+      } else if (this.isBrief == 4) {
 
+        this.raceAct.stageBox[this.jdIndex].brief = this.fullBrief;
 
+      }
 
+      this.isBrief = 0;
 
+      this.fullBrief = "";
 
+      this.plaText = "";
 
+      this.jdIndex = 0;
 
+      this.full = !this.full;
 
+      this.upRaceAct();
 
+    },
 
   },
 
   created() {
 
     this.raceAct = this.raceProcess;
 
@@ -346,6 +398,19 @@ export default {
 
   .upTips {
 
     align-items: flex-start !important;
 
   }
 
+  .fullCss {
 
+    right: 1% !important;
 
+  }
 
+  .fullEditor >>> .el-dialog__footer {
 
+    padding: 4% 20px 20px !important;
 
+  }
 
+}
 
+.dialog_diy >>> .el-dialog__header {
 
+  background: #3c3c3c !important;
 
+  padding: 15px 20px;
 
+}
 
+.dialog_diy >>> .el-dialog__title {
 
+  color: #fff;
 
 }
 
 .pb_content {
 
   width: 100%;
 
@@ -733,4 +798,27 @@ export default {
 
   color: #999;
 
   font-size: 14px;
 
 }
 
+.fullCss {
 
+  font-size: 12px;
 
+  position: absolute;
 
+  right: 4%;
 
+  top: 12px;
 
+  cursor: pointer;
 
+}
 
+.fullEditor >>> .text {
 
+  height: 100% !important;
 
+}
 
+.fullEditor >>> .el-dialog {
 
+  margin: 0 !important;
 
+  height: 100%;
 
+}
 
+.fullEditor >>> .el-dialog__body {
 
+  height: 70%;
 
+}
 
+.fullEditor >>> .editor {
 
+  height: 100%;
 
+}
 
+.fullEditor >>> .el-dialog__footer {
 
+  padding: 2% 20px 20px !important;
 
+}
 
 </style>

+ 72 - 1
src/components/pages/race/addRace/projectEffect.vue
View File 

@@ -24,11 +24,14 @@
 
             <div class="right_title">项目成效与反思</div>
 
             <div class="saBox">
 
               <div class="saLittleBox">
 
-                <div>
 
+                <div style="position: relative">
 
                   <editor-bar
 
                     v-model="raceEff.brief"
 
                     @change="upproEff"
 
                   ></editor-bar>
 
+                  <div class="fullCss" @click="fullTools(raceEff.brief)">
 
+                    全屏编辑
 
+                  </div>
 
                 </div>
 
                 <div>
 
                   <div class="basic_box">
 
@@ -129,6 +132,20 @@
 
         </div>
 
       </div>
 
     </div>
 
+    <el-dialog
 
+      title="编辑富文本"
 
+      :visible.sync="full"
 
+      :append-to-body="true"
 
+      width="100%"
 
+      :before-close="handleClose"
 
+      class="dialog_diy fullEditor"
 
+    >
 
+      <editor-bar v-model="fullBrief" :placeholder="plaText"></editor-bar>
 
+      <span slot="footer" class="dialog-footer">
 
+        <el-button @click="full = false">取 消</el-button>
 
+        <el-button type="primary" @click="addFullText">确定</el-button>
 
+      </span>
 
+    </el-dialog>
 
   </div>
 
 </template>
 
 
@@ -143,12 +160,18 @@ export default {
 
         brief: "",
 
         data: [],
 
       },
 
+      fullBrief: "",
 
+      plaText: "",
 
+      full: false,
 
     };
 
   },
 
   methods: {
 
     change(val) {
 
       console.log(val);
 
     },
 
+    handleClose(done) {
 
+      done();
 
+    },
 
     upproEff() {
 
       this.$emit("upproEff", this.raceEff);
 
     },
 
@@ -301,6 +324,18 @@ export default {
 
           });
 
       }
 
     },
 
+    fullTools(b) {
 
+      this.fullBrief = b;
 
+      this.plaText = "";
 
+      this.full = !this.full;
 
+    },
 
+    addFullText() {
 
+      this.raceEff.brief = this.fullBrief;
 
+      this.fullBrief = "";
 
+      this.plaText = "";
 
+      this.full = !this.full;
 
+      this.upproEff();
 
+    },
 
   },
 
   created() {
 
     this.raceEff = this.raceEffect;
 
@@ -316,6 +351,19 @@ export default {
 
   .upTips {
 
     align-items: flex-start !important;
 
   }
 
+  .fullCss {
 
+    right: 1% !important;
 
+  }
 
+  .fullEditor >>> .el-dialog__footer {
 
+    padding: 4% 20px 20px !important;
 
+  }
 
+}
 
+.dialog_diy >>> .el-dialog__header {
 
+  background: #3c3c3c !important;
 
+  padding: 15px 20px;
 
+}
 
+.dialog_diy >>> .el-dialog__title {
 
+  color: #fff;
 
 }
 
 .pb_content {
 
   width: 100%;
 
@@ -765,4 +813,27 @@ export default {
 
   color: #999;
 
   font-size: 14px;
 
 }
 
+.fullCss {
 
+  font-size: 12px;
 
+  position: absolute;
 
+  right: 4%;
 
+  top: 12px;
 
+  cursor: pointer;
 
+}
 
+.fullEditor >>> .text {
 
+  height: 100% !important;
 
+}
 
+.fullEditor >>> .el-dialog {
 
+  margin: 0 !important;
 
+  height: 100%;
 
+}
 
+.fullEditor >>> .el-dialog__body {
 
+  height: 70%;
 
+}
 
+.fullEditor >>> .editor {
 
+  height: 100%;
 
+}
 
+.fullEditor >>> .el-dialog__footer {
 
+  padding: 2% 20px 20px !important;
 
+}
 
 </style>

+ 72 - 1
src/components/pages/race/addRace/projectExceva.vue
View File 

@@ -24,11 +24,14 @@
 
             <div class="right_title">项目成果交流与评价</div>
 
             <div class="saBox">
 
               <div class="saLittleBox">
 
-                <div>
 
+                <div style="position: relative">
 
                   <editor-bar
 
                     v-model="raceExc.brief"
 
                     @change="upExc"
 
                   ></editor-bar>
 
+                  <div class="fullCss" @click="fullTools(raceExc.brief)">
 
+                    全屏编辑
 
+                  </div>
 
                 </div>
 
                 <div>
 
                   <div class="basic_box">
 
@@ -129,6 +132,20 @@
 
         </div>
 
       </div>
 
     </div>
 
+    <el-dialog
 
+      title="编辑富文本"
 
+      :visible.sync="full"
 
+      :append-to-body="true"
 
+      width="100%"
 
+      :before-close="handleClose"
 
+      class="dialog_diy fullEditor"
 
+    >
 
+      <editor-bar v-model="fullBrief" :placeholder="plaText"></editor-bar>
 
+      <span slot="footer" class="dialog-footer">
 
+        <el-button @click="full = false">取 消</el-button>
 
+        <el-button type="primary" @click="addFullText">确定</el-button>
 
+      </span>
 
+    </el-dialog>
 
   </div>
 
 </template>
 
 
@@ -143,12 +160,18 @@ export default {
 
         brief: "",
 
         data: [],
 
       },
 
+      fullBrief: "",
 
+      plaText: "",
 
+      full: false,
 
     };
 
   },
 
   methods: {
 
     change(val) {
 
       console.log(val);
 
     },
 
+    handleClose(done) {
 
+      done();
 
+    },
 
     upExc() {
 
       this.$emit("upExc", this.raceExc);
 
     },
 
@@ -301,6 +324,18 @@ export default {
 
           });
 
       }
 
     },
 
+    fullTools(b) {
 
+      this.fullBrief = b;
 
+      this.plaText = "";
 
+      this.full = !this.full;
 
+    },
 
+    addFullText() {
 
+      this.raceExc.brief = this.fullBrief;
 
+      this.fullBrief = "";
 
+      this.plaText = "";
 
+      this.full = !this.full;
 
+      this.upExc();
 
+    },
 
   },
 
   created() {
 
     this.raceExc = this.raceExceva;
 
@@ -316,6 +351,19 @@ export default {
 
   .upTips {
 
     align-items: flex-start !important;
 
   }
 
+  .fullCss {
 
+    right: 1% !important;
 
+  }
 
+  .fullEditor >>> .el-dialog__footer {
 
+    padding: 4% 20px 20px !important;
 
+  }
 
+}
 
+.dialog_diy >>> .el-dialog__header {
 
+  background: #3c3c3c !important;
 
+  padding: 15px 20px;
 
+}
 
+.dialog_diy >>> .el-dialog__title {
 
+  color: #fff;
 
 }
 
 .pb_content {
 
   width: 100%;
 
@@ -765,4 +813,27 @@ export default {
 
   color: #999;
 
   font-size: 14px;
 
 }
 
+.fullCss {
 
+  font-size: 12px;
 
+  position: absolute;
 
+  right: 4%;
 
+  top: 12px;
 
+  cursor: pointer;
 
+}
 
+.fullEditor >>> .text {
 
+  height: 100% !important;
 
+}
 
+.fullEditor >>> .el-dialog {
 
+  margin: 0 !important;
 
+  height: 100%;
 
+}
 
+.fullEditor >>> .el-dialog__body {
 
+  height: 70%;
 
+}
 
+.fullEditor >>> .editor {
 
+  height: 100%;
 
+}
 
+.fullEditor >>> .el-dialog__footer {
 
+  padding: 2% 20px 20px !important;
 
+}
 
 </style>

+ 135 - 6
src/components/pages/race/addRace/projectProcess.vue
View File 

@@ -14,12 +14,7 @@
 
             </div>
 
             <div class="stepRightNav" @click="jump('jd' + staIndex + 1)">
 
               <div>阶段{{ staIndex + 1 }}</div>
 
-              <div
 
-                class="isFinishCss"
 
-                v-if="
 
-                  sta.staTitle != ''
 
-                "
 
-              >
 
+              <div class="isFinishCss" v-if="sta.staTitle != ''">
 
                 <div class="isFinish">
 
                   <img src="../../../../assets/icon/race/finish.png" alt="" />
 
                 </div>
 
@@ -97,6 +92,18 @@
 
                     v-model="race.driQuestion.brief"
 
                     @change="upRacePro"
 
                   ></editor-bar>
 
+                  <div
 
+                    class="fullCss"
 
+                    @click="
 
+                      fullTools(
 
+                        race.driQuestion.brief,
 
+                        1,
 
+                        '',saIndex,raIndex
 
+                      )
 
+                    "
 
+                  >
 
+                    全屏编辑
 
+                  </div>
 
                 </div>
 
                 <!-- <div>
 
                   <div class="basic_box">
 
@@ -217,6 +224,18 @@
 
                     v-model="race.tarDesign.brief"
 
                     @change="upRacePro"
 
                   ></editor-bar>
 
+                  <div
 
+                    class="fullCss"
 
+                    @click="
 
+                      fullTools(
 
+                        race.tarDesign.brief,
 
+                        2,
 
+                        '',saIndex,raIndex
 
+                      )
 
+                    "
 
+                  >
 
+                    全屏编辑
 
+                  </div>
 
                 </div>
 
                 <!-- <div>
 
                   <div class="basic_box">
 
@@ -336,6 +355,18 @@
 
                     v-model="race.actiDesign.brief"
 
                     @change="upRacePro"
 
                   ></editor-bar>
 
+                  <div
 
+                    class="fullCss"
 
+                    @click="
 
+                      fullTools(
 
+                        race.actiDesign.brief,
 
+                        3,
 
+                        '',saIndex,raIndex
 
+                      )
 
+                    "
 
+                  >
 
+                    全屏编辑
 
+                  </div>
 
                 </div>
 
                 <!-- <div>
 
                   <div class="basic_box">
 
@@ -456,6 +487,18 @@
 
                     v-model="race.evaDesign.brief"
 
                     @change="upRacePro"
 
                   ></editor-bar>
 
+                  <div
 
+                    class="fullCss"
 
+                    @click="
 
+                      fullTools(
 
+                        race.evaDesign.brief,
 
+                        4,
 
+                        '',saIndex,raIndex
 
+                      )
 
+                    "
 
+                  >
 
+                    全屏编辑
 
+                  </div>
 
                 </div>
 
                 <!-- <div>
 
                   <div class="basic_box">
 
@@ -590,6 +633,20 @@
 
         </div>
 
       </div>
 
     </div>
 
+    <el-dialog
 
+      title="编辑富文本"
 
+      :visible.sync="full"
 
+      :append-to-body="true"
 
+      width="100%"
 
+      :before-close="handleClose"
 
+      class="dialog_diy fullEditor"
 
+    >
 
+      <editor-bar v-model="fullBrief" :placeholder="plaText"></editor-bar>
 
+      <span slot="footer" class="dialog-footer">
 
+        <el-button @click="full = false">取 消</el-button>
 
+        <el-button type="primary" @click="addFullText">确定</el-button>
 
+      </span>
 
+    </el-dialog>
 
   </div>
 
 </template>
 
 
@@ -620,12 +677,21 @@ export default {
 
           },
 
         ],
 
       },
 
+      fullBrief: "",
 
+      plaText: "",
 
+      isBrief: 0,
 
+      full:false,
 
+      jdIndex:0,
 
+      rwIndex:0,
 
     };
 
   },
 
   methods: {
 
     change(val) {
 
       console.log(val);
 
     },
 
+    handleClose(done) {
 
+      done();
 
+    },
 
     addImg(e) {
 
       var el = e.currentTarget;
 
       el.getElementsByTagName("input")[0].click();
 
@@ -984,6 +1050,32 @@ export default {
 
           });
 
       }
 
     },
 
+    fullTools(b, t, text,i,j) {
 
+      this.fullBrief = b;
 
+      this.isBrief = t;
 
+      this.plaText = text;
 
+      this.jdIndex = i;
 
+      this.rwIndex = j;
 
+      this.full = !this.full;
 
+    },
 
+    addFullText() {
 
+      if (this.isBrief == 1) {
 
+        this.racePro.stageBox[this.jdIndex].actBox[this.rwIndex].driQuestion.brief = this.fullBrief;
 
+      } else if (this.isBrief == 2) {
 
+        this.racePro.stageBox[this.jdIndex].actBox[this.rwIndex].tarDesign.brief = this.fullBrief;
 
+      } else if (this.isBrief == 3) {
 
+        this.racePro.stageBox[this.jdIndex].actBox[this.rwIndex].actiDesign.brief = this.fullBrief;
 
+      } else if (this.isBrief == 4) {
 
+        this.racePro.stageBox[this.jdIndex].actBox[this.rwIndex].evaDesign.brief = this.fullBrief;
 
+      }
 
+      this.isBrief = 0;
 
+      this.fullBrief = "";
 
+      this.plaText = "";
 
+      this.jdIndex = 0;
 
+      this.rwIndex = 0;
 
+      this.full = !this.full;
 
+      this.upRacePro();
 
+    },
 
   },
 
   created() {
 
     this.racePro = this.raceProcess;
 
@@ -1005,6 +1097,19 @@ export default {
 
   .rwInput {
 
     width: 45% !important;
 
   }
 
+  .fullCss {
 
+    right: 1% !important;
 
+  }
 
+  .fullEditor >>> .el-dialog__footer {
 
+    padding: 4% 20px 20px !important;
 
+  }
 
+}
 
+.dialog_diy >>> .el-dialog__header {
 
+  background: #3c3c3c !important;
 
+  padding: 15px 20px;
 
+}
 
+.dialog_diy >>> .el-dialog__title {
 
+  color: #fff;
 
 }
 
 .pb_content {
 
   width: 100%;
 
@@ -1120,6 +1225,7 @@ export default {
 
 
 .editorCss {
 
   width: 90% !important;
 
+  position: relative;
 
 }
 
 
 .basic_box {
 
@@ -1519,4 +1625,27 @@ export default {
 
   width: 100%;
 
   height: 100%;
 
 }
 
+.fullCss {
 
+  font-size: 12px;
 
+  position: absolute;
 
+  right: 4%;
 
+  top: 12px;
 
+  cursor: pointer;
 
+}
 
+.fullEditor >>> .text {
 
+  height: 100% !important;
 
+}
 
+.fullEditor >>> .el-dialog {
 
+  margin: 0 !important;
 
+  height: 100%;
 
+}
 
+.fullEditor >>> .el-dialog__body {
 
+  height: 70%;
 
+}
 
+.fullEditor >>> .editor {
 
+  height: 100%;
 
+}
 
+.fullEditor >>> .el-dialog__footer {
 
+  padding: 2% 20px 20px !important;
 
+}
 
 </style>

+ 47 - 15
src/components/pages/race/addRace/raceOverview.vue
View File 

@@ -89,8 +89,18 @@
 
                   @change="upRaceOver"
 
                   :placeholder="'可包括阶段性问题和学科问题：阶段性问题是指在核心问题解决的不同阶段，通过提出驱动性问题，明确阶段子任务。学科问题是指从不同学科的角度以及分解和提出要研究解决的主要问题。'"
 
                 ></editor-bar>
 
-                <!-- <div class="fullCss">
 
-                  <img
 
+                <div
 
+                  class="fullCss"
 
+                  @click="
 
+                    fullTools(
 
+                      raceOver.driQuestion.brief,
 
+                      1,
 
+                      '可包括阶段性问题和学科问题：阶段性问题是指在核心问题解决的不同阶段，通过提出驱动性问题，明确阶段子任务。学科问题是指从不同学科的角度以及分解和提出要研究解决的主要问题。'
 
+                    )
 
+                  "
 
+                >
 
+                  全屏编辑
 
+                  <!-- <img
 
                     src="../../../../assets/full.png"
 
                     class="full"
 
                     @click="
 
@@ -100,8 +110,8 @@
 
                         '可包括阶段性问题和学科问题：阶段性问题是指在核心问题解决的不同阶段，通过提出驱动性问题，明确阶段子任务。学科问题是指从不同学科的角度以及分解和提出要研究解决的主要问题。'
 
                       )
 
                     "
 
-                  />
 
-                </div> -->
 
+                  /> -->
 
+                </div>
 
               </div>
 
               <div>
 
                 <div class="basic_box">
 
@@ -222,8 +232,18 @@
 
                   @change="upRaceOver"
 
                   :placeholder="'学习目标提倡用核心素养来分类概括再描述，具体表述时应行为化、具体化、操作化，可以用“通过什么，达到什么，培养什么”的句式来进行表述'"
 
                 ></editor-bar>
 
-                <!-- <div class="fullCss">
 
-                  <img
 
+                <div
 
+                  class="fullCss"
 
+                  @click="
 
+                    fullTools(
 
+                      raceOver.tarDesign.brief,
 
+                      2,
 
+                      '学习目标提倡用核心素养来分类概括再描述，具体表述时应行为化、具体化、操作化，可以用“通过什么，达到什么，培养什么”的句式来进行表述'
 
+                    )
 
+                  "
 
+                >
 
+                  全屏编辑
 
+                  <!-- <img
 
                     src="../../../../assets/full.png"
 
                     class="full"
 
                     @click="
 
@@ -233,8 +253,8 @@
 
                         '学习目标提倡用核心素养来分类概括再描述，具体表述时应行为化、具体化、操作化，可以用“通过什么，达到什么，培养什么”的句式来进行表述'
 
                       )
 
                     "
 
-                  />
 
-                </div> -->
 
+                  /> -->
 
+                </div>
 
               </div>
 
               <div>
 
                 <div class="basic_box">
 
@@ -354,8 +374,18 @@
 
                   @change="upRaceOver"
 
                   :placeholder="'项目学习评价方式需要体现过程性评价与总结性评价相结合，积极使用表现性评价。本次征集案例中，需要将学生的作品和报告作为附件呈现作品评价。'"
 
                 ></editor-bar>
 
-                <!-- <div class="fullCss">
 
-                  <img
 
+                <div
 
+                  class="fullCss"
 
+                  @click="
 
+                    fullTools(
 
+                      raceOver.actiDesign.brief,
 
+                      3,
 
+                      '项目学习评价方式需要体现过程性评价与总结性评价相结合，积极使用表现性评价。本次征集案例中，需要将学生的作品和报告作为附件呈现作品评价。'
 
+                    )
 
+                  "
 
+                >
 
+                  全屏编辑
 
+                  <!-- <img
 
                     src="../../../../assets/full.png"
 
                     class="full"
 
                     @click="
 
@@ -365,8 +395,8 @@
 
                         '项目学习评价方式需要体现过程性评价与总结性评价相结合，积极使用表现性评价。本次征集案例中，需要将学生的作品和报告作为附件呈现作品评价。'
 
                       )
 
                     "
 
-                  />
 
-                </div> -->
 
+                  /> -->
 
+                </div>
 
               </div>
 
               <div>
 
                 <div class="basic_box">
 
@@ -987,7 +1017,7 @@ export default {
 
     right: 15% !important;
 
   }
 
   .fullEditor >>> .el-dialog__footer {
 
-    padding: 3% 20px 20px !important;
 
+    padding: 4% 20px 20px !important;
 
   }
 
   .upTips {
 
     align-items: flex-start !important;
 
@@ -1468,9 +1498,11 @@ export default {
 
   background: #000;
 
 }
 
 .fullCss {
 
+  font-size: 12px;
 
   position: absolute;
 
-  right: 12%;
 
-  top: 9px;
 
+  right: 14%;
 
+  top: 12px;
 
+  cursor: pointer;
 
 }
 
 .fullEditor >>> .text {
 
   height: 100% !important;

+ 6 - 1
src/components/pages/race/eventCenter/myAnli.vue
View File 

@@ -337,7 +337,12 @@ export default {
 
       document.body.removeChild(link);
 
     },
 
     lookDetail(aid) {
 
-      window.open(window.origin + "/#/anliDetail?aid=" + aid);
 
+      window.open(
 
+        window.location.origin +
 
+          window.location.pathname +
 
+          "/#/anliDetail?aid=" +
 
+          aid
 
+      );
 
     },
 
   },
 
   created() {

Some files were not shown because too many files changed in this diff