Home Esplora Aiuto
Accedi
CocoRoboLabs
/
EvenManage-GM
3
0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

build

zengyicheng 1 anno fa
parent
50c3dc6e27
commit
5631ae8cd2
14 ha cambiato i file con 41 aggiunte e 16 eliminazioni
Visualizzazione unificata Mostra Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.20ab2fbee8f75082e551e17184dc4ba1.css
  3. 0 0
      dist/static/css/app.20ab2fbee8f75082e551e17184dc4ba1.css.map
  4. 0 0
      dist/static/css/app.babfb6e172688ab521f58acca296f0af.css
  5. 0 0
      dist/static/css/app.babfb6e172688ab521f58acca296f0af.css.map
  6. 0 0
      dist/static/js/app.8e4a56d653584c95dc55.js
  7. 0 0
      dist/static/js/app.8e4a56d653584c95dc55.js.map
  8. 0 0
      dist/static/js/app.d333d368e4236b3eb9c4.js
  9. 0 0
      dist/static/js/app.d333d368e4236b3eb9c4.js.map
  10. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  11. 12 6
      src/App.vue
  12. 2 3
      src/components/pages/disAdmin/anliList.vue
  13. 25 5
      src/components/pages/race/eventCenter.vue
  14. 1 1
      src/components/tools/leftBar.vue

+ 1 - 1
dist/index.html
Vedi File 

@@ -24,4 +24,4 @@
 
             height: 100%;
 
             height: 100%;
 
             width: 100%;
 
             width: 100%;
 
             background: #e6eaf0;
 
             background: #e6eaf0;
 
-        }</style><link href=./static/css/app.babfb6e172688ab521f58acca296f0af.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.dca404bd3711c644c2ae.js></script><script type=text/javascript src=./static/js/app.d333d368e4236b3eb9c4.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>
 
+        }</style><link href=./static/css/app.20ab2fbee8f75082e551e17184dc4ba1.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.dca404bd3711c644c2ae.js></script><script type=text/javascript src=./static/js/app.8e4a56d653584c95dc55.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.20ab2fbee8f75082e551e17184dc4ba1.css


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


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


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


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


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


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


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


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


+ 12 - 6
src/App.vue
Vedi File 

@@ -117,14 +117,14 @@ export default {
 
       });
 
       });
 
       var _isLogin = this.$cookies.get("tlogin");
 
       var _isLogin = this.$cookies.get("tlogin");
 
       var userInfo = this.$cookies.get("teacherInfo");
 
       var userInfo = this.$cookies.get("teacherInfo");
 
-      if (_isLogin == "1" && userInfo && (userInfo.userid == this.userid)) {
 
+      if (_isLogin == "1" && userInfo && userInfo.userid == this.userid) {
 
         loading.close();
 
         loading.close();
 
         this.$store.commit("update", ["isLogin", true]);
 
         this.$store.commit("update", ["isLogin", true]);
 
         // var info = JSON.parse(window.sessionStorage.getItem("userInfo"));
 
         // var info = JSON.parse(window.sessionStorage.getItem("userInfo"));
 
         this.$store.commit("update", ["userInfo", userInfo]);
 
         this.$store.commit("update", ["userInfo", userInfo]);
 
         // if (this.$route.path == "/login") {
 
         // if (this.$route.path == "/login") {
 
         //   if (userInfo.type == "1") {
 
         //   if (userInfo.type == "1") {
 
-            this.$router.push("/eventCenter?steps=" + "2");
 
+        this.$router.push("/eventCenter?steps=" + "2");
 
         //   } else if (userInfo.type == "2" || userInfo.type == "4") {
 
         //   } else if (userInfo.type == "2" || userInfo.type == "4") {
 
         //     this.$router.push("/anliList");
 
         //     this.$router.push("/anliList");
 
         //   } else if (userInfo.type == "5" || userInfo.type == "6") {
 
         //   } else if (userInfo.type == "5" || userInfo.type == "6") {
 
@@ -164,23 +164,28 @@ export default {
 
           this.isShowNav = true;
 
           this.isShowNav = true;
 
         }
 
         }
 
         this.nav = navTabs;
 
         this.nav = navTabs;
 
-      } else if (userInfo.type == 5 || userInfo.type == 6) {
 
+      } else if (
 
+        userInfo.type == 5 ||
 
+        userInfo.type == 6 ||
 
+        userInfo.type == 0
 
+      ) {
 
         if (navTabs2.indexOf(router_path) != -1) {
 
         if (navTabs2.indexOf(router_path) != -1) {
 
           a = 1;
 
           a = 1;
 
           this.isShowNav = true;
 
           this.isShowNav = true;
 
         }
 
         }
 
-        this.nav = navTabs;
 
+        this.nav = navTabs2;
 
       } else if (userInfo.type == 3) {
 
       } else if (userInfo.type == 3) {
 
         if (navTabs3.indexOf(router_path) != -1) {
 
         if (navTabs3.indexOf(router_path) != -1) {
 
           a = 1;
 
           a = 1;
 
           this.isShowNav = true;
 
           this.isShowNav = true;
 
         }
 
         }
 
-        this.nav = navTabs;
 
+        this.nav = navTabs3;
 
       }
 
       }
 
       if (a == 0) {
 
       if (a == 0) {
 
         this.nav = [];
 
         this.nav = [];
 
         this.isShowNav = false;
 
         this.isShowNav = false;
 
       }
 
       }
 
+      this.$forceUpdate();
 
     },
 
     },
 
     exit() {
 
     exit() {
 
       sessionStorage.clear();
 
       sessionStorage.clear();
 
@@ -212,7 +217,7 @@ export default {
 
           this.isShowNav = true;
 
           this.isShowNav = true;
 
         }
 
         }
 
         this.nav = navTabs;
 
         this.nav = navTabs;
 
-      } else if (userInfo.type == 5 || userInfo.type == 6) {
 
+      } else if (userInfo.type == 5 || userInfo.type == 6 || userInfo.type == 0) {
 
         if (navTabs2.indexOf(toPath) != -1) {
 
         if (navTabs2.indexOf(toPath) != -1) {
 
           a = 1;
 
           a = 1;
 
           this.isShowNav = true;
 
           this.isShowNav = true;
 
@@ -229,6 +234,7 @@ export default {
 
         this.nav = [];
 
         this.nav = [];
 
         this.isShowNav = false;
 
         this.isShowNav = false;
 
       }
 
       }
 
+      this.$forceUpdate();
 
     },
 
     },
 
   },
 
   },
 
   created() {
 
   created() {

+ 2 - 3
src/components/pages/disAdmin/anliList.vue
Vedi File 

@@ -1393,12 +1393,11 @@ export default {
 
 }
 
 }
 
 
 
 .aName {
 
 .aName {
 
-  position: relative;
 
+  margin-left: 10px;
 
 }
 
 }
 
 
 
 .aName >>> .el-input__inner {
 
 .aName >>> .el-input__inner {
 
-  width: 290px;
 
-  text-indent: 12px;
 
+  width: 300px;
 
 }
 
 }
 
 
 
 .searchImg {
 
 .searchImg {

+ 25 - 5
src/components/pages/race/eventCenter.vue
Vedi File 

@@ -14,11 +14,25 @@
 
     <div class="center_nav">
 
     <div class="center_nav">
 
       <span @click="steps = 1" :class="{ active: steps == 1 }">活动信息</span>
 
       <span @click="steps = 1" :class="{ active: steps == 1 }">活动信息</span>
 
       <span @click="steps = 2" :class="{ active: steps == 2 }">我的案例</span>
 
       <span @click="steps = 2" :class="{ active: steps == 2 }">我的案例</span>
 
+      <el-button
 
+        v-if="tType == 0"
 
+        @click="
 
+          goTo('/score1?userid=' + userid + '&oid=' + oid + '&org=' + org)
 
+        "
 
+        type="primary"
 
+        >查看评分</el-button
 
+      >
 
       <!-- <span @click="steps = 3" :class="{ active: steps == 3 }">项目进度</span> -->
 
       <!-- <span @click="steps = 3" :class="{ active: steps == 3 }">项目进度</span> -->
 
     </div>
 
     </div>
 
-    <div :class="steps == 1 ? 'center_body' : 'center_body1'" >
 
+    <div :class="steps == 1 ? 'center_body' : 'center_body1'">
 
       <EventMessage v-if="steps == 1"></EventMessage>
 
       <EventMessage v-if="steps == 1"></EventMessage>
 
-      <MyAnli :userid="userid" :oid="oid" :org="org" :type="tType" v-if="steps == 2"></MyAnli>
 
+      <MyAnli
 
+        :userid="userid"
 
+        :oid="oid"
 
+        :org="org"
 
+        :type="tType"
 
+        v-if="steps == 2"
 
+      ></MyAnli>
 
       <!-- <ProjectJd v-if="steps == 3"></ProjectJd> -->
 
       <!-- <ProjectJd v-if="steps == 3"></ProjectJd> -->
 
     </div>
 
     </div>
 
     <div class="center_btn" v-if="steps == 1">
 
     <div class="center_btn" v-if="steps == 1">
 
@@ -99,6 +113,7 @@ export default {
 
   justify-content: center;
 
   justify-content: center;
 
   width: 100%;
 
   width: 100%;
 
   margin: 20px auto 10px;
 
   margin: 20px auto 10px;
 
+  position: relative;
 
 }
 
 }
 
 
 
 .center_nav span {
 
 .center_nav span {
 
@@ -118,15 +133,20 @@ export default {
 
   color: #191919;
 
   color: #191919;
 
   border-bottom: 5px solid rgb(96 162 231);
 
   border-bottom: 5px solid rgb(96 162 231);
 
 }
 
 }
 
-
 
-.center_body,.center_body1 {
 
+.center_nav >>> .el-button {
 
+  position: absolute;
 
+  right: 30px;
 
+  top: 0;
 
+}
 
+.center_body,
 
+.center_body1 {
 
   display: flex;
 
   display: flex;
 
   width: 100%;
 
   width: 100%;
 
   justify-content: center;
 
   justify-content: center;
 
   margin: 0 auto;
 
   margin: 0 auto;
 
   height: calc(100% - 268px);
 
   height: calc(100% - 268px);
 
 }
 
 }
 
-.center_body1{
 
+.center_body1 {
 
   height: calc(100% - 200px);
 
   height: calc(100% - 200px);
 
 }
 
 }
 
 .center_btn {
 
 .center_btn {

+ 1 - 1
src/components/tools/leftBar.vue
Vedi File 

@@ -67,7 +67,7 @@
 
             <span>通知公告</span>
 
             <span>通知公告</span>
 
           </el-menu-item> -->
 
           </el-menu-item> -->
 
         </el-menu>
 
         </el-menu>
 
-        <el-menu :default-active="path" background-color="#fff" text-color="#777" active-text-color="#fff" router v-else-if="$store.state.userInfo.type == 5 || $store.state.userInfo.type == 6">
 
+        <el-menu :default-active="path" background-color="#fff" text-color="#777" active-text-color="#fff" router v-else-if="$store.state.userInfo.type == 5 || $store.state.userInfo.type == 6 || $store.state.userInfo.type == 0">
 
           <el-menu-item index="/score1" v-if="nav.indexOf('/score1') != -1">
 
           <el-menu-item index="/score1" v-if="nav.indexOf('/score1') != -1">
 
             <div class="img" v-if="path == '/score1'">
 
             <div class="img" v-if="path == '/score1'">
 
               <img src="../../assets/icon/works-active.png" alt="" />
 
               <img src="../../assets/icon/works-active.png" alt="" />

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