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

build

zengyicheng 2 years ago
parent
c8adcd7b1e
commit
f26bc07c73
19 changed files with 740 additions and 292 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.357b2149e560252513bdece46be6d86b.css.map
  3. 0 0
      dist/static/css/app.58db28138fa89c767801d9eb122d4514.css
  4. 0 0
      dist/static/css/app.58db28138fa89c767801d9eb122d4514.css.map
  5. 0 0
      dist/static/js/app.bd5c0cfe481a01fa0c72.js
  6. 0 0
      dist/static/js/app.bd5c0cfe481a01fa0c72.js.map
  7. 0 0
      dist/static/js/app.f7ca8d8214e86da14a59.js
  8. 0 0
      dist/static/js/app.f7ca8d8214e86da14a59.js.map
  9. 0 0
      dist/static/js/manifest.f73e1f5407603f6a733b.js.map
  10. 65 38
      src/components/pages/disAdmin/anliList.vue
  11. 150 57
      src/components/pages/disAdmin/score.vue
  12. 26 6
      src/components/pages/disAdmin/user.vue
  13. 225 50
      src/components/pages/munAdmin/anliList.vue
  14. 2 2
      src/components/pages/munAdmin/data.vue
  15. 152 59
      src/components/pages/munAdmin/score.vue
  16. 29 7
      src/components/pages/munAdmin/user.vue
  17. 44 35
      src/components/pages/proAdmin/anliList.vue
  18. 44 35
      src/components/pages/race/eventCenter/anliDetail.vue
  19. 2 2
      src/components/tools/leftBar.vue

+ 1 - 1
dist/index.html
View File 

@@ -24,4 +24,4 @@
 
             height: 100%;
 
             width: 100%;
 
             background: #e6eaf0;
 
-        }</style><link href=./static/css/app.357b2149e560252513bdece46be6d86b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f73e1f5407603f6a733b.js></script><script type=text/javascript src=./static/js/vendor.0c21445a4cd992a83ee9.js></script><script type=text/javascript src=./static/js/app.f7ca8d8214e86da14a59.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>
 
+        }</style><link href=./static/css/app.58db28138fa89c767801d9eb122d4514.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f73e1f5407603f6a733b.js></script><script type=text/javascript src=./static/js/vendor.0c21445a4cd992a83ee9.js></script><script type=text/javascript src=./static/js/app.bd5c0cfe481a01fa0c72.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.357b2149e560252513bdece46be6d86b.css.map


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


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


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


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


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


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


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


+ 65 - 38
src/components/pages/disAdmin/anliList.vue
View File 

@@ -129,6 +129,9 @@
 
             </div>
 
           </div>
 
           <div class="aName">
 
+            <div class="searchImg">
 
+              <img src="../../../assets/icon/search.png" alt="" />
 
+            </div>
 
             <el-input
 
               v-model="assCaseName"
 
               auto-complete="off"
 
@@ -201,7 +204,7 @@
 
             <div>请选择评分</div>
 
             <div>
 
               <div class="scoreDiv">
 
-                <div>评审维度1</div>
 
+                <div>项目式学习</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -211,7 +214,7 @@
 
                 </div>
 
               </div>
 
               <div class="scoreDiv">
 
-                <div>评审维度2</div>
 
+                <div>项目成果</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -221,7 +224,7 @@
 
                 </div>
 
               </div>
 
               <div class="scoreDiv">
 
-                <div>评审维度3</div>
 
+                <div>项目评价</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -230,7 +233,7 @@
 
                   ></el-input>
 
                 </div>
 
               </div>
 
-              <div class="scoreDiv">
 
+              <!-- <div class="scoreDiv">
 
                 <div>评审维度4</div>
 
                 <div>
 
                   <el-input
 
@@ -249,7 +252,7 @@
 
                     @change="isNumber($event, 5)"
 
                   ></el-input>
 
                 </div>
 
-              </div>
 
+              </div> -->
 
             </div>
 
           </div>
 
           <div class="anliContent">
 
@@ -338,8 +341,8 @@ export default {
 
             first: "",
 
             second: "",
 
             third: "",
 
-            fourth: "",
 
-            fivth: "",
 
+            // fourth: "",
 
+            // fivth: "",
 
             content: "",
 
           },
 
           sumScore: 0,
 
@@ -369,13 +372,14 @@ export default {
 
             this.scoreDetail[0].scoreAll.first = "";
 
           } else if (t == 2) {
 
             this.scoreDetail[0].scoreAll.second = "";
 
-          } else if (t == 3) {
 
-            this.scoreDetail[0].scoreAll.third = "";
 
-          } else if (t == 4) {
 
-            this.scoreDetail[0].scoreAll.fourth = "";
 
           } else {
 
-            this.scoreDetail[0].scoreAll.fivth = "";
 
+            this.scoreDetail[0].scoreAll.third = "";
 
           }
 
+          //  else if (t == 4) {
 
+          //   this.scoreDetail[0].scoreAll.fourth = "";
 
+          // } else {
 
+          //   this.scoreDetail[0].scoreAll.fivth = "";
 
+          // }
 
           return;
 
         } else if (e > 100) {
 
           this.$message.error("数值不能大于100");
 
@@ -383,13 +387,14 @@ export default {
 
             this.scoreDetail[0].scoreAll.first = "";
 
           } else if (t == 2) {
 
             this.scoreDetail[0].scoreAll.second = "";
 
-          } else if (t == 3) {
 
-            this.scoreDetail[0].scoreAll.third = "";
 
-          } else if (t == 4) {
 
-            this.scoreDetail[0].scoreAll.fourth = "";
 
           } else {
 
-            this.scoreDetail[0].scoreAll.fivth = "";
 
+            this.scoreDetail[0].scoreAll.third = "";
 
           }
 
+          //  else if (t == 4) {
 
+          //   this.scoreDetail[0].scoreAll.fourth = "";
 
+          // } else {
 
+          //   this.scoreDetail[0].scoreAll.fivth = "";
 
+          // }
 
           return;
 
         }
 
       } else {
 
@@ -397,13 +402,14 @@ export default {
 
           this.scoreDetail[0].scoreAll.first = "";
 
         } else if (t == 2) {
 
           this.scoreDetail[0].scoreAll.second = "";
 
-        } else if (t == 3) {
 
-          this.scoreDetail[0].scoreAll.third = "";
 
-        } else if (t == 4) {
 
-          this.scoreDetail[0].scoreAll.fourth = "";
 
         } else {
 
-          this.scoreDetail[0].scoreAll.fivth = "";
 
+          this.scoreDetail[0].scoreAll.third = "";
 
         }
 
+        //  else if (t == 4) {
 
+        //   this.scoreDetail[0].scoreAll.fourth = "";
 
+        // } else {
 
+        //   this.scoreDetail[0].scoreAll.fivth = "";
 
+        // }
 
         this.$message.error("请输入数字");
 
         return;
 
       }
 
@@ -624,16 +630,17 @@ export default {
 
             var a = parseInt(this.scoreDetail[0].scoreAll.first);
 
             var b = parseInt(this.scoreDetail[0].scoreAll.second);
 
             var c = parseInt(this.scoreDetail[0].scoreAll.third);
 
-            var d = parseInt(this.scoreDetail[0].scoreAll.fourth);
 
-            var e = parseInt(this.scoreDetail[0].scoreAll.fivth);
 
-            this.scoreDetail[0].sumScore = Math.round((a + b + c + d + e) / 5);
 
+            // var d = parseInt(this.scoreDetail[0].scoreAll.fourth);
 
+            // var e = parseInt(this.scoreDetail[0].scoreAll.fivth);
 
+            // this.scoreDetail[0].sumScore = Math.round((a + b + c + d + e) / 5);
 
+            this.scoreDetail[0].sumScore = Math.round((a + b + c) / 3);
 
           } else {
 
             this.scoreDetail[0].scoreAll = {
 
               first: "",
 
               second: "",
 
               third: "",
 
-              fourth: "",
 
-              fivth: "",
 
+              // fourth: "",
 
+              // fivth: "",
 
               content: "",
 
             };
 
             this.scoreDetail[0].sumScore = 0;
 
@@ -658,13 +665,14 @@ export default {
 
       } else if (this.scoreDetail[0].scoreAll.third == "") {
 
         this.$message.error("请将信息填写完整");
 
         return;
 
-      } else if (this.scoreDetail[0].scoreAll.fourth == "") {
 
-        this.$message.error("请将信息填写完整");
 
-        return;
 
-      } else if (this.scoreDetail[0].scoreAll.fivth == "") {
 
-        this.$message.error("请将信息填写完整");
 
-        return;
 
       }
 
+      //  else if (this.scoreDetail[0].scoreAll.fourth == "") {
 
+      //   this.$message.error("请将信息填写完整");
 
+      //   return;
 
+      // } else if (this.scoreDetail[0].scoreAll.fivth == "") {
 
+      //   this.$message.error("请将信息填写完整");
 
+      //   return;
 
+      // }
 
       let params = {
 
         rid: this.scoreDetail[0].id,
 
         suser: this.$store.state.userInfo.userid,
 
@@ -687,8 +695,8 @@ export default {
 
                 first: "",
 
                 second: "",
 
                 third: "",
 
-                fourth: "",
 
-                fivth: "",
 
+                // fourth: "",
 
+                // fivth: "",
 
                 content: "",
 
               },
 
               sumScore: 0,
 
@@ -969,7 +977,7 @@ export default {
 
 }
 
 
 .people_search > div:nth-child(1) {
 
-  font-size: 20px;
 
+  font-size: 16px;
 
   margin-right: 10px;
 
 }
 
 
@@ -1084,6 +1092,10 @@ export default {
 
   align-items: center;
 
   padding: 10px 0;
 
 }
 
+.scoreDiv > div:nth-child(1) {
 
+  min-width: 90px;
 
+  width: 90px;
 
+}
 
 .scoreDiv > div:nth-child(2) {
 
   margin-left: 10px;
 
 }
 
@@ -1199,10 +1211,25 @@ export default {
 
 }
 
 
 .aName {
 
-  margin-left: 10px;
 
+  position: relative;
 
 }
 
 
 .aName >>> .el-input__inner {
 
-  width: 300px;
 
+  width: 290px;
 
+  text-indent: 12px;
 
+}
 
+
 
+.searchImg {
 
+  width: 20px;
 
+  height: 20px;
 
+  position: absolute;
 
+  z-index: 9;
 
+  top: 10px;
 
+  left: 5px;
 
+}
 
+
 
+.searchImg > img {
 
+  width: 100%;
 
+  height: 100%;
 
 }
 
 </style>

+ 150 - 57
src/components/pages/disAdmin/score.vue
View File 

@@ -45,12 +45,24 @@
 
           </div> -->
 
         </div>
 
         <div @click="clear" class="clear">重置</div>
 
+        <div class="aName">
 
+          <el-input
 
+            v-model="anliName"
 
+            auto-complete="off"
 
+            placeholder="请输入案例名称"
 
+            @input="search"
 
+          ></el-input>
 
+        </div>
 
       </div>
 
     </div>
 
     <div v-if="isNoTableData" class="isNoMessage">
 
       <img src="../../../assets/icon/isNoMessage.png" alt />
 
     </div>
 
-    <div class="pb_content_body" style="margin: 0 auto" v-if="tableData.length > 0">
 
+    <div
 
+      class="pb_content_body"
 
+      style="margin: 0 auto"
 
+      v-if="tableData.length > 0"
 
+    >
 
       <div class="student_table">
 
         <el-table
 
           ref="table"
 
@@ -63,6 +75,13 @@
 
           :header-cell-style="{ background: '#f1f1f1', fontSize: '17px' }"
 
           :row-class-name="tableRowClassName"
 
         >
 
+          <el-table-column label="排名" min-width="10" align="center">
 
+            <template slot-scope="scope">
 
+              <div>
 
+                {{ (page - 1) * 10 + scope.$index + 1 }}
 
+              </div>
 
+            </template>
 
+          </el-table-column>
 
           <el-table-column label="创建人" min-width="10" align="center">
 
             <template slot-scope="scope">
 
               <div class="userImg">
 
@@ -166,7 +185,7 @@
 
             <div>请选择评分</div>
 
             <div>
 
               <div class="scoreDiv">
 
-                <div>评审维度1</div>
 
+                <div>项目式学习</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -176,7 +195,7 @@
 
                 </div>
 
               </div>
 
               <div class="scoreDiv">
 
-                <div>评审维度2</div>
 
+                <div>项目成果</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -186,7 +205,7 @@
 
                 </div>
 
               </div>
 
               <div class="scoreDiv">
 
-                <div>评审维度3</div>
 
+                <div>项目评价</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -195,7 +214,7 @@
 
                   ></el-input>
 
                 </div>
 
               </div>
 
-              <div class="scoreDiv">
 
+              <!-- <div class="scoreDiv">
 
                 <div>评审维度4</div>
 
                 <div>
 
                   <el-input
 
@@ -214,7 +233,7 @@
 
                     @change="isNumber($event, 5)"
 
                   ></el-input>
 
                 </div>
 
-              </div>
 
+              </div> -->
 
             </div>
 
           </div>
 
           <div class="anliContent">
 
@@ -277,6 +296,7 @@ export default {
 
       CourseTypeJson: {},
 
       courseTypeId: {},
 
       courseTypeSon: [],
 
+      anliName: "",
 
       anliBox: "",
 
       tableData: [],
 
       reviewer: "",
 
@@ -298,8 +318,8 @@ export default {
 
             first: "",
 
             second: "",
 
             third: "",
 
-            fourth: "",
 
-            fivth: "",
 
+            // fourth: "",
 
+            // fivth: "",
 
             content: "",
 
           },
 
           sumScore: 0,
 
@@ -354,13 +374,14 @@ export default {
 
             this.scoreDetail[0].scoreAll.first = "";
 
           } else if (t == 2) {
 
             this.scoreDetail[0].scoreAll.second = "";
 
-          } else if (t == 3) {
 
-            this.scoreDetail[0].scoreAll.third = "";
 
-          } else if (t == 4) {
 
-            this.scoreDetail[0].scoreAll.fourth = "";
 
           } else {
 
-            this.scoreDetail[0].scoreAll.fivth = "";
 
+            this.scoreDetail[0].scoreAll.third = "";
 
           }
 
+          //  else if (t == 4) {
 
+          //   this.scoreDetail[0].scoreAll.fourth = "";
 
+          // } else {
 
+          //   this.scoreDetail[0].scoreAll.fivth = "";
 
+          // }
 
           return;
 
         } else if (e > 100) {
 
           this.$message.error("数值不能大于100");
 
@@ -368,13 +389,14 @@ export default {
 
             this.scoreDetail[0].scoreAll.first = "";
 
           } else if (t == 2) {
 
             this.scoreDetail[0].scoreAll.second = "";
 
-          } else if (t == 3) {
 
-            this.scoreDetail[0].scoreAll.third = "";
 
-          } else if (t == 4) {
 
-            this.scoreDetail[0].scoreAll.fourth = "";
 
           } else {
 
-            this.scoreDetail[0].scoreAll.fivth = "";
 
+            this.scoreDetail[0].scoreAll.third = "";
 
           }
 
+          //  else if (t == 4) {
 
+          //   this.scoreDetail[0].scoreAll.fourth = "";
 
+          // } else {
 
+          //   this.scoreDetail[0].scoreAll.fivth = "";
 
+          // }
 
           return;
 
         }
 
       } else {
 
@@ -382,13 +404,14 @@ export default {
 
           this.scoreDetail[0].scoreAll.first = "";
 
         } else if (t == 2) {
 
           this.scoreDetail[0].scoreAll.second = "";
 
-        } else if (t == 3) {
 
-          this.scoreDetail[0].scoreAll.third = "";
 
-        } else if (t == 4) {
 
-          this.scoreDetail[0].scoreAll.fourth = "";
 
         } else {
 
-          this.scoreDetail[0].scoreAll.fivth = "";
 
+          this.scoreDetail[0].scoreAll.third = "";
 
         }
 
+        //  else if (t == 4) {
 
+        //   this.scoreDetail[0].scoreAll.fourth = "";
 
+        // } else {
 
+        //   this.scoreDetail[0].scoreAll.fivth = "";
 
+        // }
 
         this.$message.error("请输入数字");
 
         return;
 
       }
 
@@ -433,40 +456,97 @@ export default {
 
         typeE: typeE.join(","),
 
         cn: this.anliBox == "" ? 0 : this.anliBox,
 
         cid: rc ? rc : "",
 
-        page: this.page,
 
+        title: this.anliName,
 
       };
 
       this.ajax
 
-        .get(this.$store.state.api + "selectPoint", params)
 
+        .get(this.$store.state.api + "selectPointAll", params)
 
         .then((res) => {
 
-          this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
-          this.tableData = res.data[0];
 
-          for (var i = 0; i < this.tableData.length; i++) {
 
-            this.tableData[i].info = JSON.parse(this.tableData[i].info);
 
-            this.tableData[i].overview = JSON.parse(this.tableData[i].overview);
 
-            this.tableData[i].process = JSON.parse(this.tableData[i].process);
 
-            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 != null) {
 
-              var point = JSON.parse(this.tableData[i].score);
 
+          this.total = res.data[0].length > 0 ? res.data[0].length : 0;
 
+          var scoreList = res.data[0];
 
+          for (var i = 0; i < scoreList.length; i++) {
 
+            scoreList[i].info = JSON.parse(scoreList[i].info);
 
+            if (scoreList[i].score != null) {
 
+              var point = JSON.parse(scoreList[i].score);
 
               var a = parseInt(point.first);
 
               var b = parseInt(point.second);
 
               var c = parseInt(point.third);
 
-              var d = parseInt(point.fourth);
 
-              var e = parseInt(point.fivth);
 
-              var sumScore = Math.round((a + b + c + d + e) / 5);
 
-              this.tableData[i].sum = sumScore;
 
+              var sumScore = Math.round((a + b + c) / 3);
 
+              scoreList[i].sum = sumScore;
 
             }
 
-            var a = JSON.parse(JSON.stringify(this.tableData));
 
-            a.sort((item1, item2) => item2.sum - item1.sum);
 
-            this.tableData = a;
 
           }
 
+          scoreList.sort((item1, item2) => item2.sum - item1.sum);
 
+          const start = (this.page - 1) * 10;
 
+          const end = start + 10;
 
+          let pageData = scoreList.slice(start, end);
 
+          this.tableData = pageData;
 
           this.isLoading = false;
 
         })
 
         .catch((err) => {
 
           console.error(err);
 
         });
 
     },
 
+    // getAnliList(rc) {
 
+    //   this.isLoading = true;
 
+    //   var typeE = [];
 
+    //   var typea, typeb, typec, typed;
 
+    //   for (var i = 0; i < this.CourseType[0].length; i++) {
 
+    //     if (this.courseTypeId[this.CourseType[0][i].id] == "1") {
 
+    //       typeE.push(this.CourseType[0][i].id);
 
+    //     } else if (this.courseTypeId[this.CourseType[0][i].id] != "") {
 
+    //       if (this.CourseType[0][i].name == "案例组别") {
 
+    //         typea = this.courseTypeId[this.CourseType[0][i].id];
 
+    //       } else if (this.CourseType[0][i].name == "年级") {
 
+    //         typeb = this.courseTypeId[this.CourseType[0][i].id];
 
+    //       } else if (this.CourseType[0][i].name == "学科") {
 
+    //         typec = this.courseTypeId[this.CourseType[0][i].id];
 
+    //       }
 
+    //       this.courseTypeSon.push(this.courseTypeId[this.CourseType[0][i].id]);
 
+    //     }
 
+    //   }
 
+    //   let params = {
 
+    //     typea: typea != undefined ? typea : "",
 
+    //     typeb: typeb != undefined ? typeb : "",
 
+    //     typec: typec != undefined ? typec : "",
 
+    //     typed: typed != undefined ? typed : "",
 
+    //     typeE: typeE.join(","),
 
+    //     cn: this.anliBox == "" ? 0 : this.anliBox,
 
+    //     cid: rc ? rc : "",
 
+    //     title: this.anliName,
 
+    //     page: this.page,
 
+    //   };
 
+    //   this.ajax
 
+    //     .get(this.$store.state.api + "selectPoint", params)
 
+    //     .then((res) => {
 
+    //       this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
+    //       this.tableData = res.data[0];
 
+    //       for (var i = 0; i < this.tableData.length; i++) {
 
+    //         this.tableData[i].info = JSON.parse(this.tableData[i].info);
 
+    //         this.tableData[i].overview = JSON.parse(this.tableData[i].overview);
 
+    //         this.tableData[i].process = JSON.parse(this.tableData[i].process);
 
+    //         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 != null) {
 
+    //           var point = JSON.parse(this.tableData[i].score);
 
+    //           var a = parseInt(point.first);
 
+    //           var b = parseInt(point.second);
 
+    //           var c = parseInt(point.third);
 
+    //           // var d = parseInt(point.fourth);
 
+    //           // var e = parseInt(point.fivth);
 
+    //           // var sumScore = Math.round((a + b + c + d + e) / 5);
 
+    //           var sumScore = Math.round((a + b + c) / 3);
 
+    //           this.tableData[i].sum = sumScore;
 
+    //         }
 
+    //         var a = JSON.parse(JSON.stringify(this.tableData));
 
+    //         a.sort((item1, item2) => item2.sum - item1.sum);
 
+    //         this.tableData = a;
 
+    //       }
 
+    //       this.isLoading = false;
 
+    //     })
 
+    //     .catch((err) => {
 
+    //       console.error(err);
 
+    //     });
 
+    // },
 
     selectType(rc) {
 
       this.ajax
 
         .get(this.$store.state.api + "selectMatType")
 
@@ -484,7 +564,7 @@ export default {
 
           }
 
           if (rc) {
 
             this.getAnliList(rc);
 
-          }else{
 
+          } else {
 
             this.getAnliList();
 
           }
 
         })
 
@@ -551,16 +631,17 @@ export default {
 
             var a = parseInt(this.scoreDetail[0].scoreAll.first);
 
             var b = parseInt(this.scoreDetail[0].scoreAll.second);
 
             var c = parseInt(this.scoreDetail[0].scoreAll.third);
 
-            var d = parseInt(this.scoreDetail[0].scoreAll.fourth);
 
-            var e = parseInt(this.scoreDetail[0].scoreAll.fivth);
 
-            this.scoreDetail[0].sumScore = Math.round((a + b + c + d + e) / 5);
 
+            // var d = parseInt(this.scoreDetail[0].scoreAll.fourth);
 
+            // var e = parseInt(this.scoreDetail[0].scoreAll.fivth);
 
+            // this.scoreDetail[0].sumScore = Math.round((a + b + c + d + e) / 5);
 
+            this.scoreDetail[0].sumScore = Math.round((a + b + c) / 3);
 
           } else {
 
             this.scoreDetail[0].scoreAll = {
 
               first: "",
 
               second: "",
 
               third: "",
 
-              fourth: "",
 
-              fivth: "",
 
+              // fourth: "",
 
+              // fivth: "",
 
               content: "",
 
             };
 
             this.scoreDetail[0].sumScore = 0;
 
@@ -585,13 +666,14 @@ export default {
 
       } else if (this.scoreDetail[0].scoreAll.third == "") {
 
         this.$message.error("请将信息填写完整");
 
         return;
 
-      } else if (this.scoreDetail[0].scoreAll.fourth == "") {
 
-        this.$message.error("请将信息填写完整");
 
-        return;
 
-      } else if (this.scoreDetail[0].scoreAll.fivth == "") {
 
-        this.$message.error("请将信息填写完整");
 
-        return;
 
       }
 
+      //  else if (this.scoreDetail[0].scoreAll.fourth == "") {
 
+      //   this.$message.error("请将信息填写完整");
 
+      //   return;
 
+      // } else if (this.scoreDetail[0].scoreAll.fivth == "") {
 
+      //   this.$message.error("请将信息填写完整");
 
+      //   return;
 
+      // }
 
       let params = {
 
         rid: this.scoreDetail[0].id,
 
         suser: this.$store.state.userInfo.userid,
 
@@ -614,8 +696,8 @@ export default {
 
                 first: "",
 
                 second: "",
 
                 third: "",
 
-                fourth: "",
 
-                fivth: "",
 
+                // fourth: "",
 
+                // fivth: "",
 
                 content: "",
 
               },
 
               sumScore: 0,
 
@@ -1007,6 +1089,10 @@ export default {
 
   align-items: center;
 
   padding: 10px 0;
 
 }
 
+.scoreDiv > div:nth-child(1) {
 
+  min-width: 90px;
 
+  width: 90px;
 
+}
 
 .scoreDiv > div:nth-child(2) {
 
   margin-left: 10px;
 
 }
 
@@ -1132,4 +1218,11 @@ export default {
 
   width: 100%;
 
   height: 100%;
 
 }
 
+.aName {
 
+  margin-left: 10px;
 
+}
 
+
 
+.aName >>> .el-input__inner {
 
+  width: 300px;
 
+}
 
 </style>

+ 26 - 6
src/components/pages/disAdmin/user.vue
View File 

@@ -161,8 +161,12 @@
 
             </el-option>
 
           </el-select>
 
         </el-form-item>
 
-        <div style="text-align: center; color: #adb3b7">
 
-          注：添加账号账号密码为123456
 
+        <div class="tips">
 
+          <div>注：</div>
 
+          <div class="tipsList">
 
+            <div>1、添加账号账号密码为123456</div>
 
+            <div>2、请使用生成的账号登录平台</div>
 
+          </div>
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -430,10 +434,11 @@ export default {
 
       } else if (this.sType == "") {
 
         this.$message.error("请选择权限");
 
         return;
 
-      } else if (this.sSchool == "") {
 
-        this.$message.error("请选择学校");
 
-        return;
 
       }
 
+      //  else if (this.sSchool == "") {
 
+      //   this.$message.error("请选择学校");
 
+      //   return;
 
+      // }
 
       this.isloading = true;
 
       let params = [
 
         {
 
@@ -478,7 +483,7 @@ export default {
 
         n: this.sName,
 
         p: this.sPhone,
 
         t: this.sType,
 
-        s: this.$store.state.userInfo.school,
 
+        s: this.sSchool,
 
         uid: this.upId,
 
       };
 
       this.ajax
 
@@ -492,6 +497,7 @@ export default {
 
           this.sPhone = "";
 
           this.sType = "";
 
           this.upId = "";
 
+          this.sSchool = "";
 
           this.isAddOrUp = false;
 
           this.dialogVisible = false;
 
           this.getAdmin();
 
@@ -787,4 +793,18 @@ export default {
 
 .people_name >>> .el-checkbox {
 
   margin-bottom: 10px;
 
 }
 
+.tips {
 
+  color: #adb3b7;
 
+  display: flex;
 
+  flex-direction: row;
 
+  flex-wrap: nowrap;
 
+  align-items: flex-start;
 
+  justify-content: center;
 
+}
 
+.tipsList {
 
+  display: flex;
 
+  flex-direction: column;
 
+  flex-wrap: nowrap;
 
+  align-items: flex-start;
 
+}
 
 </style>

+ 225 - 50
src/components/pages/munAdmin/anliList.vue
View File 

@@ -86,6 +86,9 @@
 
             <div>
 
               <el-button @click="openScore(a, 1)">评分</el-button>
 
             </div>
 
+            <div v-if="a.score">
 
+              <el-button @click="lookAnliScore(a.id)">查看评分</el-button>
 
+            </div>
 
             <!-- <div>
 
               <el-button @click="openScore(a, 2)">推荐</el-button>
 
             </div> -->
 
@@ -130,6 +133,9 @@
 
             </div>
 
           </div>
 
           <div class="aName">
 
+            <div class="searchImg">
 
+              <img src="../../../assets/icon/search.png" alt="" />
 
+            </div>
 
             <el-input
 
               v-model="assCaseName"
 
               auto-complete="off"
 
@@ -203,7 +209,7 @@
 
             <div>请选择评分</div>
 
             <div>
 
               <div class="scoreDiv">
 
-                <div>评审维度1</div>
 
+                <div>项目式学习</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -213,7 +219,7 @@
 
                 </div>
 
               </div>
 
               <div class="scoreDiv">
 
-                <div>评审维度2</div>
 
+                <div>项目成果</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -223,7 +229,7 @@
 
                 </div>
 
               </div>
 
               <div class="scoreDiv">
 
-                <div>评审维度3</div>
 
+                <div>项目评价</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -232,7 +238,7 @@
 
                   ></el-input>
 
                 </div>
 
               </div>
 
-              <div class="scoreDiv">
 
+              <!-- <div class="scoreDiv">
 
                 <div>评审维度4</div>
 
                 <div>
 
                   <el-input
 
@@ -251,7 +257,7 @@
 
                     @change="isNumber($event, 5)"
 
                   ></el-input>
 
                 </div>
 
-              </div>
 
+              </div> -->
 
             </div>
 
           </div>
 
           <div class="anliContent">
 
@@ -298,6 +304,111 @@
 
         </div>
 
       </div>
 
     </el-dialog>
 
+    <el-dialog
 
+      title="查看评分"
 
+      :visible.sync="dialogVisibleAllScore"
 
+      :append-to-body="true"
 
+      width="70%"
 
+      height="80%"
 
+      :before-close="handleClose"
 
+      class="dialog_diy customWidth1"
 
+    >
 
+      <!-- <div v-for="(item, index) in anliScoreList" :key="index">
 
+        <el-descriptions class="margin-top" :column="3" border>
 
+          <el-descriptions-item>
 
+            <template slot="label">
 
+              <i class="el-icon-s-custom"></i>
 
+              姓名
 
+            </template>
 
+            {{ item.name }}
 
+          </el-descriptions-item>
 
+          <el-descriptions-item>
 
+            <template slot="label">
 
+              <i class="el-icon-s-custom"></i>
 
+              项目式学习
 
+            </template>
 
+            {{ item.score.first }}
 
+          </el-descriptions-item>
 
+          <el-descriptions-item>
 
+            <template slot="label">
 
+              <i class="el-icon-s-custom"></i>
 
+              项目成果
 
+            </template>
 
+            {{ item.score.second }}
 
+          </el-descriptions-item>
 
+          <el-descriptions-item>
 
+            <template slot="label">
 
+              <i class="el-icon-s-custom"></i>
 
+              项目评价
 
+            </template>
 
+            {{ item.score.third }}
 
+          </el-descriptions-item>
 
+          <el-descriptions-item>
 
+            <template slot="label">
 
+              <i class="el-icon-s-custom"></i>
 
+              平均分
 
+            </template>
 
+            {{ item.sum }}
 
+          </el-descriptions-item>
 
+          <el-descriptions-item>
 
+            <template slot="label">
 
+              <i class="el-icon-s-custom"></i>
 
+              评价时间
 
+            </template>
 
+            {{ item.time }}
 
+          </el-descriptions-item>
 
+          <el-descriptions-item>
 
+            <template slot="label">
 
+              <i class="el-icon-s-custom"></i>
 
+              评语
 
+            </template>
 
+            {{ item.score.content }}
 
+          </el-descriptions-item>
 
+        </el-descriptions>
 
+      </div> -->
 
+
 
+      <el-table :data="anliScoreList" stripe border style="width: 100%">
 
+        <el-table-column label="姓名" min-width="10" align="center">
 
+          <template slot-scope="scope">
 
+            <div>{{ scope.row.name ? scope.row.name : "-" }}</div>
 
+          </template>
 
+        </el-table-column>
 
+        <el-table-column label="项目式学习" min-width="10">
 
+          <template slot-scope="scope">
 
+            <div>{{ scope.row.score.first ? scope.row.score.first : "-" }}</div>
 
+          </template>
 
+        </el-table-column>
 
+        <el-table-column label="项目成果" min-width="10">
 
+          <template slot-scope="scope">
 
+            <div>
 
+              {{ scope.row.score.second ? scope.row.score.second : "-" }}
 
+            </div>
 
+          </template>
 
+        </el-table-column>
 
+        <el-table-column label="项目评价" min-width="10">
 
+          <template slot-scope="scope">
 
+            <div>{{ scope.row.score.third ? scope.row.score.third : "-" }}</div>
 
+          </template>
 
+        </el-table-column>
 
+        <el-table-column label="平均分" min-width="10">
 
+          <template slot-scope="scope">
 
+            <div>{{ scope.row.sum ? scope.row.sum : "-" }}</div>
 
+          </template>
 
+        </el-table-column>
 
+        <el-table-column label="评价时间" min-width="10">
 
+          <template slot-scope="scope">
 
+            <div>{{ scope.row.time ? scope.row.time : "-" }}</div>
 
+          </template>
 
+        </el-table-column>
 
+        <el-table-column label="评语" min-width="30">
 
+          <template slot-scope="scope">
 
+            <div>
 
+              {{ scope.row.score.content ? scope.row.score.content : "-" }}
 
+            </div>
 
+          </template>
 
+        </el-table-column>
 
+      </el-table>
 
+    </el-dialog>
 
   </div>
 
 </template>
 
 
@@ -313,7 +424,7 @@ export default {
 
       courseTypeId: {},
 
       courseTypeSon: [],
 
       anliName: "",
 
-      assCaseName:"",
 
+      assCaseName: "",
 
       caseLoading: false,
 
       anliBox: "",
 
       tableData: [],
 
@@ -329,6 +440,8 @@ export default {
 
       dialogVisibleMember: false,
 
       dialogVisibleScore: false,
 
       dialogVisibleRecommend: false,
 
+      dialogVisibleAllScore: false,
 
+      anliScoreList: [],
 
       noBanner: require("../../../assets/noBanner.jpg"),
 
       scoreDetail: [
 
         {
 
@@ -340,8 +453,8 @@ export default {
 
             first: "",
 
             second: "",
 
             third: "",
 
-            fourth: "",
 
-            fivth: "",
 
+            // fourth: "",
 
+            // fivth: "",
 
             content: "",
 
           },
 
           sumScore: 0,
 
@@ -371,13 +484,14 @@ export default {
 
             this.scoreDetail[0].scoreAll.first = "";
 
           } else if (t == 2) {
 
             this.scoreDetail[0].scoreAll.second = "";
 
-          } else if (t == 3) {
 
-            this.scoreDetail[0].scoreAll.third = "";
 
-          } else if (t == 4) {
 
-            this.scoreDetail[0].scoreAll.fourth = "";
 
           } else {
 
-            this.scoreDetail[0].scoreAll.fivth = "";
 
+            this.scoreDetail[0].scoreAll.third = "";
 
           }
 
+          //  else if (t == 4) {
 
+          //   this.scoreDetail[0].scoreAll.fourth = "";
 
+          // } else {
 
+          //   this.scoreDetail[0].scoreAll.fivth = "";
 
+          // }
 
           return;
 
         } else if (e > 100) {
 
           this.$message.error("数值不能大于100");
 
@@ -385,13 +499,14 @@ export default {
 
             this.scoreDetail[0].scoreAll.first = "";
 
           } else if (t == 2) {
 
             this.scoreDetail[0].scoreAll.second = "";
 
-          } else if (t == 3) {
 
-            this.scoreDetail[0].scoreAll.third = "";
 
-          } else if (t == 4) {
 
-            this.scoreDetail[0].scoreAll.fourth = "";
 
           } else {
 
-            this.scoreDetail[0].scoreAll.fivth = "";
 
+            this.scoreDetail[0].scoreAll.third = "";
 
           }
 
+          //  else if (t == 4) {
 
+          //   this.scoreDetail[0].scoreAll.fourth = "";
 
+          // } else {
 
+          //   this.scoreDetail[0].scoreAll.fivth = "";
 
+          // }
 
           return;
 
         }
 
       } else {
 
@@ -399,19 +514,19 @@ export default {
 
           this.scoreDetail[0].scoreAll.first = "";
 
         } else if (t == 2) {
 
           this.scoreDetail[0].scoreAll.second = "";
 
-        } else if (t == 3) {
 
-          this.scoreDetail[0].scoreAll.third = "";
 
-        } else if (t == 4) {
 
-          this.scoreDetail[0].scoreAll.fourth = "";
 
         } else {
 
-          this.scoreDetail[0].scoreAll.fivth = "";
 
+          this.scoreDetail[0].scoreAll.third = "";
 
         }
 
+        //  else if (t == 4) {
 
+        //   this.scoreDetail[0].scoreAll.fourth = "";
 
+        // } else {
 
+        //   this.scoreDetail[0].scoreAll.fivth = "";
 
+        // }
 
         this.$message.error("请输入数字");
 
         return;
 
       }
 
-
 
-      value = value.replace(/^0+(d)/, "$1"); // 第一位0开头，0后面为数字，则过滤掉，取后面的数字
 
-      value = value.replace(/(d{15})d*/, "$1"); // 最多保留15位整数
 
+      value = e.replace(/^0+(d)/, "$1"); // 第一位0开头，0后面为数字，则过滤掉，取后面的数字
 
+      value = e.replace(/(d{15})d*/, "$1"); // 最多保留15位整数
 
       // this.height = value;
 
     },
 
     handleCheckAllChange(val) {
 
@@ -439,6 +554,31 @@ export default {
 
       this.anliBox = "";
 
       this.getAnliList();
 
     },
 
+    lookAnliScore(id) {
 
+      this.anliScoreList = [];
 
+      let params = {
 
+        rid: id,
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "selectAnliScore", params)
 
+        .then((res) => {
 
+          var sList = res.data[0];
 
+          for (var i = 0; i < sList.length; i++) {
 
+            sList[i].score = JSON.parse(sList[i].score);
 
+            var point = sList[i].score;
 
+            var a = parseInt(point.first);
 
+            var b = parseInt(point.second);
 
+            var c = parseInt(point.third);
 
+            var sumScore = Math.round((a + b + c) / 3);
 
+            sList[i].sum = sumScore;
 
+          }
 
+          this.anliScoreList = sList;
 
+          this.dialogVisibleAllScore = true;
 
+        })
 
+        .catch((err) => {
 
+          console.error(err);
 
+        });
 
+    },
 
     getAnliList(rc) {
 
       this.isLoading = true;
 
       var typeE = [];
 
@@ -475,18 +615,33 @@ export default {
 
           this.tableData = res.data[0];
 
           for (var i = 0; i < this.tableData.length; i++) {
 
             this.tableData[i].info = JSON.parse(this.tableData[i].info);
 
-            this.tableData[i].overview = JSON.parse(this.tableData[i].overview);
 
-            this.tableData[i].process = JSON.parse(this.tableData[i].process);
 
-            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);
 
           }
 
+          this.sScore(this.tableData);
 
           this.isLoading = false;
 
         })
 
         .catch((err) => {
 
           console.error(err);
 
         });
 
     },
 
+    sScore(t) {
 
+      this.ajax
 
+        .get(this.$store.state.api + "selectAllScore")
 
+        .then((res) => {
 
+          var scoreList = res.data[0];
 
+          for (var i = 0; i < t.length; i++) {
 
+            for (var j = 0; j < scoreList.length; j++) {
 
+              if (t[i].id == scoreList[j].rid) {
 
+                t[i].score = scoreList[j].score;
 
+              }
 
+            }
 
+          }
 
+          this.tableData = t;
 
+          this.$forceUpdate();
 
+        })
 
+        .catch((err) => {
 
+          console.error(err);
 
+        });
 
+    },
 
     selectType(rc) {
 
       this.ajax
 
         .get(this.$store.state.api + "selectMatType")
 
@@ -617,6 +772,7 @@ export default {
 
     getScore(id, t) {
 
       let params = {
 
         rid: id,
 
+        suser: this.$store.state.userInfo.userid,
 
       };
 
       this.ajax
 
         .get(this.$store.state.api + "selectScore", params)
 
@@ -626,16 +782,17 @@ export default {
 
             var a = parseInt(this.scoreDetail[0].scoreAll.first);
 
             var b = parseInt(this.scoreDetail[0].scoreAll.second);
 
             var c = parseInt(this.scoreDetail[0].scoreAll.third);
 
-            var d = parseInt(this.scoreDetail[0].scoreAll.fourth);
 
-            var e = parseInt(this.scoreDetail[0].scoreAll.fivth);
 
-            this.scoreDetail[0].sumScore = Math.round((a + b + c + d + e) / 5);
 
+            // var d = parseInt(this.scoreDetail[0].scoreAll.fourth);
 
+            // var e = parseInt(this.scoreDetail[0].scoreAll.fivth);
 
+            // this.scoreDetail[0].sumScore = Math.round((a + b + c + d + e) / 5);
 
+            this.scoreDetail[0].sumScore = Math.round((a + b + c) / 3);
 
           } else {
 
             this.scoreDetail[0].scoreAll = {
 
               first: "",
 
               second: "",
 
               third: "",
 
-              fourth: "",
 
-              fivth: "",
 
+              // fourth: "",
 
+              // fivth: "",
 
               content: "",
 
             };
 
             this.scoreDetail[0].sumScore = 0;
 
@@ -660,13 +817,14 @@ export default {
 
       } else if (this.scoreDetail[0].scoreAll.third == "") {
 
         this.$message.error("请将信息填写完整");
 
         return;
 
-      } else if (this.scoreDetail[0].scoreAll.fourth == "") {
 
-        this.$message.error("请将信息填写完整");
 
-        return;
 
-      } else if (this.scoreDetail[0].scoreAll.fivth == "") {
 
-        this.$message.error("请将信息填写完整");
 
-        return;
 
       }
 
+      //  else if (this.scoreDetail[0].scoreAll.fourth == "") {
 
+      //   this.$message.error("请将信息填写完整");
 
+      //   return;
 
+      // } else if (this.scoreDetail[0].scoreAll.fivth == "") {
 
+      //   this.$message.error("请将信息填写完整");
 
+      //   return;
 
+      // }
 
       let params = {
 
         rid: this.scoreDetail[0].id,
 
         suser: this.$store.state.userInfo.userid,
 
@@ -689,8 +847,8 @@ export default {
 
                 first: "",
 
                 second: "",
 
                 third: "",
 
-                fourth: "",
 
-                fivth: "",
 
+                // fourth: "",
 
+                // fivth: "",
 
                 content: "",
 
               },
 
               sumScore: 0,
 
@@ -897,7 +1055,7 @@ export default {
 
   flex-direction: row;
 
   flex-wrap: nowrap;
 
   align-items: center;
 
-  justify-content: flex-end;
 
+  justify-content: center;
 
   padding: 10px 0 0 0;
 
 }
 
 
@@ -908,8 +1066,6 @@ export default {
 
 .anliButton > div > .el-button {
 
   background: #409efe;
 
   color: #fff;
 
-  width: 80px;
 
-  border-radius: 5px;
 
 }
 
 
 .customWidth >>> .el-dialog {
 
@@ -971,7 +1127,7 @@ export default {
 
 }
 
 
 .people_search > div:nth-child(1) {
 
-  font-size: 20px;
 
+  font-size: 16px;
 
   margin-right: 10px;
 
 }
 
 
@@ -1086,6 +1242,10 @@ export default {
 
   align-items: center;
 
   padding: 10px 0;
 
 }
 
+.scoreDiv > div:nth-child(1) {
 
+  min-width: 90px;
 
+  width: 90px;
 
+}
 
 .scoreDiv > div:nth-child(2) {
 
   margin-left: 10px;
 
 }
 
@@ -1201,10 +1361,25 @@ export default {
 
 }
 
 
 .aName {
 
-  margin-left: 10px;
 
+  position: relative;
 
 }
 
 
 .aName >>> .el-input__inner {
 
-  width: 300px;
 
+  width: 290px;
 
+  text-indent: 12px;
 
+}
 
+
 
+.searchImg {
 
+  width: 20px;
 
+  height: 20px;
 
+  position: absolute;
 
+  z-index: 9;
 
+  top: 10px;
 
+  left: 5px;
 
+}
 
+
 
+.searchImg > img {
 
+  width: 100%;
 
+  height: 100%;
 
 }
 
 </style>

+ 2 - 2
src/components/pages/munAdmin/data.vue
View File 

@@ -12,7 +12,7 @@
 
       <div>
 
         <span>我的资料</span>
 
       </div>
 
-      <div>
 
+      <div v-if="$store.state.userInfo.type == 1">
 
         <el-button @click="goTo('/eventCenter')" type="primary" size="small"
 
           >返回</el-button
 
         >
 
@@ -22,7 +22,7 @@
 
       <div style="width: 100%; margin: 0px auto">
 
         <div
 
           :class="
 
-            this.$store.state.userInfo.type == 1 ? 'isDataNav' : 'data_nav'
 
+            $store.state.userInfo.type == 1 ? 'isDataNav' : 'data_nav'
 
           "
 
         >
 
           <span @click="type = 1" :class="{ active: type == 1 }">我的资料</span>

+ 152 - 59
src/components/pages/munAdmin/score.vue
View File 

@@ -45,12 +45,24 @@
 
           </div> -->
 
         </div>
 
         <div @click="clear" class="clear">重置</div>
 
+        <div class="aName">
 
+          <el-input
 
+            v-model="anliName"
 
+            auto-complete="off"
 
+            placeholder="请输入案例名称"
 
+            @input="search"
 
+          ></el-input>
 
+        </div>
 
       </div>
 
     </div>
 
     <div v-if="isNoTableData" class="isNoMessage">
 
       <img src="../../../assets/icon/isNoMessage.png" alt />
 
     </div>
 
-    <div class="pb_content_body" style="margin: 0 auto" v-if="tableData.length > 0">
 
+    <div
 
+      class="pb_content_body"
 
+      style="margin: 0 auto"
 
+      v-if="tableData.length > 0"
 
+    >
 
       <div class="student_table">
 
         <el-table
 
           ref="table"
 
@@ -63,6 +75,13 @@
 
           :header-cell-style="{ background: '#f1f1f1', fontSize: '17px' }"
 
           :row-class-name="tableRowClassName"
 
         >
 
+          <el-table-column label="排名" min-width="10" align="center">
 
+            <template slot-scope="scope">
 
+              <div>
 
+                {{ (page - 1) * 10 + scope.$index + 1 }}
 
+              </div>
 
+            </template>
 
+          </el-table-column>
 
           <el-table-column label="创建人" min-width="10" align="center">
 
             <template slot-scope="scope">
 
               <div class="userImg">
 
@@ -166,7 +185,7 @@
 
             <div>请选择评分</div>
 
             <div>
 
               <div class="scoreDiv">
 
-                <div>评审维度1</div>
 
+                <div>项目式学习</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -176,7 +195,7 @@
 
                 </div>
 
               </div>
 
               <div class="scoreDiv">
 
-                <div>评审维度2</div>
 
+                <div>项目成果</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -186,7 +205,7 @@
 
                 </div>
 
               </div>
 
               <div class="scoreDiv">
 
-                <div>评审维度3</div>
 
+                <div>项目评价</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -195,7 +214,7 @@
 
                   ></el-input>
 
                 </div>
 
               </div>
 
-              <div class="scoreDiv">
 
+              <!-- <div class="scoreDiv">
 
                 <div>评审维度4</div>
 
                 <div>
 
                   <el-input
 
@@ -214,7 +233,7 @@
 
                     @change="isNumber($event, 5)"
 
                   ></el-input>
 
                 </div>
 
-              </div>
 
+              </div> -->
 
             </div>
 
           </div>
 
           <div class="anliContent">
 
@@ -277,6 +296,7 @@ export default {
 
       CourseTypeJson: {},
 
       courseTypeId: {},
 
       courseTypeSon: [],
 
+      anliName: "",
 
       anliBox: "",
 
       tableData: [],
 
       reviewer: "",
 
@@ -298,8 +318,8 @@ export default {
 
             first: "",
 
             second: "",
 
             third: "",
 
-            fourth: "",
 
-            fivth: "",
 
+            // fourth: "",
 
+            // fivth: "",
 
             content: "",
 
           },
 
           sumScore: 0,
 
@@ -354,13 +374,14 @@ export default {
 
             this.scoreDetail[0].scoreAll.first = "";
 
           } else if (t == 2) {
 
             this.scoreDetail[0].scoreAll.second = "";
 
-          } else if (t == 3) {
 
-            this.scoreDetail[0].scoreAll.third = "";
 
-          } else if (t == 4) {
 
-            this.scoreDetail[0].scoreAll.fourth = "";
 
           } else {
 
-            this.scoreDetail[0].scoreAll.fivth = "";
 
+            this.scoreDetail[0].scoreAll.third = "";
 
           }
 
+          //  else if (t == 4) {
 
+          //   this.scoreDetail[0].scoreAll.fourth = "";
 
+          // } else {
 
+          //   this.scoreDetail[0].scoreAll.fivth = "";
 
+          // }
 
           return;
 
         } else if (e > 100) {
 
           this.$message.error("数值不能大于100");
 
@@ -368,13 +389,14 @@ export default {
 
             this.scoreDetail[0].scoreAll.first = "";
 
           } else if (t == 2) {
 
             this.scoreDetail[0].scoreAll.second = "";
 
-          } else if (t == 3) {
 
-            this.scoreDetail[0].scoreAll.third = "";
 
-          } else if (t == 4) {
 
-            this.scoreDetail[0].scoreAll.fourth = "";
 
           } else {
 
-            this.scoreDetail[0].scoreAll.fivth = "";
 
+            this.scoreDetail[0].scoreAll.third = "";
 
           }
 
+          //  else if (t == 4) {
 
+          //   this.scoreDetail[0].scoreAll.fourth = "";
 
+          // } else {
 
+          //   this.scoreDetail[0].scoreAll.fivth = "";
 
+          // }
 
           return;
 
         }
 
       } else {
 
@@ -382,13 +404,14 @@ export default {
 
           this.scoreDetail[0].scoreAll.first = "";
 
         } else if (t == 2) {
 
           this.scoreDetail[0].scoreAll.second = "";
 
-        } else if (t == 3) {
 
-          this.scoreDetail[0].scoreAll.third = "";
 
-        } else if (t == 4) {
 
-          this.scoreDetail[0].scoreAll.fourth = "";
 
         } else {
 
-          this.scoreDetail[0].scoreAll.fivth = "";
 
+          this.scoreDetail[0].scoreAll.third = "";
 
         }
 
+        //  else if (t == 4) {
 
+        //   this.scoreDetail[0].scoreAll.fourth = "";
 
+        // } else {
 
+        //   this.scoreDetail[0].scoreAll.fivth = "";
 
+        // }
 
         this.$message.error("请输入数字");
 
         return;
 
       }
 
@@ -433,40 +456,97 @@ export default {
 
         typeE: typeE.join(","),
 
         cn: this.anliBox == "" ? 0 : this.anliBox,
 
         cid: rc ? rc : "",
 
-        page: this.page,
 
+        title: this.anliName,
 
       };
 
       this.ajax
 
-        .get(this.$store.state.api + "selectPoint1", params)
 
+        .get(this.$store.state.api + "selectPointAll", params)
 
         .then((res) => {
 
-          this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
-          this.tableData = res.data[0];
 
-          for (var i = 0; i < this.tableData.length; i++) {
 
-            this.tableData[i].info = JSON.parse(this.tableData[i].info);
 
-            this.tableData[i].overview = JSON.parse(this.tableData[i].overview);
 
-            this.tableData[i].process = JSON.parse(this.tableData[i].process);
 
-            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 != null) {
 
-              var point = JSON.parse(this.tableData[i].score);
 
+          this.total = res.data[0].length > 0 ? res.data[0].length : 0;
 
+          var scoreList = res.data[0];
 
+          for (var i = 0; i < scoreList.length; i++) {
 
+            scoreList[i].info = JSON.parse(scoreList[i].info);
 
+            if (scoreList[i].score != null) {
 
+              var point = JSON.parse(scoreList[i].score);
 
               var a = parseInt(point.first);
 
               var b = parseInt(point.second);
 
               var c = parseInt(point.third);
 
-              var d = parseInt(point.fourth);
 
-              var e = parseInt(point.fivth);
 
-              var sumScore = Math.round((a + b + c + d + e) / 5);
 
-              this.tableData[i].sum = sumScore;
 
+              var sumScore = Math.round((a + b + c) / 3);
 
+              scoreList[i].sum = sumScore;
 
             }
 
-            var a = JSON.parse(JSON.stringify(this.tableData));
 
-            a.sort((item1, item2) => item2.sum - item1.sum);
 
-            this.tableData = a;
 
           }
 
+          scoreList.sort((item1, item2) => item2.sum - item1.sum);
 
+          const start = (this.page - 1) * 10;
 
+          const end = start + 10;
 
+          let pageData = scoreList.slice(start, end);
 
+          this.tableData = pageData;
 
           this.isLoading = false;
 
         })
 
         .catch((err) => {
 
           console.error(err);
 
         });
 
     },
 
+    // getAnliList(rc) {
 
+    //   this.isLoading = true;
 
+    //   var typeE = [];
 
+    //   var typea, typeb, typec, typed;
 
+    //   for (var i = 0; i < this.CourseType[0].length; i++) {
 
+    //     if (this.courseTypeId[this.CourseType[0][i].id] == "1") {
 
+    //       typeE.push(this.CourseType[0][i].id);
 
+    //     } else if (this.courseTypeId[this.CourseType[0][i].id] != "") {
 
+    //       if (this.CourseType[0][i].name == "案例组别") {
 
+    //         typea = this.courseTypeId[this.CourseType[0][i].id];
 
+    //       } else if (this.CourseType[0][i].name == "年级") {
 
+    //         typeb = this.courseTypeId[this.CourseType[0][i].id];
 
+    //       } else if (this.CourseType[0][i].name == "学科") {
 
+    //         typec = this.courseTypeId[this.CourseType[0][i].id];
 
+    //       }
 
+    //       this.courseTypeSon.push(this.courseTypeId[this.CourseType[0][i].id]);
 
+    //     }
 
+    //   }
 
+    //   let params = {
 
+    //     typea: typea != undefined ? typea : "",
 
+    //     typeb: typeb != undefined ? typeb : "",
 
+    //     typec: typec != undefined ? typec : "",
 
+    //     typed: typed != undefined ? typed : "",
 
+    //     typeE: typeE.join(","),
 
+    //     cn: this.anliBox == "" ? 0 : this.anliBox,
 
+    //     cid: rc ? rc : "",
 
+    //     title: this.anliName,
 
+    //     page: this.page,
 
+    //   };
 
+    //   this.ajax
 
+    //     .get(this.$store.state.api + "selectPoint1", params)
 
+    //     .then((res) => {
 
+    //       this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
+    //       this.tableData = res.data[0];
 
+    //       for (var i = 0; i < this.tableData.length; i++) {
 
+    //         this.tableData[i].info = JSON.parse(this.tableData[i].info);
 
+    //         this.tableData[i].overview = JSON.parse(this.tableData[i].overview);
 
+    //         this.tableData[i].process = JSON.parse(this.tableData[i].process);
 
+    //         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 != null) {
 
+    //           var point = JSON.parse(this.tableData[i].score);
 
+    //           var a = parseInt(point.first);
 
+    //           var b = parseInt(point.second);
 
+    //           var c = parseInt(point.third);
 
+    //           // var d = parseInt(point.fourth);
 
+    //           // var e = parseInt(point.fivth);
 
+    //           // var sumScore = Math.round((a + b + c + d + e) / 5);
 
+    //           var sumScore = Math.round((a + b + c) / 3);
 
+    //           this.tableData[i].sum = sumScore;
 
+    //         }
 
+    //         var a = JSON.parse(JSON.stringify(this.tableData));
 
+    //         a.sort((item1, item2) => item2.sum - item1.sum);
 
+    //         this.tableData = a;
 
+    //       }
 
+    //       this.isLoading = false;
 
+    //     })
 
+    //     .catch((err) => {
 
+    //       console.error(err);
 
+    //     });
 
+    // },
 
     selectType(rc) {
 
       this.ajax
 
         .get(this.$store.state.api + "selectMatType")
 
@@ -484,7 +564,7 @@ export default {
 
           }
 
           if (rc) {
 
             this.getAnliList(rc);
 
-          }else{
 
+          } else {
 
             this.getAnliList();
 
           }
 
         })
 
@@ -551,16 +631,17 @@ export default {
 
             var a = parseInt(this.scoreDetail[0].scoreAll.first);
 
             var b = parseInt(this.scoreDetail[0].scoreAll.second);
 
             var c = parseInt(this.scoreDetail[0].scoreAll.third);
 
-            var d = parseInt(this.scoreDetail[0].scoreAll.fourth);
 
-            var e = parseInt(this.scoreDetail[0].scoreAll.fivth);
 
-            this.scoreDetail[0].sumScore = Math.round((a + b + c + d + e) / 5);
 
+            // var d = parseInt(this.scoreDetail[0].scoreAll.fourth);
 
+            // var e = parseInt(this.scoreDetail[0].scoreAll.fivth);
 
+            // this.scoreDetail[0].sumScore = Math.round((a + b + c + d + e) / 5);
 
+            this.scoreDetail[0].sumScore = Math.round((a + b + c) / 3);
 
           } else {
 
             this.scoreDetail[0].scoreAll = {
 
               first: "",
 
               second: "",
 
               third: "",
 
-              fourth: "",
 
-              fivth: "",
 
+              // fourth: "",
 
+              // fivth: "",
 
               content: "",
 
             };
 
             this.scoreDetail[0].sumScore = 0;
 
@@ -585,13 +666,14 @@ export default {
 
       } else if (this.scoreDetail[0].scoreAll.third == "") {
 
         this.$message.error("请将信息填写完整");
 
         return;
 
-      } else if (this.scoreDetail[0].scoreAll.fourth == "") {
 
-        this.$message.error("请将信息填写完整");
 
-        return;
 
-      } else if (this.scoreDetail[0].scoreAll.fivth == "") {
 
-        this.$message.error("请将信息填写完整");
 
-        return;
 
       }
 
+      //  else if (this.scoreDetail[0].scoreAll.fourth == "") {
 
+      //   this.$message.error("请将信息填写完整");
 
+      //   return;
 
+      // } else if (this.scoreDetail[0].scoreAll.fivth == "") {
 
+      //   this.$message.error("请将信息填写完整");
 
+      //   return;
 
+      // }
 
       let params = {
 
         rid: this.scoreDetail[0].id,
 
         suser: this.$store.state.userInfo.userid,
 
@@ -614,8 +696,8 @@ export default {
 
                 first: "",
 
                 second: "",
 
                 third: "",
 
-                fourth: "",
 
-                fivth: "",
 
+                // fourth: "",
 
+                // fivth: "",
 
                 content: "",
 
               },
 
               sumScore: 0,
 
@@ -1005,6 +1087,10 @@ export default {
 
   align-items: center;
 
   padding: 10px 0;
 
 }
 
+.scoreDiv > div:nth-child(1) {
 
+  min-width: 90px;
 
+  width: 90px;
 
+}
 
 .scoreDiv > div:nth-child(2) {
 
   margin-left: 10px;
 
 }
 
@@ -1114,9 +1200,9 @@ export default {
 
   flex-direction: row;
 
   flex-wrap: nowrap;
 
   align-items: center;
 
-  color: #43A0F5;
 
+  color: #43a0f5;
 
 }
 
-.tableButton>div{
 
+.tableButton > div {
 
   margin-right: 10px;
 
   cursor: pointer;
 
 }
 
@@ -1129,4 +1215,11 @@ export default {
 
   width: 100%;
 
   height: 100%;
 
 }
 
+.aName {
 
+  margin-left: 10px;
 
+}
 
+
 
+.aName >>> .el-input__inner {
 
+  width: 300px;
 
+}
 
 </style>

+ 29 - 7
src/components/pages/munAdmin/user.vue
View File 

@@ -77,7 +77,9 @@
 
           <el-table-column label="操作" min-width="20">
 
             <template slot-scope="scope">
 
               <div class="tableButton">
 
-                <el-button v-if="scope.row.type == 4" @click="assCase(scope.row.userid)"
 
+                <el-button
 
+                  v-if="scope.row.type == 4"
 
+                  @click="assCase(scope.row.userid)"
 
                   >分配案例</el-button
 
                 >
 
                 <el-button @click="upUser(scope.row)">修改</el-button>
 
@@ -156,8 +158,12 @@
 
             </el-option>
 
           </el-select>
 
         </el-form-item>
 
-        <div style="text-align: center; color: #adb3b7">
 
-          注：添加账号账号密码为123456
 
+        <div class="tips">
 
+          <div>注：</div>
 
+          <div class="tipsList">
 
+            <div>1、添加账号账号密码为123456</div>
 
+            <div>2、请使用生成的账号登录平台</div>
 
+          </div>
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -426,10 +432,11 @@ export default {
 
       } else if (this.sType == "") {
 
         this.$message.error("请选择权限");
 
         return;
 
-      } else if (this.sSchool == "") {
 
-        this.$message.error("请选择学校");
 
-        return;
 
       }
 
+      //  else if (this.sSchool == "") {
 
+      //   this.$message.error("请选择学校");
 
+      //   return;
 
+      // }
 
       let params = [
 
         {
 
           reg: "",
 
@@ -473,7 +480,7 @@ export default {
 
         n: this.sName,
 
         p: this.sPhone,
 
         t: this.sType,
 
-        s: this.$store.state.userInfo.school,
 
+        s: this.sSchool,
 
         uid: this.upId,
 
       };
 
       this.ajax
 
@@ -487,6 +494,7 @@ export default {
 
           this.sPhone = "";
 
           this.sType = "";
 
           this.upId = "";
 
+          this.sSchool = "";
 
           this.isAddOrUp = false;
 
           this.dialogVisible = false;
 
           this.getAdmin();
 
@@ -782,4 +790,18 @@ export default {
 
 .people_name >>> .el-checkbox {
 
   margin-bottom: 10px;
 
 }
 
+.tips {
 
+  color: #adb3b7;
 
+  display: flex;
 
+  flex-direction: row;
 
+  flex-wrap: nowrap;
 
+  align-items: flex-start;
 
+  justify-content: center;
 
+}
 
+.tipsList {
 
+  display: flex;
 
+  flex-direction: column;
 
+  flex-wrap: nowrap;
 
+  align-items: flex-start;
 
+}
 
 </style>

+ 44 - 35
src/components/pages/proAdmin/anliList.vue
View File 

@@ -189,7 +189,7 @@
 
             <div>请选择评分</div>
 
             <div>
 
               <div class="scoreDiv">
 
-                <div>评审维度1</div>
 
+                <div>项目式学习</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -199,7 +199,7 @@
 
                 </div>
 
               </div>
 
               <div class="scoreDiv">
 
-                <div>评审维度2</div>
 
+                <div>项目成果</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -209,7 +209,7 @@
 
                 </div>
 
               </div>
 
               <div class="scoreDiv">
 
-                <div>评审维度3</div>
 
+                <div>项目评价</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -218,7 +218,7 @@
 
                   ></el-input>
 
                 </div>
 
               </div>
 
-              <div class="scoreDiv">
 
+              <!-- <div class="scoreDiv">
 
                 <div>评审维度4</div>
 
                 <div>
 
                   <el-input
 
@@ -237,7 +237,7 @@
 
                     @change="isNumber($event, 5)"
 
                   ></el-input>
 
                 </div>
 
-              </div>
 
+              </div> -->
 
             </div>
 
           </div>
 
           <div class="anliContent">
 
@@ -323,8 +323,8 @@ export default {
 
             first: "",
 
             second: "",
 
             third: "",
 
-            fourth: "",
 
-            fivth: "",
 
+            // fourth: "",
 
+            // fivth: "",
 
             content: "",
 
           },
 
           sumScore: 0,
 
@@ -354,13 +354,14 @@ export default {
 
             this.scoreDetail[0].scoreAll.first = "";
 
           } else if (t == 2) {
 
             this.scoreDetail[0].scoreAll.second = "";
 
-          } else if (t == 3) {
 
-            this.scoreDetail[0].scoreAll.third = "";
 
-          } else if (t == 4) {
 
-            this.scoreDetail[0].scoreAll.fourth = "";
 
           } else {
 
-            this.scoreDetail[0].scoreAll.fivth = "";
 
+            this.scoreDetail[0].scoreAll.third = "";
 
           }
 
+          //  else if (t == 4) {
 
+          //   this.scoreDetail[0].scoreAll.fourth = "";
 
+          // } else {
 
+          //   this.scoreDetail[0].scoreAll.fivth = "";
 
+          // }
 
           return;
 
         } else if (e > 100) {
 
           this.$message.error("数值不能大于100");
 
@@ -368,13 +369,14 @@ export default {
 
             this.scoreDetail[0].scoreAll.first = "";
 
           } else if (t == 2) {
 
             this.scoreDetail[0].scoreAll.second = "";
 
-          } else if (t == 3) {
 
-            this.scoreDetail[0].scoreAll.third = "";
 
-          } else if (t == 4) {
 
-            this.scoreDetail[0].scoreAll.fourth = "";
 
           } else {
 
-            this.scoreDetail[0].scoreAll.fivth = "";
 
+            this.scoreDetail[0].scoreAll.third = "";
 
           }
 
+          //  else if (t == 4) {
 
+          //   this.scoreDetail[0].scoreAll.fourth = "";
 
+          // } else {
 
+          //   this.scoreDetail[0].scoreAll.fivth = "";
 
+          // }
 
           return;
 
         }
 
       } else {
 
@@ -382,13 +384,14 @@ export default {
 
           this.scoreDetail[0].scoreAll.first = "";
 
         } else if (t == 2) {
 
           this.scoreDetail[0].scoreAll.second = "";
 
-        } else if (t == 3) {
 
-          this.scoreDetail[0].scoreAll.third = "";
 
-        } else if (t == 4) {
 
-          this.scoreDetail[0].scoreAll.fourth = "";
 
         } else {
 
-          this.scoreDetail[0].scoreAll.fivth = "";
 
+          this.scoreDetail[0].scoreAll.third = "";
 
         }
 
+        //  else if (t == 4) {
 
+        //   this.scoreDetail[0].scoreAll.fourth = "";
 
+        // } else {
 
+        //   this.scoreDetail[0].scoreAll.fivth = "";
 
+        // }
 
         this.$message.error("请输入数字");
 
         return;
 
       }
 
@@ -598,16 +601,17 @@ export default {
 
             var a = parseInt(this.scoreDetail[0].scoreAll.first);
 
             var b = parseInt(this.scoreDetail[0].scoreAll.second);
 
             var c = parseInt(this.scoreDetail[0].scoreAll.third);
 
-            var d = parseInt(this.scoreDetail[0].scoreAll.fourth);
 
-            var e = parseInt(this.scoreDetail[0].scoreAll.fivth);
 
-            this.scoreDetail[0].sumScore = Math.round((a + b + c + d + e) / 5);
 
+            // var d = parseInt(this.scoreDetail[0].scoreAll.fourth);
 
+            // var e = parseInt(this.scoreDetail[0].scoreAll.fivth);
 
+            // this.scoreDetail[0].sumScore = Math.round((a + b + c + d + e) / 5);
 
+            this.scoreDetail[0].sumScore = Math.round((a + b + c) / 3);
 
           } else {
 
             this.scoreDetail[0].scoreAll = {
 
               first: "",
 
               second: "",
 
               third: "",
 
-              fourth: "",
 
-              fivth: "",
 
+              // fourth: "",
 
+              // fivth: "",
 
               content: "",
 
             };
 
             this.scoreDetail[0].sumScore = 0;
 
@@ -632,13 +636,14 @@ export default {
 
       } else if (this.scoreDetail[0].scoreAll.third == "") {
 
         this.$message.error("请将信息填写完整");
 
         return;
 
-      } else if (this.scoreDetail[0].scoreAll.fourth == "") {
 
-        this.$message.error("请将信息填写完整");
 
-        return;
 
-      } else if (this.scoreDetail[0].scoreAll.fivth == "") {
 
-        this.$message.error("请将信息填写完整");
 
-        return;
 
       }
 
+      //  else if (this.scoreDetail[0].scoreAll.fourth == "") {
 
+      //   this.$message.error("请将信息填写完整");
 
+      //   return;
 
+      // } else if (this.scoreDetail[0].scoreAll.fivth == "") {
 
+      //   this.$message.error("请将信息填写完整");
 
+      //   return;
 
+      // }
 
       let params = {
 
         rid: this.scoreDetail[0].id,
 
         suser: this.$store.state.userInfo.userid,
 
@@ -661,8 +666,8 @@ export default {
 
                 first: "",
 
                 second: "",
 
                 third: "",
 
-                fourth: "",
 
-                fivth: "",
 
+                // fourth: "",
 
+                // fivth: "",
 
                 content: "",
 
               },
 
               sumScore: 0,
 
@@ -1058,6 +1063,10 @@ export default {
 
   align-items: center;
 
   padding: 10px 0;
 
 }
 
+.scoreDiv > div:nth-child(1) {
 
+  min-width: 90px;
 
+  width: 90px;
 
+}
 
 .scoreDiv > div:nth-child(2) {
 
   margin-left: 10px;
 
 }

+ 44 - 35
src/components/pages/race/eventCenter/anliDetail.vue
View File 

@@ -2228,7 +2228,7 @@
 
             <div>请选择评分</div>
 
             <div>
 
               <div class="scoreDiv">
 
-                <div>评审维度1</div>
 
+                <div>项目式学习</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -2238,7 +2238,7 @@
 
                 </div>
 
               </div>
 
               <div class="scoreDiv">
 
-                <div>评审维度2</div>
 
+                <div>项目成果</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -2248,7 +2248,7 @@
 
                 </div>
 
               </div>
 
               <div class="scoreDiv">
 
-                <div>评审维度3</div>
 
+                <div>项目评价</div>
 
                 <div>
 
                   <el-input
 
                     placeholder="输入分数"
 
@@ -2257,7 +2257,7 @@
 
                   ></el-input>
 
                 </div>
 
               </div>
 
-              <div class="scoreDiv">
 
+              <!-- <div class="scoreDiv">
 
                 <div>评审维度4</div>
 
                 <div>
 
                   <el-input
 
@@ -2276,7 +2276,7 @@
 
                     @change="isNumber($event, 5)"
 
                   ></el-input>
 
                 </div>
 
-              </div>
 
+              </div> -->
 
             </div>
 
           </div>
 
           <div class="anliContent">
 
@@ -2393,8 +2393,8 @@ export default {
 
             first: "",
 
             second: "",
 
             third: "",
 
-            fourth: "",
 
-            fivth: "",
 
+            // fourth: "",
 
+            // fivth: "",
 
             content: "",
 
           },
 
           sumScore: 0,
 
@@ -2436,13 +2436,14 @@ export default {
 
             this.scoreDetail[0].scoreAll.first = "";
 
           } else if (t == 2) {
 
             this.scoreDetail[0].scoreAll.second = "";
 
-          } else if (t == 3) {
 
-            this.scoreDetail[0].scoreAll.third = "";
 
-          } else if (t == 4) {
 
-            this.scoreDetail[0].scoreAll.fourth = "";
 
           } else {
 
-            this.scoreDetail[0].scoreAll.fivth = "";
 
+            this.scoreDetail[0].scoreAll.third = "";
 
           }
 
+          //  else if (t == 4) {
 
+          //   this.scoreDetail[0].scoreAll.fourth = "";
 
+          // } else {
 
+          //   this.scoreDetail[0].scoreAll.fivth = "";
 
+          // }
 
           return;
 
         } else if (e > 100) {
 
           this.$message.error("数值不能大于100");
 
@@ -2450,13 +2451,14 @@ export default {
 
             this.scoreDetail[0].scoreAll.first = "";
 
           } else if (t == 2) {
 
             this.scoreDetail[0].scoreAll.second = "";
 
-          } else if (t == 3) {
 
-            this.scoreDetail[0].scoreAll.third = "";
 
-          } else if (t == 4) {
 
-            this.scoreDetail[0].scoreAll.fourth = "";
 
           } else {
 
-            this.scoreDetail[0].scoreAll.fivth = "";
 
+            this.scoreDetail[0].scoreAll.third = "";
 
           }
 
+          //  else if (t == 4) {
 
+          //   this.scoreDetail[0].scoreAll.fourth = "";
 
+          // } else {
 
+          //   this.scoreDetail[0].scoreAll.fivth = "";
 
+          // }
 
           return;
 
         }
 
       } else {
 
@@ -2464,13 +2466,14 @@ export default {
 
           this.scoreDetail[0].scoreAll.first = "";
 
         } else if (t == 2) {
 
           this.scoreDetail[0].scoreAll.second = "";
 
-        } else if (t == 3) {
 
-          this.scoreDetail[0].scoreAll.third = "";
 
-        } else if (t == 4) {
 
-          this.scoreDetail[0].scoreAll.fourth = "";
 
         } else {
 
-          this.scoreDetail[0].scoreAll.fivth = "";
 
+          this.scoreDetail[0].scoreAll.third = "";
 
         }
 
+        //  else if (t == 4) {
 
+        //   this.scoreDetail[0].scoreAll.fourth = "";
 
+        // } else {
 
+        //   this.scoreDetail[0].scoreAll.fivth = "";
 
+        // }
 
         this.$message.error("请输入数字");
 
         return;
 
       }
 
@@ -2498,16 +2501,17 @@ export default {
 
             var a = parseInt(this.scoreDetail[0].scoreAll.first);
 
             var b = parseInt(this.scoreDetail[0].scoreAll.second);
 
             var c = parseInt(this.scoreDetail[0].scoreAll.third);
 
-            var d = parseInt(this.scoreDetail[0].scoreAll.fourth);
 
-            var e = parseInt(this.scoreDetail[0].scoreAll.fivth);
 
-            this.scoreDetail[0].sumScore = Math.round((a + b + c + d + e) / 5);
 
+            // var d = parseInt(this.scoreDetail[0].scoreAll.fourth);
 
+            // var e = parseInt(this.scoreDetail[0].scoreAll.fivth);
 
+            // this.scoreDetail[0].sumScore = Math.round((a + b + c + d + e) / 5);
 
+            this.scoreDetail[0].sumScore = Math.round((a + b + c) / 3);
 
           } else {
 
             this.scoreDetail[0].scoreAll = {
 
               first: "",
 
               second: "",
 
               third: "",
 
-              fourth: "",
 
-              fivth: "",
 
+              // fourth: "",
 
+              // fivth: "",
 
               content: "",
 
             };
 
             this.scoreDetail[0].sumScore = 0;
 
@@ -2528,13 +2532,14 @@ export default {
 
       } else if (this.scoreDetail[0].scoreAll.third == "") {
 
         this.$message.error("请将信息填写完整");
 
         return;
 
-      } else if (this.scoreDetail[0].scoreAll.fourth == "") {
 
-        this.$message.error("请将信息填写完整");
 
-        return;
 
-      } else if (this.scoreDetail[0].scoreAll.fivth == "") {
 
-        this.$message.error("请将信息填写完整");
 
-        return;
 
       }
 
+      //  else if (this.scoreDetail[0].scoreAll.fourth == "") {
 
+      //   this.$message.error("请将信息填写完整");
 
+      //   return;
 
+      // } else if (this.scoreDetail[0].scoreAll.fivth == "") {
 
+      //   this.$message.error("请将信息填写完整");
 
+      //   return;
 
+      // }
 
       let params = {
 
         rid: this.scoreDetail[0].id,
 
         suser: this.$store.state.userInfo.userid,
 
@@ -2557,8 +2562,8 @@ export default {
 
                 first: "",
 
                 second: "",
 
                 third: "",
 
-                fourth: "",
 
-                fivth: "",
 
+                // fourth: "",
 
+                // fivth: "",
 
                 content: "",
 
               },
 
               sumScore: 0,
 
@@ -4528,6 +4533,10 @@ ol {
 
   align-items: center;
 
   padding: 10px 0;
 
 }
 
+.scoreDiv > div:nth-child(1) {
 
+  min-width: 90px;
 
+  width: 90px;
 
+}
 
 .scoreDiv > div:nth-child(2) {
 
   margin-left: 10px;
 
 }

+ 2 - 2
src/components/tools/leftBar.vue
View File 

@@ -21,7 +21,7 @@
 
             </div>
 
             <span>区县管理</span>
 
           </el-menu-item> -->
 
-          <el-menu-item index="/user" v-if="nav.indexOf('/user') != -1">
 
+          <el-menu-item index="/user" v-if="nav.indexOf('/user') != -1 && $store.state.userInfo.type == 2">
 
             <div class="img" v-if="path == '/user'">
 
               <img src="../../assets/icon/user-active.png" alt="" />
 
             </div>
 
@@ -77,7 +77,7 @@
 
             </div>
 
             <span>案例管理</span>
 
           </el-menu-item>
 
-          <el-menu-item index="/user1" v-if="nav.indexOf('/user1') != -1">
 
+          <el-menu-item index="/user1" v-if="nav.indexOf('/user1') != -1 && $store.state.userInfo.type == 5">
 
             <div class="img" v-if="path == '/user1'">
 
               <img src="../../assets/icon/user-active.png" alt="" />
 
             </div>

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