9 months ago · e92fc1c791
--- a/dist/index.html
+++ b/dist/index.html
@@ -32,4 +32,4 @@
 
				             background: #e6eaf0;
			
 
				 						font-family: '黑体';
			
 
				 						/* font-family: 'Source Han Sans SC', sans-serif; */
			
 
				-        }</style><link href=./static/css/app.32eb6d7629ee7ec2ed293f66a08b2d8a.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.2f61b77fba6c932585e1.js></script><script type=text/javascript src=./static/js/app.6db4262d999b4127b1f5.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>
			
 
				+        }</style><link href=./static/css/app.0612387c9f292737ceb3f5f42bb086d9.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.2f61b77fba6c932585e1.js></script><script type=text/javascript src=./static/js/app.873ba29e990ee944222c.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>
			
--- a/dist/static/css/app.0612387c9f292737ceb3f5f42bb086d9.css
+++ b/dist/static/css/app.0612387c9f292737ceb3f5f42bb086d9.css
--- a/dist/static/css/app.0612387c9f292737ceb3f5f42bb086d9.css.map
+++ b/dist/static/css/app.0612387c9f292737ceb3f5f42bb086d9.css.map
--- a/dist/static/js/app.6db4262d999b4127b1f5.js
+++ b/dist/static/js/app.6db4262d999b4127b1f5.js
--- a/dist/static/js/app.6db4262d999b4127b1f5.js.map
+++ b/dist/static/js/app.6db4262d999b4127b1f5.js.map
--- a/dist/static/js/app.873ba29e990ee944222c.js
+++ b/dist/static/js/app.873ba29e990ee944222c.js
--- a/dist/static/js/app.873ba29e990ee944222c.js.map
+++ b/dist/static/js/app.873ba29e990ee944222c.js.map
--- a/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
+++ b/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
--- a/src/components/pages/disAdmin/score.vue
+++ b/src/components/pages/disAdmin/score.vue
@@ -122,17 +122,17 @@
 
				           </el-table-column> -->
			
 
				           <el-table-column label="评委1" min-width="10" align="center" v-if="$store.state.userInfo.role == 1">
			
 
				             <template slot-scope="scope">
			
 
				-              <div>{{ scope.row.firstPw ? scope.row.firstPw : "-" }}</div>
			
 
				+              <div>{{ scope.row.firstPw ? scope.row.firstPw+"-"+scope.row.firstPwP : "-" }}</div>
			
 
				             </template>
			
 
				           </el-table-column>
			
 
				            <el-table-column label="评委2" min-width="10" align="center" v-if="$store.state.userInfo.role == 1">
			
 
				             <template slot-scope="scope">
			
 
				-              <div>{{ scope.row.secondPw ? scope.row.secondPw : "-" }}</div>
			
 
				+              <div>{{ scope.row.secondPw ? scope.row.secondPw+"-"+scope.row.secondPwP : "-" }}</div>
			
 
				             </template>
			
 
				           </el-table-column>
			
 
				           <el-table-column label="评委3" min-width="10" align="center" v-if="$store.state.userInfo.role == 1">
			
 
				             <template slot-scope="scope">
			
 
				-              <div>{{ scope.row.thirdPw ? scope.row.thirdPw : "-" }}</div>
			
 
				+              <div>{{ scope.row.thirdPw ? scope.row.thirdPw+"-"+scope.row.thirdPwP : "-" }}</div>
			
 
				             </template>
			
 
				           </el-table-column>
			
 
				           <el-table-column label="评分结果" min-width="10" align="center" v-if="$store.state.userInfo.role == 1">
			
@@ -540,12 +540,16 @@ export default {
 
				                 }
			
 
				                 sum += sumScore;
			
 
				                 isScore++;
			
 
				+
			
 
				                 if (!p[j].firstPw) {
			
 
				                   p[j].firstPw = sumScore;
			
 
				+                  p[j].firstPwP = scoreList[i].name;
			
 
				                 } else if (!p[j].secondPw){
			
 
				-                    p[j].secondPw = sumScore;
			
 
				+                  p[j].secondPw = sumScore;
			
 
				+                  p[j].secondPwP = scoreList[i].name;
			
 
				                 } else if (!p[j].thirdPw){
			
 
				-                    p[j].thirdPw = sumScore;
			
 
				+                  p[j].thirdPw = sumScore;
			
 
				+                  p[j].thirdPwP = scoreList[i].name;
			
 
				                 }
			
 
				               }
			
 
				             }